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

Timestamp:

2018-08-03T18:18:43+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16550 - use UTC by default for GPX timestamps

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• JOSMFixture.java (modified) (2 diffs)
• gui/layer/geoimage/CorrelateGpxWithImagesTest.java (modified) (2 diffs)
• gui/layer/geoimage/OffsetTest.java (modified) (3 diffs)
• gui/layer/geoimage/TimezoneTest.java (modified) (3 diffs)
• io/nmea/NmeaReaderTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/JOSMFixture.java

@@ -29 +29 @@
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -97 +98 @@
         }
         System.setProperty("josm.home", josmHome);
-        TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
+        TimeZone.setDefault(DateUtils.UTC);
         Config.setPreferencesInstance(Main.pref);
         Config.setBaseDirectoriesProvider(JosmBaseDirectories.getInstance());

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

@@ -8 +8 @@
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.TimeZone;
 
 import org.junit.BeforeClass;
@@ -40 +39 @@
     @BeforeClass
     public static void setUp() {
-        DateUtilsTest.setTimeZone(TimeZone.getTimeZone("UTC"));
+        DateUtilsTest.setTimeZone(DateUtils.UTC);
     }
 

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

@@ -5 +5 @@
 
 import java.text.ParseException;
-import java.util.TimeZone;
 
 import org.junit.BeforeClass;
@@ -11 +10 @@
 import org.junit.Test;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtils;
 import org.openstreetmap.josm.tools.date.DateUtilsTest;
 
@@ -32 +32 @@
     @BeforeClass
     public static void setUp() {
-        DateUtilsTest.setTimeZone(TimeZone.getTimeZone("UTC"));
+        DateUtilsTest.setTimeZone(DateUtils.UTC);
     }
 

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

@@ -5 +5 @@
 
 import java.text.ParseException;
-import java.util.TimeZone;
 
 import org.junit.BeforeClass;
@@ -11 +10 @@
 import org.junit.Test;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.date.DateUtils;
 import org.openstreetmap.josm.tools.date.DateUtilsTest;
 
@@ -32 +32 @@
     @BeforeClass
     public static void setUp() {
-        DateUtilsTest.setTimeZone(TimeZone.getTimeZone("UTC"));
+        DateUtilsTest.setTimeZone(DateUtils.UTC);
     }
 

trunk/test/unit/org/openstreetmap/josm/io/nmea/NmeaReaderTest.java

@@ -51 +51 @@
     @Before
     public void setUp() {
-        iso8601.setTimeZone(TimeZone.getTimeZone("UTC"));
+        iso8601.setTimeZone(DateUtils.UTC);
     }