Changeset 10495 in josm for trunk

Timestamp:

2016-06-26T23:16:54+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13071 - Make DateUtilsTest.testTsFromString pass (patch by michael2402) - gsoc-core

File:

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

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

@@ -35 +35 @@
     public static void setTimeZone(TimeZone zone) {
         DateUtils.setTimeZone(zone);
+        TimeZone.setDefault(zone);
     }
 
@@ -122 +123 @@
         assertEquals("12:00 AM", DateUtils.formatTime(new Date(5999), DateFormat.SHORT));
 
-        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
+        setTimeZone(TimeZone.getTimeZone("Europe/Berlin"));
         assertEquals("1:00:00 AM CET", DateUtils.formatTime(new Date(0), DateFormat.LONG));
     }
@@ -156 +157 @@
 
         // Local time
+        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
         assertEquals(1459688400000L, DateUtils.tsFromString("03-APR-16 15:00:00"));
     }