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:17 UTC
[06/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/e18bc7a8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e18bc7a8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e18bc7a8
Branch: refs/heads/master
Commit: e18bc7a8cd4c9cce3a5be7517f5dbc97b54031ea
Parents: b259e6f
Author: benwa <bt...@linagora.com>
Authored: Sat Jan 20 17:47:11 2018 +0700
Committer: benwa <bt...@linagora.com>
Committed: Tue Jan 30 15:09:47 2018 +0700
----------------------------------------------------------------------
.../cassandra/CassandraDomainListTest.java | 2 +-
.../domainlist/hbase/HBaseDomainListTest.java | 4 +--
.../james/domainlist/jpa/JPADomainListTest.java | 5 ++--
.../domainlist/lib/AbstractDomainListTest.java | 30 ++++----------------
.../domainlist/memory/MemoryDomainListTest.java | 2 +-
5 files changed, 12 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e18bc7a8/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
index f5abd9f..be722db 100644
--- a/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
+++ b/server/data/data-cassandra/src/test/java/org/apache/james/domainlist/cassandra/CassandraDomainListTest.java
@@ -45,7 +45,7 @@ public class CassandraDomainListTest extends AbstractDomainListTest {
}
@Override
- protected DomainList createDomainList() {
+ protected DomainList createDomainList() throws Exception {
CassandraDomainList testee = new CassandraDomainList(getDNSServer("localhost"), cassandra.getConf());
testee.setAutoDetect(false);
testee.setAutoDetectIP(false);
http://git-wip-us.apache.org/repos/asf/james-project/blob/e18bc7a8/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java b/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
index 2df0de2..9b83fe2 100644
--- a/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
+++ b/server/data/data-hbase/src/test/java/org/apache/james/domainlist/hbase/HBaseDomainListTest.java
@@ -52,7 +52,7 @@ public class HBaseDomainListTest extends AbstractDomainListTest {
}
@After
- public void tearDown() throws DomainListException {
+ public void tearDown() throws Exception {
DomainList domainList = createDomainList();
for (String domain: domainList.getDomains()) {
domainList.removeDomain(domain);
@@ -63,7 +63,7 @@ public class HBaseDomainListTest extends AbstractDomainListTest {
* @see org.apache.james.domainlist.lib.AbstractDomainListTest#createDomainList()
*/
@Override
- protected DomainList createDomainList() {
+ protected DomainList createDomainList() throws Exception {
HBaseDomainList domainList = new HBaseDomainList(getDNSServer("localhost"));
domainList.setAutoDetect(false);
domainList.setAutoDetectIP(false);
http://git-wip-us.apache.org/repos/asf/james-project/blob/e18bc7a8/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java b/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
index 57694af..4a79542 100644
--- a/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
+++ b/server/data/data-jpa/src/test/java/org/apache/james/domainlist/jpa/JPADomainListTest.java
@@ -20,7 +20,6 @@ package org.apache.james.domainlist.jpa;
import org.apache.james.backends.jpa.JpaTestCluster;
import org.apache.james.domainlist.api.DomainList;
-import org.apache.james.domainlist.api.DomainListException;
import org.apache.james.domainlist.jpa.model.JPADomain;
import org.apache.james.domainlist.lib.AbstractDomainListTest;
import org.junit.After;
@@ -39,7 +38,7 @@ public class JPADomainListTest extends AbstractDomainListTest {
}
@After
- public void tearDown() throws DomainListException {
+ public void tearDown() throws Exception {
DomainList domainList = createDomainList();
for (String domain: domainList.getDomains()) {
domainList.removeDomain(domain);
@@ -47,7 +46,7 @@ public class JPADomainListTest extends AbstractDomainListTest {
}
@Override
- protected DomainList createDomainList() {
+ protected DomainList createDomainList() throws Exception {
JPADomainList jpaDomainList = new JPADomainList(getDNSServer("localhost"),
JPA_TEST_CLUSTER.getEntityManagerFactory());
jpaDomainList.setAutoDetect(false);
http://git-wip-us.apache.org/repos/asf/james-project/blob/e18bc7a8/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java
index 658c68c..a639b36 100644
--- a/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java
+++ b/server/data/data-library/src/test/java/org/apache/james/domainlist/lib/AbstractDomainListTest.java
@@ -21,20 +21,16 @@ package org.apache.james.domainlist.lib;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
-import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.util.Collection;
import org.apache.james.dnsservice.api.DNSService;
-import org.apache.james.dnsservice.api.mock.MockDNSService;
+import org.apache.james.dnsservice.api.InMemoryDNSService;
import org.apache.james.domainlist.api.DomainList;
import org.apache.james.domainlist.api.DomainListException;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.ImmutableList;
-
public abstract class AbstractDomainListTest {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractDomainListTest.class);
@@ -155,24 +151,10 @@ public abstract class AbstractDomainListTest {
/**
* Return a fake DNSServer.
*/
- protected DNSService getDNSServer(final String hostName) {
- return new MockDNSService() {
-
- @Override
- public String getHostName(InetAddress inet) {
- return hostName;
- }
-
- @Override
- public Collection<InetAddress> getAllByName(String name) throws UnknownHostException {
- return ImmutableList.of(InetAddress.getByName("127.0.0.1"));
- }
-
- @Override
- public InetAddress getLocalHost() throws UnknownHostException {
- return InetAddress.getLocalHost();
- }
- };
+ protected DNSService getDNSServer(final String hostName) throws UnknownHostException {
+ return new InMemoryDNSService()
+ .registerMxRecord(hostName, "127.0.0.1")
+ .registerMxRecord("127.0.0.1", "127.0.0.1");
}
/**
@@ -181,5 +163,5 @@ public abstract class AbstractDomainListTest {
*
* @return an implementation of DomainList
*/
- protected abstract DomainList createDomainList();
+ protected abstract DomainList createDomainList() throws Exception;
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/e18bc7a8/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
----------------------------------------------------------------------
diff --git a/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java b/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
index 95c79cc..3cde69f 100644
--- a/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
+++ b/server/data/data-memory/src/test/java/org/apache/james/domainlist/memory/MemoryDomainListTest.java
@@ -31,7 +31,7 @@ public class MemoryDomainListTest extends AbstractDomainListTest {
}
@Override
- protected DomainList createDomainList() {
+ protected DomainList createDomainList() throws Exception {
MemoryDomainList testee = new MemoryDomainList(getDNSServer("localhost"));
testee.setAutoDetect(false);
testee.setAutoDetectIP(false);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org