v1.2.2 修正2016年国庆节数据；删除5月23日世界读书日；修复v1.2.0和v1.2.1的重大bug。

src/test/java/test/BaZiTest.java

@@ -57,6 +57,16 @@ public class BaZiTest {
     Assert.assertEquals("时柱", "辛亥", eightChar.getTime());
   }
 
+  @Test
+  public void testGanZhi3(){
+    Lunar lunar = new Lunar(2019,12,12,11,22,0);
+    EightChar eightChar = lunar.getEightChar();
+    Assert.assertEquals("年柱", "己亥", eightChar.getYear());
+    Assert.assertEquals("月柱", "丁丑", eightChar.getMonth());
+    Assert.assertEquals("日柱", "戊申", eightChar.getDay());
+    Assert.assertEquals("时柱", "戊午", eightChar.getTime());
+  }
+
   @Test
   public void testHideGan() {
     Solar solar = new Solar(2005, 12, 23, 8, 37, 0);

src/test/java/test/GanZhiTest.java

@@ -73,17 +73,6 @@ public class GanZhiTest {
     Assert.assertEquals("丁丑",lunar.getMonthInGanZhi());
     Assert.assertEquals("丁丑",lunar.getMonthInGanZhiExact());
 
-
-    solar = new Solar(2020,2,4,13,22,0);
-    lunar = solar.getLunar();
-    Assert.assertEquals("庚子",lunar.getYearInGanZhi());
-    Assert.assertEquals("庚子",lunar.getYearInGanZhiByLiChun());
-    Assert.assertEquals("己亥",lunar.getYearInGanZhiExact());
-
-    Assert.assertEquals("戊寅",lunar.getMonthInGanZhi());
-    Assert.assertEquals("丁丑",lunar.getMonthInGanZhiExact());
-
-
     solar = new Solar(2020,2,4,18,22,0);
     lunar = solar.getLunar();
     Assert.assertEquals("庚子",lunar.getYearInGanZhi());
@@ -320,4 +309,28 @@ public class GanZhiTest {
     Assert.assertEquals("戊辰",lunar.getYearInGanZhiExact());
   }
 
+  @Test
+  public void test17() {
+    Solar solar = new Solar(2019, 2, 8, 13, 22, 0);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("己亥", lunar.getYearInGanZhi());
+    Assert.assertEquals("己亥", lunar.getYearInGanZhiByLiChun());
+    Assert.assertEquals("己亥", lunar.getYearInGanZhiExact());
+
+    Assert.assertEquals("丙寅", lunar.getMonthInGanZhi());
+    Assert.assertEquals("丙寅", lunar.getMonthInGanZhiExact());
+  }
+
+  @Test
+  public void test18() {
+    Solar solar = new Solar(2020,2,4,13,22,0);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("庚子",lunar.getYearInGanZhi());
+    Assert.assertEquals("庚子",lunar.getYearInGanZhiByLiChun());
+    Assert.assertEquals("己亥",lunar.getYearInGanZhiExact());
+
+    Assert.assertEquals("戊寅",lunar.getMonthInGanZhi());
+    Assert.assertEquals("丁丑",lunar.getMonthInGanZhiExact());
+  }
+
 }

src/test/java/test/HolidayTest.java

@@ -1,5 +1,6 @@
 package test;
 
+import com.nlf.calendar.Holiday;
 import com.nlf.calendar.Solar;
 import com.nlf.calendar.util.HolidayUtil;
 import org.junit.Assert;
@@ -116,4 +117,12 @@ public class HolidayTest {
     Assert.assertEquals("2021-11-11 结婚纪念日 2021-11-11", HolidayUtil.getHoliday("2021-11-11") + "");
     Assert.assertEquals("2021-12-01 她的生日 2021-12-01", HolidayUtil.getHoliday("2021-12-01") + "");
   }
+
+  @Test
+  public void test1() {
+    Holiday holiday = HolidayUtil.getHoliday(2016,10,4);
+    Assert.assertNotNull(holiday);
+    Assert.assertNotNull(holiday.getTarget());
+    Assert.assertEquals("2016-10-01",holiday.getTarget());
+  }
 }

src/test/java/test/LunarTest.java

