JAMES-2513 Enforce usage of DomainListConfiguration over XML in tests
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/33c809a8 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/33c809a8 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/33c809a8 Branch: refs/heads/master Commit: 33c809a8076d5fe1f9c7ffa8bdc5579b10dfaaba Parents: 26b4081 Author: benwa <btell...@linagora.com> Authored: Thu Aug 2 10:58:25 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Fri Aug 3 15:51:29 2018 +0700 ---------------------------------------------------------------------- .../test/java/org/apache/james/AbstractJamesServerTest.java | 9 +++++++++ .../src/test/java/org/apache/james/JPAJamesServerTest.java | 2 +- .../apache/james/JPAJamesServerWithSqlValidationTest.java | 2 +- .../org/apache/james/webadmin/routes/ForwardRoutesTest.java | 7 ++++--- .../james/webadmin/routes/ScanningQuotaSearchExtension.java | 6 ++++-- 5 files changed, 19 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/33c809a8/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java index c0ffb7b..f10d8d6 100644 --- a/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java +++ b/server/container/guice/guice-common/src/test/java/org/apache/james/AbstractJamesServerTest.java @@ -27,11 +27,14 @@ import java.nio.ByteBuffer; import java.nio.channels.SocketChannel; import java.nio.charset.Charset; +import org.apache.james.domainlist.lib.DomainListConfiguration; import org.apache.james.utils.DataProbeImpl; import org.junit.After; import org.junit.Before; import org.junit.Test; +import com.google.inject.Module; + public abstract class AbstractJamesServerTest { private static final int IMAP_PORT = 1143; // You need to be root (superuser) to bind to ports under 1024. @@ -40,6 +43,12 @@ public abstract class AbstractJamesServerTest { private static final int SMTP_PORT = 1025; private static final int LMTP_PORT = 1024; + public static final Module DOMAIN_LIST_CONFIGURATION_MODULE = binder -> binder.bind(DomainListConfiguration.class) + .toInstance(DomainListConfiguration.builder() + .autoDetect(true) + .autoDetectIp(false) + .build()); + protected GuiceJamesServer server; private SocketChannel socketChannel; http://git-wip-us.apache.org/repos/asf/james-project/blob/33c809a8/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java index fac0a80..220bfe1 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerTest.java @@ -68,7 +68,7 @@ public class JPAJamesServerTest extends AbstractJamesServerTest { return new GuiceJamesServer(configuration) .combineWith(JPAJamesServerMain.JPA_SERVER_MODULE, JPAJamesServerMain.PROTOCOLS) - .overrideWith(new TestJPAConfigurationModule()); + .overrideWith(new TestJPAConfigurationModule(), DOMAIN_LIST_CONFIGURATION_MODULE); } @Override http://git-wip-us.apache.org/repos/asf/james-project/blob/33c809a8/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithSqlValidationTest.java ---------------------------------------------------------------------- diff --git a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithSqlValidationTest.java b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithSqlValidationTest.java index 5bdee09..7a86bbc 100644 --- a/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithSqlValidationTest.java +++ b/server/container/guice/jpa-guice/src/test/java/org/apache/james/JPAJamesServerWithSqlValidationTest.java @@ -34,7 +34,7 @@ public class JPAJamesServerWithSqlValidationTest extends JPAJamesServerTest { return new GuiceJamesServer(configuration) .combineWith(JPAJamesServerMain.JPA_SERVER_MODULE, JPAJamesServerMain.PROTOCOLS) - .overrideWith(new TestJPAConfigurationModuleWithSqlValidation()); + .overrideWith(new TestJPAConfigurationModuleWithSqlValidation(), DOMAIN_LIST_CONFIGURATION_MODULE); } } http://git-wip-us.apache.org/repos/asf/james-project/blob/33c809a8/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java index c27bc00..80e4e45 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java @@ -40,6 +40,7 @@ import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.james.core.Domain; import org.apache.james.dnsservice.api.DNSService; import org.apache.james.domainlist.api.DomainList; +import org.apache.james.domainlist.lib.DomainListConfiguration; import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.metrics.logger.DefaultMetricFactory; import org.apache.james.rrt.api.RecipientRewriteTable; @@ -108,9 +109,9 @@ class ForwardRoutesTest { memoryRecipientRewriteTable = new MemoryRecipientRewriteTable(); DNSService dnsService = mock(DNSService.class); domainList = new MemoryDomainList(dnsService); - domainList.setAutoDetectIP(false); - domainList.setAutoDetect(false); - domainList.configure(new DefaultConfigurationBuilder()); + domainList.configure(DomainListConfiguration.builder() + .autoDetect(false) + .autoDetectIp(false)); domainList.addDomain(DOMAIN); usersRepository = MemoryUsersRepository.withVirtualHosting(); http://git-wip-us.apache.org/repos/asf/james-project/blob/33c809a8/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ScanningQuotaSearchExtension.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ScanningQuotaSearchExtension.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ScanningQuotaSearchExtension.java index af69584..552f3d2 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ScanningQuotaSearchExtension.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/ScanningQuotaSearchExtension.java @@ -21,8 +21,8 @@ package org.apache.james.webadmin.routes; import static org.mockito.Mockito.mock; -import org.apache.commons.configuration.DefaultConfigurationBuilder; import org.apache.james.dnsservice.api.DNSService; +import org.apache.james.domainlist.lib.DomainListConfiguration; import org.apache.james.domainlist.memory.MemoryDomainList; import org.apache.james.mailbox.acl.SimpleGroupMembershipResolver; import org.apache.james.mailbox.inmemory.manager.InMemoryIntegrationResources; @@ -51,7 +51,9 @@ public class ScanningQuotaSearchExtension implements ParameterResolver, BeforeEa DNSService dnsService = mock(DNSService.class); MemoryDomainList domainList = new MemoryDomainList(dnsService); - domainList.configure(new DefaultConfigurationBuilder()); + domainList.configure(DomainListConfiguration.builder() + .autoDetect(false) + .autoDetectIp(false)); usersRepository.setDomainList(domainList); QuotaSearchTestSystem quotaSearchTestSystem = new QuotaSearchTestSystem( --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
