JAMES-2285 Get ride of an DNS test implementation
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/80d1e9df Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/80d1e9df Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/80d1e9df Branch: refs/heads/master Commit: 80d1e9df533d3116f13d5f13a23e9851a0809668 Parents: 526a919 Author: benwa <[email protected]> Authored: Sat Jan 20 18:11:53 2018 +0700 Committer: benwa <[email protected]> Committed: Tue Jan 30 15:10:26 2018 +0700 ---------------------------------------------------------------------- .../matchers/RemoteAddrInNetworkTest.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/80d1e9df/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java index 0f87010..ad00285 100644 --- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java +++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrInNetworkTest.java @@ -20,14 +20,13 @@ package org.apache.james.transport.matchers; import static org.assertj.core.api.Assertions.assertThat; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.Collection; import javax.mail.MessagingException; import org.apache.james.core.MailAddress; -import org.apache.james.dnsservice.api.mock.MockDNSService; +import org.apache.james.dnsservice.api.DNSService; +import org.apache.james.dnsservice.api.InMemoryDNSService; import org.apache.mailet.base.test.FakeMail; import org.apache.mailet.base.test.FakeMatcherConfig; import org.junit.Before; @@ -39,13 +38,12 @@ public class RemoteAddrInNetworkTest { private MailAddress testRecipient; @Before - public void setup() throws MessagingException { - MockDNSService dnsServer = new MockDNSService() { - @Override - public InetAddress getByName(String host) throws UnknownHostException { - return InetAddress.getByName(host); - } - }; + public void setup() throws Exception { + DNSService dnsServer = new InMemoryDNSService() + .registerMxRecord("192.168.0.1", "192.168.0.1") + .registerMxRecord("192.168.200.1", "192.168.200.1") + .registerMxRecord("192.168.200.0", "192.168.200.0") + .registerMxRecord("255.255.255.0", "255.255.255.0"); FakeMatcherConfig matcherConfig = FakeMatcherConfig.builder() .matcherName("AllowedNetworkIs") .condition("192.168.200.0/24") --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
