JAMES-1958 Change port for WebAdmin on every test

apache · Mar 16, 2017 · a495cd3 · a495cd3
1 parent 19e2a15
commit a495cd3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/...test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java b/...test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java
@@ -19,25 +19,15 @@
 
 package org.apache.james.webadmin.integration;
 
-import org.apache.james.webadmin.RandomPort;
 import org.apache.james.webadmin.WebAdminConfiguration;
 
 import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
 
 public class WebAdminConfigurationModule extends AbstractModule {
 
     @Override
     protected void configure() {
-
+        bind(WebAdminConfiguration.class).toProvider(WebAdminConfiguration::testingConfiguration);
-    }
-
-    @Provides
-    public WebAdminConfiguration provideWebAdminConfiguration() throws Exception {
-        return WebAdminConfiguration.builder()
-            .enabled()
-            .port(new RandomPort())
-            .build();
     }
 
 }
diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java
@@ -31,10 +31,13 @@ public class WebAdminConfiguration {
     public static final boolean DEFAULT_CORS_DISABLED = false;
     public static final String CORS_ALL_ORIGINS = "*";
 
-    public static final WebAdminConfiguration TESTING_CONFIGURATION = WebAdminConfiguration.builder()
+    public static WebAdminConfiguration testingConfiguration() {
-        .enabled()
+        return WebAdminConfiguration.builder()
-        .port(new RandomPort())
+            .enabled()
-        .build();
+            .port(new RandomPort())
+            .build();
+    }
+
     public static final WebAdminConfiguration DISABLED_CONFIGURATION = WebAdminConfiguration.builder()
         .disabled()
         .build();

diff --git a/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminServer.java b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminServer.java
@@ -67,7 +67,7 @@ private WebAdminServer(WebAdminConfiguration configuration, Set<Routes> routesLi
 
     @VisibleForTesting
     public WebAdminServer(MetricFactory metricFactory, Routes... routes) throws IOException {
-        this(WebAdminConfiguration.TESTING_CONFIGURATION,
+        this(WebAdminConfiguration.testingConfiguration(),
             ImmutableSet.copyOf(routes),
             new NoAuthenticationFilter(),
             metricFactory);