Fix some unit tests

Signed-off-by: Taylor Smock <taylor.smock@kaart.com>

build.gradle

@@ -139,6 +139,7 @@ spotless {
 
 josm {
   manifest {
+    oldVersionDownloadLink 16220, "v1.4.1", new URL("https://gokaart.gitlab.io/JOSM_MapWithAI/dist/v1.4.1/mapwithai.jar")
     oldVersionDownloadLink 15820, "v1.3.7", new URL("https://gokaart.gitlab.io/JOSM_MapWithAI/dist/v1.3.7/mapwithai.jar")
     oldVersionDownloadLink 15737, "v1.2.3", new URL("https://gokaart.gitlab.io/JOSM_MapWithAI/dist/v1.2.3/mapwithai.jar")
     oldVersionDownloadLink 15609, "v1.1.8", new URL("https://gokaart.gitlab.io/JOSM_MapWithAI/dist/v1.1.8/mapwithai.jar")

gradle.properties

@@ -1,9 +1,9 @@
 # The minimum JOSM version this plugin is compatible with (can be any numeric version
-plugin.main.version = 16220
+plugin.main.version = 16284
 # The JOSM version this plugin is currently compiled against
 # Please make sure this version is available at https://josm.openstreetmap.de/download
 # The special values "latest" and "tested" are also possible here, but not recommended.
-plugin.compile.version = 16220
+plugin.compile.version = 16284
 plugin.canloadatruntime = true
 plugin.author = Taylor Smock <incoming+gokaart/JOSM_MapWithAI@incoming.gitlab.com>
 plugin.class = org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin

src/main/java/org/openstreetmap/josm/plugins/mapwithai/backend/DataAvailability.java

@@ -12,6 +12,7 @@ import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.TreeMap;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.json.Json;
 import javax.json.JsonException;
@@ -22,6 +23,8 @@ import javax.json.stream.JsonParser;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.io.CachedFile;
+import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo;
+import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAILayerInfo;
 import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Territories;
 import org.openstreetmap.josm.tools.Utils;
@@ -235,15 +238,17 @@ public class DataAvailability {
      * @return List of terms of use urls
      */
     public static final List<String> getTermsOfUse() {
-        return DATA_SOURCES.stream().map(clazz -> {
-            try {
-                return clazz.getConstructor().newInstance().getTermsOfUseUrl();
-            } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
-                    | InvocationTargetException | NoSuchMethodException | SecurityException e) {
-                Logging.debug(e);
-            }
-            return "";
-        }).filter(Objects::nonNull).filter(str -> !Utils.removeWhiteSpaces(str).isEmpty()).collect(Collectors.toList());
+        return Stream.concat(MapWithAILayerInfo.instance.getLayers().stream().map(MapWithAIInfo::getTermsOfUseURL),
+                DATA_SOURCES.stream().map(clazz -> {
+                    try {
+                        return clazz.getConstructor().newInstance().getTermsOfUseUrl();
+                    } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+                            | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+                        Logging.debug(e);
+                    }
+                    return "";
+                })).filter(Objects::nonNull).filter(str -> !Utils.removeWhiteSpaces(str).isEmpty())
+                .collect(Collectors.toList());
     }
 
     /**
@@ -252,15 +257,17 @@ public class DataAvailability {
      * @return List of privacy policy urls
      */
     public static final List<String> getPrivacyPolicy() {
-        return DATA_SOURCES.stream().map(clazz -> {
-            try {
-                return clazz.getConstructor().newInstance().getPrivacyPolicyUrl();
-            } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
-                    | InvocationTargetException | NoSuchMethodException | SecurityException e) {
-                Logging.debug(e);
-            }
-            return "";
-        }).filter(Objects::nonNull).filter(str -> !Utils.removeWhiteSpaces(str).isEmpty()).collect(Collectors.toList());
+        return Stream.concat(MapWithAILayerInfo.instance.getLayers().stream().map(MapWithAIInfo::getPrivacyPolicyURL),
+                DATA_SOURCES.stream().map(clazz -> {
+                    try {
+                        return clazz.getConstructor().newInstance().getPrivacyPolicyUrl();
+                    } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+                            | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+                        Logging.debug(e);
+                    }
+                    return "";
+                })).filter(Objects::nonNull).filter(str -> !Utils.removeWhiteSpaces(str).isEmpty()).distinct()
+                .collect(Collectors.toList());
     }
 
     /**

src/main/java/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/MapWithAISourceReader.java

@@ -123,7 +123,7 @@ public class MapWithAISourceReader implements Closeable {
             info.setDefaultEntry(values.getBoolean("default", false));
             info.setParameters(values.getJsonArray("parameters"));
             if (values.containsKey("terms_of_use_url")) {
-                info.setTermsOfUseText(values.getString("terms_of_use_url"));
+                info.setTermsOfUseURL(values.getString("terms_of_use_url"));
             }
             if (values.containsKey("privacy_policy_url")) {
                 info.setPrivacyPolicyURL(values.getString("privacy_policy_url"));

test/resources/wiremock/mappings/maps_ml_roads-2aac807a-9c8c-4713-a806-9f2451600f2b.json

@@ -1,28 +0,0 @@
-{
-  "id" : "2aac807a-9c8c-4713-a806-9f2451600f2b",
-  "name" : "maps_ml_roads",
-  "request" : {
-    "url" : "/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox=-108.5715723,39.0734162,-108.5707107,39.0738791&crop_bbox=-108.5711561,39.0735205,-108.5708568,39.0736682&result_type=road_building_vector_xml",
-    "method" : "GET"
-  },
-  "response" : {
-    "status" : 200,
-    "body" : "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<osm generator=\"NS_ROADS_SERVICE\" version=\"0.6\"><bounds maxlat=\"39.0738691\" maxlon=\"-108.57072358101\" minlat=\"39.0734262\" minlon=\"-108.57155941899\"/><node id=\"-2976339053870190188\" lon=\"-108.5708568\" lat=\"39.073597910501\" visible=\"true\"/><way id=\"-4444230471161502073\" orig_id=\"-1203473873173507\" visible=\"true\" action=\"modify\"><tag k=\"highway\" v=\"residential\"/><tag k=\"source\" v=\"digitalglobe\"/><nd ref=\"-710999622096597555\"/><nd ref=\"-373066400259132\"/><nd ref=\"-2976339053870190188\"/></way><node action=\"modify\" id=\"-710999622096597555\" lat=\"39.0736112\" lon=\"-108.5710852\" visible=\"true\"><tag k=\"dupe\" v=\"n6815623346\"/></node><node action=\"modify\" id=\"-373066400259132\" lat=\"39.0735933\" lon=\"-108.5709927\" visible=\"true\"/></osm>\n",
-    "headers" : {
-      "Content-Type" : "text/xml; charset=UTF-8",
-      "Strict-Transport-Security" : "max-age=15552000; preload",
-      "Vary" : "Accept-Encoding",
-      "X-Content-Type-Options" : "nosniff",
-      "X-Frame-Options" : "DENY",
-      "X-XSS-Protection" : "0",
-      "Access-Control-Allow-Origin" : "https://mapwith.ai",
-      "X-FB-Debug" : "pAVoB1d1AQr2FejyueTMcu+w/Dz6gRkTSWM8vHG9Is5MwRmNnY97YHiWDtoDigLbkHsoKHQtAWaRwWI+47NZKw==",
-      "Date" : "Thu, 05 Dec 2019 14:25:09 GMT",
-      "Alt-Svc" : "h3-23=\":443\"; ma=3600",
-      "Connection" : "keep-alive"
-    }
-  },
-  "uuid" : "2aac807a-9c8c-4713-a806-9f2451600f2b",
-  "persistent" : true,
-  "insertionIndex" : 3
-}

test/resources/wiremock/mappings/maps_ml_roads-5547df42-8d64-4a75-8a27-d598b4de5968.json

@@ -1,28 +0,0 @@
-{
-  "id" : "5547df42-8d64-4a75-8a27-d598b4de5968",
-  "name" : "maps_ml_roads",
-  "request" : {
-    "url" : "/maps/ml_roads?conflate_with_osm=true&theme=ml_road_vector&collaborator=josm&token=ASb3N5o9HbX8QWn8G_NtHIRQaYv3nuG2r7_f3vnGld3KhZNCxg57IsaQyssIaEw5rfRNsPpMwg4TsnrSJtIJms5m&hash=ASawRla3rBcwEjY4HIY&bbox=-108.5715723,39.0734162,-108.5707107,39.0738791",
-    "method" : "GET"
-  },
-  "response" : {
-    "status" : 200,
-    "body" : "<?xml version=\"1.0\"?>\n<osm attribution=\"http://www.openstreetmap.org/copyright\" copyright=\"OpenStreetMap and contributors\" generator=\"fb_conflation_service\" version=\"0.6\">\n  <bounds maxlat=\"39.0738691\" maxlon=\"-108.57072358101\" minlat=\"39.0734262\" minlon=\"-108.57155941899\"/>\n  <node action=\"modify\" id=\"-3625810361941368501\" lat=\"39.0736017\" lon=\"-108.5707451\" visible=\"true\">\n    <tag k=\"conn\" v=\"w626760817,n5917002841,n5917002155\"/>\n  </node>\n  <node action=\"modify\" id=\"-373066400259132\" lat=\"39.0735933\" lon=\"-108.5709927\" visible=\"true\"/>\n  <way action=\"modify\" id=\"-4444230471161502072\" orig_id=\"-1203473873173507\" visible=\"true\">\n    <nd ref=\"-710999622096597555\"/>\n    <nd ref=\"-373066400259132\"/>\n    <nd ref=\"-3625810361941368501\"/>\n    <tag k=\"highway\" v=\"residential\"/>\n    <tag k=\"source\" v=\"digitalglobe\"/>\n  </way>\n  <node action=\"modify\" id=\"-710999622096597555\" lat=\"39.0736112\" lon=\"-108.5710852\" visible=\"true\">\n    <tag k=\"dupe\" v=\"n6815623346\"/>\n  </node>\n  <node action=\"modify\" id=\"-2406517166226748\" lat=\"39.0736540\" lon=\"-108.5718322\" visible=\"true\">\n    <tag k=\"dupe\" v=\"n5907055578\"/>\n  </node>\n  <node action=\"modify\" id=\"-2406517166226748\" lat=\"39.0736540\" lon=\"-108.5718322\" visible=\"true\">\n    <tag k=\"dupe\" v=\"n6815623345\"/>\n  </node>\n  <way action=\"modify\" id=\"-4444230471161502073\" orig_id=\"-1203473873173507\" visible=\"true\">\n    <nd ref=\"-2406517166226748\"/>\n    <nd ref=\"-2406517166226748\"/>\n    <tag k=\"highway\" v=\"service\"/>\n    <tag k=\"source\" v=\"digitalglobe\"/>\n  </way>\n</osm>\n",
-    "headers" : {
-      "Content-Type" : "text/xml; charset=UTF-8",
-      "Strict-Transport-Security" : "max-age=15552000; preload",
-      "Vary" : "Accept-Encoding",
-      "X-Content-Type-Options" : "nosniff",
-      "X-Frame-Options" : "DENY",
-      "X-XSS-Protection" : "0",
-      "Access-Control-Allow-Origin" : "https://mapwith.ai",
-      "X-FB-Debug" : "PO3X3PMMLb3HV54QiTBVn22/bnfz0ZqWTjvT4wBDXxjrZCbSWSX8/uGfQ7ItzmBiQQJ0ytFBpHWmvZm48YWdUQ==",
-      "Date" : "Wed, 18 Dec 2019 20:28:03 GMT",
-      "Alt-Svc" : "h3-24=\":443\"; ma=3600",
-      "Connection" : "keep-alive"
-    }
-  },
-  "uuid" : "5547df42-8d64-4a75-8a27-d598b4de5968",
-  "persistent" : true,
-  "insertionIndex" : 18
-}

test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPluginTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -16,7 +15,6 @@ import javax.swing.JMenu;
 
 import org.awaitility.Awaitility;
 import org.awaitility.Durations;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -25,11 +23,10 @@ import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.mapwithai.backend.MapWithAIDataUtils;
 import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAIPreferences;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -38,30 +35,21 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 public class MapWithAIPluginTest {
     @Rule
     @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().main();
+    public JOSMTestRules test = new MapWithAITestRules().wiremock().preferences().main();
 
     public PluginInformation info;
     public MapWithAIPlugin plugin;
 
     private static final String VERSION = "no-such-version";
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
 
     /**
      * @throws java.lang.Exception
      */
     @Before
     public void setUp() throws Exception {
-        wireMock.start();
         final InputStream in = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
         info = new PluginInformation(in, "MapWithAI", null);
         info.localversion = VERSION;
-        MapWithAIDataUtils.setPaintStyleUrl(
-                MapWithAIDataUtils.getPaintStyleUrl().replace(Config.getUrls().getJOSMWebsite(), wireMock.baseUrl()));
-    }
-
-    @After
-    public void tearDown() {
-        wireMock.stop();
     }
 
     /**

test/unit/org/openstreetmap/josm/plugins/mapwithai/UpdateProdTest.java

@@ -13,9 +13,9 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.data.Version;
-import org.openstreetmap.josm.plugins.mapwithai.testutils.OpenBrowserMocker;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.testutils.mockers.OpenBrowserMocker;
 import org.openstreetmap.josm.testutils.mockers.WindowMocker;
 
 /**

test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadMapWithAITaskTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai.backend;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -12,34 +11,17 @@ import java.net.URL;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadParams;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAILayerInfo;
-import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAILayerInfoTest;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 public class DownloadMapWithAITaskTest {
     @Rule
-    public JOSMTestRules rule = new JOSMTestRules().preferences().fakeAPI().projection().territories();
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
-
-    @Before
-    public void setUp() {
-        wireMock.start();
-        MapWithAILayerInfoTest.setupMapWithAILayerInfo(wireMock);
-    }
-
-    @After
-    public void tearDown() {
-        wireMock.stop();
-        MapWithAILayerInfoTest.resetMapWithAILayerInfo();
-    }
+    public JOSMTestRules rule = new MapWithAITestRules().wiremock().preferences().fakeAPI().projection().territories();
 
     @Test
     public void testDownloadOsmServerReaderDownloadParamsBoundsProgressMonitor()

test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnableTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai.backend;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.Assume.assumeTrue;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -15,8 +14,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
@@ -29,7 +26,7 @@ import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAILayerInfoTest;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Geometry;
 
@@ -37,21 +34,7 @@ import com.github.tomakehurst.wiremock.WireMockServer;
 
 public class GetDataRunnableTest {
     @Rule
-    public JOSMTestRules rule = new JOSMTestRules().projection().fakeAPI().territories();
-
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
-
-    @Before
-    public void setUp() {
-        wireMock.start();
-        MapWithAILayerInfoTest.setupMapWithAILayerInfo(wireMock);
-    }
-
-    @After
-    public void tearDown() {
-        wireMock.stop();
-        MapWithAILayerInfoTest.resetMapWithAILayerInfo();
-    }
+    public JOSMTestRules rule = new MapWithAITestRules().wiremock().projection().fakeAPI().territories();
 
     public static String getDefaultMapWithAIAPIForTest(WireMockServer wireMock, String url) {
         return getDefaultMapWithAIAPIForTest(wireMock, url, "https://www.mapwith.ai");

test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIActionTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai.backend;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -13,7 +12,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.awaitility.Awaitility;
 import org.awaitility.Durations;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -25,36 +23,26 @@ import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Territories;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class MapWithAIActionTest {
     @Rule
     @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main().projection().territories().timeout(100000);
+    public JOSMTestRules test = new MapWithAITestRules().wiremock().main().projection().territories().timeout(100000);
 
     private MapWithAIAction action;
 
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
-
     @Before
     public void setUp() {
         action = new MapWithAIAction();
-        wireMock.start(); // This is required to avoid failing a test in MapWithAIAvailabilityTest
-        DataAvailability.setReleaseUrl(wireMock.baseUrl() + "/JOSM_MapWithAI/json/sources.json");
         LatLon temp = new LatLon(40, -100);
         await().atMost(Durations.TEN_SECONDS).until(() -> Territories.isIso3166Code("US", temp));
     }
 
-    @After
-    public void tearDown() {
-        wireMock.stop();
-    }
-
     @Test
     public void testEnabled() {
         assertFalse(action.isEnabled());

test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIAvailabilityTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai.backend;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -11,19 +10,16 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import java.util.ArrayList;
 
 import org.awaitility.Durations;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
 import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAILayerInfo;
-import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAILayerInfoTest;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Territories;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class MapWithAIAvailabilityTest {
@@ -31,25 +27,15 @@ public class MapWithAIAvailabilityTest {
 
     @Rule
     @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().projection().territories();
-
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
+    public JOSMTestRules test = new MapWithAITestRules().wiremock().projection().territories();
 
     @Before
     public void setUp() {
-        wireMock.start();
-        MapWithAILayerInfoTest.setupMapWithAILayerInfo(wireMock);
         instance = DataAvailability.getInstance();
         LatLon temp = new LatLon(40, -100);
         await().atMost(Durations.TEN_SECONDS).until(() -> Territories.isIso3166Code("US", temp));
     }
 
-    @After
-    public void tearDown() {
-        wireMock.stop();
-        MapWithAILayerInfoTest.resetMapWithAILayerInfo();
-    }
-
     @Test
     public void testHasDataBBox() {
         assertFalse(instance.hasData(new BBox(0, 0, 0.1, 0.1)), "There shouldn't be data in the ocean");
@@ -71,10 +57,10 @@ public class MapWithAIAvailabilityTest {
                 "The US should have highway data");
         assertTrue(DataAvailability.getDataTypes(new LatLon(40, -100)).getOrDefault("building", false),
                 "The US should have building data");
-        assertFalse(DataAvailability.getDataTypes(new LatLon(71.67, -42.85)).getOrDefault("highway", false),
-                "Denmark should not have highway data");
-        assertFalse(DataAvailability.getDataTypes(new LatLon(71.67, -42.85)).getOrDefault("building", false),
-                "Denmark does not have building data");
+        assertFalse(DataAvailability.getDataTypes(new LatLon(39.1, 125.7)).getOrDefault("highway", false),
+                "North Korea should not have highway data");
+        assertFalse(DataAvailability.getDataTypes(new LatLon(39.1, 125.7)).getOrDefault("building", false),
+                "North Korea does not have building data");
         assertTrue(DataAvailability.getDataTypes(new LatLon(19.433333, -99.133333)).getOrDefault("highway", false),
                 "Mexico has highway data");
         assertFalse(DataAvailability.getDataTypes(new LatLon(19.433333, -99.133333)).getOrDefault("building", false),

test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtilsTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai.backend;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -17,8 +16,6 @@ import java.util.stream.Collectors;
 
 import org.awaitility.Awaitility;
 import org.awaitility.Durations;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
@@ -36,36 +33,17 @@ import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.StyleSource;
 import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo;
-import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAILayerInfoTest;
-import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Logging;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class MapWithAIDataUtilsTest {
     @Rule
     @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().main().projection().fakeAPI().territories();
-
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
-
-    @Before
-    public void setUp() {
-        wireMock.start();
-
-        MapWithAILayerInfoTest.resetMapWithAILayerInfo();
-        MapWithAIDataUtils.setPaintStyleUrl(
-                MapWithAIDataUtils.getPaintStyleUrl().replace(Config.getUrls().getJOSMWebsite(), wireMock.baseUrl()));
-    }
-
-    @After
-    public void tearDown() {
-        wireMock.stop();
-        MapWithAILayerInfoTest.resetMapWithAILayerInfo();
-    }
+    public JOSMTestRules test = new MapWithAITestRules().sources().wiremock().preferences().main().projection()
+            .fakeAPI().territories();
 
     /**
      * This gets data from MapWithAI. This test may fail if someone adds the data to

test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAILayerTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai.backend;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -24,7 +23,6 @@ import javax.swing.SwingUtilities;
 
 import org.awaitility.Awaitility;
 import org.awaitility.Durations;
-import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -46,12 +44,10 @@ import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
 import org.openstreetmap.josm.plugins.mapwithai.backend.MapWithAILayer.ContinuousDownloadAction;
 import org.openstreetmap.josm.plugins.mapwithai.commands.MapWithAIAddCommand;
 import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo;
-import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAILayerInfoTest;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -61,25 +57,16 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 public class MapWithAILayerTest {
     @Rule
     @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().preferences().main().projection().fakeAPI().territories();
-
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
+    public JOSMTestRules test = new MapWithAITestRules().wiremock().preferences().main().projection().fakeAPI()
+            .territories();
 
     MapWithAILayer layer;
 
     @Before
     public void setUp() {
-        wireMock.start();
-        MapWithAILayerInfoTest.setupMapWithAILayerInfo(wireMock);
         layer = new MapWithAILayer(new DataSet(), "test", null);
     }
 
-    @After
-    public void tearDown() {
-        wireMock.stop();
-        MapWithAILayerInfoTest.resetMapWithAILayerInfo();
-    }
-
     @Test
     public void testGetSource() {
         assertNull(layer.getChangesetSourceTag(), "The source tag should be null");

test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIRemoteControlTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai.backend;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -11,8 +10,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.awaitility.Awaitility;
 import org.awaitility.Durations;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -21,12 +18,10 @@ import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.remotecontrol.handler.RequestHandler.RequestHandlerBadRequestException;
 import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
 import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAILayerInfo;
-import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAILayerInfoTest;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 import org.openstreetmap.josm.tools.Utils;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -46,21 +41,7 @@ public class MapWithAIRemoteControlTest {
      */
     @Rule
     @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().main().projection().territories();
