Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f3e2d29bd | ||
|
|
ce267b4942 | ||
|
|
6581f01956 |
@@ -152,7 +152,7 @@ test('身宫1', () => {
|
||||
const solar = Solar.fromYmdHms(1994, 12, 6, 2, 0, 0);
|
||||
const lunar = solar.getLunar();
|
||||
const eightChar = lunar.getEightChar();
|
||||
expect(eightChar.getShenGong()).toBe('丁丑');
|
||||
expect(eightChar.getShenGong()).toBe('乙丑');
|
||||
});
|
||||
|
||||
test('身宫2', () => {
|
||||
@@ -189,3 +189,55 @@ test('流月', () => {
|
||||
const yun = eightChar.getYun(1);
|
||||
expect(yun.getDaYun()[0].getLiuNian()[0].getLiuYue()[0].getGanZhi()).toBe('甲寅');
|
||||
});
|
||||
|
||||
test('test19', () => {
|
||||
const solarList = Solar.fromBaZi('丁丑','癸卯','癸丑','辛酉', 2, 1900);
|
||||
const timeList = [];
|
||||
solarList.forEach(solar => {
|
||||
timeList.push(solar.toYmdHms());
|
||||
})
|
||||
expect(timeList).toStrictEqual(['1997-03-12 18:00:00', '1937-03-27 18:00:00']);
|
||||
});
|
||||
|
||||
|
||||
test('test20', () => {
|
||||
const lunar = Solar.fromYmdHms(2024, 1, 29, 9, 30, 0).getLunar();
|
||||
const eightChar = lunar.getEightChar();
|
||||
expect(eightChar.getMingGong()).toBe('癸亥');
|
||||
expect(eightChar.getShenGong()).toBe('己未');
|
||||
});
|
||||
|
||||
|
||||
test('test21', () => {
|
||||
expect(Solar.fromYmdHms(1990, 1, 27, 0, 0, 0).getLunar().getEightChar().getShenGong()).toBe('丙寅');
|
||||
});
|
||||
|
||||
|
||||
test('test23', () => {
|
||||
expect(Solar.fromYmdHms(2019, 3, 7, 8, 0, 0).getLunar().getEightChar().getMingGong()).toBe('甲戌');
|
||||
});
|
||||
|
||||
|
||||
test('test24', () => {
|
||||
expect(Solar.fromYmdHms(2019, 3, 27, 2, 0, 0).getLunar().getEightChar().getMingGong()).toBe('丁丑');
|
||||
});
|
||||
|
||||
|
||||
test('test25', () => {
|
||||
expect(Lunar.fromYmdHms(1994, 5, 20, 18, 0 ,0).getEightChar().getMingGong()).toBe('丙寅');
|
||||
});
|
||||
|
||||
|
||||
test('test26', () => {
|
||||
const lunar = Solar.fromYmdHms(1986, 2, 16, 8, 0, 0).getLunar();
|
||||
const eightChar = lunar.getEightChar();
|
||||
expect(eightChar.getMingGong()).toBe('己亥');
|
||||
expect(eightChar.getShenGong()).toBe('乙未');
|
||||
});
|
||||
|
||||
|
||||
test('test27', () => {
|
||||
const lunar = Solar.fromYmdHms(1972, 11, 27, 10, 0, 0).getLunar();
|
||||
const eightChar = lunar.getEightChar();
|
||||
expect(eightChar.getShenGong()).toBe('乙巳');
|
||||
});
|
||||
|
||||
@@ -655,3 +655,11 @@ test('test071', () => {
|
||||
const solar = Solar.fromYmd(918, 1, 1);
|
||||
expect(solar.getLunar().toString()).toBe('九一七年冬月十六');
|
||||
});
|
||||
|
||||
test('test072', () => {
|
||||
const solar = Solar.fromYmd(1991, 2, 15);
|
||||
const lunar = solar.getLunar();
|
||||
expect(lunar.toString()).toBe('一九九一年正月初一');
|
||||
expect(lunar.getYearInGanZhi()).toBe('辛未');
|
||||
expect(lunar.getYearShengXiao()).toBe('羊');
|
||||
});
|
||||
|
||||
@@ -65,3 +65,13 @@ test('test9', () => {
|
||||
test('test10', () => {
|
||||
expect(Solar.fromYmd(9865, 7, 26).getWeek()).toBe(3);
|
||||
});
|
||||
|
||||
test('test11', () => {
|
||||
expect(Solar.fromYmd(1961, 9, 30).getWeek()).toBe(6);
|
||||
expect(Solar.fromYmdHms(1961, 9, 30, 23, 59, 59).getWeek()).toBe(6);
|
||||
});
|
||||
|
||||
test('test12', () => {
|
||||
expect(Solar.fromYmdHms(2021, 9, 15, 0, 0, 0).getWeek()).toBe(3);
|
||||
expect(Solar.fromYmdHms(2021, 9, 15, 23, 59, 59).getWeek()).toBe(3);
|
||||
});
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "lunar-javascript",
|
||||
"version": "1.6.6",
|
||||
"version": "1.6.9",
|
||||
"description": "lunar is a calendar library for Solar and Chinese Lunar.",
|
||||
"main": "index.js",
|
||||
"scripts": {
|
||||
|
||||
Reference in New Issue
Block a user