1
0
mirror of synced 2026-10-17 03:56:11 +08:00

v1.3.12 八字转阳历结果按时间先后排序,转换速度大幅提升。

This commit is contained in:
6tail
2024-02-06 17:40:46 +08:00
parent e15a916e55
commit 1c3ff0cbc5
8 changed files with 82 additions and 97 deletions

View File

@@ -258,8 +258,8 @@ public class BaZiTest {
}
List<String> expected = new ArrayList<String>();
expected.add("1976-09-21 12:00:00");
expected.add("1916-10-06 12:00:00");
expected.add("1976-09-21 12:00:00");
Assert.assertEquals(expected, actual);
}
@@ -285,8 +285,8 @@ public class BaZiTest {
}
List<String> expected = new ArrayList<String>();
expected.add("1999-07-21 16:00:00");
expected.add("1939-08-05 16:00:00");
expected.add("1999-07-21 16:00:00");
Assert.assertEquals(expected, actual);
}
@@ -299,8 +299,8 @@ public class BaZiTest {
}
List<String> expected = new ArrayList<String>();
expected.add("1960-12-17 12:00:00");
expected.add("1901-01-01 12:00:00");
expected.add("1960-12-17 12:00:00");
Assert.assertEquals(expected, actual);
}
@@ -313,8 +313,8 @@ public class BaZiTest {
}
List<String> expected = new ArrayList<String>();
expected.add("2020-07-21 22:00:00");
expected.add("1960-08-05 22:00:00");
expected.add("2020-07-21 22:00:00");
Assert.assertEquals(expected, actual);
}
@@ -368,15 +368,15 @@ public class BaZiTest {
@Test
public void test14() {
List<Solar> l = Solar.fromBaZi("癸卯","甲寅","癸丑","甲子", 2, 1843);
List<Solar> l = Solar.fromBaZi("癸卯","甲寅","甲寅","甲子", 2, 1843);
List<String> actual = new ArrayList<String>();
for (Solar solar : l) {
actual.add(solar.toYmdHms());
}
List<String> expected = new ArrayList<String>();
expected.add("2023-02-24 23:00:00");
expected.add("1843-02-08 23:00:00");
expected.add("1843-02-09 00:00:00");
expected.add("2023-02-25 00:00:00");
Assert.assertEquals(expected, actual);
}
@@ -389,8 +389,8 @@ public class BaZiTest {
}
List<String> expected = new ArrayList<String>();
expected.add("1960-01-15 16:00:00");
expected.add("1900-01-29 16:00:00");
expected.add("1960-01-15 16:00:00");
Assert.assertEquals(expected, actual);
}
@@ -432,8 +432,8 @@ public class BaZiTest {
}
List<String> expected = new ArrayList<String>();
expected.add("1997-03-12 18:00:00");
expected.add("1937-03-27 18:00:00");
expected.add("1997-03-12 18:00:00");
Assert.assertEquals(expected, actual);
}