v1.2.6 新增治水、分饼、耕田、得金、日禄；新增时辰LunarTime；新增获取当天的所有时辰。

src/test/java/sample/BaZiTestNew.java

@@ -108,6 +108,15 @@ public class BaZiTestNew {
     }
   }
 
+  @Test
+  public void testBazi2Solar3() {
+    List<Solar> l = Solar.fromBaZi("辛丑", "丁酉", "丙寅", "戊戌");
+    // [2021-09-15 20:00:00 星期三 处女座, 1961-09-30 20:00:00 星期六 天秤座]
+    for (Solar solar : l) {
+      System.out.println(solar.toFullString());
+    }
+  }
+
   @Test
   public void testBaziShiShenZhi() {
     Solar solar = new Solar(2020, 1, 1, 22, 35, 0);

src/test/java/test/LunarTest.java

@@ -331,4 +331,25 @@ public class LunarTest {
     Assert.assertEquals("猴", lunar.getYearShengXiao());
   }
 
+  @Test
+  public void test45() {
+    Solar solar = Solar.fromYmd(1946, 9, 30);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("一九四六年九月初六", lunar.toString());
+  }
+
+  @Test
+  public void test46() {
+    Solar solar = Solar.fromYmd(1946, 9, 29);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("一九四六年九月初五", lunar.toString());
+  }
+
+  @Test
+  public void test47() {
+    Solar solar = Solar.fromYmd(2017, 2, 15);
+    Lunar lunar = solar.getLunar();
+    Assert.assertEquals("子命互禄 辛命进禄", lunar.getDayLu());
+  }
+
 }

src/test/java/test/YearTest.java

@@ -1,5 +1,6 @@
 package test;
 
+import com.nlf.calendar.LunarYear;
 import com.nlf.calendar.SolarYear;
 import org.junit.Assert;
 import org.junit.Test;
@@ -21,4 +22,43 @@ public class YearTest {
     Assert.assertEquals("2020年",year.next(1).toFullString());
   }
 
+  @Test
+  public void test1(){
+    LunarYear year = new LunarYear(2017);
+    Assert.assertEquals("二龙治水",year.getZhiShui());
+
+    year = new LunarYear(2018);
+    Assert.assertEquals("二龙治水",year.getZhiShui());
+
+    year = new LunarYear(2019);
+    Assert.assertEquals("八龙治水",year.getZhiShui());
+
+    year = new LunarYear(5);
+    Assert.assertEquals("三龙治水",year.getZhiShui());
+  }
+
+  @Test
+  public void test2(){
+    LunarYear year = new LunarYear(2017);
+    Assert.assertEquals("二人分饼",year.getFenBing());
+
+    year = new LunarYear(2018);
+    Assert.assertEquals("八人分饼",year.getFenBing());
+
+    year = new LunarYear(5);
+    Assert.assertEquals("一人分饼",year.getFenBing());
+  }
+
+  @Test
+  public void test3(){
+    LunarYear year = new LunarYear(2021);
+    Assert.assertEquals("十一牛耕田",year.getGengTian());
+  }
+
+  @Test
+  public void test4(){
+    LunarYear year = new LunarYear(2018);
+    Assert.assertEquals("三日得金",year.getDeJin());
+  }
+
 }