lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-05-05 13:17:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3443 from lanluyug/v6-dev

Browse Source 
fix code:三月初一与闰二月初一不应该相等
This commit is contained in:
Golden Looly 2023-12-25 15:38:08 +08:00 committed by GitHub
commit d8dbb1f11c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hutool-core/src/main/java/org/dromara/hutool/core/date/chinese/ChineseDate.java
View File

@ -414,12 +414,12 @@ public class ChineseDate {
return false; return false;
} }
final ChineseDate that = (ChineseDate) o; final ChineseDate that = (ChineseDate) o;
return year == that.year && month == that.month && day == that.day; return year == that.year && month == that.month && day == that.day && isLeapMonth == that.isLeapMonth;
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(year, month, day); return Objects.hash(year, month, day, isLeapMonth);
} }
// ------------------------------------------------------- private method start // ------------------------------------------------------- private method start

6
hutool-core/src/test/java/org/dromara/hutool/core/date/ChineseDateTest.java
View File

@ -182,16 +182,22 @@ public class ChineseDateTest {
final Date date1 = DateUtil.date(LocalDate.of(2023, 2, 20)); final Date date1 = DateUtil.date(LocalDate.of(2023, 2, 20));
// 润二月初一 // 润二月初一
final Date date2 = DateUtil.date(LocalDate.of(2023, 3, 22)); final Date date2 = DateUtil.date(LocalDate.of(2023, 3, 22));
// 三月初一
final Date date4 = DateUtil.date(LocalDate.of(2023, 4, 20));
final ChineseDate chineseDate1 = new ChineseDate(date1); final ChineseDate chineseDate1 = new ChineseDate(date1);
final ChineseDate chineseDate2 = new ChineseDate(date2); final ChineseDate chineseDate2 = new ChineseDate(date2);
final ChineseDate chineseDate3 = new ChineseDate(date2); final ChineseDate chineseDate3 = new ChineseDate(date2);
final ChineseDate chineseDate4 = new ChineseDate(date4);
Assertions.assertEquals("2023-02-01", chineseDate1.toStringNormal()); Assertions.assertEquals("2023-02-01", chineseDate1.toStringNormal());
Assertions.assertEquals("2023-02-01", chineseDate2.toStringNormal()); Assertions.assertEquals("2023-02-01", chineseDate2.toStringNormal());
Assertions.assertEquals("2023-02-01", chineseDate3.toStringNormal()); Assertions.assertEquals("2023-02-01", chineseDate3.toStringNormal());
Assertions.assertEquals("2023-03-01", chineseDate4.toStringNormal());
Assertions.assertNotEquals(chineseDate1, chineseDate2); Assertions.assertNotEquals(chineseDate1, chineseDate2);
Assertions.assertEquals(chineseDate2, chineseDate3); Assertions.assertEquals(chineseDate2, chineseDate3);
Assertions.assertNotEquals(chineseDate2, chineseDate4);
} }
} }