zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2024-07-31 15:46:15 +08:00
parent 1a0ae09047
commit a22f4d686a
7 changed files with 85 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
hutool-core/src/test/java/org/dromara/hutool/core/date/DateModifierTest.java
View File

@@ -85,52 +85,52 @@ public class DateModifierTest {
final Date date = DateUtil.parse(dateStr);
// 毫秒
DateTime begin = DateUtil.ceiling(date, DateField.MILLISECOND);
DateTime begin = DateUtil.ceiling(date, DateField.MILLISECOND, false);
Assertions.assertEquals(dateStr, begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
// 秒
begin = DateUtil.ceiling(date, DateField.SECOND);
begin = DateUtil.ceiling(date, DateField.SECOND, false);
Assertions.assertEquals("2017-03-01 22:33:23.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
// 分
begin = DateUtil.ceiling(date, DateField.MINUTE);
begin = DateUtil.ceiling(date, DateField.MINUTE, false);
Assertions.assertEquals("2017-03-01 22:33:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
// 小时
begin = DateUtil.ceiling(date, DateField.HOUR);
begin = DateUtil.ceiling(date, DateField.HOUR, false);
Assertions.assertEquals("2017-03-01 22:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
begin = DateUtil.ceiling(date, DateField.HOUR_OF_DAY);
begin = DateUtil.ceiling(date, DateField.HOUR_OF_DAY, false);
Assertions.assertEquals("2017-03-01 22:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
// 上下午，原始日期是22点，上下午的结束就是23点
begin = DateUtil.ceiling(date, DateField.AM_PM);
begin = DateUtil.ceiling(date, DateField.AM_PM, false);
Assertions.assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
// 天，day of xxx按照day处理
begin = DateUtil.ceiling(date, DateField.DAY_OF_WEEK_IN_MONTH);
begin = DateUtil.ceiling(date, DateField.DAY_OF_WEEK_IN_MONTH, false);
Assertions.assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
begin = DateUtil.ceiling(date, DateField.DAY_OF_WEEK);
begin = DateUtil.ceiling(date, DateField.DAY_OF_WEEK, false);
Assertions.assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
begin = DateUtil.ceiling(date, DateField.DAY_OF_MONTH);
begin = DateUtil.ceiling(date, DateField.DAY_OF_MONTH, false);
Assertions.assertEquals("2017-03-01 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
// 星期
begin = DateUtil.ceiling(date, DateField.WEEK_OF_MONTH);
begin = DateUtil.ceiling(date, DateField.WEEK_OF_MONTH, false);
Assertions.assertEquals("2017-03-05 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
begin = DateUtil.ceiling(date, DateField.WEEK_OF_YEAR);
begin = DateUtil.ceiling(date, DateField.WEEK_OF_YEAR, false);
Assertions.assertEquals("2017-03-05 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
// 月
begin = DateUtil.ceiling(date, DateField.MONTH);
begin = DateUtil.ceiling(date, DateField.MONTH, false);
Assertions.assertEquals("2017-03-31 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
// 年
begin = DateUtil.ceiling(date, DateField.YEAR);
begin = DateUtil.ceiling(date, DateField.YEAR, false);
Assertions.assertEquals("2017-12-31 23:59:59.999", begin.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
}
@Test
public void roundTest(){
public void roundTest() {
// issues#I5M2I0
final String dateStr = "2022-08-12 14:59:21.500";
final Date date = DateUtil.parse(dateStr);

2
hutool-core/src/test/java/org/dromara/hutool/core/date/DateTimeTest.java
View File

@@ -92,7 +92,7 @@ public class DateTimeTest {
// 精确到毫秒
final DateTime endTime = new DateTime("2017-12-31 23:59:59.999", DatePattern.NORM_DATETIME_MS_FORMAT);
dateTime = DateUtil.endOfQuarter(dateTime);
dateTime = DateUtil.endOfQuarter(dateTime, false);
Assertions.assertEquals(endTime, dateTime);
}

20
hutool-core/src/test/java/org/dromara/hutool/core/date/DateUtilTest.java
View File

@@ -113,14 +113,14 @@ public class DateUtilTest {
final Date beginOfDay = DateUtil.beginOfDay(date);
Assertions.assertEquals("2017-03-01 00:00:00", beginOfDay.toString());
// 一天的结束
final Date endOfDay = DateUtil.endOfDay(date);
final Date endOfDay = DateUtil.endOfDay(date, false);
Assertions.assertEquals("2017-03-01 23:59:59", endOfDay.toString());
}
@Test
public void endOfDayTest() {
final Date parse = DateUtil.parse("2020-05-31 00:00:00");
Assertions.assertEquals("2020-05-31 23:59:59", DateUtil.endOfDay(parse).toString());
Assertions.assertEquals("2020-05-31 23:59:59", DateUtil.endOfDay(parse, false).toString());
}
@Test
@@ -137,7 +137,7 @@ public class DateUtilTest {
final Date date2 = DateUtil.parse(dateStr2);
DateTime dateTime = DateUtil.ceiling(date2, DateField.MINUTE);
DateTime dateTime = DateUtil.ceiling(date2, DateField.MINUTE, false);
Assertions.assertEquals("2020-02-29 12:59:59.999", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
dateTime = DateUtil.ceiling(date2, DateField.MINUTE, true);
@@ -150,7 +150,7 @@ public class DateUtilTest {
final Date date2 = DateUtil.parse(dateStr2);
DateTime dateTime = DateUtil.ceiling(date2, DateField.DAY_OF_MONTH);
DateTime dateTime = DateUtil.ceiling(date2, DateField.DAY_OF_MONTH, false);
Assertions.assertEquals("2020-02-29 23:59:59.999", dateTime.toString(DatePattern.NORM_DATETIME_MS_PATTERN));
dateTime = DateUtil.ceiling(date2, DateField.DAY_OF_MONTH, true);
@@ -167,7 +167,7 @@ public class DateUtilTest {
final Date beginOfWeek = DateUtil.beginOfWeek(date);
Assertions.assertEquals("2017-02-27 00:00:00", beginOfWeek.toString());
// 一周的结束
final Date endOfWeek = DateUtil.endOfWeek(date);
final Date endOfWeek = DateUtil.endOfWeek(date, true, false);
Assertions.assertEquals("2017-03-05 23:59:59", endOfWeek.toString());
final Calendar calendar = CalendarUtil.calendar(date);
@@ -175,7 +175,7 @@ public class DateUtilTest {
final Calendar begin = CalendarUtil.beginOfWeek(calendar);
Assertions.assertEquals("2017-02-27 00:00:00", DateUtil.date(begin).toString());
// 一周的结束
final Calendar end = CalendarUtil.endOfWeek(calendar);
final Calendar end = CalendarUtil.endOfWeek(calendar, true, false);
Assertions.assertEquals("2017-03-05 23:59:59", DateUtil.date(end).toString());
}
@@ -188,7 +188,7 @@ public class DateUtilTest {
Assertions.assertEquals("2020-03-08 00:00:00", DateUtil.date(begin).toString());
final Calendar calendar2 = date.toCalendar();
final Calendar end = CalendarUtil.endOfWeek(calendar2, false);
final Calendar end = CalendarUtil.endOfWeek(calendar2, false, false);
Assertions.assertEquals("2020-03-14 23:59:59", DateUtil.date(end).toString());
}
@@ -743,14 +743,14 @@ public class DateUtilTest {
public void endOfYearTest() {
final DateTime date = DateUtil.now();
date.setField(DateField.YEAR, 2019);
final DateTime endOfYear = DateUtil.endOfYear(date);
final DateTime endOfYear = DateUtil.endOfYear(date, false);
Assertions.assertEquals("2019-12-31 23:59:59", endOfYear.toString());
}
@Test
public void endOfQuarterTest() {
final Date date = DateUtil.endOfQuarter(
DateUtil.parse("2020-05-31 00:00:00"));
DateUtil.parse("2020-05-31 00:00:00"), false);
Assertions.assertEquals("2020-06-30 23:59:59", DateUtil.format(date, "yyyy-MM-dd HH:mm:ss"));
}
@@ -762,7 +762,7 @@ public class DateUtilTest {
final DateTime startOfWeek = DateUtil.beginOfWeek(now);
Assertions.assertEquals("2019-09-09 00:00:00", startOfWeek.toString());
final DateTime endOfWeek = DateUtil.endOfWeek(now);
final DateTime endOfWeek = DateUtil.endOfWeek(now, true, false);
Assertions.assertEquals("2019-09-15 23:59:59", endOfWeek.toString());
final long between = DateUtil.between(endOfWeek, startOfWeek, DateUnit.DAY);