Merge pull request #26 from bitxon/feature/multiple-extentions

Simplify extensions class names concatenation + Add a test for extensions combination

Author: oleg-nenashev

pom.xml

@@ -146,6 +146,11 @@
                   <version>0.4.1</version>
                   <classifier>jar-with-dependencies</classifier>
                 </artifactItem>
+                <dependency>
+                  <groupId>org.wiremock</groupId>
+                  <artifactId>wiremock-webhooks-extension</artifactId>
+                  <version>2.35.0</version>
+                </dependency>
               </artifactItems>
               <outputDirectory>${project.build.directory}/test-wiremock-extension</outputDirectory>
             </configuration>

src/main/java/org/wiremock/integrations/testcontainers/WireMockContainer.java

@@ -219,11 +219,7 @@ protected void configure() {
         }
         if (!extensionClassNames.isEmpty()) {
             wireMockArgs.append(" --extensions ");
-            int counter = 0;
-            for (String className : extensionClassNames) {
-                wireMockArgs.append(className);
-                wireMockArgs.append( (++counter != extensionClassNames.size()) ? ',' : ' ');
-            }
+            wireMockArgs.append(String.join(",", extensionClassNames));
         }
 
         // Add CLI arguments

src/test/java/org/wiremock/integrations/testcontainers/WireMockContainerExtensionTest.java

@@ -37,13 +37,14 @@
  */
 public class WireMockContainerExtensionTest {
 
-    public static final Logger LOGGER =  LoggerFactory.getLogger(WireMockContainerExtensionTest.class);
+    public static final Logger LOGGER = LoggerFactory.getLogger(WireMockContainerExtensionTest.class);
 
     @Rule
     public WireMockContainer wiremockServer = new WireMockContainer("2.35.0")
             .withStartupTimeout(Duration.ofSeconds(60))
             .withMapping("json-body-transformer", WireMockContainerExtensionTest.class, "json-body-transformer.json")
-            .withExtension("JSON Body Transformer", Collections.singleton("com.ninecookies.wiremock.extensions.JsonBodyTransformer"),
+            .withExtension("JSON Body Transformer",
+                    Collections.singleton("com.ninecookies.wiremock.extensions.JsonBodyTransformer"),
                     Collections.singleton(Paths.get("target", "test-wiremock-extension", "wiremock-extensions-0.4.1-jar-with-dependencies.jar").toFile()));
 
     @Before

src/test/java/org/wiremock/integrations/testcontainers/WireMockContainerExtensionsCombinationTest.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright (C) 2023 WireMock Inc, Oleg Nenashev and all project contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.wiremock.integrations.testcontainers;
+
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testcontainers.containers.output.Slf4jLogConsumer;
+
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.nio.file.Paths;
+import java.time.Duration;
+import java.util.Collections;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests the WireMock extension loading.
+ * It uses multiple external Jars supplied by the Maven Dependency Plugin.
+ */
+public class WireMockContainerExtensionsCombinationTest {
+
+    public static final Logger LOGGER = LoggerFactory.getLogger(WireMockContainerExtensionsCombinationTest.class);
+
+    @Rule
+    public WireMockContainer wiremockServer = new WireMockContainer("2.35.0")
+            .withMapping("json-body-transformer", WireMockContainerExtensionsCombinationTest.class, "json-body-transformer.json")
+            .withExtension("Webhook",
+                    Collections.singleton("org.wiremock.webhooks.Webhooks"),
+                    Collections.singleton(Paths.get("target", "test-wiremock-extension", "wiremock-webhooks-extension-2.35.0.jar").toFile()))
+            .withExtension("JSON Body Transformer",
+                    Collections.singleton("com.ninecookies.wiremock.extensions.JsonBodyTransformer"),
+                    Collections.singleton(Paths.get("target", "test-wiremock-extension", "wiremock-extensions-0.4.1-jar-with-dependencies.jar").toFile()));
+
+    @Before
+    public void before() {
+        wiremockServer.followOutput(new Slf4jLogConsumer(LOGGER));
+    }
+
+    @Test
+    public void testJSONBodyTransformer() throws Exception {
+        final HttpClient client = HttpClient.newBuilder().build();
+        final HttpRequest request = HttpRequest.newBuilder()
+                .uri(wiremockServer.getRequestURI("json-body-transformer"))
+                .timeout(Duration.ofSeconds(10))
+                .header("Content-Type", "application/json")
+                .POST(HttpRequest.BodyPublishers.ofString("{\"name\":\"John Doe\"}")).build();
+
+        HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+
+        assertThat(response.body())
+                .as("Wrong response body")
+                .contains("Hello, John Doe!");
+    }
+
+}

src/test/resources/org/wiremock/integrations/testcontainers/WireMockContainerExtensionsCombinationTest/json-body-transformer.json

@@ -0,0 +1,16 @@
+{
+  "request": {
+    "method": "POST",
+    "url": "/json-body-transformer"
+  },
+  "response": {
+    "status": 201,
+    "headers": {
+      "content-type": "application/json"
+    },
+    "jsonBody": {
+      "message": "Hello, $(name)!"
+    },
+    "transformers" : ["json-body-transformer"]
+  }
+}