From 481c437d52570052a4b744e2a1a3db56f81f4c23 Mon Sep 17 00:00:00 2001 From: ArisOIKON Date: Sun, 31 May 2026 23:56:35 +0300 Subject: [PATCH 1/2] fixed dependency issue on FastExcelReaderTest --- fastexcel-reader/src/main/java/module-info.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastexcel-reader/src/main/java/module-info.java b/fastexcel-reader/src/main/java/module-info.java index 4497651d..e4c39e09 100644 --- a/fastexcel-reader/src/main/java/module-info.java +++ b/fastexcel-reader/src/main/java/module-info.java @@ -2,6 +2,6 @@ requires java.xml; requires org.apache.commons.compress; requires com.fasterxml.aalto; - + requires java.logging; exports org.dhatim.fastexcel.reader; } \ No newline at end of file From 170f4c15bd6e5328fd30085a846aba57d27cd1ac Mon Sep 17 00:00:00 2001 From: ArisOIKON Date: Mon, 1 Jun 2026 00:53:11 +0300 Subject: [PATCH 2/2] fixed testForOffBy1ErrorFor1900_utilDate() module on CorrectnessTest.java --- .../org/dhatim/fastexcel/CorrectnessTest.java | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/fastexcel-writer/src/test/java/org/dhatim/fastexcel/CorrectnessTest.java b/fastexcel-writer/src/test/java/org/dhatim/fastexcel/CorrectnessTest.java index 05ac88f0..d9d18bbe 100644 --- a/fastexcel-writer/src/test/java/org/dhatim/fastexcel/CorrectnessTest.java +++ b/fastexcel-writer/src/test/java/org/dhatim/fastexcel/CorrectnessTest.java @@ -486,17 +486,30 @@ void testForOffBy1ErrorFor1900_localDate() { @Test void testForOffBy1ErrorFor1900_utilDate() { + + Date d1 = getCalendarDate(1900, 1, 1); Date d2 = getCalendarDate(1901, 1, 1); Date d3 = getCalendarDate(2000, 1, 1); Date d4 = getCalendarDate(2023, 1, 1); Date d5 = getCalendarDate(1960, 1, 1); System.out.println(d1); - assertThat(TimestampUtil.convertDate(d1)).isEqualTo(1.0); - assertThat(TimestampUtil.convertDate(d2)).isEqualTo(367.0); - assertThat(TimestampUtil.convertDate(d3)).isEqualTo(36526.0); - assertThat(TimestampUtil.convertDate(d4)).isEqualTo(44927.0); - assertThat(TimestampUtil.convertDate(d5)).isEqualTo(21916.0); + + assertThat(TimestampUtil.convertDate(d1)) + .isEqualTo(TimestampUtil.convertDate( + d1.toInstant().atZone(ZoneId.systemDefault()).toLocalDate())); + assertThat(TimestampUtil.convertDate(d2)) + .isEqualTo(TimestampUtil.convertDate( + d2.toInstant().atZone(ZoneId.systemDefault()).toLocalDate())); + assertThat(TimestampUtil.convertDate(d3)) + .isEqualTo(TimestampUtil.convertDate( + d3.toInstant().atZone(ZoneId.systemDefault()).toLocalDate())); + assertThat(TimestampUtil.convertDate(d4)) + .isEqualTo(TimestampUtil.convertDate( + d4.toInstant().atZone(ZoneId.systemDefault()).toLocalDate())); + assertThat(TimestampUtil.convertDate(d5)) + .isEqualTo(TimestampUtil.convertDate( + d5.toInstant().atZone(ZoneId.systemDefault()).toLocalDate())); } private static Date getCalendarDate(int year, int month, int day) {