Changeset 19428 in josm for trunk/test/unit/org/openstreetmap

Timestamp:

2025-07-13T20:19:41+02:00 (4 months ago)

Author:

taylor.smock

Message:

Fix some test issues (from order) and clean up some try blocks

Location:

trunk/test/unit/org/openstreetmap/josm

Files:

• actions/AddImageryLayerActionTest.java (modified) (2 diffs)
• actions/CreateMultipolygonActionTest.java (modified) (2 diffs)
• actions/JoinAreasActionTest.java (modified) (2 diffs)
• actions/JoinNodeWayActionTest.java (modified) (2 diffs)
• gui/conflict/pair/tags/TagMergeItemTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java

@@ -6 +6 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -100 +101 @@
     void testActionPerformedDisabled() {
         assertTrue(MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
-        try {
-            new AddImageryLayerAction(new ImageryInfo("foo")).actionPerformed(null);
-        } catch (IllegalArgumentException expected) {
-            assertEquals("Parameter 'info.url' must not be null", expected.getMessage());
-        }
+        final AddImageryLayerAction action = new AddImageryLayerAction(new ImageryInfo("foo"));
+        IllegalArgumentException expected = assertThrows(IllegalArgumentException.class, () -> action.actionPerformed(null));
+        assertEquals("Parameter 'info.url' must not be null", expected.getMessage());
         assertTrue(MainApplication.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty());
     }

trunk/test/unit/org/openstreetmap/josm/actions/CreateMultipolygonActionTest.java

@@ -33 +33 @@
 import org.openstreetmap.josm.testutils.annotations.MapPaintStyles;
 import org.openstreetmap.josm.testutils.annotations.Projection;
+import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.openstreetmap.josm.tools.Pair;
 import org.openstreetmap.josm.tools.SubclassFilteredCollection;
@@ -43 +44 @@
 @MapPaintStyles
 @Projection
+@Territories(Territories.Initialize.ALL)
 class CreateMultipolygonActionTest {
     private static Map<String, String> getRefToRoleMap(Relation relation) {

trunk/test/unit/org/openstreetmap/josm/actions/JoinAreasActionTest.java

@@ -38 +38 @@
 import org.openstreetmap.josm.testutils.annotations.Main;
 import org.openstreetmap.josm.testutils.annotations.Projection;
+import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.openstreetmap.josm.tools.MultiMap;
 import org.openstreetmap.josm.tools.Utils;
@@ -47 +48 @@
 @Main
 @Projection
+@Territories
 class JoinAreasActionTest {
     /**

trunk/test/unit/org/openstreetmap/josm/actions/JoinNodeWayActionTest.java

@@ -29 +29 @@
 import org.openstreetmap.josm.testutils.annotations.Main;
 import org.openstreetmap.josm.testutils.annotations.Projection;
+import org.openstreetmap.josm.testutils.annotations.Territories;
 import org.openstreetmap.josm.tools.Geometry;
 
@@ -37 +38 @@
 @Main
 @Projection
+@Territories(Territories.Initialize.ALL)
 final class JoinNodeWayActionTest {
     private void setupMapView(DataSet ds) {

trunk/test/unit/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItemTest.java

@@ -4 +4 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -81 +82 @@
     void testDecide1() {
         TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
-        try {
-            item.decide(null);
-            fail("expected IllegalArgumentException not thrown");
-        } catch (IllegalArgumentException e) {
-            // OK
-            Logging.trace(e);
-        }
+        assertThrows(IllegalArgumentException.class, () -> item.decide(null));
     }
 
@@ -128 +123 @@
         Node n1 = new Node(1);
         n1.put("key", "oldvalue");
-        try {
-            item.applyToMyPrimitive(n1);
-            fail("expected IllegalStateException");
-        } catch (IllegalStateException e) {
-            // OK
-            Logging.trace(e);
-        }
+        assertThrows(IllegalStateException.class, () -> item.applyToMyPrimitive(n1));
     }
 
@@ -141 +130 @@
         TagMergeItem item = new TagMergeItem("key", "myvalue", "theirvalue");
 
-        try {
-            item.applyToMyPrimitive(null);
-            fail("expected IllegalArgumentException");
-        } catch (IllegalArgumentException e) {
-            // OK
-            Logging.trace(e);
-        }
+        assertThrows(IllegalArgumentException.class, () -> item.applyToMyPrimitive(null));
     }
 }