Changeset 9817 in josm for trunk

Timestamp:

2016-02-17T22:05:02+01:00 (9 years ago)

Author:

Don-vip

Message:

fix coverity defect 1351474 (division by zero), add unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java (modified) (2 diffs)
• test/data/empty.gpx (added)
• test/unit/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackActionTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadAlongTrackAction.java

@@ -81 +81 @@
                 latcnt++;
             }
+        }
+        if (latcnt == 0) {
+            return null;
         }
         double avglat = latsum / latcnt;
@@ -190 +193 @@
     @Override
     public void actionPerformed(ActionEvent e) {
-        Main.worker.submit(createTask());
+        PleaseWaitRunnable task = createTask();
+        if (task != null) {
+            Main.worker.submit(task);
+        }
     }
 }

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

@@ -3 +3 @@
 
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 
 import org.junit.BeforeClass;
@@ -28 +29 @@
     }
 
-    /**
-     * Test action.
-     * @throws Exception if an error occurs
-     */
-    @Test
-    public void testDownload() throws Exception {
-        final OsmDataLayer layer = new OsmDataLayer(new DataSet(), getClass().getName(), null);
+    private static PleaseWaitRunnable createTask(String file) throws Exception {
+        final OsmDataLayer layer = new OsmDataLayer(new DataSet(), DownloadAlongTrackActionTest.class.getName(), null);
         try {
             Main.main.addLayer(layer);
             // Perform action
-            final GpxData gpx = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + "minimal.gpx");
-            PleaseWaitRunnable task = new DownloadAlongTrackAction(gpx).createTask();
-            assertNotNull(task);
+            final GpxData gpx = GpxReaderTest.parseGpxData(TestUtils.getTestDataRoot() + file);
+            return new DownloadAlongTrackAction(gpx).createTask();
         } finally {
             // Ensure we clean the place before leaving, even if test fails.
@@ -46 +41 @@
         }
     }
+
+    /**
+     * Test action with nominal data set.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testDownload() throws Exception {
+        assertNotNull(createTask("minimal.gpx"));
+    }
+
+    /**
+     * Test action with empty data set.
+     * @throws Exception if an error occurs
+     */
+    @Test
+    public void testDownloadEmpty() throws Exception {
+        assertNull(createTask("empty.gpx"));
+    }
 }