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

git-svn-id: https://josm.openstreetmap.de/svn/trunk@19428 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: taylor.smock

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

@@ -5,6 +5,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.get;
 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;
 
 import java.util.Arrays;
@@ -99,11 +100,9 @@ void testActionPerformedEnabledWms(WireMockRuntimeInfo wireMockRuntimeInfo) {
     @Test
     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());
     }
 

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

@@ -32,6 +32,7 @@
 import org.openstreetmap.josm.testutils.annotations.Main;
 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;
 
@@ -42,6 +43,7 @@
 @Main
 @MapPaintStyles
 @Projection
+@Territories(Territories.Initialize.ALL)
 class CreateMultipolygonActionTest {
     private static Map<String, String> getRefToRoleMap(Relation relation) {
         Map<String, String> refToRole = new TreeMap<>();

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

@@ -37,6 +37,7 @@
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 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;
 
@@ -46,6 +47,7 @@
 @BasicPreferences
 @Main
 @Projection
+@Territories
 class JoinAreasActionTest {
     /**
      * Non-regression test for bug #9599.

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

@@ -28,6 +28,7 @@
 import org.openstreetmap.josm.testutils.annotations.BasicPreferences;
 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;
 
 /**
@@ -36,6 +37,7 @@
 @BasicPreferences
 @Main
 @Projection
+@Territories(Territories.Initialize.ALL)
 final class JoinNodeWayActionTest {
     private void setupMapView(DataSet ds) {
         // setup a reasonable size for the edit window

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

@@ -3,6 +3,7 @@
 
 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;
 
 import org.openstreetmap.josm.data.osm.Node;
@@ -80,13 +81,7 @@ void testDecide() {
     @Test
     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));
     }
 
     @Test
@@ -127,25 +122,13 @@ void testApplyToMyPrimitive3() {
 
         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));
     }
 
     @Test
     void testApplyToMyPrimitive4() {
         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));
     }
 }