Changeset 11383 in josm for trunk/test/unit/org/openstreetmap/josm/gui/layer

Timestamp:

2016-12-12T17:29:27+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - BC_UNCONFIRMED_CAST

Location:

trunk/test/unit/org/openstreetmap/josm/gui/layer

Files:

• GpxLayerTest.java (modified) (2 diffs)
• geoimage/GeoImageLayerTest.java (modified) (2 diffs)

trunk/test/unit/org/openstreetmap/josm/gui/layer/GpxLayerTest.java

@@ -23 +23 @@
 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
@@ -192 +193 @@
 
     /**
+     * Test that {@link GpxLayer#mergeFrom} throws IAE for invalid arguments
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testMergeFromIAE() {
+        new GpxLayer(new GpxData()).mergeFrom(new OsmDataLayer(new DataSet(), "", null));
+    }
+
+    /**
      * Unit test of {@link GpxLayer#paint}.
      * @throws Exception if any error occurs

trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java

@@ -14 +14 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
+import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer.Loader;
 import org.openstreetmap.josm.io.GpxReader;
@@ -57 +59 @@
         }
     }
+
+    /**
+     * Test that {@link GeoImageLayer#mergeFrom} throws IAE for invalid arguments
+     */
+    @Test(expected = IllegalArgumentException.class)
+    public void testMergeFromIAE() {
+        new GeoImageLayer(null, null).mergeFrom(new OsmDataLayer(new DataSet(), "", null));
+    }
 }