From c93031cc28d172ebef5453414fa130638533e872 Mon Sep 17 00:00:00 2001 From: 6tail <6tail@6tail.cn> Date: Mon, 13 Sep 2021 15:41:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=B0=E5=86=AC=E6=9C=88?= =?UTF-8?q?=E3=80=81=E9=97=B0=E8=85=8A=E6=9C=88=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=8E=86=E4=B8=8D=E5=87=86?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B=E4=BF=AE=E5=A4=8D=E7=89=A9?= =?UTF-8?q?=E5=80=99=E9=94=99=E8=AF=AF=EF=BC=9B=E5=A4=A7=E8=BF=90=E3=80=81?= =?UTF-8?q?=E5=B0=8F=E8=BF=90=E3=80=81=E6=B5=81=E5=B9=B4=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=BD=AE=E6=95=B0=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- src/main/java/com/nlf/calendar/ExactDate.java | 10 +- src/main/java/com/nlf/calendar/Lunar.java | 2 +- src/main/java/com/nlf/calendar/LunarYear.java | 68 ++++- .../com/nlf/calendar/eightchar/DaYun.java | 25 +- .../java/com/nlf/calendar/eightchar/Yun.java | 13 +- .../com/nlf/calendar/util/HolidayUtil.java | 2 +- src/test/java/test/LunarTest.java | 278 +++++++++++++----- src/test/java/test/SolarTest.java | 6 + src/test/java/test/WuHouTest.java | 7 + 10 files changed, 314 insertions(+), 99 deletions(-) diff --git a/README.md b/README.md index 774d5f7..62bfb19 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # lunar [![License](https://img.shields.io/badge/license-MIT-4EB1BA.svg?style=flat-square)](https://github.com/6tail/lunar-java/blob/master/LICENSE) -lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)工具，支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道黑道日及吉凶、法定节假日及调休等。 +lunar是一款无第三方依赖的公历(阳历)和农历(阴历、老黄历)工具，支持星座、儒略日、干支、生肖、节气、节日、彭祖百忌、吉神(喜神/福神/财神/阳贵神/阴贵神)方位、胎神方位、冲煞、纳音、星宿、八字、五行、十神、建除十二值星、青龙名堂等十二神、黄道日及吉凶、法定节假日及调休等。 > 支持java 1.5及以上版本。 diff --git a/src/main/java/com/nlf/calendar/ExactDate.java b/src/main/java/com/nlf/calendar/ExactDate.java index 2ee09de..e26a37e 100644 --- a/src/main/java/com/nlf/calendar/ExactDate.java +++ b/src/main/java/com/nlf/calendar/ExactDate.java @@ -2,6 +2,7 @@ package com.nlf.calendar; import java.util.Calendar; import java.util.Date; +import java.util.TimeZone; /** * 精确日期 @@ -10,8 +11,13 @@ import java.util.Date; */ public class ExactDate { + /** + * 时区 + */ + private static final TimeZone TIME_ZONE = TimeZone.getTimeZone("GMT+8"); + public static Calendar fromYmdHms(int year, int month, int day, int hour, int minute, int second) { - Calendar c = Calendar.getInstance(); + Calendar c = Calendar.getInstance(TIME_ZONE); c.set(year, month - 1, day, hour, minute, second); c.set(Calendar.MILLISECOND, 0); return c; @@ -22,7 +28,7 @@ public class ExactDate { } public static Calendar fromDate(Date date) { - Calendar c = Calendar.getInstance(); + Calendar c = Calendar.getInstance(TIME_ZONE); c.setTime(date); c.set(Calendar.MILLISECOND, 0); return c; diff --git a/src/main/java/com/nlf/calendar/Lunar.java b/src/main/java/com/nlf/calendar/Lunar.java index 71ec44f..4cc991c 100644 --- a/src/main/java/com/nlf/calendar/Lunar.java +++ b/src/main/java/com/nlf/calendar/Lunar.java @@ -2590,6 +2590,6 @@ public class Lunar { Calendar startCalendar = ExactDate.fromYmd(startSolar.getYear(), startSolar.getMonth(), startSolar.getDay()); int days = (int) ((currentCalendar.getTimeInMillis() - startCalendar.getTimeInMillis()) / MS_PER_DAY); - return LunarUtil.WU_HOU[offset * 3 + days / 5]; + return LunarUtil.WU_HOU[(offset * 3 + days / 5) % LunarUtil.WU_HOU.length]; } } diff --git a/src/main/java/com/nlf/calendar/LunarYear.java b/src/main/java/com/nlf/calendar/LunarYear.java index f197e22..8c39d03 100644 --- a/src/main/java/com/nlf/calendar/LunarYear.java +++ b/src/main/java/com/nlf/calendar/LunarYear.java @@ -3,7 +3,9 @@ package com.nlf.calendar; import com.nlf.calendar.util.ShouXingUtil; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 农历年 @@ -12,6 +14,26 @@ import java.util.List; */ public class LunarYear { + /** + * 闰冬月年份 + */ + private static final int[] LEAP_11 = {75, 94, 170, 238, 265, 322, 389, 469, 553, 583, 610, 678, 735, 754, 773, 849, 887, 936, 1050, 1069, 1126, 1145, 1164, 1183, 1259, 1278, 1308, 1373, 1403, 1441, 1460, 1498, 1555, 1593, 1612, 1631, 1642, 2033, 2128, 2147, 2242, 2614, 2728, 2910, 3062, 3244, 3339, 3616, 3711, 3730, 3825, 4007, 4159, 4197, 4322, 4341, 4379, 4417, 4531, 4599, 4694, 4713, 4789, 4808, 4971, 5085, 5104, 5161, 5180, 5199, 5294, 5305, 5476, 5677, 5696, 5772, 5791, 5848, 5886, 6049, 6068, 6144, 6163, 6258, 6402, 6440, 6497, 6516, 6630, 6641, 6660, 6679, 6736, 6774, 6850, 6869, 6899, 6918, 6994, 7013, 7032, 7051, 7070, 7089, 7108, 7127, 7146, 7222, 7271, 7290, 7309, 7366, 7385, 7404, 7442, 7461, 7480, 7491, 7499, 7594, 7624, 7643, 7662, 7681, 7719, 7738, 7814, 7863, 7882, 7901, 7939, 7958, 7977, 7996, 8034, 8053, 8072, 8091, 8121, 8159, 8186, 8216, 8235, 8254, 8273, 8311, 8330, 8341, 8349, 8368, 8444, 8463, 8474, 8493, 8531, 8569, 8588, 8626, 8664, 8683, 8694, 8702, 8713, 8721, 8751, 8789, 8808, 8816, 8827, 8846, 8884, 8903, 8922, 8941, 8971, 9036, 9066, 9085, 9104, 9123, 9142, 9161, 9180, 9199, 9218, 9256, 9294, 9313, 9324, 9343, 9362, 9381, 9419, 9438, 9476, 9514, 9533, 9544, 9552, 9563, 9571, 9582, 9601, 9639, 9658, 9666, 9677, 9696, 9734, 9753, 9772, 9791, 9802, 9821, 9886, 9897, 9916, 9935, 9954, 9973, 9992}; + /** + * 闰腊月年份 + */ + private static final int[] LEAP_12 = {37, 56, 113, 132, 151, 189, 208, 227, 246, 284, 303, 341, 360, 379, 417, 436, 458, 477, 496, 515, 534, 572, 591, 629, 648, 667, 697, 716, 792, 811, 830, 868, 906, 925, 944, 963, 982, 1001, 1020, 1039, 1058, 1088, 1153, 1202, 1221, 1240, 1297, 1335, 1392, 1411, 1422, 1430, 1517, 1525, 1536, 1574, 3358, 3472, 3806, 3988, 4751, 4941, 5066, 5123, 5275, 5343, 5438, 5457, 5495, 5533, 5552, 5715, 5810, 5829, 5905, 5924, 6421, 6535, 6793, 6812, 6888, 6907, 7002, 7184, 7260, 7279, 7374, 7556, 7746, 7757, 7776, 7833, 7852, 7871, 7966, 8015, 8110, 8129, 8148, 8224, 8243, 8338, 8406, 8425, 8482, 8501, 8520, 8558, 8596, 8607, 8615, 8645, 8740, 8778, 8835, 8865, 8930, 8960, 8979, 8998, 9017, 9055, 9074, 9093, 9112, 9150, 9188, 9237, 9275, 9332, 9351, 9370, 9408, 9427, 9446, 9457, 9465, 9495, 9560, 9590, 9628, 9647, 9685, 9715, 9742, 9780, 9810, 9818, 9829, 9848, 9867, 9905, 9924, 9943, 9962, 10000}; + + private static final Map LEAP = new HashMap(); + + static { + for (int y : LEAP_11) { + LEAP.put(y, 13); + } + for (int y : LEAP_12) { + LEAP.put(y, 14); + } + } + /** * 农历年 */ @@ -55,7 +77,9 @@ public class LunarYear { // 每月天数 int[] dayCounts = new int[hs.length - 1]; - int year = this.year - 2000; + int currentYear = this.year; + + int year = currentYear - 2000; // 从上年的大雪到下年的立春 for (int i = 0, j = Lunar.JIE_QI_IN_USE.length; i < j; i++) { // 精确的节气 @@ -82,25 +106,41 @@ public class LunarYear { dayCounts[i] = (int) (hs[i + 1] - hs[i]); } - int leap = -1; - if (hs[13] <= jq[24]) { - int i = 1; - while (hs[i + 1] > jq[2 * i] && i < 13) { - i++; + Integer currentYearLeap = LEAP.get(currentYear); + if (null == currentYearLeap) { + currentYearLeap = -1; + if (hs[13] <= jq[24]) { + int i = 1; + while (hs[i + 1] > jq[2 * i] && i < 13) { + i++; + } + currentYearLeap = i; } - leap = i; } - int y = this.year - 1; + int prevYear = currentYear - 1; + Integer prevYearLeap = LEAP.get(prevYear); + prevYearLeap = null == prevYearLeap ? -1 : prevYearLeap - 12; + + int y = prevYear; int m = 11; for (int i = 0, j = dayCounts.length; i < j; i++) { - boolean isLeap = false; - if (i == leap) { - isLeap = true; - m--; + int cm = m; + boolean isNextLeap = false; + if (y == currentYear && i == currentYearLeap) { + cm = -cm; + } else if (y == prevYear && i == prevYearLeap) { + cm = -cm; + } + if (y == currentYear && i + 1 == currentYearLeap) { + isNextLeap = true; + } else if (y == prevYear && i + 1 == prevYearLeap) { + isNextLeap = true; + } + this.months.add(new LunarMonth(y, cm, dayCounts[i], hs[i] + Solar.J2000)); + if (!isNextLeap) { + m++; } - this.months.add(new LunarMonth(y, isLeap ? -m : m, dayCounts[i], hs[i] + Solar.J2000)); - m++; if (m == 13) { m = 1; y++; diff --git a/src/main/java/com/nlf/calendar/eightchar/DaYun.java b/src/main/java/com/nlf/calendar/eightchar/DaYun.java index dc428c4..89abb6f 100644 --- a/src/main/java/com/nlf/calendar/eightchar/DaYun.java +++ b/src/main/java/com/nlf/calendar/eightchar/DaYun.java @@ -117,12 +117,21 @@ public class DaYun { } /** - * 获取流年 + * 获取10轮流年 * * @return 流年 */ public LiuNian[] getLiuNian() { - int n = 10; + return getLiuNian(10); + } + + /** + * 获取流年 + * + * @param n 轮数 + * @return 流年 + */ + public LiuNian[] getLiuNian(int n) { if (index < 1) { n = endYear-startYear+1; } @@ -134,12 +143,20 @@ public class DaYun { } /** - * 获取小运 + * 获取10轮小运 * * @return 小运 */ public XiaoYun[] getXiaoYun() { - int n = 10; + return getXiaoYun(10); + } + + /** + * 获取小运 + * @param n 轮数 + * @return 小运 + */ + public XiaoYun[] getXiaoYun(int n) { if (index < 1) { n = endYear-startYear+1; } diff --git a/src/main/java/com/nlf/calendar/eightchar/Yun.java b/src/main/java/com/nlf/calendar/eightchar/Yun.java index 5abfd8b..80d5ec6 100644 --- a/src/main/java/com/nlf/calendar/eightchar/Yun.java +++ b/src/main/java/com/nlf/calendar/eightchar/Yun.java @@ -145,12 +145,21 @@ public class Yun { } /** - * 获取大运 + * 获取10轮大运 * * @return 大运 */ public DaYun[] getDaYun() { - int n = 10; + return getDaYun(10); + } + + /** + * 获取大运 + * + * @param n 轮数 + * @return 大运 + */ + public DaYun[] getDaYun(int n) { DaYun[] l = new DaYun[n]; for (int i = 0; i < n; i++) { l[i] = new DaYun(this, i); diff --git a/src/main/java/com/nlf/calendar/util/HolidayUtil.java b/src/main/java/com/nlf/calendar/util/HolidayUtil.java index 728faaf..fcd41c2 100644 --- a/src/main/java/com/nlf/calendar/util/HolidayUtil.java +++ b/src/main/java/com/nlf/calendar/util/HolidayUtil.java @@ -7,7 +7,7 @@ import java.util.Collections; import java.util.List; /** - * 法定节假日工具（默认自2001年12月29日起，至2020年12月31日止） + * 法定节假日工具（默认自2001年12月29日起） * * @author 6tail */ diff --git a/src/test/java/test/LunarTest.java b/src/test/java/test/LunarTest.java index d696e18..9781672 100644 --- a/src/test/java/test/LunarTest.java +++ b/src/test/java/test/LunarTest.java @@ -13,150 +13,280 @@ import org.junit.Test; public class LunarTest { @Test - public void test(){ - Lunar date = new Lunar(2019,3,27,0,0,0); - Assert.assertEquals("二〇一九年三月廿七",date.toString()); - Assert.assertEquals("二〇一九年三月廿七 己亥(猪)年 戊辰(龙)月 戊戌(狗)日 子(鼠)时 纳音[平地木 大林木 平地木 桑柘木] 星期三 (七殿泰山王诞) 西方白虎 星宿[参水猿](吉) 彭祖百忌[戊不受田田主不祥 戌不吃犬作怪上床] 喜神方位[巽](东南) 阳贵神方位[艮](东北) 阴贵神方位[坤](西南) 福神方位[坎](正北) 财神方位[坎](正北) 冲[(壬辰)龙] 煞[北]",date.toFullString()); - Assert.assertEquals("2019-05-01",date.getSolar().toString()); - Assert.assertEquals("2019-05-01 00:00:00 星期三 (劳动节) 金牛座",date.getSolar().toFullString()); + public void test() { + Lunar date = new Lunar(2019, 3, 27, 0, 0, 0); + Assert.assertEquals("二〇一九年三月廿七", date.toString()); + Assert.assertEquals("二〇一九年三月廿七 己亥(猪)年 戊辰(龙)月 戊戌(狗)日 子(鼠)时 纳音[平地木 大林木 平地木 桑柘木] 星期三 (七殿泰山王诞) 西方白虎 星宿[参水猿](吉) 彭祖百忌[戊不受田田主不祥 戌不吃犬作怪上床] 喜神方位[巽](东南) 阳贵神方位[艮](东北) 阴贵神方位[坤](西南) 福神方位[坎](正北) 财神方位[坎](正北) 冲[(壬辰)龙] 煞[北]", date.toFullString()); + Assert.assertEquals("2019-05-01", date.getSolar().toString()); + Assert.assertEquals("2019-05-01 00:00:00 星期三 (劳动节) 金牛座", date.getSolar().toFullString()); } @Test - public void test1(){ - Solar solar = new Solar(1,1,1,12,0,0); - Assert.assertEquals("〇年冬月十八",solar.getLunar().toString()); + public void test1() { + Solar solar = new Solar(1, 1, 1, 12, 0, 0); + Assert.assertEquals("〇年冬月十八", solar.getLunar().toString()); } @Test - public void test2(){ - Solar solar = new Solar(9999,12,31,12,0,0); - Assert.assertEquals("九九九九年腊月初二",solar.getLunar().toString()); + public void test2() { + Solar solar = new Solar(9999, 12, 31, 12, 0, 0); + Assert.assertEquals("九九九九年腊月初二", solar.getLunar().toString()); } @Test - public void test3(){ - Lunar lunar = new Lunar(0,11,18,12,0,0); - Assert.assertEquals("0001-01-01",lunar.getSolar().toString()); + public void test3() { + Lunar lunar = new Lunar(0, 11, 18, 12, 0, 0); + Assert.assertEquals("0001-01-01", lunar.getSolar().toString()); } @Test - public void test4(){ - Lunar lunar = new Lunar(9999,12,2,12,0,0); - Assert.assertEquals("9999-12-31",lunar.getSolar().toString()); + public void test4() { + Lunar lunar = new Lunar(9999, 12, 2, 12, 0, 0); + Assert.assertEquals("9999-12-31", lunar.getSolar().toString()); } @Test - public void test5(){ - Lunar lunar = new Lunar(1905,1,1,12,0,0); - Assert.assertEquals("1905-02-04",lunar.getSolar().toString()); + public void test5() { + Lunar lunar = new Lunar(1905, 1, 1, 12, 0, 0); + Assert.assertEquals("1905-02-04", lunar.getSolar().toString()); } @Test - public void test6(){ - Lunar lunar = new Lunar(2038,12,29,12,0,0); - Assert.assertEquals("2039-01-23",lunar.getSolar().toString()); + public void test6() { + Lunar lunar = new Lunar(2038, 12, 29, 12, 0, 0); + Assert.assertEquals("2039-01-23", lunar.getSolar().toString()); } @Test - public void test7(){ - Lunar lunar = new Lunar(2020,-4,2,13,0,0); - Assert.assertEquals("二〇二〇年闰四月初二",lunar.toString()); - Assert.assertEquals("2020-05-24",lunar.getSolar().toString()); + public void test7() { + Lunar lunar = new Lunar(2020, -4, 2, 13, 0, 0); + Assert.assertEquals("二〇二〇年闰四月初二", lunar.toString()); + Assert.assertEquals("2020-05-24", lunar.getSolar().toString()); } @Test - public void test8(){ - Lunar lunar = new Lunar(2020,12,10,13,0,0); - Assert.assertEquals("二〇二〇年腊月初十",lunar.toString()); - Assert.assertEquals("2021-01-22",lunar.getSolar().toString()); + public void test8() { + Lunar lunar = new Lunar(2020, 12, 10, 13, 0, 0); + Assert.assertEquals("二〇二〇年腊月初十", lunar.toString()); + Assert.assertEquals("2021-01-22", lunar.getSolar().toString()); } @Test - public void test9(){ - Lunar lunar = new Lunar(1500,1,1,12,0,0); - Assert.assertEquals("1500-01-31",lunar.getSolar().toString()); + public void test9() { + Lunar lunar = new Lunar(1500, 1, 1, 12, 0, 0); + Assert.assertEquals("1500-01-31", lunar.getSolar().toString()); } @Test - public void test10(){ - Lunar lunar = new Lunar(1500,12,29,12,0,0); - Assert.assertEquals("1501-01-18",lunar.getSolar().toString()); + public void test10() { + Lunar lunar = new Lunar(1500, 12, 29, 12, 0, 0); + Assert.assertEquals("1501-01-18", lunar.getSolar().toString()); } @Test - public void test11(){ - Solar solar = new Solar(1500,1,1,12,0,0); - Assert.assertEquals("一四九九年腊月初一",solar.getLunar().toString()); + public void test11() { + Solar solar = new Solar(1500, 1, 1, 12, 0, 0); + Assert.assertEquals("一四九九年腊月初一", solar.getLunar().toString()); } @Test - public void test12(){ - Solar solar = new Solar(1500,12,31,12,0,0); - Assert.assertEquals("一五〇〇年腊月十一",solar.getLunar().toString()); + public void test12() { + Solar solar = new Solar(1500, 12, 31, 12, 0, 0); + Assert.assertEquals("一五〇〇年腊月十一", solar.getLunar().toString()); } @Test - public void test13(){ - Solar solar = new Solar(1582,10,4,12,0,0); - Assert.assertEquals("一五八二年九月十八",solar.getLunar().toString()); + public void test13() { + Solar solar = new Solar(1582, 10, 4, 12, 0, 0); + Assert.assertEquals("一五八二年九月十八", solar.getLunar().toString()); } @Test - public void test14(){ - Solar solar = new Solar(1582,10,15,12,0,0); - Assert.assertEquals("一五八二年九月十九",solar.getLunar().toString()); + public void test14() { + Solar solar = new Solar(1582, 10, 15, 12, 0, 0); + Assert.assertEquals("一五八二年九月十九", solar.getLunar().toString()); } @Test - public void test15(){ - Lunar lunar = new Lunar(1582,9,18,12,0,0); - Assert.assertEquals("1582-10-04",lunar.getSolar().toString()); + public void test15() { + Lunar lunar = new Lunar(1582, 9, 18, 12, 0, 0); + Assert.assertEquals("1582-10-04", lunar.getSolar().toString()); } @Test - public void test16(){ - Lunar lunar = new Lunar(1582,9,19,12,0,0); - Assert.assertEquals("1582-10-15",lunar.getSolar().toString()); + public void test16() { + Lunar lunar = new Lunar(1582, 9, 19, 12, 0, 0); + Assert.assertEquals("1582-10-15", lunar.getSolar().toString()); } @Test - public void test17(){ - Lunar lunar = new Lunar(2019,12,12,11,22,0); - Assert.assertEquals("2020-01-06",lunar.getSolar().toString()); + public void test17() { + Lunar lunar = new Lunar(2019, 12, 12, 11, 22, 0); + Assert.assertEquals("2020-01-06", lunar.getSolar().toString()); } @Test - public void test18(){ - Lunar lunar = new Lunar(2021,12,29); - Assert.assertEquals("除夕",lunar.getFestivals().get(0)); + public void test18() { + Lunar lunar = new Lunar(2021, 12, 29); + Assert.assertEquals("除夕", lunar.getFestivals().get(0)); } @Test - public void test19(){ - Lunar lunar = new Lunar(2020,12,30); - Assert.assertEquals("除夕",lunar.getFestivals().get(0)); + public void test19() { + Lunar lunar = new Lunar(2020, 12, 30); + Assert.assertEquals("除夕", lunar.getFestivals().get(0)); } @Test - public void test20(){ - Lunar lunar = new Lunar(2020,12,29); - Assert.assertEquals(0,lunar.getFestivals().size()); + public void test20() { + Lunar lunar = new Lunar(2020, 12, 29); + Assert.assertEquals(0, lunar.getFestivals().size()); } @Test - public void test21(){ + public void test21() { Solar solar = Solar.fromYmd(2022, 1, 31); Lunar lunar = solar.getLunar(); - Assert.assertEquals("除夕",lunar.getFestivals().get(0)); + Assert.assertEquals("除夕", lunar.getFestivals().get(0)); } @Test - public void testNext(){ - Solar solar = new Solar(2020,1,10,12,0,0); + public void test22() { + Lunar lunar = Lunar.fromYmd(2033, -11, 1); + Assert.assertEquals("2033-12-22", lunar.getSolar().toYmd()); + } + + @Test + public void test23() { + Lunar lunar = Lunar.fromYmd(2022, 1, 1); + Assert.assertEquals("五黄土玉衡", lunar.getYearNineStar().toString()); + } + + @Test + public void test24() { + Lunar lunar = Lunar.fromYmd(2033, 1, 1); + Assert.assertEquals("三碧木天玑", lunar.getYearNineStar().toString()); + } + + @Test + public void test25() { + Solar solar = new Solar(2021, 6, 7, 21, 18, 0); Lunar lunar = solar.getLunar(); - for(int i=-50;i<50;i++){ - Assert.assertEquals("推移天数："+i,solar.next(i).getLunar().toFullString(),lunar.next(i).toFullString()); + Assert.assertEquals("二〇二一年四月廿七", lunar.toString()); + } + + @Test + public void test26() { + Lunar lunar = Lunar.fromYmdHms(2021, 6, 7, 21, 18, 0); + Solar solar = lunar.getSolar(); + Assert.assertEquals("2021-07-16", solar.toString()); + } + + @Test + public void testNext() { + Solar solar = new Solar(2020, 1, 10, 12, 0, 0); + Lunar lunar = solar.getLunar(); + for (int i = -50; i < 50; i++) { + Assert.assertEquals("推移天数：" + i, solar.next(i).getLunar().toFullString(), lunar.next(i).toFullString()); } } + @Test + public void test27() { + Solar solar = Solar.fromYmd(1989, 4, 28); + Lunar lunar = solar.getLunar(); + Assert.assertEquals(23, lunar.getDay()); + } + + @Test + public void test28() { + Solar solar = Solar.fromYmd(1990, 10, 8); + Lunar lunar = solar.getLunar(); + Assert.assertEquals("乙酉", lunar.getMonthInGanZhiExact()); + } + + @Test + public void test29() { + Solar solar = Solar.fromYmd(1990, 10, 9); + Lunar lunar = solar.getLunar(); + Assert.assertEquals("丙戌", lunar.getMonthInGanZhiExact()); + } + + @Test + public void test30() { + Solar solar = Solar.fromYmd(1990, 10, 8); + Lunar lunar = solar.getLunar(); + Assert.assertEquals("丙戌", lunar.getMonthInGanZhi()); + } + + @Test + public void test31() { + Solar solar = Solar.fromYmdHms(1987, 4, 17, 9, 0, 0); + Lunar lunar = solar.getLunar(); + Assert.assertEquals("一九八七年三月二十", lunar.toString()); + } + + @Test + public void test32() { + Lunar lunar = Lunar.fromYmd(2034, 1, 1); + Assert.assertEquals("2034-02-19", lunar.getSolar().toYmd()); + } + + @Test + public void test33() { + Lunar lunar = Lunar.fromYmd(2033, 12, 1); + Assert.assertEquals("2034-01-20", lunar.getSolar().toYmd()); + } + + @Test + public void test34() { + Lunar lunar = Lunar.fromYmd(37, -12, 1); + Assert.assertEquals("闰腊", lunar.getMonthInChinese()); + } + + @Test + public void test35() { + Lunar lunar = Lunar.fromYmd(56, -12, 1); + Assert.assertEquals("闰腊", lunar.getMonthInChinese()); + + lunar = Lunar.fromYmd(75, -11, 1); + Assert.assertEquals("闰冬", lunar.getMonthInChinese()); + + lunar = Lunar.fromYmd(94, -11, 1); + Assert.assertEquals("闰冬", lunar.getMonthInChinese()); + + lunar = Lunar.fromYmd(94, 12, 1); + Assert.assertEquals("腊", lunar.getMonthInChinese()); + + lunar = Lunar.fromYmd(113, 12, 1); + Assert.assertEquals("腊", lunar.getMonthInChinese()); + + lunar = Lunar.fromYmd(113, -12, 1); + Assert.assertEquals("闰腊", lunar.getMonthInChinese()); + + lunar = Lunar.fromYmd(5552, -12, 1); + Assert.assertEquals("闰腊", lunar.getMonthInChinese()); + } + + @Test + public void test36() { + Solar solar = Solar.fromYmd(5553, 1, 22); + Lunar lunar = solar.getLunar(); + Assert.assertEquals("五五五二年闰腊月初二", lunar.toString()); + } + + @Test + public void test37() { + Solar solar = Solar.fromYmd(7013, 12, 24); + Lunar lunar = solar.getLunar(); + Assert.assertEquals("七〇一三年闰冬月初四", lunar.toString()); + } + + @Test + public void test38() { + Lunar lunar = Lunar.fromYmd(7013, -11, 4); + Solar solar = lunar.getSolar(); + Assert.assertEquals("7013-12-24", solar.toString()); + } + } diff --git a/src/test/java/test/SolarTest.java b/src/test/java/test/SolarTest.java index 182fa60..d56af07 100644 --- a/src/test/java/test/SolarTest.java +++ b/src/test/java/test/SolarTest.java @@ -1,6 +1,7 @@ package test; import com.nlf.calendar.Solar; +import com.nlf.calendar.util.SolarUtil; import org.junit.Assert; import org.junit.Test; @@ -44,6 +45,11 @@ public class SolarTest { Assert.assertEquals("二六年三月初八",solar.getLunar().toString()); } + @Test + public void test10(){ + Assert.assertEquals(false, SolarUtil.isLeapYear(1500)); + } + @Test public void testNext(){ Solar date = new Solar(2020,1,23); diff --git a/src/test/java/test/WuHouTest.java b/src/test/java/test/WuHouTest.java index 71161ad..650ec6c 100644 --- a/src/test/java/test/WuHouTest.java +++ b/src/test/java/test/WuHouTest.java @@ -68,4 +68,11 @@ public class WuHouTest { Assert.assertEquals(solar.toString(),"鹖鴠不鸣",lunar.getWuHou()); } + @Test + public void test9(){ + Solar solar = new Solar(1982,12,22); + Lunar lunar = solar.getLunar(); + Assert.assertEquals(solar.toString(),"蚯蚓结",lunar.getWuHou()); + } + }