v1.3.11 修复命宫、身宫的错误。
This commit is contained in:
@@ -234,7 +234,7 @@ public class BaZiTest {
|
||||
@Test
|
||||
public void testShenGong1() {
|
||||
Lunar lunar = new Solar(1994, 12, 6, 2, 0, 0).getLunar();
|
||||
Assert.assertEquals("身宫", "丁丑", lunar.getEightChar().getShenGong());
|
||||
Assert.assertEquals("身宫", "乙丑", lunar.getEightChar().getShenGong());
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -412,7 +412,7 @@ public class BaZiTest {
|
||||
Solar solar = new Solar(1986, 5, 29, 13, 37, 0);
|
||||
Lunar lunar = solar.getLunar();
|
||||
EightChar eightChar = lunar.getEightChar();
|
||||
Assert.assertEquals("辛丑", eightChar.getShenGong());
|
||||
Assert.assertEquals("己丑", eightChar.getShenGong());
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -437,4 +437,60 @@ public class BaZiTest {
|
||||
Assert.assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test20() {
|
||||
List<Solar> l = Solar.fromBaZi("乙未","己卯","丁丑","甲辰");
|
||||
List<String> actual = new ArrayList<String>();
|
||||
for (Solar solar : l) {
|
||||
actual.add(solar.toYmdHms());
|
||||
}
|
||||
|
||||
List<String> expected = new ArrayList<String>();
|
||||
expected.add("1955-03-17 08:00:00");
|
||||
Assert.assertEquals(expected, actual);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test21() {
|
||||
Lunar lunar = Solar.fromYmdHms(2024, 1, 29, 9, 30, 0).getLunar();
|
||||
EightChar eightChar = lunar.getEightChar();
|
||||
Assert.assertEquals("命宫", "癸亥", eightChar.getMingGong());
|
||||
Assert.assertEquals("身宫", "己未", eightChar.getShenGong());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test22() {
|
||||
Assert.assertEquals("身宫", "丙寅", Solar.fromYmdHms(1990, 1, 27, 0, 0, 0).getLunar().getEightChar().getShenGong());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test23() {
|
||||
Assert.assertEquals("甲戌", Solar.fromYmdHms(2019, 3, 7, 8, 0, 0).getLunar().getEightChar().getMingGong());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test24() {
|
||||
Assert.assertEquals("丁丑", Solar.fromYmdHms(2019, 3, 27, 2, 0, 0).getLunar().getEightChar().getMingGong());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test25() {
|
||||
Assert.assertEquals("丙寅", Lunar.fromYmdHms(1994, 5, 20, 18, 0 ,0).getEightChar().getMingGong());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test26() {
|
||||
Lunar lunar = Solar.fromYmdHms(1986, 2, 16, 8, 0, 0).getLunar();
|
||||
EightChar eightChar = lunar.getEightChar();
|
||||
Assert.assertEquals("命宫", "己亥", eightChar.getMingGong());
|
||||
Assert.assertEquals("身宫", "乙未", eightChar.getShenGong());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test27() {
|
||||
Lunar lunar = Solar.fromYmdHms(1972, 11, 27, 10, 0, 0).getLunar();
|
||||
EightChar eightChar = lunar.getEightChar();
|
||||
Assert.assertEquals("身宫", "乙巳", eightChar.getShenGong());
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user