Expand ZonedDateTime and OffsetDateTime deserialization tests

Author: schlosna

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/OffsetDateTimeDeserTest.java

@@ -5,6 +5,7 @@
 import java.time.temporal.ChronoField;
 import java.time.temporal.ChronoUnit;
 import java.time.temporal.Temporal;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TimeZone;
 
@@ -811,6 +812,34 @@ public void testOffsetDateTimeMinOrMax() throws Exception
         _testOffsetDateTimeMinOrMax(OffsetDateTime.MAX);
     }
 
+    @Test
+    public void OffsetDateTime_with_offset_can_be_deserialized() throws Exception {
+        ObjectReader r = MAPPER.readerFor(OffsetDateTime.class)
+                .without(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE);
+
+        String base = "2015-07-24T12:23:34.184";
+        for (String offset : Arrays.asList("+00", "-00")) {
+            String time = base + offset;
+            assertIsEqual(OffsetDateTime.parse(time), r.readValue('"' + time + '"'));
+            assertIsEqual(OffsetDateTime.parse("2015-07-24T12:23:34.184Z"), r.readValue('"' + time + '"'));
+            assertIsEqual(OffsetDateTime.parse("2015-07-24T12:23:34.184Z"), r.readValue('"' + time + "00" + '"'));
+            assertIsEqual(OffsetDateTime.parse("2015-07-24T12:23:34.184Z"), r.readValue('"' + time + ":00" + '"'));
+            assertIsEqual(OffsetDateTime.parse("2015-07-24T12:23:34.184" + offset + ":30"), r.readValue('"' + time + "30" + '"'));
+            assertIsEqual(OffsetDateTime.parse("2015-07-24T12:23:34.184" + offset + ":30"), r.readValue('"' + time + ":30" + '"'));
+        }
+
+        for (String prefix : Arrays.asList("-", "+")) {
+            for (String hours : Arrays.asList("00", "01", "02", "03", "11", "12")) {
+                String time = base + prefix + hours;
+                assertIsEqual(OffsetDateTime.parse(time), r.readValue('"' + time + '"'));
+                assertIsEqual(OffsetDateTime.parse(time), r.readValue('"' + time + "00" + '"'));
+                assertIsEqual(OffsetDateTime.parse(time), r.readValue('"' + time + ":00" + '"'));
+                assertIsEqual(OffsetDateTime.parse(time + ":30"), r.readValue('"' + time + "30" + '"'));
+                assertIsEqual(OffsetDateTime.parse(time + ":30"), r.readValue('"' + time + ":30" + '"'));
+            }
+        }
+    }
+
     private void _testOffsetDateTimeMinOrMax(OffsetDateTime offsetDateTime)
         throws Exception
     {

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/deser/ZonedDateTimeDeserTest.java

@@ -18,11 +18,13 @@
 
 import java.io.IOException;
 import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.util.Arrays;
 import java.util.Map;
 import java.util.TimeZone;
 
@@ -282,6 +284,33 @@ public void testDeserializationWithoutColonInTimeZoneWithTZDB() throws Throwable
                 wrapper.value);
     }
 
+    @Test
+    public void ZonedDateTime_with_offset_can_be_deserialized() throws Exception {
+        ObjectReader r = newMapper().readerFor(ZonedDateTime.class)
+                .without(DeserializationFeature.ADJUST_DATES_TO_CONTEXT_TIME_ZONE);
+
+        String base = "2015-07-24T12:23:34.184";
+        for (String offset : Arrays.asList("+00", "-00")) {
+            String time = base + offset;
+            assertEquals(ZonedDateTime.parse(time), r.readValue('"' + time + '"'));
+            assertEquals(ZonedDateTime.parse("2015-07-24T12:23:34.184Z"), r.readValue('"' + time + '"'));
+            assertEquals(ZonedDateTime.parse("2015-07-24T12:23:34.184Z"), r.readValue('"' + time + "00" + '"'));
+            assertEquals(ZonedDateTime.parse("2015-07-24T12:23:34.184Z"), r.readValue('"' + time + ":00" + '"'));
+            assertEquals(ZonedDateTime.parse("2015-07-24T12:23:34.184" + offset + ":30" ), r.readValue('"' + time + "30" + '"'));
+            assertEquals(ZonedDateTime.parse("2015-07-24T12:23:34.184" + offset + ":30" ), r.readValue('"' + time + ":30" + '"'));
+        }
+
+        for (String prefix : Arrays.asList("-", "+")) {
+            for (String hours : Arrays.asList("00", "01", "02", "03", "11", "12")) {
+                String time = base + prefix + hours;
+                assertEquals(ZonedDateTime.parse(time), r.readValue('"' + time + '"'));
+                assertEquals(ZonedDateTime.parse(time), r.readValue('"' + time + "00" + '"'));
+                assertEquals(ZonedDateTime.parse(time), r.readValue('"' + time + ":00" + '"'));
+                assertEquals(ZonedDateTime.parse(time + ":30"), r.readValue('"' + time + "30" + '"'));
+                assertEquals(ZonedDateTime.parse(time + ":30"), r.readValue('"' + time + ":30" + '"'));
+            }
+        }
+    }
 
     private void expectFailure(String json) throws Throwable {
         try {