Changeset 9385 in josm for trunk/test/unit/org/openstreetmap/josm/tools

Timestamp:

2016-01-10T13:48:42+01:00 (9 years ago)

Author:

simon04

Message:

Refactoring: introduce UncheckedParseException

In addition, DateUtils#fromString does no longer return "now" when
date cannot be parsed, but throws an UncheckedParseException instead.

Location:

trunk/test/unit/org/openstreetmap/josm/tools

Files:

• OverpassTurboQueryWizardTest.java (modified) (1 diff)
• date/DateUtilsTest.java (modified) (2 diffs)

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

@@ -46 +46 @@
      * Test erroneous value.
      */
-    @Test(expected = OverpassTurboQueryWizard.ParseException.class)
+    @Test(expected = UncheckedParseException.class)
     public void testErroneous() {
         OverpassTurboQueryWizard.getInstance().constructQuery("foo");

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;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.openstreetmap.josm.tools.UncheckedParseException;
 
 /**
@@ -65 +67 @@
         assertEquals(-1041337172130L, DateUtils.fromString("1937-01-01T12:00:27.87+00:20").getTime());
     }
+
+    /**
+     * Verifies that parsing an illegal date throws a {@link UncheckedParseException}
+     */
+    @Test(expected = UncheckedParseException.class)
+    public void testIllegalDate() {
+        DateUtils.fromString("2014-");
+    }
 }