[isis] branch master updated: ISIS-3105: consolidate temporal samplers for testing (2)

[ahuber]

This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git


The following commit(s) were added to refs/heads/master by this push:
     new 876ffb6267 ISIS-3105: consolidate temporal samplers for testing (2)
876ffb6267 is described below

commit 876ffb62673b9cde6c70241b8197a06c8050e5e5
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Tue Aug 2 13:04:22 2022 +0200

    ISIS-3105: consolidate temporal samplers for testing (2)
---
 .../isis/commons/internal/base/TemporalsTest.java  | 42 +++++-----------------
 1 file changed, 9 insertions(+), 33 deletions(-)

diff --git 
a/commons/src/test/java/org/apache/isis/commons/internal/base/TemporalsTest.java
 
b/commons/src/test/java/org/apache/isis/commons/internal/base/TemporalsTest.java
index 3722cddb15..7ba7add80a 100644
--- 
a/commons/src/test/java/org/apache/isis/commons/internal/base/TemporalsTest.java
+++ 
b/commons/src/test/java/org/apache/isis/commons/internal/base/TemporalsTest.java
@@ -18,14 +18,6 @@
  */
 package org.apache.isis.commons.internal.base;
 
-import java.time.LocalDate;
-import java.time.LocalTime;
-import java.time.OffsetDateTime;
-import java.time.OffsetTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -36,39 +28,23 @@ class TemporalsTest {
 
     @Test
     void roundtripOffsetTime() {
-        val temporal = OffsetTime.of(sampleTime(), sampleOffset());
-        assertEquals(temporal, 
_Temporals.destringAsOffsetTime(_Temporals.enstringOffsetTime(temporal)));
+        for(val temporal: _Temporals.sampleOffsetTime()) {
+            assertEquals(temporal, 
_Temporals.destringAsOffsetTime(_Temporals.enstringOffsetTime(temporal)));
+        }
     }
 
     @Test
     void roundtripOffsetDateTime() {
-        val temporal = OffsetDateTime.of(sampleDate(), sampleTime(), 
sampleOffset());
-        assertEquals(temporal, 
_Temporals.destringAsOffsetDateTime(_Temporals.enstringOffsetDateTime(temporal)));
+        for(val temporal: _Temporals.sampleOffsetDateTime()) {
+            assertEquals(temporal, 
_Temporals.destringAsOffsetDateTime(_Temporals.enstringOffsetDateTime(temporal)));
+        }
     }
 
     @Test
     void roundtripZonedDateTime() {
-        val temporal = ZonedDateTime.of(sampleDate(), sampleTime(), 
sampleZone());
-        assertEquals(temporal, 
_Temporals.destringAsZonedDateTime(_Temporals.enstringZonedDateTime(temporal)));
-    }
-
-    // -- HELPER
-
-    private static LocalDate sampleDate() {
-        return _Temporals.sampleLocalDate().getElseFail(0);
-    }
-
-    private static LocalTime sampleTime() {
-        return _Temporals.sampleLocalTime().getElseFail(0);
+        for(val temporal: _Temporals.sampleZonedDateTime()) {
+            assertEquals(temporal, 
_Temporals.destringAsZonedDateTime(_Temporals.enstringZonedDateTime(temporal)));
+        }
     }
 
-    private static ZoneOffset sampleOffset() {
-        return ZoneOffset.ofHoursMinutes(6, 15);
-    }
-
-    private static ZoneId sampleZone() {
-        return ZoneId.of("Europe/Paris");
-    }
-
-
 }