Changeset 18614 in josm for trunk/test

Timestamp:

2022-12-13T14:25:40+01:00 (19 months ago)

Author:

taylor.smock

Message:

See #21605: Add tabs to ImageViewerDialog for use with different image layers

This fixes a broken test. This occurred because this was the only location where
GeoImageLayer was initialized with a null image list. We also needed to add
main() from JOSMTestRules due to initializing the image viewer in the
constructor, if no image viewer was already initialized.

File:

• trunk/test/unit/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayerTest.java (modified) (3 diffs)

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

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+import java.util.Collections;
+
+import org.junit.jupiter.api.extension.RegisterExtension;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 
@@ -16 +20 @@
 @BasicPreferences
 class GeoImageLayerTest {
+    @RegisterExtension
+    static JOSMTestRules josmTestRules = new JOSMTestRules().main();
 
     /**
@@ -22 +28 @@
     @Test
     void testMergeFromIAE() {
-        assertThrows(IllegalArgumentException.class, () -> new GeoImageLayer(null, null).mergeFrom(new OsmDataLayer(new DataSet(), "", null)));
+        GeoImageLayer geoImageLayer = new GeoImageLayer(Collections.emptyList(), null);
+        OsmDataLayer osmDataLayer = new OsmDataLayer(new DataSet(), "", null);
+        assertThrows(IllegalArgumentException.class, () -> geoImageLayer.mergeFrom(osmDataLayer));
     }
 }