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

fix bug

Browse Source
This commit is contained in:
Looly
2022-03-28 00:44:21 +08:00
parent 8177848a47
commit 63ad6de20d
6 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
hutool-core/src/test/java/cn/hutool/core/date/ChineseDateTest.java
View File

@@ -57,10 +57,12 @@ public class ChineseDateTest {
Assert.assertEquals("六月", chineseDate.getChineseMonth());
chineseDate = new ChineseDate(2020,4,15);
Assert.assertEquals("四月", chineseDate.getChineseMonth());
Assert.assertEquals("2020-06-06 00:00:00", chineseDate.getGregorianDate().toString());
Assert.assertEquals("闰四月", chineseDate.getChineseMonth());
chineseDate = new ChineseDate(2020,5,15);
Assert.assertEquals("闰四月", chineseDate.getChineseMonth());
Assert.assertEquals("2020-07-05 00:00:00", chineseDate.getGregorianDate().toString());
Assert.assertEquals("五月", chineseDate.getChineseMonth());
}
@Test
@@ -82,12 +84,14 @@ public class ChineseDateTest {
@Test
public void dateTest2(){
//noinspection ConstantConditions
ChineseDate date = new ChineseDate(DateUtil.parse("2020-10-19"));
Assert.assertEquals("庚子鼠年 九月初三", date.toString());
}
@Test
public void dateTest2_2(){
//noinspection ConstantConditions
ChineseDate date = new ChineseDate(DateUtil.parse("2020-07-20"));
Assert.assertEquals("庚子鼠年 五月三十", date.toString());
}
@@ -95,13 +99,16 @@ public class ChineseDateTest {
@Test
public void dateTest3(){
// 初一，offset为0测试
//noinspection ConstantConditions
ChineseDate date = new ChineseDate(DateUtil.parse("2099-03-22"));
Assert.assertEquals("己未羊年 闰二月初一", date.toString());
}
@Test
public void leapMonthTest(){
//noinspection ConstantConditions
final ChineseDate c1 = new ChineseDate(DateUtil.parse("2028-05-28"));
//noinspection ConstantConditions
final ChineseDate c2 = new ChineseDate(DateUtil.parse("2028-06-27"));
Assert.assertEquals("戊申猴年 五月初五", c1.toString());
@@ -120,14 +127,17 @@ public class ChineseDateTest {
public void day19700101Test(){
// https://gitee.com/dromara/hutool/issues/I4UTPK
Date date = DateUtil.parse("1970-01-01");
//noinspection ConstantConditions
ChineseDate chineseDate = new ChineseDate(date);
Assert.assertEquals("己酉鸡年 冬月廿四", chineseDate.toString());
date = DateUtil.parse("1970-01-02");
//noinspection ConstantConditions
chineseDate = new ChineseDate(date);
Assert.assertEquals("己酉鸡年 冬月廿五", chineseDate.toString());
date = DateUtil.parse("1970-01-03");
//noinspection ConstantConditions
chineseDate = new ChineseDate(date);
Assert.assertEquals("己酉鸡年 冬月廿六", chineseDate.toString());
}
@@ -136,7 +146,18 @@ public class ChineseDateTest {
public void day19000101Test(){
// 1900-01-31之前不支持
Date date = DateUtil.parse("1900-01-31");
//noinspection ConstantConditions
ChineseDate chineseDate = new ChineseDate(date);
Assert.assertEquals("庚子鼠年 正月初一", chineseDate.toString());
}
@Test
public void getGregorianDateTest(){
// https://gitee.com/dromara/hutool/issues/I4ZSGJ
ChineseDate chineseDate = new ChineseDate(1998, 5, 1);
Assert.assertEquals("1998-06-24 00:00:00", chineseDate.getGregorianDate().toString());
chineseDate = new ChineseDate(1998, 5, 1, false);
Assert.assertEquals("1998-05-26 00:00:00", chineseDate.getGregorianDate().toString());
}
}

1
hutool-core/src/test/java/cn/hutool/core/date/WeekTest.java
View File

@@ -37,6 +37,7 @@ public class WeekTest {
Assert.assertEquals(Week.SATURDAY, Week.of("SATURDAY"));
}
@Test
public void ofTest2(){
Assert.assertEquals(Week.SUNDAY, Week.of(DayOfWeek.SUNDAY));
Assert.assertEquals(Week.MONDAY, Week.of(DayOfWeek.MONDAY));