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-04 11:59:43 +08:00
parent 52d4a68bca
commit 05e453b23c
8 changed files with 57 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,12 +170,12 @@ public class DateUtilTest {
final Date endOfWeek = DateUtil.endOfWeek(date);
Assertions.assertEquals("2017-03-05 23:59:59", endOfWeek.toString());
final Calendar calendar = DateUtil.calendar(date);
final Calendar calendar = CalendarUtil.calendar(date);
// 一周的开始
final Calendar begin = DateUtil.beginOfWeek(calendar);
final Calendar begin = CalendarUtil.beginOfWeek(calendar);
Assertions.assertEquals("2017-02-27 00:00:00", DateUtil.date(begin).toString());
// 一周的结束
final Calendar end = DateUtil.endOfWeek(calendar);
final Calendar end = CalendarUtil.endOfWeek(calendar);
Assertions.assertEquals("2017-03-05 23:59:59", DateUtil.date(end).toString());
}
@@ -184,11 +184,11 @@ public class DateUtilTest {
final String beginStr = "2020-03-11";
final DateTime date = DateUtil.parse(beginStr);
final Calendar calendar = Objects.requireNonNull(date).toCalendar();
final Calendar begin = DateUtil.beginOfWeek(calendar, false);
final Calendar begin = CalendarUtil.beginOfWeek(calendar, false);
Assertions.assertEquals("2020-03-08 00:00:00", DateUtil.date(begin).toString());
final Calendar calendar2 = date.toCalendar();
final Calendar end = DateUtil.endOfWeek(calendar2, false);
final Calendar end = CalendarUtil.endOfWeek(calendar2, false);
Assertions.assertEquals("2020-03-14 23:59:59", DateUtil.date(end).toString());
}

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

@@ -30,6 +30,6 @@ public class Issue3011Test {
calendar2.set(2021, Calendar.FEBRUARY, 12);
Assertions.assertFalse(DateUtil.isSameMonth(calendar1, calendar2));
Assertions.assertFalse(CalendarUtil.isSameMonth(calendar1, calendar2));
}
}

4
hutool-core/src/test/java/org/dromara/hutool/core/lang/range/RangeTest.java
View File

@@ -33,8 +33,8 @@ public class RangeTest {
@Test
public void dateRangeTest() {
final DateTime start = DateUtil.parseDateTime("2017-01-01");
final DateTime end = DateUtil.parseDateTime("2017-01-02");
final DateTime start = DateUtil.parse("2017-01-01");
final DateTime end = DateUtil.parse("2017-01-02");
final Range<DateTime> range = new Range<>(start, end, (current, end1, index) -> {
if (current.isAfterOrEquals(end1)) {