From 5f16317d37c1efb254f458f1858174e3d35755ab Mon Sep 17 00:00:00 2001 From: zubri Date: Tue, 7 Jan 2025 22:02:15 -0300 Subject: [PATCH] GitHub action test run fix attempt --- .../adapters/OffsetDateTimeAdapterTest.java | 20 ++++++++++++------- .../mx/adapters/OffsetTimeAdapterTest.java | 15 +++++++++----- 2 files changed, 23 insertions(+), 12 deletions(-) diff --git a/iso20022-core/src/test/java/com/prowidesoftware/swift/model/mx/adapters/OffsetDateTimeAdapterTest.java b/iso20022-core/src/test/java/com/prowidesoftware/swift/model/mx/adapters/OffsetDateTimeAdapterTest.java index b460fc5ee..5e4e69ace 100644 --- a/iso20022-core/src/test/java/com/prowidesoftware/swift/model/mx/adapters/OffsetDateTimeAdapterTest.java +++ b/iso20022-core/src/test/java/com/prowidesoftware/swift/model/mx/adapters/OffsetDateTimeAdapterTest.java @@ -2,17 +2,21 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import java.time.LocalDateTime; -import java.time.OffsetDateTime; -import java.time.ZoneId; -import java.time.ZoneOffset; +import java.time.*; + import org.junit.jupiter.api.Test; class OffsetDateTimeAdapterTest { @Test void testOffsetDateTime() throws Exception { - ZoneId zoneId = ZoneOffset.ofHours(-3); + ZoneId zoneId = ZoneId.systemDefault(); + ZoneOffset zoneOffset = zoneId.getRules().getStandardOffset(Instant.now()); + String offset = zoneOffset.toString(); + if (offset.equals("Z")) { + offset = "+00:00"; + } + OffsetDateTime dateTime = LocalDateTime.parse("2021-09-19T12:13:14") .atZone(zoneId) .withEarlierOffsetAtOverlap() @@ -20,8 +24,6 @@ void testOffsetDateTime() throws Exception { .withEarlierOffsetAtOverlap() .toOffsetDateTime(); - String offset = "-03:00"; - // DateTime without offset and with/without fractional seconds testDateTimeImpl("2021-09-19T12:13:14", "2021-09-19T12:13:14" + offset); testDateTimeImpl("2021-09-19T12:13:14.1", "2021-09-19T12:13:14.1" + offset); @@ -88,4 +90,8 @@ public void testOffsetDateTimeWithNanosOnlyZero() throws Exception { testDateTimeImpl("2018-01-15T17:30:33.123456789Z", "2018-01-15T17:30:33.123456789+00:00"); testDateTimeImpl("2018-01-15T17:30:33Z", "2018-01-15T17:30:33+00:00"); } + + private static String systemOffset() { + return offset; + } } diff --git a/iso20022-core/src/test/java/com/prowidesoftware/swift/model/mx/adapters/OffsetTimeAdapterTest.java b/iso20022-core/src/test/java/com/prowidesoftware/swift/model/mx/adapters/OffsetTimeAdapterTest.java index 3353d1d27..351c7be18 100644 --- a/iso20022-core/src/test/java/com/prowidesoftware/swift/model/mx/adapters/OffsetTimeAdapterTest.java +++ b/iso20022-core/src/test/java/com/prowidesoftware/swift/model/mx/adapters/OffsetTimeAdapterTest.java @@ -77,11 +77,7 @@ public void testMarshallNoOffset() throws Exception { @Test public void testOffsetTime() throws Exception { - ZoneOffset zoneOffset = ZoneId.systemDefault().getRules().getStandardOffset(Instant.now()); - String offset = zoneOffset.toString(); - if (offset.equals("Z")) { - offset = "+00:00"; - } + String offset = systemOffset(); // DateTime without offset and with/without fractional seconds testTimeImpl("12:13:14", "12:13:14" + offset); @@ -149,4 +145,13 @@ public void testOffsetTimeWithNanosOnlyZero() throws Exception { testTimeImpl("17:30:33.123456789Z", "17:30:33.123456789+00:00"); testTimeImpl("17:30:33Z", "17:30:33+00:00"); } + + private static String systemOffset() { + ZoneOffset zoneOffset = ZoneId.systemDefault().getRules().getStandardOffset(Instant.now()); + String offset = zoneOffset.toString(); + if (offset.equals("Z")) { + offset = "+00:00"; + } + return offset; + } }