Changeset 19155 in josm for trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java

Timestamp:

2024-07-29T17:57:38+02:00 (9 months ago)

Author:

taylor.smock

Message:

Fix tests broken by r19152

File:

• trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java (modified) (4 diffs)

trunk/test/unit/org/openstreetmap/josm/data/osm/DefaultNameFormatterTest.java

@@ -15 +15 @@
 import java.util.stream.IntStream;
 
+import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import org.junit.jupiter.api.Test;
 import org.openstreetmap.josm.TestUtils;
@@ -25 +26 @@
 import org.openstreetmap.josm.testutils.annotations.HTTP;
 import org.xml.sax.SAXException;
-
-import com.github.tomakehurst.wiremock.WireMockServer;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -39 +38 @@
 class DefaultNameFormatterTest {
     /**
-     * HTTP mock.
-     */
-    @BasicWiremock
-    WireMockServer wireMockServer;
-
-    /**
      * Non-regression test for ticket <a href="https://josm.openstreetmap.de/ticket/9632">#9632</a>.
+     * @param wireMockRuntimeInfo Wiremock information
      * @throws IllegalDataException if an error was found while parsing the data from the source
      * @throws IOException if any I/O error occurs
@@ -52 +46 @@
     @Test
     @SuppressFBWarnings(value = "ITA_INEFFICIENT_TO_ARRAY")
-    void testTicket9632() throws IllegalDataException, IOException, SAXException {
+    void testTicket9632(WireMockRuntimeInfo wireMockRuntimeInfo) throws IllegalDataException, IOException, SAXException {
         String source = "presets/Presets_BicycleJunction-preset.xml";
-        wireMockServer.stubFor(get(urlEqualTo("/" + source))
+        wireMockRuntimeInfo.getWireMock().register(get(urlEqualTo("/" + source))
                 .willReturn(aResponse()
                     .withStatus(200)
                     .withHeader("Content-Type", "text/xml")
                     .withBodyFile(source)));
-        TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll(wireMockServer.url(source), true));
+        TaggingPresets.addTaggingPresets(TaggingPresetReader.readAll(wireMockRuntimeInfo.getHttpBaseUrl() + '/' + source, true));
 
         Comparator<IRelation<?>> comparator = DefaultNameFormatter.getInstance().getRelationComparator();