https://github.com/javers/javers/issues/761

test fixes
javers · Jan 5, 2019 · c34f666 · c34f666
1 parent 665a736
commit c34f666
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 26 deletions.
diff --git a/javers-core/src/main/java/org/javers/java8support/InstantTypeAdapter.java b/javers-core/src/main/java/org/javers/java8support/InstantTypeAdapter.java
@@ -10,12 +10,18 @@
  * @author bartosz.walacik
  */
 class InstantTypeAdapter extends BasicStringTypeAdapter<Instant> {
-    private final DateTimeFormatter formatter = DateTimeFormatter.
+    private final DateTimeFormatter formatterMillis = DateTimeFormatter.
             ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSX").withZone(ZoneId.of("UTC"));
 
+    private final DateTimeFormatter formatterSec = DateTimeFormatter.
+            ofPattern("yyyy-MM-dd'T'HH:mm:ssX").withZone(ZoneId.of("UTC"));
+
     @Override
     public String serialize(Instant sourceValue) {
-        return formatter.format(sourceValue);
+        if (sourceValue.getNano() == 0) {
+            return formatterSec.format(sourceValue);
+        }
+        return formatterMillis.format(sourceValue);
     }
 
     @Override

diff --git a/javers-core/src/test/groovy/org/javers/core/json/JsonConverterJava8TypesTest.groovy b/javers-core/src/test/groovy/org/javers/core/json/JsonConverterJava8TypesTest.groovy
@@ -44,7 +44,6 @@ class JsonConverterJava8TypesTest extends Specification {
                          ZonedDateTime,
                          ZoneOffset,
                          OffsetDateTime,
-                         Instant,
                          Period,
                          Duration
         ]
@@ -57,7 +56,6 @@ class JsonConverterJava8TypesTest extends Specification {
                          ZonedDateTime.of(localDateTime, ZoneId.of("Europe/Berlin")),
                          ZoneOffset.of("+05:00"),
                          OffsetDateTime.of(localDateTime, ZoneOffset.of("+05:00")),
-                         Instant.parse("2010-01-01T12:00:00Z"),
                          Period.between(LocalDate.of(2014, 1, 1), LocalDate.of(2015, 3, 7)),
                          Duration.ofSeconds(6005)
         ]
@@ -70,38 +68,36 @@ class JsonConverterJava8TypesTest extends Specification {
                          '"2001-01-31T15:14:13.085+01:00[Europe/Berlin]"',
                          '"+05:00"',
                          '"2001-01-31T15:14:13.085+05:00"',
-                         '"2010-01-01T12:00:00Z"',
                          '"P1Y2M6D"',
                          '"PT1H40M5S"'
         ]
     }
 
-    def "should convert java8.Instant and using ISO format with millis"(){
+    @Unroll
+    def "should serialize java8.Instant to JSON using ISO format with millis, where givenValueAsSring: #givenValueAsSring"(){
         given:
-        def instantWithSec =    '2015-10-02T17:37:07Z'
-        def instantWithMilli  = '2015-10-02T17:37:07.050Z'
-        def instantWithNano   = '2015-10-02T17:37:07.050228100Z'
-
-        def instantValSec =   Instant.parse(instantWithSec)
-        def instantValMilli = Instant.parse(instantWithMilli)
-        def instantValNano =  Instant.parse(instantWithNano)
-        assert instantValNano.getNano() == 50228100
-
-        println "instantValSec:    " + instantValSec
-        println "instantValMilli:  " + instantValMilli
-        println "instantValNano:   " + instantValNano
+        def givenValue = Instant.parse(givenValueAsSring)
 
         expect:
-        jsonConverter.fromJson('"' + instantWithMilli + '"', Instant) == instantValMilli
-        jsonConverter.fromJson('"' + instantWithSec + '"', Instant) ==   instantValSec
+        jsonConverter.toJson(givenValue) == '"' + expectedSerialized + '"'
 
-        jsonConverter.toJson(instantValMilli) == '"' + instantWithMilli + '"'
-        jsonConverter.toJson(instantValMilli).size() == 26
+        where:
+        givenValueAsSring                | expectedSerialized
+        '2015-10-02T17:37:07Z'           | '2015-10-02T17:37:07Z'
+        '2015-10-02T17:37:07.050Z'       | '2015-10-02T17:37:07.050Z'
+        '2015-10-02T17:37:07.050228100Z' | '2015-10-02T17:37:07.050Z'
+    }
 
-        jsonConverter.toJson(instantValNano) == '"' + instantWithMilli + '"'
-        jsonConverter.toJson(instantValNano).size() == 26
+    @Unroll
+    def "should deserialize java8.Instant from JSON using standard ISO format, where givenJSON: #givenJSON"(){
+        expect:
+        jsonConverter.fromJson('"' + givenJSON + '"', Instant) == Instant.parse(givenJSON)
 
-        jsonConverter.toJson(instantValSec) == '"' + instantWithSec + '"'
-        jsonConverter.toJson(instantValSec).size() == 22
+        where:
+        givenJSON << [
+            '2015-10-02T17:37:07Z',
+            '2015-10-02T17:37:07.050Z',
+            '2015-10-02T17:37:07.050228100Z'
+        ]
     }
 }