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

修正节气判断逻辑，节气和节日一样，是一天而不是一段日期

Browse Source
This commit is contained in:
zak
2021-04-04 19:08:51 +08:00
parent d60b315a20
commit 0d4419d2aa
2 changed files with 20 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
hutool-core/src/test/java/cn/hutool/core/date/chinese/SolarTermsTest.java
View File

@@ -15,78 +15,52 @@ public class SolarTermsTest {
@Test
public void getTermTest() {
Assert.assertEquals("冬至", SolarTerms.getTerm(2021, 1, 4));
Assert.assertEquals("小寒", SolarTerms.getTerm(2021, 1, 5));
Assert.assertEquals("小寒", SolarTerms.getTerm(2021, 1, 19));
Assert.assertEquals("大寒", SolarTerms.getTerm(2021, 1, 20));
Assert.assertEquals("大寒", SolarTerms.getTerm(2021, 2, 2));
Assert.assertEquals("立春", SolarTerms.getTerm(2021, 2, 3));
Assert.assertEquals("立春", SolarTerms.getTerm(2021, 2, 17));
Assert.assertEquals("雨水", SolarTerms.getTerm(2021, 2, 18));
Assert.assertEquals("雨水", SolarTerms.getTerm(2021, 3, 4));
Assert.assertEquals("惊蛰", SolarTerms.getTerm(2021, 3, 5));
Assert.assertEquals("惊蛰", SolarTerms.getTerm(2021, 3, 19));
Assert.assertEquals("春分", SolarTerms.getTerm(2021, 3, 20));
Assert.assertEquals("春分", SolarTerms.getTerm(2021, 4, 3));
Assert.assertEquals("清明", SolarTerms.getTerm(2021, 4, 4));
Assert.assertEquals("清明", SolarTerms.getTerm(2021, 4, 10));
Assert.assertEquals("清明", SolarTerms.getTerm(2021, 4, 19));
Assert.assertEquals("谷雨", SolarTerms.getTerm(2021, 4, 20));
Assert.assertEquals("谷雨", SolarTerms.getTerm(2021, 4, 29));
Assert.assertEquals("谷雨", SolarTerms.getTerm(2021, 5, 4));
Assert.assertEquals("立夏", SolarTerms.getTerm(2021, 5, 5));
Assert.assertEquals("立夏", SolarTerms.getTerm(2021, 5, 9));
Assert.assertEquals("立夏", SolarTerms.getTerm(2021, 5, 20));
Assert.assertEquals("小满", SolarTerms.getTerm(2021, 5, 21));
Assert.assertEquals("小满", SolarTerms.getTerm(2021, 6, 4));
Assert.assertEquals("芒种", SolarTerms.getTerm(2021, 6, 5));
Assert.assertEquals("芒种", SolarTerms.getTerm(2021, 6, 20));
Assert.assertEquals("夏至", SolarTerms.getTerm(2021, 6, 21));
Assert.assertEquals("夏至", SolarTerms.getTerm(2021, 7, 6));
Assert.assertEquals("小暑", SolarTerms.getTerm(2021, 7, 7));
Assert.assertEquals("小暑", SolarTerms.getTerm(2021, 7, 21));
Assert.assertEquals("大暑", SolarTerms.getTerm(2021, 7, 22));
Assert.assertEquals("大暑", SolarTerms.getTerm(2021, 8, 6));
Assert.assertEquals("立秋", SolarTerms.getTerm(2021, 8, 7));
Assert.assertEquals("处暑", SolarTerms.getTerm(2021, 8, 23));
Assert.assertEquals("处暑", SolarTerms.getTerm(2021, 9, 6));
Assert.assertEquals("白露", SolarTerms.getTerm(2021, 9, 7));
Assert.assertEquals("白露", SolarTerms.getTerm(2021, 9, 22));
Assert.assertEquals("秋分", SolarTerms.getTerm(2021, 9, 23));
Assert.assertEquals("秋分", SolarTerms.getTerm(2021, 10, 7));
Assert.assertEquals("寒露", SolarTerms.getTerm(2021, 10, 8));
Assert.assertEquals("寒露", SolarTerms.getTerm(2021, 10, 22));
Assert.assertEquals("霜降", SolarTerms.getTerm(2021, 10, 23));
Assert.assertEquals("霜降", SolarTerms.getTerm(2021, 11, 6));
Assert.assertEquals("立冬", SolarTerms.getTerm(2021, 11, 7));
Assert.assertEquals("立冬", SolarTerms.getTerm(2021, 11, 21));
Assert.assertEquals("小雪", SolarTerms.getTerm(2021, 11, 22));
Assert.assertEquals("小雪", SolarTerms.getTerm(2021, 12, 6));
Assert.assertEquals("大雪", SolarTerms.getTerm(2021, 12, 7));
Assert.assertEquals("大雪", SolarTerms.getTerm(2021, 12, 20));
Assert.assertEquals("冬至", SolarTerms.getTerm(2021, 12, 21));
}
@@ -94,12 +68,14 @@ public class SolarTermsTest {
@Test
public void getTermByDateTest() {
Assert.assertEquals("春分", SolarTerms.getTerm(DateUtil.parseDate("2021-04-02")));
Assert.assertEquals("春分", SolarTerms.getTerm(DateUtil.parseDate("2021-03-20")));
Assert.assertEquals("处暑", SolarTerms.getTerm(DateUtil.parseDate("2022-08-23")));
}
@Test
public void getTermByChineseDateTest() {
Assert.assertEquals("清明", SolarTerms.getTerm(new ChineseDate(2021, 2, 25)));
Assert.assertEquals("清明", SolarTerms.getTerm(new ChineseDate(2021, 2, 23)));
Assert.assertEquals("秋分", SolarTerms.getTerm(new ChineseDate(2022, 8, 28)));
}
}