Changeset 9394 in josm

Timestamp:

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

Author:

simon04

Message:

Fix timezone aware unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/date/DateUtils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -303 +303 @@
         return getDateTimeFormat(dateStyle, timeStyle).format(datetime);
     }
+
+    /**
+     * Allows to override the timezone for unit tests.
+     * @param zone the timezone to use
+     */
+    protected static void setTimeZone(TimeZone zone) {
+        calendarLocale.setTimeZone(zone);
+    }
 }

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImagesTest.java

@@ -13 +13 @@
 import org.openstreetmap.josm.io.GpxReaderTest;
 import org.openstreetmap.josm.tools.date.DateUtils;
+import org.openstreetmap.josm.tools.date.DateUtilsTest;
 
 /**
@@ -24 +25 @@
     @BeforeClass
     public static void setUp() {
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+        DateUtilsTest.setTimeZone(TimeZone.getTimeZone("UTC"));
     }
 

trunk/test/unit/org/openstreetmap/josm/tools/ExifReaderTest.java

@@ -11 +11 @@
 import java.util.Date;
 import java.util.GregorianCalendar;
+import java.util.TimeZone;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.tools.date.DateUtilsTest;
 
 /**
@@ -31 +33 @@
         directionSampleFile = new File("data_nodist/exif-example_direction.jpg");
         orientationSampleFile = new File("data_nodist/exif-example_orientation=6.jpg");
+        DateUtilsTest.setTimeZone(TimeZone.getTimeZone("Europe/Berlin"));
     }
 

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());