JAMES-1958 Change port for WebAdmin on every test
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a495cd3b Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a495cd3b Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a495cd3b Branch: refs/heads/master Commit: a495cd3b910fd5e067c3fb4758e819bf1e8bcc3a Parents: 19e2a15 Author: benwa <btell...@linagora.com> Authored: Thu Mar 16 14:23:47 2017 +0700 Committer: benwa <btell...@linagora.com> Committed: Thu Mar 16 14:23:47 2017 +0700 ---------------------------------------------------------------------- .../integration/WebAdminConfigurationModule.java | 12 +----------- .../apache/james/webadmin/WebAdminConfiguration.java | 11 +++++++---- .../java/org/apache/james/webadmin/WebAdminServer.java | 2 +- 3 files changed, 9 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/a495cd3b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java b/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java index d7ccc6d..6f5ec20 100644 --- a/server/protocols/webadmin-integration-test/src/test/java/org/apache/james/webadmin/integration/WebAdminConfigurationModule.java +++ b/server/protocols/webadmin-integration-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() { - - } - - @Provides - public WebAdminConfiguration provideWebAdminConfiguration() throws Exception { - return WebAdminConfiguration.builder() - .enabled() - .port(new RandomPort()) - .build(); + bind(WebAdminConfiguration.class).toProvider(WebAdminConfiguration::testingConfiguration); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/a495cd3b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java ---------------------------------------------------------------------- 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 index 4099fdc..716645c 100644 --- 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() - .enabled() - .port(new RandomPort()) - .build(); + public static WebAdminConfiguration testingConfiguration() { + return WebAdminConfiguration.builder() + .enabled() + .port(new RandomPort()) + .build(); + } + public static final WebAdminConfiguration DISABLED_CONFIGURATION = WebAdminConfiguration.builder() .disabled() .build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/a495cd3b/server/protocols/webadmin/src/main/java/org/apache/james/webadmin/WebAdminServer.java ---------------------------------------------------------------------- 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 index c5bc5fd..d118603 100644 --- 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 @@ public class WebAdminServer implements Configurable { @VisibleForTesting public WebAdminServer(MetricFactory metricFactory, Routes... routes) throws IOException { - this(WebAdminConfiguration.TESTING_CONFIGURATION, + this(WebAdminConfiguration.testingConfiguration(), ImmutableSet.copyOf(routes), new NoAuthenticationFilter(), metricFactory); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