-
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
-
-    @Before
-    public void setUp() {
-        wireMock.start();
-        MapWithAILayerInfoTest.setupMapWithAILayerInfo(wireMock);
-    }
-
-    @After
-    public void tearDown() {
-        wireMock.stop();
-        MapWithAILayerInfoTest.resetMapWithAILayerInfo();
-    }
+    public JOSMTestRules test = new MapWithAITestRules().wiremock().main().projection().territories();
 
     private static MapWithAIRemoteControl newHandler(String url) throws RequestHandlerBadRequestException {
         final MapWithAIRemoteControl req = new MapWithAIRemoteControl();

test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/CreateConnectionsCommandTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai.commands;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -12,8 +11,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
@@ -29,11 +26,9 @@ import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation.ConnectedCommand;
 import org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation.DuplicateCommand;
-import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -44,20 +39,7 @@ import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 public class CreateConnectionsCommandTest {
     @Rule
     @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().projection();
-
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
-
-    @Before
-    public void setUp() {
-        wireMock.start();
-        Config.getPref().put("osm-server.url", wireMock.baseUrl());
-    }
-
-    @After
-    public void tearDown() {
-        wireMock.stop();
-    }
+    public JOSMTestRules test = new MapWithAITestRules().wiremock().projection();
 
     /**
      * Test method for

test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MapWithAIAddComandTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai.commands;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
@@ -15,8 +14,6 @@ import java.util.Collections;
 
 import org.awaitility.Awaitility;
 import org.awaitility.Durations;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.TestUtils;
@@ -33,11 +30,9 @@ import org.openstreetmap.josm.data.validation.tests.SharpAngles;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.NullProgressMonitor;
 import org.openstreetmap.josm.plugins.mapwithai.backend.commands.conflation.ConnectedCommand;
-import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class MapWithAIAddComandTest {
@@ -45,20 +40,7 @@ public class MapWithAIAddComandTest {
 
     @Rule
     @SuppressFBWarnings("URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
-    public JOSMTestRules test = new JOSMTestRules().projection();
-
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
-
-    @Before
-    public void setUp() {
-        wireMock.start();
-        Config.getPref().put("osm-server.url", wireMock.baseUrl());
-    }
-
-    @After
-    public void tearDown() {
-        wireMock.stop();
-    }
+    public JOSMTestRules test = new MapWithAITestRules().wiremock().projection();
 
     @Test
     public void testMoveCollection() {

test/unit/org/openstreetmap/josm/plugins/mapwithai/frontend/MapWithAIDownloadReaderTest.java

@@ -1,7 +1,6 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.mapwithai.frontend;
 
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -10,8 +9,6 @@ import static org.openstreetmap.josm.tools.I18n.tr;
 
 import org.awaitility.Awaitility;
 import org.awaitility.Durations;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.openstreetmap.josm.data.Bounds;
@@ -19,28 +16,12 @@ import org.openstreetmap.josm.gui.download.DownloadSettings;
 import org.openstreetmap.josm.plugins.mapwithai.MapWithAIPlugin;
 import org.openstreetmap.josm.plugins.mapwithai.backend.MapWithAIDataUtils;
 import org.openstreetmap.josm.plugins.mapwithai.backend.MapWithAIPreferenceHelper;
-import org.openstreetmap.josm.plugins.mapwithai.gui.preferences.MapWithAILayerInfoTest;
+import org.openstreetmap.josm.plugins.mapwithai.testutils.MapWithAITestRules;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 public class MapWithAIDownloadReaderTest {
     @Rule
-    public JOSMTestRules rules = new JOSMTestRules().projection().territories();
-
-    WireMockServer wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
-
-    @Before
-    public void setUp() {
-        wireMock.start();
-        MapWithAILayerInfoTest.setupMapWithAILayerInfo(wireMock);
-    }
-
-    @After
-    public void tearDown() {
-        wireMock.stop();
-        MapWithAILayerInfoTest.resetMapWithAILayerInfo();
-    }
+    public JOSMTestRules rules = new MapWithAITestRules().wiremock().projection().territories();
 
     @Test
     public void testGetLabel() {

test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAILayerInfoTest.java

@@ -1,35 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.mapwithai.gui.preferences;
-
-import org.openstreetmap.josm.plugins.mapwithai.backend.GetDataRunnableTest;
-import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo;
-import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAILayerInfo;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
-
-/**
- * This is currently (mostly) a utils class. It should be expanded to tests,
- * sometime.
- *
- * @author Taylor Smock
- *
- */
-public class MapWithAILayerInfoTest {
-    public static void setupMapWithAILayerInfo(WireMockServer wireMock) {
-        synchronized (MapWithAILayerInfoTest.class) {
-            resetMapWithAILayerInfo();
-            MapWithAILayerInfo.instance.getLayers().stream()
-                    .forEach(i -> i.setUrl(GetDataRunnableTest.getDefaultMapWithAIAPIForTest(wireMock, i.getUrl())));
-            MapWithAILayerInfo.instance.save();
-        }
-    }
-
-    public static void resetMapWithAILayerInfo() {
-        synchronized (MapWithAILayerInfoTest.class) {
-            MapWithAILayerInfo.instance.clear();
-            MapWithAILayerInfo.instance.getDefaultLayers().stream().filter(MapWithAIInfo::isDefaultEntry)
-                    .forEach(MapWithAILayerInfo.instance::add);
-            MapWithAILayerInfo.instance.save();
-        }
-    }
-}

test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MapWithAITestRules.java

@@ -0,0 +1,91 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.mapwithai.testutils;
+
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
+
+import java.util.logging.Level;
+
+import org.junit.runners.model.InitializationError;
+import org.openstreetmap.josm.plugins.mapwithai.backend.DataAvailability;
+import org.openstreetmap.josm.plugins.mapwithai.backend.GetDataRunnableTest;
+import org.openstreetmap.josm.plugins.mapwithai.backend.MapWithAIDataUtils;
+import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAIInfo;
+import org.openstreetmap.josm.plugins.mapwithai.data.mapwithai.MapWithAILayerInfo;
+import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
+
+import com.github.tomakehurst.wiremock.WireMockServer;
+
+public class MapWithAITestRules extends JOSMTestRules {
+
+    private boolean sources;
+    private boolean wiremock;
+    private WireMockServer wireMock;
+
+    public MapWithAITestRules sources() {
+        this.sources = true;
+        return this;
+    }
+
+    public MapWithAITestRules wiremock() {
+        this.wiremock = true;
+        super.territories();
+        return this;
+    }
+
+    /**
+     * Set up before running a test
+     *
+     * @throws InitializationError          If an error occurred while creating the
+     *                                      required environment.
+     * @throws ReflectiveOperationException if a reflective access error occurs
+     */
+    @Override
+    protected void before() throws InitializationError, ReflectiveOperationException {
+        super.before();
+        Logging.getLogger().setFilter(record -> record.getLevel().intValue() >= Level.WARNING.intValue()
+                || record.getSourceClassName().startsWith("org.openstreetmap.josm.plugins.mapwithai"));
+        if (sources) {
+            MapWithAILayerInfo.instance.load(false);
+        }
+        if (wiremock) {
+            wireMock = new WireMockServer(options().usingFilesUnderDirectory("test/resources/wiremock"));
+            wireMock.start();
+            resetMapWithAILayerInfo();
+            setupMapWithAILayerInfo(wireMock);
+            MapWithAIDataUtils.setPaintStyleUrl(MapWithAIDataUtils.getPaintStyleUrl()
+                    .replace(Config.getUrls().getJOSMWebsite(), wireMock.baseUrl()));
+            DataAvailability.setReleaseUrl(wireMock.baseUrl() + "/JOSM_MapWithAI/json/sources.json");
+            Config.getPref().put("osm-server.url", wireMock.baseUrl());
+        }
+    }
+
+    @Override
+    protected void after() {
+        if (wiremock) {
+            wireMock.stop();
+            resetMapWithAILayerInfo();
+            DataAvailability.setReleaseUrl(DataAvailability.DEFAULT_SERVER_URL);
+            Config.getPref().put("osm-server.url", null);
+        }
+    }
+
+    private static void setupMapWithAILayerInfo(WireMockServer wireMock) {
+        synchronized (MapWithAITestRules.class) {
+            resetMapWithAILayerInfo();
+            MapWithAILayerInfo.instance.getLayers().stream()
+                    .forEach(i -> i.setUrl(GetDataRunnableTest.getDefaultMapWithAIAPIForTest(wireMock, i.getUrl())));
+            MapWithAILayerInfo.instance.save();
+        }
+    }
+
+    private static void resetMapWithAILayerInfo() {
+        synchronized (MapWithAITestRules.class) {
+            MapWithAILayerInfo.instance.clear();
+            MapWithAILayerInfo.instance.getDefaultLayers().stream().filter(MapWithAIInfo::isDefaultEntry)
+                    .forEach(MapWithAILayerInfo.instance::add);
+            MapWithAILayerInfo.instance.save();
+        }
+    }
+}

test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/OpenBrowserMocker.java

@@ -1,25 +0,0 @@
-// License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.plugins.mapwithai.testutils;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
-
-import java.net.URI;
-
-import org.openstreetmap.josm.tools.CheckParameterUtil;
-import org.openstreetmap.josm.tools.Logging;
-import org.openstreetmap.josm.tools.OpenBrowser;
-
-import mockit.Mock;
-import mockit.MockUp;
-
-/** TODO Remove if #18766 is merged */
-public class OpenBrowserMocker extends MockUp<OpenBrowser> {
-    @Mock
-    public static String displayUrl(URI uri) {
-        CheckParameterUtil.ensureParameterNotNull(uri, "uri");
-
-        Logging.debug(tr("Opening URL: {0}", uri));
-
-        return null;
-    }
-}