Changeset 9394 in josm for trunk/test/unit/org/openstreetmap/josm/tools/date

Timestamp:

2016-01-10T18:06:13+01:00 (8 years ago)

Author:

simon04

Message:

Fix timezone aware unit tests

File:

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

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

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
-import java.util.Date;
 import java.util.TimeZone;
 
@@ -17 +16 @@
 
     /**
-     * Setup test.
+     * Allows to override the timezone used in {@link DateUtils} for unit tests.
+     * @param zone the timezone to use
      */
-    @BeforeClass
-    public static void setUp() {
-        TimeZone.setDefault(TimeZone.getTimeZone("GMT+8:00"));
+    public static void setTimeZone(TimeZone zone) {
+        DateUtils.setTimeZone(zone);
     }
 
@@ -45 +44 @@
     @Test
     public void testExifDate() {
+        setTimeZone(TimeZone.getTimeZone("GMT+8:00")); // parsing is timezone aware
         assertEquals(1443038712000L - 8 * 3600 * 1000, DateUtils.fromString("2015:09:23 20:05:12").getTime());
         assertEquals(1443038712888L - 8 * 3600 * 1000, DateUtils.fromString("2015:09:23 20:05:12.888").getTime());