1
0
mirror of synced 2026-10-19 13:06:11 +08:00

v1.3.13 修复节气当天获取下一节气仍为当前节气的问题;修复每日宜忌存在重复项的问题;修复八字转阳历存在遗漏的问题。

This commit is contained in:
6tail
2024-02-29 11:59:27 +08:00
parent 1c3ff0cbc5
commit 0a4d172ef6
8 changed files with 78 additions and 21 deletions

View File

@@ -3,6 +3,7 @@ package test;
import com.nlf.calendar.EightChar;
import com.nlf.calendar.Lunar;
import com.nlf.calendar.Solar;
import com.nlf.calendar.eightchar.Yun;
import org.junit.Assert;
import org.junit.Test;
@@ -493,4 +494,40 @@ public class BaZiTest {
Assert.assertEquals("身宫", "乙巳", eightChar.getShenGong());
}
@Test
public void test28() {
Lunar lunar = Solar.fromYmdHms(1986, 5, 29, 13, 37, 0).getLunar();
EightChar eightChar = lunar.getEightChar();
Yun yun = eightChar.getYun(1, 2);
Assert.assertEquals(2, yun.getStartYear());
Assert.assertEquals(7, yun.getStartMonth());
Assert.assertEquals(0, yun.getStartDay());
}
@Test
public void test29() {
List<Solar> l = Solar.fromBaZi("甲辰","丙寅","壬戌","壬子", 2);
List<String> actual = new ArrayList<String>();
for (Solar solar : l) {
actual.add(solar.toYmdHms());
}
List<String> expected = new ArrayList<String>();
expected.add("2024-02-28 23:00:00");
Assert.assertEquals(expected, actual);
}
@Test
public void test30() {
List<Solar> l = Solar.fromBaZi("甲辰","丙寅","癸亥","壬子", 1);
List<String> actual = new ArrayList<String>();
for (Solar solar : l) {
actual.add(solar.toYmdHms());
}
List<String> expected = new ArrayList<String>();
expected.add("2024-02-29 00:00:00");
Assert.assertEquals(expected, actual);
}
}