Changeset 17912 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2021-05-24T12:14:00+02:00 (4 years ago)

Author:

simon04

Message:

see #14176 - Test DateUtils.getDateTimeFormatter

File:

• trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java

@@ -244 +244 @@
             assertNotNull(f1);
             assertNotEquals(f1, f2);
+            DateUtils.PROP_ISO_DATES.put(true);
+            assertEquals("2006-01-02", DateUtils.getDateFormatter(null).format(Instant.parse("2006-01-02T15:04:05.777Z")));
         } finally {
             DateUtils.PROP_ISO_DATES.put(iso);
@@ -262 +264 @@
             assertNotNull(f1);
             assertNotEquals(f1, f2);
+            DateUtils.PROP_ISO_DATES.put(true);
+            assertEquals("15:04:05.777", DateUtils.getTimeFormatter(null).format(Instant.parse("2006-01-02T15:04:05.777Z")));
+            assertEquals("15:04:05", DateUtils.getTimeFormatter(null).format(Instant.parse("2006-01-02T15:04:05Z")));
+            assertEquals("15:04:00", DateUtils.getTimeFormatter(null).format(Instant.parse("2006-01-02T15:04:00Z")));
         } finally {
             DateUtils.PROP_ISO_DATES.put(iso);
@@ -280 +286 @@
     @Test
     void testDateTimeFormatter() {
-        Instant instant = Instant.parse("2006-01-02T15:04:05Z");
+        Instant instant = Instant.parse("2006-01-02T15:04:05.777Z");
         Boolean iso = DateUtils.PROP_ISO_DATES.get();
         try {
@@ -290 +296 @@
             assertNotNull(DateUtils.getTimeFormatter(FormatStyle.SHORT).format(instant));
             assertNotNull(DateUtils.getDateTimeFormatter(FormatStyle.SHORT, FormatStyle.SHORT).format(instant));
+            DateUtils.PROP_ISO_DATES.put(true);
+            assertEquals("2006-01-02 15:04:05.777", DateUtils.getDateTimeFormatter(null, null).format(instant));
+            assertEquals(Instant.parse("2006-01-02T15:04:05.000Z"),
+                    DateUtils.getDateTimeFormatter(null, null).parse("2006-01-02 15:04:05", Instant::from));
+            assertEquals(Instant.parse("2006-01-02T15:04:00.000Z"),
+                    DateUtils.getDateTimeFormatter(null, null).parse("2006-01-02 15:04", Instant::from));
         } finally {
             DateUtils.PROP_ISO_DATES.put(iso);