Changeset 36272 in osm for applications/editors/josm/plugins/reverter/test

Timestamp:

2024-06-05T19:04:29+02:00 (8 months ago)

Author:

taylor.smock

Message:

Fix more plugin tests

For reverter, the test needed to be updated for newer WireMock versions.
For graphview, the assert in production code was removed and replaced with
requireNonNull for the parameters that are actually used.

File:

• applications/editors/josm/plugins/reverter/test/unit/reverter/ChangesetReverterTest.java (modified) (8 diffs)

applications/editors/josm/plugins/reverter/test/unit/reverter/ChangesetReverterTest.java

@@ -55 +55 @@
 
 import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.common.FileSource;
-import com.github.tomakehurst.wiremock.extension.Parameters;
-import com.github.tomakehurst.wiremock.extension.ResponseTransformer;
+import com.github.tomakehurst.wiremock.extension.ResponseTransformerV2;
 import com.github.tomakehurst.wiremock.http.QueryParameter;
-import com.github.tomakehurst.wiremock.http.Request;
 import com.github.tomakehurst.wiremock.http.Response;
 import com.github.tomakehurst.wiremock.junit5.WireMockExtension;
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
+import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
 import jakarta.json.Json;
 import jakarta.json.JsonArray;
@@ -89 +87 @@
      */
     @Test
-    void testTicket22520(WireMockRuntimeInfo wireMockRuntimeInfo) throws ExecutionException, InterruptedException {
+    void testTicket22520() throws ExecutionException, InterruptedException {
+        final WireMockRuntimeInfo wireMockRuntimeInfo = wireMockExtension.getRuntimeInfo();
         wireMockRuntimeInfo.getWireMock().loadMappingsFrom(TestUtils.getRegressionDataDir(22520));
         MultiplePrimitiveTransformer.register(wireMockRuntimeInfo.getWireMock(), 22520);
@@ -112 +111 @@
      */
     @Test
-    void testTicket23582(WireMockRuntimeInfo wireMockRuntimeInfo) {
+    void testTicket23582() {
+        final WireMockRuntimeInfo wireMockRuntimeInfo = wireMockExtension.getRuntimeInfo();
         wireMockRuntimeInfo.getWireMock().loadMappingsFrom(TestUtils.getRegressionDataDir(23582));
         MultiplePrimitiveTransformer.register(wireMockRuntimeInfo.getWireMock(), 23582);
@@ -126 +126 @@
 
     @Test
-    void testTicket23584(WireMockRuntimeInfo wireMockRuntimeInfo) {
+    void testTicket23584() {
+        final WireMockRuntimeInfo wireMockRuntimeInfo = wireMockExtension.getRuntimeInfo();
         new JOptionPaneSimpleMocker(Collections.singletonMap("Conflicts detected", JOptionPane.OK_OPTION));
         wireMockRuntimeInfo.getWireMock().loadMappingsFrom(TestUtils.getRegressionDataDir(23584));
@@ -148 +149 @@
      * the same data as {@link MultiplePrimitiveTransformer}.
      */
-    private static class PrimitiveTransformer extends ResponseTransformer {
+    private static class PrimitiveTransformer implements ResponseTransformerV2 {
         /**
          * Register the URLs for this transformer
@@ -174 +175 @@
 
         @Override
-        public Response transform(Request request, Response response, FileSource files, Parameters parameters) {
-            final int ticket = parameters.getInt("ticket");
-            final String[] parts = request.getUrl().substring(1).split("/", -1);
+        public Response transform(Response response, ServeEvent serveEvent) {
+            final int ticket = serveEvent.getTransformerParameters().getInt("ticket");
+            final String[] parts = serveEvent.getRequest().getUrl().substring(1).split("/", -1);
             final int version = Integer.parseInt(parts[3]);
             final long id = Long.parseLong(parts[2]);
@@ -204 +205 @@
      * This is needed since we don't always do the requests in the same order.
      */
-    private static class MultiplePrimitiveTransformer extends ResponseTransformer {
+    private static class MultiplePrimitiveTransformer implements ResponseTransformerV2 {
 
         /**
@@ -226 +227 @@
 
         @Override
-        public Response transform(Request request, Response response, FileSource files, Parameters parameters) {
-            final int ticket = parameters.getInt("ticket");
-            final QueryParameter wayParam = request.queryParameter("ways");
-            final QueryParameter nodeParam = request.queryParameter("nodes");
-            final QueryParameter relParam = request.queryParameter("relations");
+        public Response transform(Response response, ServeEvent serveEvent) {
+            final int ticket = serveEvent.getTransformerParameters().getInt("ticket");
+            final QueryParameter wayParam = serveEvent.getRequest().queryParameter("ways");
+            final QueryParameter nodeParam = serveEvent.getRequest().queryParameter("nodes");
+            final QueryParameter relParam = serveEvent.getRequest().queryParameter("relations");
             if (wayParam.isPresent()) {
                 return Response.Builder.like(response).but().body(getReturnXml(ticket, OsmPrimitiveType.WAY, wayParam)).build();