Skip to content

Commit 6c71de2

Browse files
Removed duplicate test code (stealthcopter#74)
Looks good, cheers @leofernandesmo
1 parent 6873a81 commit 6c71de2

File tree

1 file changed

+30
-36
lines changed

1 file changed

+30
-36
lines changed

library/src/test/java/com/stealthcopter/networktools/IPToolsTest.java

Lines changed: 30 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package com.stealthcopter.networktools;
22

3+
import static org.hamcrest.CoreMatchers.is;
34
import org.junit.Ignore;
45
import org.junit.Test;
56

67
import java.net.InetAddress;
78
import java.net.UnknownHostException;
89
import java.util.List;
910

10-
import static org.junit.Assert.assertFalse;
11-
import static org.junit.Assert.assertNotNull;
12-
import static org.junit.Assert.assertTrue;
11+
import static org.junit.Assert.*;
1312

1413
/**
1514
* Created by matthew on 03/11/17.
@@ -36,48 +35,25 @@ String[] getIPv6AddressesHexCompresed() {
3635

3736
@Test
3837
public void testIsIPv4Address() {
38+
assertIPv4Address(getIPv4Addresses(), true);
39+
assertIPv4Address(getIPv6Addresses(), false);
40+
assertIPv4Address(getInvalidIpAddresses(), false);
41+
}
3942

40-
for (String address : getIPv4Addresses()) {
41-
assertTrue(IPTools.isIPv4Address(address));
42-
}
4343

44-
for (String address : getIPv6Addresses()) {
45-
assertFalse(IPTools.isIPv4Address(address));
46-
}
47-
48-
for (String address : getInvalidIpAddresses()) {
49-
assertFalse(IPTools.isIPv4Address(address));
50-
}
51-
}
5244

5345
@Test
5446
public void testIsIPv6Address() {
55-
for (String address : getIPv4Addresses()) {
56-
assertFalse(IPTools.isIPv6Address(address));
57-
}
58-
59-
for (String address : getIPv6Addresses()) {
60-
assertTrue(IPTools.isIPv6Address(address));
61-
}
62-
63-
for (String address : getInvalidIpAddresses()) {
64-
assertFalse(IPTools.isIPv6Address(address));
65-
}
47+
assertIPv6Address(getIPv4Addresses(), false);
48+
assertIPv6Address(getIPv6Addresses(), true);
49+
assertIPv6Address(getInvalidIpAddresses(), false);
6650
}
6751

6852
@Test
6953
public void testIsIPv6AddressesStandard() {
70-
for (String address : getIPv4Addresses()) {
71-
assertFalse(IPTools.isIPv6StdAddress(address));
72-
}
73-
74-
for (String address : getIPv6Addresses()) {
75-
assertTrue(IPTools.isIPv6StdAddress(address));
76-
}
77-
78-
for (String address : getInvalidIpAddresses()) {
79-
assertFalse(IPTools.isIPv6StdAddress(address));
80-
}
54+
assertIPv6StdAddress(getIPv4Addresses(), false);
55+
assertIPv6StdAddress(getIPv6Addresses(), true);
56+
assertIPv6StdAddress(getInvalidIpAddresses(), false);
8157
}
8258

8359
@Test
@@ -123,4 +99,22 @@ public void testLocalAddressesNetwork() throws UnknownHostException {
12399
assertFalse(IPTools.isIpAddressLocalNetwork(InetAddress.getByName("8.8.8.8")));
124100
}
125101

102+
private void assertIPv4Address(String[] ips, boolean isIPv4Address) {
103+
for (String address : ips) {
104+
assertThat(IPTools.isIPv4Address(address), is(isIPv4Address));
105+
}
106+
}
107+
108+
private void assertIPv6Address(String[] ips, boolean isIPv6Address) {
109+
for (String address : ips) {
110+
assertThat(IPTools.isIPv6Address(address), is(isIPv6Address));
111+
}
112+
}
113+
114+
private void assertIPv6StdAddress(String[] ips, boolean isIPv6StdAddress) {
115+
for (String address : ips) {
116+
assertThat(IPTools.isIPv6StdAddress(address), is(isIPv6StdAddress));
117+
}
118+
}
119+
126120
}

0 commit comments

Comments
 (0)