JAMES-2139 No testing function on production code
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/87067965 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/87067965 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/87067965 Branch: refs/heads/master Commit: 87067965459c7b8029a72826bb30ee33ae456c48 Parents: 895a004 Author: quynhn <qngu...@linagora.com> Authored: Fri Sep 8 16:36:00 2017 +0700 Committer: Antoine Duprat <adup...@linagora.com> Committed: Wed Sep 13 10:23:33 2017 +0200 ---------------------------------------------------------------------- pom.xml | 6 +++ server/mailet/integration-testing/pom.xml | 1 + .../james/mailets/TemporaryJamesServer.java | 3 +- .../transport/mailets/GroupMappingTest.java | 14 ++++++ .../protocols/webadmin-integration-test/pom.xml | 1 + .../WebAdminConfigurationModule.java | 3 +- .../webadmin/webadmin-cassandra/pom.xml | 6 +++ .../routes/CassandraMigrationRoutesTest.java | 4 +- .../james/webadmin/WebAdminConfiguration.java | 7 --- .../apache/james/webadmin/WebAdminServer.java | 10 +---- .../apache/james/webadmin/WebAdminUtils.java | 45 ++++++++++++++++++++ server/protocols/webadmin/webadmin-data/pom.xml | 6 +++ .../webadmin/routes/DomainsRoutesTest.java | 3 +- .../james/webadmin/routes/GroupsRoutesTest.java | 3 +- .../james/webadmin/routes/UsersRoutesTest.java | 3 +- .../protocols/webadmin/webadmin-mailbox/pom.xml | 6 +++ .../webadmin/routes/GlobalQuotaRoutesTest.java | 3 +- .../routes/UserMailboxesRoutesTest.java | 3 +- 18 files changed, 103 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b136d64..08610af 100644 --- a/pom.xml +++ b/pom.xml @@ -1348,6 +1348,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-webadmin-core</artifactId> + <version>${project.version}</version> + <type>test-jar</type> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>james-server-webadmin-data</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/mailet/integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml index a148d31..147b510 100644 --- a/server/mailet/integration-testing/pom.xml +++ b/server/mailet/integration-testing/pom.xml @@ -91,6 +91,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java index 55f3f05..e6ad1bf 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/TemporaryJamesServer.java @@ -37,6 +37,7 @@ import org.apache.james.mailets.configuration.MailetContainer; import org.apache.james.modules.TestJMAPServerModule; import org.apache.james.utils.GuiceProbe; import org.apache.james.webadmin.WebAdminConfiguration; +import org.apache.james.webadmin.WebAdminUtils; import org.junit.rules.TemporaryFolder; import com.google.common.collect.ImmutableList; @@ -61,7 +62,7 @@ public class TemporaryJamesServer { .overrideWith(additionalModules) .overrideWith(new TestJMAPServerModule(LIMIT_TO_3_MESSAGES)) .overrideWith(new TemporaryFilesystemModule(temporaryFolder)) - .overrideWith((binder) -> binder.bind(WebAdminConfiguration.class).toProvider(WebAdminConfiguration::testingConfiguration)); + .overrideWith((binder) -> binder.bind(WebAdminConfiguration.class).toProvider(WebAdminUtils::webAdminConfigurationForTesting)); jamesServer.start(); } http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java index 37b16bd..f391fff 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java @@ -20,6 +20,9 @@ package org.apache.james.transport.mailets; import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.Matchers.equalTo; + +import java.util.concurrent.TimeUnit; import javax.mail.internet.MimeMessage; @@ -103,6 +106,17 @@ public class GroupMappingTest { .match("RecipientIsLocal") .clazz("LocalDelivery") .build()) + .addMailet(MailetConfiguration.builder() + .match("All") + .clazz("RemoteDelivery") + .addProperty("outgoingQueue", "outgoing") + .addProperty("delayTime", "5000, 100000, 500000") + .addProperty("maxRetries", "25") + .addProperty("maxDnsProblemRetries", "0") + .addProperty("deliveryThreads", "10") + .addProperty("sendpartial", "true") + .addProperty("bounceProcessor", "bounces") + .build()) .build()) .build(); http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin-integration-test/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml index 319b8b2..6de1b54 100644 --- a/server/protocols/webadmin-integration-test/pom.xml +++ b/server/protocols/webadmin-integration-test/pom.xml @@ -77,6 +77,7 @@ <dependency> <groupId>${project.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> + <type>test-jar</type> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/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 6f5ec20..8bcf260 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 @@ -20,6 +20,7 @@ package org.apache.james.webadmin.integration; import org.apache.james.webadmin.WebAdminConfiguration; +import org.apache.james.webadmin.WebAdminUtils; import com.google.inject.AbstractModule; @@ -27,7 +28,7 @@ public class WebAdminConfigurationModule extends AbstractModule { @Override protected void configure() { - bind(WebAdminConfiguration.class).toProvider(WebAdminConfiguration::testingConfiguration); + bind(WebAdminConfiguration.class).toProvider(WebAdminUtils::webAdminConfigurationForTesting); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml index 05e89ba..b88f6d0 100644 --- a/server/protocols/webadmin/webadmin-cassandra/pom.xml +++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml @@ -43,6 +43,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-webadmin-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>metrics-logger</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java index d3554d0..e647011 100644 --- a/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java +++ b/server/protocols/webadmin/webadmin-cassandra/src/test/java/org/apache/james/webadmin/routes/CassandraMigrationRoutesTest.java @@ -40,6 +40,7 @@ import org.apache.james.backends.cassandra.versions.CassandraSchemaVersionDAO; import org.apache.james.mailbox.cassandra.mail.migration.Migration; import org.apache.james.metrics.logger.DefaultMetricFactory; import org.apache.james.webadmin.WebAdminServer; +import org.apache.james.webadmin.WebAdminUtils; import org.apache.james.webadmin.service.CassandraMigrationService; import org.apache.james.webadmin.utils.JsonTransformer; import org.junit.After; @@ -72,9 +73,10 @@ public class CassandraMigrationRoutesTest { .build(); schemaVersionDAO = mock(CassandraSchemaVersionDAO.class); - webAdminServer = new WebAdminServer( + webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new CassandraMigrationRoutes(new CassandraMigrationService(schemaVersionDAO, allMigrationClazz, LATEST_VERSION), new JsonTransformer())); + webAdminServer.configure(NO_CONFIGURATION); webAdminServer.await(); http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java index b7608cf..8db2976 100644 --- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java +++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminConfiguration.java @@ -32,13 +32,6 @@ public class WebAdminConfiguration { public static final String CORS_ALL_ORIGINS = "*"; public static final String DEFAULT_HOST = "localhost"; - 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/87067965/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java index ba27d1c..444f5b8 100644 --- a/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java +++ b/server/protocols/webadmin/webadmin-core/src/main/java/org/apache/james/webadmin/WebAdminServer.java @@ -58,7 +58,7 @@ public class WebAdminServer implements Configurable { // Spark do not allow to retrieve allocated port when using a random port. Thus we generate the port. @Inject - private WebAdminServer(WebAdminConfiguration configuration, Set<Routes> routesList, AuthenticationFilter authenticationFilter, + protected WebAdminServer(WebAdminConfiguration configuration, Set<Routes> routesList, AuthenticationFilter authenticationFilter, MetricFactory metricFactory) { this.configuration = configuration; this.routesList = routesList; @@ -67,14 +67,6 @@ public class WebAdminServer implements Configurable { this.service = Service.ignite(); } - @VisibleForTesting - public WebAdminServer(MetricFactory metricFactory, Routes... routes) throws IOException { - this(WebAdminConfiguration.testingConfiguration(), - ImmutableSet.copyOf(routes), - new NoAuthenticationFilter(), - metricFactory); - } - @Override public void configure(HierarchicalConfiguration config) throws ConfigurationException { if (configuration.isEnabled()) { http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java new file mode 100644 index 0000000..3ff8c02 --- /dev/null +++ b/server/protocols/webadmin/webadmin-core/src/test/java/org/apache/james/webadmin/WebAdminUtils.java @@ -0,0 +1,45 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.webadmin; + +import java.io.IOException; + +import org.apache.james.metrics.api.MetricFactory; +import org.apache.james.webadmin.authentication.NoAuthenticationFilter; + +import com.google.common.collect.ImmutableSet; + +public class WebAdminUtils { + + public static WebAdminConfiguration webAdminConfigurationForTesting() { + return WebAdminConfiguration.builder() + .enabled() + .port(new RandomPort()) + .build(); + } + + public static WebAdminServer createWebAdminServer(MetricFactory metricFactory, Routes... routes) throws IOException { + return new WebAdminServer(webAdminConfigurationForTesting(), + ImmutableSet.copyOf(routes), + new NoAuthenticationFilter(), + metricFactory); + } + +} http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-data/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml index 6f302db..8fbe4f9 100644 --- a/server/protocols/webadmin/webadmin-data/pom.xml +++ b/server/protocols/webadmin/webadmin-data/pom.xml @@ -54,6 +54,12 @@ <groupId>${project.groupId}</groupId> <artifactId>james-server-webadmin-core</artifactId> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>james-server-webadmin-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> <dependency> <groupId>${project.groupId}</groupId> http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java index c3eeaad..5e825e8 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java @@ -42,6 +42,7 @@ import org.apache.james.domainlist.api.DomainListException; import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.metrics.logger.DefaultMetricFactory; import org.apache.james.webadmin.WebAdminServer; +import org.apache.james.webadmin.WebAdminUtils; import org.apache.james.webadmin.utils.JsonTransformer; import org.junit.After; import org.junit.Before; @@ -61,7 +62,7 @@ public class DomainsRoutesTest { private WebAdminServer webAdminServer; private void createServer(DomainList domainList) throws Exception { - webAdminServer = new WebAdminServer( + webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new DomainsRoutes(domainList, new JsonTransformer())); webAdminServer.configure(NO_CONFIGURATION); http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java index f866f6a..9cda34c 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java @@ -46,6 +46,7 @@ import org.apache.james.user.api.UsersRepository; import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.user.memory.MemoryUsersRepository; import org.apache.james.webadmin.WebAdminServer; +import org.apache.james.webadmin.WebAdminUtils; import org.apache.james.webadmin.utils.JsonTransformer; import org.eclipse.jetty.http.HttpStatus; import org.junit.After; @@ -72,7 +73,7 @@ public class GroupsRoutesTest { private WebAdminServer webAdminServer; private void createServer(GroupsRoutes groupsRoutes) throws Exception { - webAdminServer = new WebAdminServer( + webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), groupsRoutes); webAdminServer.configure(NO_CONFIGURATION); http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java index c1c7527..a073b57 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java @@ -42,6 +42,7 @@ import org.apache.james.user.api.UsersRepositoryException; import org.apache.james.user.api.model.User; import org.apache.james.user.memory.MemoryUsersRepository; import org.apache.james.webadmin.WebAdminServer; +import org.apache.james.webadmin.WebAdminUtils; import org.apache.james.webadmin.service.UserService; import org.apache.james.webadmin.utils.JsonTransformer; import org.junit.After; @@ -64,7 +65,7 @@ public class UsersRoutesTest { private WebAdminServer webAdminServer; private void createServer(UsersRepository usersRepository) throws Exception { - webAdminServer = new WebAdminServer( + webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new UserRoutes(new UserService(usersRepository), new JsonTransformer())); webAdminServer.configure(NO_CONFIGURATION); http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml index 13b8b4d..471f8dd 100644 --- a/server/protocols/webadmin/webadmin-mailbox/pom.xml +++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml @@ -61,6 +61,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>james-server-webadmin-core</artifactId> + <type>test-jar</type> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>metrics-logger</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java index 4d6f8bd..a1e3971 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/GlobalQuotaRoutesTest.java @@ -29,6 +29,7 @@ import org.apache.james.mailbox.inmemory.quota.InMemoryPerUserMaxQuotaManager; import org.apache.james.mailbox.model.Quota; import org.apache.james.metrics.logger.DefaultMetricFactory; import org.apache.james.webadmin.WebAdminServer; +import org.apache.james.webadmin.WebAdminUtils; import org.apache.james.webadmin.utils.JsonTransformer; import org.junit.After; import org.junit.Before; @@ -48,7 +49,7 @@ public class GlobalQuotaRoutesTest { @Before public void setUp() throws Exception { maxQuotaManager = new InMemoryPerUserMaxQuotaManager(); - webAdminServer = new WebAdminServer( + webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new GlobalQuotaRoutes(maxQuotaManager, new JsonTransformer())); webAdminServer.configure(NO_CONFIGURATION); http://git-wip-us.apache.org/repos/asf/james-project/blob/87067965/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java index 7ae6ce4..c62dcd6 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java @@ -58,6 +58,7 @@ import org.apache.james.mailbox.store.mail.model.impl.MessageParser; import org.apache.james.metrics.logger.DefaultMetricFactory; import org.apache.james.user.api.UsersRepository; import org.apache.james.webadmin.WebAdminServer; +import org.apache.james.webadmin.WebAdminUtils; import org.apache.james.webadmin.service.UserMailboxesService; import org.apache.james.webadmin.utils.JsonTransformer; import org.junit.After; @@ -86,7 +87,7 @@ public class UserMailboxesRoutesTest { usersRepository = mock(UsersRepository.class); when(usersRepository.contains(USERNAME)).thenReturn(true); - webAdminServer = new WebAdminServer( + webAdminServer = WebAdminUtils.createWebAdminServer( new DefaultMetricFactory(), new UserMailboxesRoutes(new UserMailboxesService(mailboxManager, usersRepository), new JsonTransformer())); webAdminServer.configure(NO_CONFIGURATION); --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
