You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2018/01/30 08:12:23 UTC
[12/16] james-project git commit: JAMES-2285 Get ride of an DNS test
implementation
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/526a9191
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/526a9191
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/526a9191
Branch: refs/heads/master
Commit: 526a9191f543812a03a1d3f15524625e2a1b5029
Parents: e18bc7a
Author: benwa <bt...@linagora.com>
Authored: Sat Jan 20 18:08:48 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jan 30 15:10:26 2018 +0700
----------------------------------------------------------------------
.../matchers/RemoteAddrNotInNetworkTest.java | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/526a9191/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
index 3adf2c4..3f60b53 100644
--- a/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.java
+++ b/server/mailet/mailets/src/test/java/org/apache/james/transport/matchers/RemoteAddrNotInNetworkTest.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;
@@ -40,13 +39,12 @@ public class RemoteAddrNotInNetworkTest {
private FakeMatcherConfig matcherConfig;
@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");
matcherConfig = FakeMatcherConfig.builder()
.matcherName("AllowedNetworkIs")
.condition("192.168.200.0/24")
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org