Changeset 11486 in josm for trunk/test

Timestamp:

2017-01-22T19:14:12+01:00 (8 years ago)

Author:

Don-vip

Message:

fix #14275 - robustness against invalid timestamps in GPX files

Location:

trunk/test

Files:

• data/regress/14275 (added)
• data/regress/14275/1485101437.8189685.gpx (added)
• unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java (modified) (3 diffs)
• unit/org/openstreetmap/josm/tools/date/DateUtilsTest.java (modified) (1 diff)

trunk/test/unit/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerActionTest.java

@@ -3 +3 @@
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+import java.io.IOException;
 
 import org.junit.BeforeClass;
@@ -13 +16 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
 import org.openstreetmap.josm.io.GpxReaderTest;
+import org.xml.sax.SAXException;
 
 /**
@@ -40 +44 @@
                 osm.getNodes().iterator().next().getKeys());
     }
+
+    /**
+     * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/14275">#14275</a>
+     * @throws IOException if an error occurs during reading
+     * @throws SAXException if any XML error occurs
+     */
+    @Test
+    public void testTicket14275() throws IOException, SAXException {
+        assertNotNull(GpxReaderTest.parseGpxData(TestUtils.getRegressionDataFile(14275, "1485101437.8189685.gpx")));
+    }
 }

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

@@ -117 +117 @@
      */
     @Test
-    public void testFromDate() throws Exception {
+    public void testFromDate() {
         assertEquals("1970-01-01T00:00:00Z", DateUtils.fromDate(new Date(0)));
         assertEquals("1970-01-01T00:00:00.1Z", DateUtils.fromDate(new Date(100)));