feat(configFactory): be able to access junit-context during config of…

… the server Closes #9
lanwen · Aug 13, 2019 · 253f708 · 253f708
1 parent 23036a3
commit 253f708
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 15 deletions.
diff --git a/src/main/java/ru/lanwen/wiremock/config/WiremockConfigFactory.java b/src/main/java/ru/lanwen/wiremock/config/WiremockConfigFactory.java
@@ -3,6 +3,7 @@
 import com.github.tomakehurst.wiremock.common.Slf4jNotifier;
 import com.github.tomakehurst.wiremock.core.WireMockConfiguration;
 import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import ru.lanwen.wiremock.ext.WiremockResolver;
 
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
@@ -20,18 +21,18 @@ public interface WiremockConfigFactory {
      *
      * @return config for wiremock
      */
-    WireMockConfiguration create();
+    default WireMockConfiguration create() {
+        return options().dynamicPort().notifier(new Slf4jNotifier(true));
+    }
+
+    default WireMockConfiguration create(ExtensionContext context) {
+        return create();
+    }
 
     /**
      * By default creates config with dynamic port only and notifier.
      */
-    class DefaultWiremockConfigFactory implements WiremockConfigFactory {
-
-        @Override
-        public WireMockConfiguration create() {
-            return options().dynamicPort().notifier(new Slf4jNotifier(true));
-        }
-    }
+    class DefaultWiremockConfigFactory implements WiremockConfigFactory {}
 
     /**
      * By default creates config with dynamic port only, notifier and Templating Response enabled.

diff --git a/src/main/java/ru/lanwen/wiremock/ext/WiremockFactory.java b/src/main/java/ru/lanwen/wiremock/ext/WiremockFactory.java
@@ -1,6 +1,7 @@
 package ru.lanwen.wiremock.ext;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
+import org.junit.jupiter.api.extension.ExtensionContext;
 import org.junit.jupiter.api.extension.ParameterResolutionException;
 import ru.lanwen.wiremock.config.CustomizationContext;
 import ru.lanwen.wiremock.config.CustomizationContext.CustomizationContextBuilder;
@@ -14,9 +15,9 @@
  */
 class WiremockFactory {
 
-    public WireMockServer createServer(final Wiremock mockedServer) {
+    public WireMockServer createServer(final Wiremock mockedServer, ExtensionContext extensionContext) {
         try {
-            return new WireMockServer(mockedServer.factory().newInstance().create());
+            return new WireMockServer(mockedServer.factory().newInstance().create(extensionContext));
         } catch (ReflectiveOperationException e) {
             throw new ParameterResolutionException(
                     format("Can't create config with given factory %s", mockedServer.factory()),

diff --git a/src/main/java/ru/lanwen/wiremock/ext/WiremockResolver.java b/src/main/java/ru/lanwen/wiremock/ext/WiremockResolver.java
@@ -65,7 +65,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
 
         Wiremock mockedServer = parameterContext.getParameter().getAnnotation(Wiremock.class);
 
-        server = wiremockFactory.createServer(mockedServer);
+        server = wiremockFactory.createServer(mockedServer, extensionContext);
         server.start();
 
         CustomizationContext customizationContext = wiremockFactory.createContextBuilder().

diff --git a/src/test/java/ru/lanwen/wiremock/ext/WiremockFactoryTest.java b/src/test/java/ru/lanwen/wiremock/ext/WiremockFactoryTest.java
@@ -61,8 +61,8 @@ public void setup() {
 
     @Test
     public void createServer() {
-        WireMockServer srv1 = factory.createServer(mockedServer);
-        WireMockServer srv2 = factory.createServer(mockedServer);
+        WireMockServer srv1 = factory.createServer(mockedServer, null);
+        WireMockServer srv2 = factory.createServer(mockedServer, null);
         assertNotNull(srv1);
         assertNotNull(srv2);
         assertSame(OPTIONS, srv1.getOptions());
@@ -74,7 +74,7 @@ public void createServer() {
     public void configFactoryCouldNotBeInstantiated() {
         when(mockedServer.factory()).thenReturn((Class) PrivateClassNotAllowed.class);
         assertThrows(ParameterResolutionException.class,
-                () -> factory.createServer(mockedServer),
+                () -> factory.createServer(mockedServer, null),
                 "Can't create config with given factory class ru.lanwen.wiremock.ext.WiremockFactoryTest$PrivateClassNotAllowed");
     }
 

diff --git a/src/test/java/ru/lanwen/wiremock/ext/WiremockResolverUnitTest.java b/src/test/java/ru/lanwen/wiremock/ext/WiremockResolverUnitTest.java
@@ -88,7 +88,7 @@ public void supportsParameter() throws Exception {
 
     @Test
     public void resolveParameterFailed() throws Exception {
-        when(wiremockFactory.createServer(mockedServer)).thenReturn(server);
+        when(wiremockFactory.createServer(mockedServer, extensionContext)).thenReturn(server);
         when(wiremockFactory.createContextBuilder()).thenReturn(customizationContextBuilder);
         when(wiremockFactory.createCustomizer(mockedServer)).thenReturn(customizer);
         when(customizationContextBuilder.extensionContext(extensionContext)).thenReturn(customizationContextBuilder);