Changeset 10483 in josm for trunk

Timestamp:

2016-06-24T22:27:38+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13047 - Make time zone test work in any time zone (patch by michael2402) - gsoc-core

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/date/DateUtils.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (modified) (3 diffs)

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

@@ -134 +134 @@
             // example date format "18-AUG-08 13:33:03"
             SimpleDateFormat f = new SimpleDateFormat("dd-MMM-yy HH:mm:ss");
+            f.setTimeZone(calendarLocale.getTimeZone());
             Date d = f.parse(str, new ParsePosition(0));
             if (d != null)

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

@@ -10 +10 @@
 import java.util.TimeZone;
 
-import org.junit.BeforeClass;
+import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.UncheckedParseException;
 
@@ -23 +23 @@
 
     /**
-     * Setup test.
-     */
-    @BeforeClass
-    public static void setUp() {
-        JOSMFixture.createUnitTestFixture().init();
-    }
+     * Set the timezone and timeout.
+     */
+    @Rule
+    @SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
+    public JOSMTestRules test = new JOSMTestRules().i18n().preferences();
 
     /**
@@ -117 +116 @@
     @Test
     public void testFormatTime() {
-        assertEquals("1:00 AM", DateUtils.formatTime(new Date(123), DateFormat.SHORT));
-        assertEquals("1:00:00 AM CET", DateUtils.formatTime(new Date(123), DateFormat.LONG));
+        assertEquals("12:00 AM", DateUtils.formatTime(new Date(0), DateFormat.SHORT));
+        assertEquals("1:00 AM", DateUtils.formatTime(new Date(60 * 60 * 1000), DateFormat.SHORT));
+        assertEquals("12:00 AM", DateUtils.formatTime(new Date(999), DateFormat.SHORT));
+        // ignore seconds
+        assertEquals("12:00 AM", DateUtils.formatTime(new Date(5999), DateFormat.SHORT));
+
+        TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
+        assertEquals("1:00:00 AM CET", DateUtils.formatTime(new Date(0), DateFormat.LONG));
     }