@@ -64,6 +64,67 @@ public class LunarTest {
     Assert.assertEquals("2020-05-24",lunar.getSolar().toString());
   }
 
+  @Test
+  public void test8(){
+    Lunar lunar = new Lunar(2020,12,10,13,0,0);
+    Assert.assertEquals("二〇二〇年腊月初十",lunar.toString());
+    Assert.assertEquals("2021-01-22",lunar.getSolar().toString());
+  }
+
+  @Test
+  public void test9(){
+    Lunar lunar = new Lunar(1500,1,1,12,0,0);
+    Assert.assertEquals("1500-01-31",lunar.getSolar().toString());
+  }
+
+  @Test
+  public void test10(){
+    Lunar lunar = new Lunar(1500,12,29,12,0,0);
+    Assert.assertEquals("1501-01-18",lunar.getSolar().toString());
+  }
+
+  @Test
+  public void test11(){
+    Solar solar = new Solar(1500,1,1,12,0,0);
+    Assert.assertEquals("一四九九年腊月初一",solar.getLunar().toString());
+  }
+
+  @Test
+  public void test12(){
+    Solar solar = new Solar(1500,12,31,12,0,0);
+    Assert.assertEquals("一五〇〇年腊月十一",solar.getLunar().toString());
+  }
+
+  @Test
+  public void test13(){
+    Solar solar = new Solar(1582,10,4,12,0,0);
+    Assert.assertEquals("一五八二年九月十八",solar.getLunar().toString());
+  }
+
+  @Test
+  public void test14(){
+    Solar solar = new Solar(1582,10,15,12,0,0);
+    Assert.assertEquals("一五八二年九月十九",solar.getLunar().toString());
+  }
+
+  @Test
+  public void test15(){
+    Lunar lunar = new Lunar(1582,9,18,12,0,0);
+    Assert.assertEquals("1582-10-04",lunar.getSolar().toString());
+  }
+
+  @Test
+  public void test16(){
+    Lunar lunar = new Lunar(1582,9,19,12,0,0);
+    Assert.assertEquals("1582-10-15",lunar.getSolar().toString());
+  }
+
+  @Test
+  public void test17(){
+    Lunar lunar = new Lunar(2019,12,12,11,22,0);
+    Assert.assertEquals("2020-01-06",lunar.getSolar().toString());
+  }
+
   @Test
   public void testNext(){
     Solar solar = new Solar(2020,1,10,12,0,0);

src/test/java/test/YunTest.java

@@ -24,4 +24,33 @@ public class YunTest {
     Assert.assertEquals("起运阳历", "1989-02-18", yun.getStartSolar().toYmd());
   }
 
+  @Test
+  public void test2() {
+    Lunar lunar = new Lunar(2019, 12, 12, 11, 22, 0);
+    System.out.println(lunar.getMonth());
+    System.out.println(lunar.toFullString());
+    System.out.println(lunar.getSolar().toFullString());
+    EightChar eightChar = lunar.getEightChar();
+    Yun yun = eightChar.getYun(1);
+    Assert.assertEquals("起运年数", 0, yun.getStartYear());
+    Assert.assertEquals("起运月数", 1, yun.getStartMonth());
+    Assert.assertEquals("起运天数", 0, yun.getStartDay());
+    Assert.assertEquals("起运阳历", "2020-02-06", yun.getStartSolar().toYmd());
+  }
+
+  @Test
+  public void test3() {
+    Solar solar = new Solar(2020, 1, 6, 11, 22, 0);
+    Lunar lunar = solar.getLunar();
+    System.out.println(lunar.getMonth());
+    System.out.println(lunar.toFullString());
+    System.out.println(lunar.getSolar().toFullString());
+    EightChar eightChar = lunar.getEightChar();
+    Yun yun = eightChar.getYun(1);
+    Assert.assertEquals("起运年数", 0, yun.getStartYear());
+    Assert.assertEquals("起运月数", 1, yun.getStartMonth());
+    Assert.assertEquals("起运天数", 0, yun.getStartDay());
+    Assert.assertEquals("起运阳历", "2020-02-06", yun.getStartSolar().toYmd());
+  }
+
 }