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

Timestamp:

2016-04-03T15:42:30+02:00 (8 years ago)

Author:

Don-vip

Message:

add more unit tests

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• gui/help/HelpBrowserTest.java (modified) (1 diff)
• gui/help/HelpContentReaderTest.java (added)
• gui/preferences/audio/AudioPreferenceTest.java (modified) (2 diffs)
• tools/date/DateUtilsTest.java (modified) (3 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/help/HelpBrowserTest.java

@@ -15 +15 @@
 public class HelpBrowserTest {
 
-    private static final String URL_1 = "https://josm.openstreetmap.de/wiki/Help";
-    private static final String URL_2 = "https://josm.openstreetmap.de/wiki/Introduction";
-    private static final String URL_3 = "https://josm.openstreetmap.de/javadoc";
+    static final String URL_1 = "https://josm.openstreetmap.de/wiki/Help";
+    static final String URL_2 = "https://josm.openstreetmap.de/wiki/Introduction";
+    static final String URL_3 = "https://josm.openstreetmap.de/javadoc";
 
     /**

trunk/test/unit/org/openstreetmap/josm/gui/preferences/audio/AudioPreferenceTest.java

@@ -7 +7 @@
 import org.junit.Test;
 import org.openstreetmap.josm.JOSMFixture;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.preferences.PreferencesTestUtils;
 
@@ -35 +36 @@
     @Test
     public void testAddGui() {
+        Main.pref.put("audio.menuinvisible", true);
+        PreferencesTestUtils.doTestPreferenceSettingAddGui(new AudioPreference.Factory(), null);
+        Main.pref.put("audio.menuinvisible", false);
         PreferencesTestUtils.doTestPreferenceSettingAddGui(new AudioPreference.Factory(), null);
     }

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

@@ -4 +4 @@
 import static org.junit.Assert.assertEquals;
 
+import java.text.DateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 
+import org.junit.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.josm.JOSMFixture;
 import org.openstreetmap.josm.tools.UncheckedParseException;
 
@@ -14 +17 @@
  */
 public class DateUtilsTest {
+
+    /**
+     * Setup test.
+     */
+    @BeforeClass
+    public static void setUp() {
+        JOSMFixture.createUnitTestFixture().init();
+    }
 
     /**
@@ -86 +97 @@
         assertEquals(1453694709400L, DateUtils.fromString("2016-01-25T04:05:09.400Z").getTime());
     }
+
+    /**
+     * Unit test of {@link DateUtils#fromTimestamp} method.
+     */
+    @Test
+    public void testFromTimestamp() {
+        assertEquals("1970-01-01T00:00:00Z", DateUtils.fromTimestamp(0));
+        assertEquals("2001-09-09T01:46:40Z", DateUtils.fromTimestamp(1000000000));
+        assertEquals("2038-01-19T03:14:07Z", DateUtils.fromTimestamp(Integer.MAX_VALUE));
+    }
+
+    /**
+     * Unit test of {@link DateUtils#formatTime} method.
+     */
+    @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));
+    }
 }