HONEYCOMB-145 - Utility Class Refactoring

problematic mockito-all changed to mockito-core( https://github.com/mockito/mockito/issues/324)

Translate Utils Splitted to multiple Trait Interfaces

Ipv4Translator - Logic for translation of ipv4-based data
Ipv6Translator - Logic for translation of ipv6-based data
MacTranslator - Logic for translation of mac-based data
AddressTranslator - Aggregation trait for Ipv4/Ipv6/Mac 
JvppReplyConsumer - Logic for extracting replies from jvpp calls
ByteDataTranslator - any byte-based conversions
Plus some existing utility classes changed to traits


Change-Id: I342b625954223966802e65dca0fabf8456c89345
Signed-off-by: Jan Srnicek <jsrnicek@cisco.com>

7 files changed, 265 insertions, 211 deletions

diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/AddressTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/AddressTranslatorTest.java
new file mode 100644
index 000000000..92f58c933
--- /dev/null
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/AddressTranslatorTest.java
@@ -0,0 +1,20 @@
+package io.fd.honeycomb.translate.v3po.util;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
+
+public class AddressTranslatorTest implements AddressTranslator {
+
+    @Test
+    public void testRevertAddress() {
+        assertEquals("1.2.168.192",
+                reverseAddress(new IpAddress(new Ipv4Address("192.168.2.1"))).getIpv4Address().getValue());
+        assertEquals("3473:7003:2e8a::a385:b80d:120",
+                reverseAddress(new IpAddress(new Ipv6Address("2001:db8:85a3:0:0:8a2e:370:7334"))).getIpv6Address()
+                        .getValue());
+    }
+}
\ No newline at end of file
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/ByteDataTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/ByteDataTranslatorTest.java
new file mode 100644
index 000000000..86ff5ff77
--- /dev/null
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/ByteDataTranslatorTest.java
@@ -0,0 +1,39 @@
+package io.fd.honeycomb.translate.v3po.util;
+
+import static org.junit.Assert.assertArrayEquals;
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+/**
+ * Created by jsrnicek on 23.9.2016.
+ */
+public class ByteDataTranslatorTest implements ByteDataTranslator {
+
+    @Test
+    public void testBooleanToByte() {
+        assertEquals(0, booleanToByte(null));
+        assertEquals(0, booleanToByte(false));
+        assertEquals(1, booleanToByte(true));
+    }
+
+    @Test
+    public void testByteToBoolean() {
+        assertEquals(Boolean.FALSE, byteToBoolean((byte) 0));
+        assertEquals(Boolean.TRUE, byteToBoolean((byte) 1));
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testByteToBooleanFailed() {
+        byteToBoolean((byte) 123);
+    }
+
+    @Test
+    public void testToString() {
+        final byte[] expected = "test".getBytes();
+        final byte[] cString = new byte[expected.length + 10];
+        System.arraycopy(expected, 0, cString, 0, expected.length);
+        final String jString = toString(cString);
+        assertArrayEquals(expected, jString.getBytes());
+    }
+}
\ No newline at end of file
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/Ipv4TranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/Ipv4TranslatorTest.java
new file mode 100644
index 000000000..3b1dcd9b1
--- /dev/null
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/Ipv4TranslatorTest.java
@@ -0,0 +1,33 @@
+package io.fd.honeycomb.translate.v3po.util;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
+
+public class Ipv4TranslatorTest implements Ipv4Translator {
+
+    @Test
+    public void testIpv4NoZone() throws Exception {
+        final Ipv4AddressNoZone ipv4Addr = new Ipv4AddressNoZone("192.168.1.1");
+        byte[] bytes = ipv4AddressNoZoneToArray(ipv4Addr);
+        assertEquals((byte) 192, bytes[0]);
+        // Simulating the magic of VPP
+        bytes = reverseBytes(bytes);
+        final Ipv4AddressNoZone ipv4AddressNoZone = arrayToIpv4AddressNoZone(bytes);
+        assertEquals(ipv4Addr, ipv4AddressNoZone);
+    }
+
+    @Test
+    public void testIpv4AddressPrefixToArray() {
+        byte[] ip = ipv4AddressPrefixToArray(new Ipv4Prefix("192.168.2.1/24"));
+
+        assertEquals("1.2.168.192", arrayToIpv4AddressNoZone(ip).getValue());
+    }
+
+    @Test
+    public void testExtractPrefix() {
+        assertEquals(24, extractPrefix(new Ipv4Prefix("192.168.2.1/24")));
+    }
+}
\ No newline at end of file
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/Ipv6TranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/Ipv6TranslatorTest.java
new file mode 100644
index 000000000..6f4d39c63
--- /dev/null
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/Ipv6TranslatorTest.java
@@ -0,0 +1,40 @@
+package io.fd.honeycomb.translate.v3po.util;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
+
+public class Ipv6TranslatorTest implements Ipv6Translator {
+
+    @Test
+    public void testIpv6NoZone() {
+        final Ipv6AddressNoZone ipv6Addr = new Ipv6AddressNoZone("3ffe:1900:4545:3:200:f8ff:fe21:67cf");
+        byte[] bytes = ipv6AddressNoZoneToArray(ipv6Addr);
+        assertEquals((byte) 63, bytes[0]);
+
+        bytes = reverseBytes(bytes);
+        final Ipv6AddressNoZone ivp6AddressNoZone = arrayToIpv6AddressNoZone(bytes);
+        assertEquals(ipv6Addr, ivp6AddressNoZone);
+    }
+
+    @Test
+    public void testIpv6AddressPrefixToArray() {
+        byte[] ip = ipv6AddressPrefixToArray(new Ipv6Prefix("3ffe:1900:4545:3:200:f8ff:fe21:67cf/48"));
+
+        assertEquals("cf67:21fe:fff8:2:300:4545:19:fe3f", arrayToIpv6AddressNoZone(ip).getValue());
+    }
+
+    @Test
+    public void testIpv4AddressPrefixToArray() {
+        byte[] ip = ipv6AddressPrefixToArray(new Ipv6Prefix("2001:0db8:0a0b:12f0:0000:0000:0000:0001/128"));
+
+        assertEquals("100::f012:b0a:b80d:120", arrayToIpv6AddressNoZone(ip).getValue());
+    }
+
+    @Test
+    public void testExtractPrefix() {
+        assertEquals(48, extractPrefix(new Ipv6Prefix("3ffe:1900:4545:3:200:f8ff:fe21:67cf/48")));
+    }
+}
\ No newline at end of file
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/JvppReplyConsumerTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/JvppReplyConsumerTest.java
new file mode 100644
index 000000000..dbccef6e2
--- /dev/null
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/JvppReplyConsumerTest.java
@@ -0,0 +1,60 @@
+package io.fd.honeycomb.translate.v3po.util;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import static org.mockito.Matchers.anyLong;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import org.junit.Test;
+import org.opendaylight.yangtools.yang.binding.DataContainer;
+import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.openvpp.jvpp.dto.JVppReply;
+
+public class JvppReplyConsumerTest implements JvppReplyConsumer {
+
+    private static class AnDataObject implements DataObject {
+        @Override
+        public Class<? extends DataContainer> getImplementedInterface() {
+            return null;
+        }
+    }
+
+    @Test
+    public void testGetReplyForWriteTimeout() throws Exception {
+        final Future<JVppReply<?>> future = mock(Future.class);
+        when(future.get(anyLong(), eq(TimeUnit.SECONDS))).thenThrow(TimeoutException.class);
+        final InstanceIdentifier<AnDataObject>
+                replyType = InstanceIdentifier.create(AnDataObject.class);
+        try {
+            getReplyForWrite(future, replyType);
+        } catch (WriteTimeoutException e) {
+            assertTrue(e.getCause() instanceof TimeoutException);
+            assertEquals(replyType, e.getFailedId());
+            return;
+        }
+        fail("WriteTimeoutException was expected");
+    }
+
+    @Test
+    public void testGetReplyForReadTimeout() throws Exception {
+        final Future<JVppReply<?>> future = mock(Future.class);
+        final InstanceIdentifier<AnDataObject> replyType =
+                InstanceIdentifier.create(AnDataObject.class);
+        when(future.get(anyLong(), eq(TimeUnit.SECONDS))).thenThrow(TimeoutException.class);
+        try {
+            getReplyForRead(future, replyType);
+        } catch (ReadTimeoutException e) {
+            assertTrue(e.getCause() instanceof TimeoutException);
+            assertEquals(replyType, e.getFailedId());
+            return;
+        }
+        fail("ReadTimeoutException was expected");
+    }
+}
\ No newline at end of file
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/MacTranslatorTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/MacTranslatorTest.java
new file mode 100644
index 000000000..60444204e
--- /dev/null
+++ b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/MacTranslatorTest.java
@@ -0,0 +1,73 @@
+package io.fd.honeycomb.translate.v3po.util;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+public class MacTranslatorTest implements MacTranslator {
+
+    @Test
+    public void testParseMac() throws Exception {
+        byte[] bytes = parseMac("00:fF:7f:15:5e:A9");
+        assertMac(bytes);
+    }
+
+    private void assertMac(final byte[] bytes) {
+        assertEquals(6, bytes.length);
+        assertEquals((byte) 0, bytes[0]);
+        assertEquals((byte) 255, bytes[1]);
+        assertEquals((byte) 127, bytes[2]);
+        assertEquals((byte) 21, bytes[3]);
+        assertEquals((byte) 94, bytes[4]);
+        assertEquals((byte) 169, bytes[5]);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseMacLonger() throws Exception {
+        byte[] bytes = parseMac("00:fF:7f:15:5e:A9:88:77");
+        assertMac(bytes);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseMacShorter() throws Exception {
+        parseMac("00:fF:7f");
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testParseRandomString() throws Exception {
+        parseMac("random{}}@$*&*!");
+    }
+
+    @Test(expected = NumberFormatException.class)
+    public void testParseMacNumberFormatEx() throws Exception {
+        parseMac("00:XX:7f:15:5e:77\"");
+    }
+
+    @Test
+    public void testByteArrayToMacUnseparated() {
+        byte[] address = parseMac("aa:bb:cc:dd:ee:ff");
+
+        String converted = byteArrayToMacUnseparated(address);
+
+        assertEquals("aabbccddeeff", converted);
+    }
+
+    @Test
+    public void testByteArrayToMacSeparated() {
+        byte[] address = parseMac("aa:bb:cc:dd:ee:ff");
+
+        String converted = byteArrayToMacSeparated(address);
+
+        assertEquals("aa:bb:cc:dd:ee:ff", converted);
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testByteArrayToMacUnseparatedIllegal() {
+        byteArrayToMacUnseparated(new byte[]{54, 26, 87, 32, 14});
+    }
+
+    @Test(expected = IllegalArgumentException.class)
+    public void testByteArrayToMacSeparatedIllegal() {
+        byteArrayToMacSeparated(new byte[]{54, 26, 87, 32, 14});
+    }
+}
\ No newline at end of file
diff --git a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/TranslateUtilsTest.java b/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/TranslateUtilsTest.java
deleted file mode 100644
index 3b7efbfc5..000000000
--- a/vpp-common/vpp-translate-utils/src/test/java/io/fd/honeycomb/translate/v3po/util/TranslateUtilsTest.java
+++ /dev/null
@@ -1,211 +0,0 @@
-package io.fd.honeycomb.translate.v3po.util;
-
-import static io.fd.honeycomb.translate.v3po.util.TranslateUtils.reverseAddress;
-import static io.fd.honeycomb.translate.v3po.util.TranslateUtils.reverseBytes;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import org.junit.Test;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Prefix;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6AddressNoZone;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix;
-import org.opendaylight.yangtools.yang.binding.DataContainer;
-import org.opendaylight.yangtools.yang.binding.DataObject;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.openvpp.jvpp.dto.JVppReply;
-
-public class TranslateUtilsTest {
-
-    private static class AnDataObject implements DataObject {
-        @Override
-        public Class<? extends DataContainer> getImplementedInterface() {
-            return null;
-        }
-    }
-
-    @Test
-    public void testGetReplyForWriteTimeout() throws Exception {
-        final Future<JVppReply<?>> future = mock(Future.class);
-        when(future.get(anyLong(), eq(TimeUnit.SECONDS))).thenThrow(TimeoutException.class);
-        final InstanceIdentifier<AnDataObject> replyType = InstanceIdentifier.create(AnDataObject.class);
-        try {
-            TranslateUtils.getReplyForWrite(future, replyType);
-        } catch (WriteTimeoutException e) {
-            assertTrue(e.getCause() instanceof TimeoutException);
-            assertEquals(replyType, e.getFailedId());
-            return;
-        }
-        fail("WriteTimeoutException was expected");
-    }
-
-    @Test
-    public void testGetReplyForReadTimeout() throws Exception {
-        final Future<JVppReply<?>> future = mock(Future.class);
-        final InstanceIdentifier<AnDataObject> replyType = InstanceIdentifier.create(AnDataObject.class);
-        when(future.get(anyLong(), eq(TimeUnit.SECONDS))).thenThrow(TimeoutException.class);
-        try {
-            TranslateUtils.getReplyForRead(future, replyType);
-        } catch (ReadTimeoutException e) {
-            assertTrue(e.getCause() instanceof TimeoutException);
-            assertEquals(replyType, e.getFailedId());
-            return;
-        }
-        fail("ReadTimeoutException was expected");
-    }
-
-    @Test
-    public void testIpv4NoZone() throws Exception {
-        final Ipv4AddressNoZone ipv4Addr = new Ipv4AddressNoZone("192.168.1.1");
-        byte[] bytes = TranslateUtils.ipv4AddressNoZoneToArray(ipv4Addr);
-        assertEquals((byte) 192, bytes[0]);
-        // Simulating the magic of VPP
-        bytes = reverseBytes(bytes);
-        final Ipv4AddressNoZone ipv4AddressNoZone = TranslateUtils.arrayToIpv4AddressNoZone(bytes);
-        assertEquals(ipv4Addr, ipv4AddressNoZone);
-    }
-
-    @Test
-    public void testToString() {
-        final byte[] expected = "test".getBytes();
-        final byte[] cString = new byte[expected.length + 10];
-        System.arraycopy(expected, 0, cString, 0, expected.length);
-        final String jString = TranslateUtils.toString(cString);
-        assertArrayEquals(expected, jString.getBytes());
-    }
-
-    @Test
-    public void testParseMac() throws Exception {
-        byte[] bytes = TranslateUtils.parseMac("00:fF:7f:15:5e:A9");
-        assertMac(bytes);
-    }
-
-    private void assertMac(final byte[] bytes) {
-        assertEquals(6, bytes.length);
-        assertEquals((byte) 0, bytes[0]);
-        assertEquals((byte) 255, bytes[1]);
-        assertEquals((byte) 127, bytes[2]);
-        assertEquals((byte) 21, bytes[3]);
-        assertEquals((byte) 94, bytes[4]);
-        assertEquals((byte) 169, bytes[5]);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testParseMacLonger() throws Exception {
-        byte[] bytes = TranslateUtils.parseMac("00:fF:7f:15:5e:A9:88:77");
-        assertMac(bytes);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testParseMacShorter() throws Exception {
-        TranslateUtils.parseMac("00:fF:7f");
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testParseRandomString() throws Exception {
-        TranslateUtils.parseMac("random{}}@$*&*!");
-    }
-
-    @Test(expected = NumberFormatException.class)
-    public void testParseMacNumberFormatEx() throws Exception {
-        TranslateUtils.parseMac("00:XX:7f:15:5e:77\"");
-    }
-
-    @Test
-    public void testBooleanToByte() {
-        assertEquals(0, TranslateUtils.booleanToByte(null));
-        assertEquals(0, TranslateUtils.booleanToByte(false));
-        assertEquals(1, TranslateUtils.booleanToByte(true));
-    }
-
-    @Test
-    public void testByteToBoolean() {
-        assertEquals(Boolean.FALSE, TranslateUtils.byteToBoolean((byte) 0));
-        assertEquals(Boolean.TRUE, TranslateUtils.byteToBoolean((byte) 1));
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testByteToBooleanFailed() {
-        TranslateUtils.byteToBoolean((byte) 123);
-    }
-
-    @Test
-    public void testIpv6NoZone() {
-        final Ipv6AddressNoZone ipv6Addr = new Ipv6AddressNoZone("3ffe:1900:4545:3:200:f8ff:fe21:67cf");
-        byte[] bytes = TranslateUtils.ipv6AddressNoZoneToArray(ipv6Addr);
-        assertEquals((byte) 63, bytes[0]);
-
-        bytes = reverseBytes(bytes);
-        final Ipv6AddressNoZone ivp6AddressNoZone = TranslateUtils.arrayToIpv6AddressNoZone(bytes);
-        assertEquals(ipv6Addr, ivp6AddressNoZone);
-    }
-
-    @Test
-    public void testByteArrayToMacUnseparated() {
-        byte[] address = TranslateUtils.parseMac("aa:bb:cc:dd:ee:ff");
-
-        String converted = TranslateUtils.byteArrayToMacUnseparated(address);
-
-        assertEquals("aabbccddeeff", converted);
-    }
-
-    @Test
-    public void testByteArrayToMacSeparated() {
-        byte[] address = TranslateUtils.parseMac("aa:bb:cc:dd:ee:ff");
-
-        String converted = TranslateUtils.byteArrayToMacSeparated(address);
-
-        assertEquals("aa:bb:cc:dd:ee:ff", converted);
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testByteArrayToMacUnseparatedIllegal() {
-        TranslateUtils.byteArrayToMacUnseparated(new byte[]{54, 26, 87, 32, 14});
-    }
-
-    @Test(expected = IllegalArgumentException.class)
-    public void testByteArrayToMacSeparatedIllegal() {
-        TranslateUtils.byteArrayToMacSeparated(new byte[]{54, 26, 87, 32, 14});
-    }
-
-    @Test
-    public void testIpv4AddressPrefixToArray() {
-        byte[] ip = TranslateUtils.ipv4AddressPrefixToArray(new Ipv4Prefix("192.168.2.1/24"));
-
-        assertEquals("1.2.168.192", TranslateUtils.arrayToIpv4AddressNoZone(ip).getValue());
-    }
-
-    @Test
-    public void testIpv6AddressPrefixToArray() {
-        byte[] ip = TranslateUtils.ipv6AddressPrefixToArray(new Ipv6Prefix("3ffe:1900:4545:3:200:f8ff:fe21:67cf/48"));
-
-        assertEquals("cf67:21fe:fff8:2:300:4545:19:fe3f", TranslateUtils.arrayToIpv6AddressNoZone(ip).getValue());
-    }
-
-    @Test
-    public void testExtractPrefix() {
-        assertEquals(24, TranslateUtils.extractPrefix(new Ipv4Prefix("192.168.2.1/24")));
-        assertEquals(48, TranslateUtils.extractPrefix(new Ipv6Prefix("3ffe:1900:4545:3:200:f8ff:fe21:67cf/48")));
-    }
-
-    @Test
-    public void testRevertAddress() {
-        assertEquals("1.2.168.192",
-                reverseAddress(new IpAddress(new Ipv4Address("192.168.2.1"))).getIpv4Address().getValue());
-        assertEquals("3473:7003:2e8a::a385:b80d:120",
-                reverseAddress(new IpAddress(new Ipv6Address("2001:db8:85a3:0:0:8a2e:370:7334"))).getIpv6Address()
-                        .getValue());
-    }
-}
\ No newline at end of file