v1.2.22 新增万圣节、万圣节前夜；新增全国中小学生安全教育日；新增春社（原二月初二春社改为社日节）、秋社；优化代码。

src/test/java/test/GanZhiTest.java

@@ -333,4 +333,22 @@ public class GanZhiTest {
     Assert.assertEquals("丁丑",lunar.getMonthInGanZhiExact());
   }
 
+  @Test
+  public void test19() {
+    Solar solar = new Solar(2022,4,6,20,18,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());
+
+    Assert.assertEquals("己丑",lunar.getDayInGanZhi());
+    Assert.assertEquals("己丑",lunar.getDayInGanZhiExact());
+    Assert.assertEquals("己丑",lunar.getDayInGanZhiExact2());
+
+    Assert.assertEquals("甲戌",lunar.getTimeInGanZhi());
+  }
+
 }

src/test/java/test/LunarTest.java

@@ -424,4 +424,39 @@ public class LunarTest {
     Assert.assertEquals(4, lunar.getDayJi().size());
   }
 
+  @Test
+  public void test57() {
+    Solar solar = new Solar(1991, 2, 5);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("庚寅", lunar.getMonthInGanZhi());
+  }
+
+  @Test
+  public void test58() {
+    Solar solar = new Solar(2021, 3, 21);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("春社", lunar.getOtherFestivals().get(0));
+  }
+
+  @Test
+  public void test59() {
+    Solar solar = new Solar(2022, 3, 16);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("春社", lunar.getOtherFestivals().get(0));
+  }
+
+  @Test
+  public void test60() {
+    Solar solar = new Solar(1722, 9, 25);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("秋社", lunar.getOtherFestivals().get(0));
+  }
+
+  @Test
+  public void test61() {
+    Solar solar = new Solar(840, 9, 14);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("秋社", lunar.getOtherFestivals().get(0));
+  }
+
 }

src/test/java/test/SolarTest.java

@@ -47,7 +47,7 @@ public class SolarTest {
 
   @Test
   public void test10(){
-    Assert.assertEquals(false, SolarUtil.isLeapYear(1500));
+    Assert.assertFalse(SolarUtil.isLeapYear(1500));
   }
 
   @Test
@@ -73,4 +73,10 @@ public class SolarTest {
     Assert.assertEquals("2020-01-19",date.next(1,true).toString());
   }
 
+  @Test
+  public void test11(){
+    Solar solar = new Solar(2022, 3, 28);
+    Assert.assertEquals("全国中小学生安全教育日",solar.getFestivals().get(0));
+  }
+
 }