Add MockWebServerExtension constructor that accepts a server customiz…

…er (#561)
kiwiproject · Feb 8, 2025 · b841d39 · b841d39
1 parent 1e52f0d
commit b841d39
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 9 deletions.
diff --git a/src/main/java/org/kiwiproject/test/okhttp3/mockwebserver/MockWebServerExtension.java b/src/main/java/org/kiwiproject/test/okhttp3/mockwebserver/MockWebServerExtension.java
@@ -56,7 +56,18 @@ public class MockWebServerExtension implements BeforeEachCallback, AfterEachCall
      * use the builder instead of this constructor.
      */
     public MockWebServerExtension() {
-        this(new MockWebServer(), KiwiConsumers.noOp());
+        this(KiwiConsumers.noOp());
+    }
+
+    /**
+     * Create a new instance that will create a new {@link MockWebServer} and
+     * customize it using the {@code serverCustomizer}.
+     *
+     * @param serverCustomizer allows a test to configure the server, e.g., to customize the protocols
+     *                         it supports or to serve requests via HTTPS over TLS. Must not be {@code null}.
+     */
+    public MockWebServerExtension(Consumer<MockWebServer> serverCustomizer) {
+        this(new MockWebServer(), requireNotNull(serverCustomizer, "serverCustomizer must not be null"));
     }
 
     /**

diff --git a/src/test/java/org/kiwiproject/test/okhttp3/mockwebserver/MockWebServerExtensionTest.java b/src/test/java/org/kiwiproject/test/okhttp3/mockwebserver/MockWebServerExtensionTest.java
@@ -30,7 +30,29 @@
 class MockWebServerExtensionTest {
 
     @Nested
-    class Constructors {
+    class NoArgsConstructor {
+
+        @Test
+        void shouldCreateServer() {
+            var extension = new MockWebServerExtension();
+
+            assertThat(extension.server()).isNotNull();
+        }
+    }
+
+    @Nested
+    class ConstructorWithServerCustomizer {
+
+        @Test
+        void shouldRequireNonNullCustomizer() {
+            assertThatIllegalArgumentException()
+                    .isThrownBy(() -> new MockWebServerExtension(null))
+                    .withMessage("serverCustomizer must not be null");
+        }
+    }
+
+    @Nested
+    class AllArgsConstructor {
 
         @Test
         void shouldRequireNonNullServer() {
@@ -47,13 +69,6 @@ void shouldAllowNullServerCustomizer() {
                     .doesNotThrowAnyException();
         }
 
-        @Test
-        void shouldCreateServer() {
-            var extension = new MockWebServerExtension();
-
-            assertThat(extension.server()).isNotNull();
-        }
-
         @Test
         void shouldSetSpecificServer() {
             var server = new MockWebServer();