zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-08-18 20:38:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

add CalendarUtil

Browse Source
This commit is contained in:
Looly
2020-04-11 13:53:08 +08:00
parent bc486cdac4
commit 4a574e3241
5 changed files with 1238 additions and 1177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hutool-core/src/test/java/cn/hutool/core/date/DateUtilTest.java
View File

@@ -329,28 +329,36 @@ public class DateUtilTest {
Assert.assertEquals("20190321", ymd);
}
@SuppressWarnings("ConstantConditions")
@Test
public void parseTest5() {
// 测试时间解析
//noinspection ConstantConditions
String time = DateUtil.parse("22:12:12").toString(DatePattern.NORM_TIME_FORMAT);
Assert.assertEquals("22:12:12", time);
//noinspection ConstantConditions
time = DateUtil.parse("2:12:12").toString(DatePattern.NORM_TIME_FORMAT);
Assert.assertEquals("02:12:12", time);
//noinspection ConstantConditions
time = DateUtil.parse("2:2:12").toString(DatePattern.NORM_TIME_FORMAT);
Assert.assertEquals("02:02:12", time);
//noinspection ConstantConditions
time = DateUtil.parse("2:2:1").toString(DatePattern.NORM_TIME_FORMAT);
Assert.assertEquals("02:02:01", time);
//noinspection ConstantConditions
time = DateUtil.parse("22:2:1").toString(DatePattern.NORM_TIME_FORMAT);
Assert.assertEquals("22:02:01", time);
//noinspection ConstantConditions
time = DateUtil.parse("2:22:1").toString(DatePattern.NORM_TIME_FORMAT);
Assert.assertEquals("02:22:01", time);
// 测试两位时间解析
//noinspection ConstantConditions
time = DateUtil.parse("2:22").toString(DatePattern.NORM_TIME_FORMAT);
Assert.assertEquals("02:22:00", time);
//noinspection ConstantConditions
time = DateUtil.parse("12:22").toString(DatePattern.NORM_TIME_FORMAT);
Assert.assertEquals("12:22:00", time);
//noinspection ConstantConditions
time = DateUtil.parse("12:2").toString(DatePattern.NORM_TIME_FORMAT);
Assert.assertEquals("12:02:00", time);
@@ -688,6 +696,14 @@ public class DateUtilTest {
Assert.assertEquals(18, age);
}
@Test(expected = IllegalArgumentException.class)
public void ageTest2(){
String d1 = "2019-02-29";
String d2 = "2018-02-28";
final int age = DateUtil.age(DateUtil.parseDate(d1), DateUtil.parseDate(d2));
Assert.assertEquals(18, age);
}
@Test
public void isExpiredTest(){
DateTime startDate = DateUtil.parse("2019-12-01 17:02:30");