Changeset 10108 in josm for trunk

Timestamp:

2016-04-03T19:25:25+02:00 (9 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/history/CoordinateInfoViewerTest.java (modified) (2 diffs)
• gui/history/HistoryBrowserDialogTest.java (modified) (2 diffs)
• gui/history/HistoryBrowserModelTest.java (added)
• tools/date/DateUtilsTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/history/CoordinateInfoViewerTest.java

@@ -4 +4 @@
 import static org.junit.Assert.assertNotNull;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
 
 /**
@@ -10 +12 @@
  */
 public class CoordinateInfoViewerTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
 
     /**

trunk/test/unit/org/openstreetmap/josm/gui/history/HistoryBrowserDialogTest.java

@@ -6 +6 @@
 import java.util.Date;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 import org.openstreetmap.josm.data.osm.User;
@@ -19 +21 @@
  */
 public class HistoryBrowserDialogTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUpBeforeClass() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
 
     /**

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

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.text.DateFormat;
@@ -116 +118 @@
         assertEquals("1:00:00 AM CET", DateUtils.formatTime(new Date(123), DateFormat.LONG));
     }
+
+    /**
+     * Unit test of {@link DateUtils#formatDate} method.
+     */
+    @Test
+    public void testFormatDate() {
+        assertEquals("1/1/70", DateUtils.formatDate(new Date(123), DateFormat.SHORT));
+        assertEquals("January 1, 1970", DateUtils.formatDate(new Date(123), DateFormat.LONG));
+    }
+
+    /**
+     * Unit test of {@link DateUtils#tsFromString} method.
+     */
+    @Test
+    public void testTsFromString() {
+        // UTC times
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00Z"));
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00"));
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03 15:00:00 UTC"));
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00+00"));
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00-00"));
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00+00:00"));
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00-00:00"));
+
+        // UTC times with millis
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00.000Z"));
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00.000"));
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00.000+00:00"));
+        assertEquals(1459695600000L, DateUtils.tsFromString("2016-04-03T15:00:00.000-00:00"));
+
+        // Local time
+        assertEquals(1459688400000L, DateUtils.tsFromString("03-APR-16 15:00:00"));
+    }
+
+    /**
+     * Unit test of {@link DateUtils#getDateFormat} method.
+     */
+    @Test
+    public void testGetDateFormat() {
+        Boolean iso = DateUtils.PROP_ISO_DATES.get();
+        try {
+            DateFormat f1 = DateUtils.getDateFormat(DateFormat.SHORT);
+            assertNotNull(f1);
+            DateUtils.PROP_ISO_DATES.put(!iso);
+            DateFormat f2 = DateUtils.getDateFormat(DateFormat.SHORT);
+            assertNotNull(f1);
+            assertNotEquals(f1, f2);
+        } finally {
+            DateUtils.PROP_ISO_DATES.put(iso);
+        }
+    }
+
+    /**
+     * Unit test of {@link DateUtils#getTimeFormat} method.
+     */
+    @Test
+    public void testTimeFormat() {
+        Boolean iso = DateUtils.PROP_ISO_DATES.get();
+        try {
+            DateFormat f1 = DateUtils.getTimeFormat(DateFormat.SHORT);
+            assertNotNull(f1);
+            DateUtils.PROP_ISO_DATES.put(!iso);
+            DateFormat f2 = DateUtils.getTimeFormat(DateFormat.SHORT);
+            assertNotNull(f1);
+            assertNotEquals(f1, f2);
+        } finally {
+            DateUtils.PROP_ISO_DATES.put(iso);
+        }
+    }
 }