Improve mockserver documentation (#6002)

Signed-off-by: Decker, Stefan <[email protected]>
Co-authored-by: Eddú Meléndez <[email protected]>

Author: StefanHufschmidt

modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerRuleTest.java

@@ -11,35 +11,32 @@
 
 public class MockServerContainerRuleTest {
 
-    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse(
-        "mockserver/mockserver:mockserver-5.14.0"
-    );
-
     // creatingProxy {
+    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
+        .parse("mockserver/mockserver")
+        .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
+
     @Rule
-    public MockServerContainer mockServer = new MockServerContainer(
-        MOCKSERVER_IMAGE.withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion())
-    );
+    public MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE);
 
     // }
 
     @Test
     public void shouldReturnExpectation() throws Exception {
-        // spotless:off
         // testSimpleExpectation {
-        new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
-            .when(request()
-                .withPath("/person")
-                .withQueryStringParameter("name", "peter"))
-            .respond(response()
-                .withBody("Peter the person!"));
-
-        // ...a GET request to '/person?name=peter' returns "Peter the person!"
+        try (
+            MockServerClient mockServerClient = new MockServerClient(mockServer.getHost(), mockServer.getServerPort())
+        ) {
+            mockServerClient
+                .when(request().withPath("/person").withQueryStringParameter("name", "peter"))
+                .respond(response().withBody("Peter the person!"));
+
+            // ...a GET request to '/person?name=peter' returns "Peter the person!"
+
+            assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/person?name=peter"))
+                .as("Expectation returns expected response body")
+                .contains("Peter the person");
+        }
         // }
-        // spotless:on
-
-        assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/person?name=peter"))
-            .as("Expectation returns expected response body")
-            .contains("Peter the person");
     }
 }

modules/mockserver/src/test/java/org/testcontainers/containers/MockServerContainerTest.java

@@ -10,38 +10,32 @@
 
 public class MockServerContainerTest {
 
-    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName.parse(
-        "mockserver/mockserver:mockserver-5.14.0"
-    );
+    public static final DockerImageName MOCKSERVER_IMAGE = DockerImageName
+        .parse("mockserver/mockserver")
+        .withTag("mockserver-" + MockServerClient.class.getPackage().getImplementationVersion());
 
     @Test
     public void shouldCallActualMockserverVersion() throws Exception {
-        String actualVersion = MockServerClient.class.getPackage().getImplementationVersion();
-        try (
-            MockServerContainer mockServer = new MockServerContainer(
-                MOCKSERVER_IMAGE.withTag("mockserver-" + actualVersion)
-            )
-        ) {
+        try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
 
             String expectedBody = "Hello World!";
 
-            MockServerClient client = new MockServerClient(mockServer.getHost(), mockServer.getServerPort());
+            try (MockServerClient client = new MockServerClient(mockServer.getHost(), mockServer.getServerPort())) {
+                assertThat(client.hasStarted()).as("Mockserver running").isTrue();
 
-            assertThat(client.isRunning()).as("Mockserver running").isTrue();
+                client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
 
-            client.when(request().withPath("/hello")).respond(response().withBody(expectedBody));
-
-            assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/hello"))
-                .as("MockServer returns correct result")
-                .isEqualTo(expectedBody);
+                assertThat(SimpleHttpClient.responseFromMockserver(mockServer, "/hello"))
+                    .as("MockServer returns correct result")
+                    .isEqualTo(expectedBody);
+            }
         }
     }
 
     @Test
     public void newVersionStartsWithDefaultWaitStrategy() {
-        DockerImageName dockerImageName = DockerImageName.parse("mockserver/mockserver:mockserver-5.14.0");
-        try (MockServerContainer mockServer = new MockServerContainer(dockerImageName)) {
+        try (MockServerContainer mockServer = new MockServerContainer(MOCKSERVER_IMAGE)) {
             mockServer.start();
         }
     }