You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/02/09 04:29:59 UTC
[james-project] 31/33: [REFACTORING] Convert server/dns tests to
JUNIT 5
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6ab9d7144f2f215ea323684bd013c4dd2fd2ac63
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Mon Feb 8 11:46:46 2021 +0700
[REFACTORING] Convert server/dns tests to JUNIT 5
- Clean up some javadoc along the way
---
.../dnsservice/dnsjava/DNSJavaServiceTest.java | 32 +++++++++++-----------
.../library/MXHostAddressIteratorTest.java | 7 ++---
.../inetnetwork/InetNetworkBuilderTest.java | 14 ++--------
.../library/inetnetwork/model/InetNetworkTest.java | 24 +++++-----------
.../library/netmatcher/NetMatcherTest.java | 32 ++++++----------------
.../dnsservice/api/AbstractDNSServiceTest.java | 17 ++++--------
6 files changed, 44 insertions(+), 82 deletions(-)
diff --git a/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java b/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
index e27a880..939cb70 100644
--- a/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
+++ b/server/dns-service/dnsservice-dnsjava/src/test/java/org/apache/james/dnsservice/dnsjava/DNSJavaServiceTest.java
@@ -34,9 +34,9 @@ import java.util.List;
import org.apache.james.metrics.tests.RecordingMetricFactory;
import org.apache.james.server.core.configuration.FileConfigurationProvider;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xbill.DNS.Cache;
@@ -48,7 +48,7 @@ import org.xbill.DNS.Zone;
import com.google.common.io.Resources;
-public class DNSJavaServiceTest {
+class DNSJavaServiceTest {
private static final Logger LOGGER = LoggerFactory.getLogger(DNSJavaServiceTest.class);
private TestableDNSServer dnsServer;
@@ -63,8 +63,8 @@ public class DNSJavaServiceTest {
private Cache mockedCache;
- @Before
- public void setUp() throws Exception {
+ @BeforeEach
+ void setUp() throws Exception {
dnsServer = new TestableDNSServer();
dnsServer.configure(FileConfigurationProvider.getConfig(new ByteArrayInputStream(DNS_SERVER_CONFIG)));
@@ -81,8 +81,8 @@ public class DNSJavaServiceTest {
mockedCache = mock(Cache.class);
}
- @After
- public void tearDown() throws Exception {
+ @AfterEach
+ void tearDown() {
dnsServer.setCache(null);
dnsServer = null;
Lookup.setDefaultCache(defaultCache, DClass.IN);
@@ -91,7 +91,7 @@ public class DNSJavaServiceTest {
}
@Test
- public void testNoMX() throws Exception {
+ void testNoMX() throws Exception {
doAnswer(new ZoneCacheLookupRecordsAnswer(loadZone("dnstest.com.")))
.when(mockedCache).lookupRecords(any(Name.class), anyInt(), anyInt());
dnsServer.setCache(mockedCache);
@@ -103,7 +103,7 @@ public class DNSJavaServiceTest {
}
@Test
- public void testBadMX() throws Exception {
+ void testBadMX() throws Exception {
doAnswer(new ZoneCacheLookupRecordsAnswer(loadZone("dnstest.com.")))
.when(mockedCache).lookupRecords(any(Name.class), anyInt(), anyInt());
dnsServer.setCache(mockedCache);
@@ -118,7 +118,7 @@ public class DNSJavaServiceTest {
}
@Test
- public void testINARecords() throws Exception {
+ void testINARecords() throws Exception {
doAnswer(new ZoneCacheLookupRecordsAnswer(loadZone("pippo.com.")))
.when(mockedCache).lookupRecords(any(Name.class), anyInt(), anyInt());
dnsServer.setCache(mockedCache);
@@ -130,7 +130,7 @@ public class DNSJavaServiceTest {
}
@Test
- public void testMXCatches() throws Exception {
+ void testMXCatches() throws Exception {
doAnswer(new ZoneCacheLookupRecordsAnswer(loadZone("test-zone.com.")))
.when(mockedCache).lookupRecords(any(Name.class), anyInt(), anyInt());
dnsServer.setCache(mockedCache);
@@ -151,7 +151,7 @@ public class DNSJavaServiceTest {
* Test for JAMES-1251
*/
@Test
- public void testTwoMXSamePrio() throws Exception {
+ void testTwoMXSamePrio() throws Exception {
doAnswer(new ZoneCacheLookupRecordsAnswer(loadZone("two-mx.sameprio.")))
.when(mockedCache).lookupRecords(any(Name.class), anyInt(), anyInt());
dnsServer.setCache(mockedCache);
@@ -164,7 +164,7 @@ public class DNSJavaServiceTest {
}
@Test
- public void testThreeMX() throws Exception {
+ void testThreeMX() throws Exception {
doAnswer(new ZoneCacheLookupRecordsAnswer(loadZone("three-mx.bar.")))
.when(mockedCache).lookupRecords(any(Name.class), anyInt(), anyInt());
dnsServer.setCache(mockedCache);
@@ -182,7 +182,7 @@ public class DNSJavaServiceTest {
* Test for JAMES-1251
*/
@Test
- public void testTwoMXDifferentPrio() throws Exception {
+ void testTwoMXDifferentPrio() throws Exception {
doAnswer(new ZoneCacheLookupRecordsAnswer(loadZone("two-mx.differentprio.")))
.when(mockedCache).lookupRecords(any(Name.class), anyInt(), anyInt());
dnsServer.setCache(mockedCache);
@@ -198,7 +198,7 @@ public class DNSJavaServiceTest {
* Test for JAMES-1251
*/
@Test
- public void testOneMX() throws Exception {
+ void testOneMX() throws Exception {
doAnswer(new ZoneCacheLookupRecordsAnswer(loadZone("one-mx.bar.")))
.when(mockedCache).lookupRecords(any(Name.class), anyInt(), anyInt());
dnsServer.setCache(mockedCache);
diff --git a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/MXHostAddressIteratorTest.java b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/MXHostAddressIteratorTest.java
index c43e061..6f8a57d 100644
--- a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/MXHostAddressIteratorTest.java
+++ b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/MXHostAddressIteratorTest.java
@@ -25,17 +25,16 @@ import java.util.Arrays;
import org.apache.james.dnsservice.api.DNSService;
import org.apache.james.dnsservice.api.InMemoryDNSService;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
public class MXHostAddressIteratorTest {
-
/**
* Test case for JAMES-1251
*/
@Test
- public void testIteratorContainMultipleMX() throws Exception {
+ void testIteratorContainMultipleMX() throws Exception {
InetAddress address = InetAddress.getLocalHost();
ImmutableList<String> mxs = ImmutableList.of(address.getHostAddress());
ImmutableList<String> noTxtRecord = ImmutableList.of();
@@ -60,7 +59,7 @@ public class MXHostAddressIteratorTest {
}
@Test
- public void testIteratorWithInvalidMX() {
+ void testIteratorWithInvalidMX() {
// See JAMES-1271
MXHostAddressIterator it = new MXHostAddressIterator(Arrays.asList("localhost").iterator(), new InMemoryDNSService(), false);
diff --git a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java
index bc0a786..fa1c97b 100644
--- a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java
+++ b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/InetNetworkBuilderTest.java
@@ -24,23 +24,17 @@ import java.net.UnknownHostException;
import org.apache.james.dnsservice.api.mock.DNSFixture;
import org.apache.james.dnsservice.library.inetnetwork.model.InetNetwork;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-/**
- * Test the InetNetworkBuilder.
- */
public class InetNetworkBuilderTest {
-
private InetNetworkBuilder inetNetworkBuilder;
private InetNetwork inetNetwork;
/**
* Verify that InetNetworkBuild return correctly initialized Inet4Network.
- *
- * @throws UnknownHostException
*/
@Test
- public void testInetNetworkBuilderDnsV4() throws UnknownHostException {
+ void testInetNetworkBuilderDnsV4() throws UnknownHostException {
inetNetworkBuilder = new InetNetworkBuilder(DNSFixture.DNS_SERVER_IPV4_MOCK);
@@ -54,11 +48,9 @@ public class InetNetworkBuilderTest {
/**
* Verify that InetNetworkBuild return correctly initialized Inet6Network.
- *
- * @throws UnknownHostException
*/
@Test
- public void testInetNetworkBuilderDnsV6() throws UnknownHostException {
+ void testInetNetworkBuilderDnsV6() throws UnknownHostException {
inetNetworkBuilder = new InetNetworkBuilder(DNSFixture.DNS_SERVER_IPV6_MOCK);
diff --git a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java
index 677950c..371beaf 100644
--- a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java
+++ b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/inetnetwork/model/InetNetworkTest.java
@@ -26,12 +26,12 @@ import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.StringTokenizer;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the InetNetwork class with various IPv4 and IPv6 network specification.
*/
-public class InetNetworkTest {
+class InetNetworkTest {
private static InetAddress address;
@@ -42,11 +42,9 @@ public class InetNetworkTest {
* The InetAddress.toString() returns a string with format
* "name/ip_address". It has no indication of subnetmask. The name is
* optional.
- *
- * @throws UnknownHostException
*/
@Test
- public void testInetAddress() throws UnknownHostException {
+ void testInetAddress() throws UnknownHostException {
// Test name alone (can be IPv4 or IPv6 depending on the OS plaform
// configuration).
@@ -62,11 +60,9 @@ public class InetNetworkTest {
* The InetAddress.toString() returns a string with format
* "name/ip_address". It has no indication of subnetmask. The returned name
* is optional.
- *
- * @throws UnknownHostException
*/
@Test
- public void testInet4Address() throws UnknownHostException {
+ void testInet4Address() throws UnknownHostException {
// Test Bad IP V4 address.
try {
@@ -99,11 +95,9 @@ public class InetNetworkTest {
* The InetAddress.toString() returns a string with format
* "name/ip_address". It has no indication of subnetmask. The returned name
* is optional.
- *
- * @throws UnknownHostException
*/
@Test
- public void testInet6Address() throws UnknownHostException {
+ void testInet6Address() throws UnknownHostException {
// Test Bad IP V6 address.
try {
@@ -128,11 +122,9 @@ public class InetNetworkTest {
/**
* Test the Inet4Network.
- *
- * @throws UnknownHostException
*/
@Test
- public void testInet4Network() throws UnknownHostException {
+ void testInet4Network() throws UnknownHostException {
// Test with null parameter.
address = InetAddress.getByAddress(getBytesFromAddress("127.0.0.1"));
@@ -153,11 +145,9 @@ public class InetNetworkTest {
/**
* Test the Inet6Network.
- *
- * @throws UnknownHostException
*/
@Test
- public void testInet6Network() throws UnknownHostException {
+ void testInet6Network() throws UnknownHostException {
// Test with null parameter.
address = InetAddress.getByAddress(getBytesFromAddress("2781:0db8:1234:8612:45ee:0000:f05e:0001"));
diff --git a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java
index dbea721..94228d3 100644
--- a/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java
+++ b/server/dns-service/dnsservice-library/src/test/java/org/apache/james/dnsservice/library/netmatcher/NetMatcherTest.java
@@ -20,24 +20,20 @@ package org.apache.james.dnsservice.library.netmatcher;
import static org.assertj.core.api.Assertions.assertThat;
-import java.net.UnknownHostException;
-
import org.apache.james.dnsservice.api.mock.DNSFixture;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test the NetMatcher class with various IPv4 and IPv6 parameters.
- *
*/
-public class NetMatcherTest {
-
+class NetMatcherTest {
private static NetMatcher netMatcher;
/**
* Test ability to split expressions even when comma is not followed by a space.
*/
@Test
- public void testSplitterDoesNotRequireSpaceAfterComma() {
+ void testSplitterDoesNotRequireSpaceAfterComma() {
netMatcher = new NetMatcher("127.0.0.1,192.168.100.14/24,10.*", DNSFixture.DNS_SERVER_IPV4_MOCK);
assertThat(netMatcher.toString())
.isEqualTo("[10.0.0.0/255.0.0.0, 127.0.0.1/255.255.255.255, 192.168.100.0/255.255.255.0]");
@@ -47,7 +43,7 @@ public class NetMatcherTest {
* Test for IPV4 uniqueness.
*/
@Test
- public void testIpV4NetworksUniqueness() {
+ void testIpV4NetworksUniqueness() {
netMatcher = new NetMatcher(DNSFixture.LOCALHOST_IP_V4_ADDRESSES_DUPLICATE, DNSFixture.DNS_SERVER_IPV4_MOCK);
assertThat(netMatcher.toString()).isEqualTo("[172.16.0.0/255.255.0.0, 192.168.1.0/255.255.255.0]");
}
@@ -56,17 +52,16 @@ public class NetMatcherTest {
* Test for IPV6 uniqueness.
*/
@Test
- public void testIpV6NetworksUniqueness() {
+ void testIpV6NetworksUniqueness() {
netMatcher = new NetMatcher(DNSFixture.LOCALHOST_IP_V6_ADDRESSES_DUPLICATE, DNSFixture.DNS_SERVER_IPV6_MOCK);
assertThat(netMatcher.toString()).isEqualTo("[0:0:0:0:0:0:0:1/32768, 2781:db8:1234:0:0:0:0:0/48]");
}
/**
* Test for IPV4 matcher.
- * @throws UnknownHostException
*/
@Test
- public void testIpV4Matcher() throws UnknownHostException {
+ void testIpV4Matcher() {
netMatcher = new NetMatcher(DNSFixture.LOCALHOST_IP_V4_ADDRESSES, DNSFixture.DNS_SERVER_IPV4_MOCK);
@@ -77,11 +72,8 @@ public class NetMatcherTest {
assertThat(netMatcher.matchInetNetwork("192.169.1.254")).isFalse();
}
- /**
- * @throws UnknownHostException
- */
@Test
- public void testIpV4MatcherWithIpV6() throws UnknownHostException {
+ void testIpV4MatcherWithIpV6() {
netMatcher = new NetMatcher(DNSFixture.LOCALHOST_IP_V4_ADDRESSES, DNSFixture.DNS_SERVER_IPV4_MOCK);
@@ -92,11 +84,8 @@ public class NetMatcherTest {
assertThat(netMatcher.matchInetNetwork("2781:0db8:1235:8612:45ee:ffff:fffe:0001")).isFalse();
}
- /**
- * @throws UnknownHostException
- */
@Test
- public void testIpV6Matcher() throws UnknownHostException {
+ void testIpV6Matcher() {
netMatcher = new NetMatcher(DNSFixture.LOCALHOST_IP_V6_ADDRESSES, DNSFixture.DNS_SERVER_IPV6_MOCK);
@@ -107,11 +96,8 @@ public class NetMatcherTest {
assertThat(netMatcher.matchInetNetwork("2781:0db8:1235:8612:45ee:ffff:fffe:0001")).isFalse();
}
- /**
- * @throws UnknownHostException
- */
@Test
- public void testIpV6MatcherWithIpV4() throws UnknownHostException {
+ void testIpV6MatcherWithIpV4() {
netMatcher = new NetMatcher(DNSFixture.LOCALHOST_IP_V6_ADDRESSES, DNSFixture.DNS_SERVER_IPV6_MOCK);
diff --git a/server/dns-service/dnsservice-test/src/main/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java b/server/dns-service/dnsservice-test/src/main/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
index 6b93f5d..4950034 100644
--- a/server/dns-service/dnsservice-test/src/main/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
+++ b/server/dns-service/dnsservice-test/src/main/java/org/apache/james/dnsservice/api/AbstractDNSServiceTest.java
@@ -25,8 +25,8 @@ import java.net.UnknownHostException;
import java.util.Collection;
import org.apache.james.dnsservice.api.mock.MockDNSService;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import com.google.common.collect.ImmutableList;
@@ -35,8 +35,7 @@ import com.google.common.collect.ImmutableList;
* Basic tests for AbstractDNSServer. The goal is to verify that the interface
* remains constants and that the built platform has access to the Internet.
*/
-public class AbstractDNSServiceTest {
-
+class AbstractDNSServiceTest {
/**
* Simple Mock DNSService relaying on InetAddress.
*/
@@ -65,11 +64,9 @@ public class AbstractDNSServiceTest {
/**
* Simple localhost resolution.
- *
- * @throws UnknownHostException
*/
@Test
- public void testLocalhost() throws UnknownHostException {
+ void testLocalhost() throws UnknownHostException {
assertThat(DNS_SERVER.getByName("localhost").toString()).isEqualTo("localhost/127.0.0.1");
@@ -81,12 +78,10 @@ public class AbstractDNSServiceTest {
/**
* Simple apache.org resolution.
- *
- * @throws UnknownHostException
*/
@Test
- @Ignore(value = "It requires internet connection!")
- public void testApache() throws UnknownHostException {
+ @Disabled(value = "It requires internet connection!")
+ void testApache() throws UnknownHostException {
//TODO: move to some sort of Live tests
assertThat(DNS_SERVER.getByName("www.apache.org").toString().startsWith("www.apache.org")).isTrue();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org