Remove use of junit-addons

[lispflowmapping.git] / mappingservice / lisp-proto / src / test / java / org / opendaylight / lispflowmapping / serializer / address / ExplicitLocatorPathSerializerTest.java

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ExplicitLocatorPathSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ExplicitLocatorPathSerializerTest.java
index 3dc4734f512b3decbb067d3e1ea75132a2452912..0727c41e9a4b2fd80684fb386718fcee459cc932 100644 (file)
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ExplicitLocatorPathSerializerTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ExplicitLocatorPathSerializerTest.java
@@ -7,12 +7,12 @@
  */
 package org.opendaylight.lispflowmapping.serializer.address;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
-import junitx.framework.ArrayAssert;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException;
@@ -30,12 +30,12 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase {
 
     @Test
     public void deserialize__Simple() throws Exception {
-        Rloc address = LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 " + //
-                "0A 00 00 10 " + //
-                "00 00 00 01 AA BB CC DD " + // IPv4
-                "00 00 00 01 11 22 33 44")); // IPv4
+        Rloc address = LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 "
+                + "0A 00 00 10 "
+                + "00 00 00 01 AA BB CC DD "   // IPv4
+                + "00 00 00 01 11 22 33 44")); // IPv4
 
-        assertEquals(ExplicitLocatorPathLcaf.class, address.getAddressType());
+        assertEquals(ExplicitLocatorPathLcaf.VALUE, address.getAddressType());
         ExplicitLocatorPath elp = (ExplicitLocatorPath) address.getAddress();
 
         List<Hop> hops = elp.getExplicitLocatorPath().getHop();
@@ -47,33 +47,33 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase {
 
     @Test
     public void deserialize__Bits() throws Exception {
-        Rloc address = LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 " + //
-                "0A 00 00 10 " + //
-                "00 05 00 01 AA BB CC DD " + // IPv4
-                "00 02 00 01 11 22 33 44")); // IPv4
+        Rloc address = LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 "
+                + "0A 00 00 10 "
+                + "00 05 00 01 AA BB CC DD "   // IPv4
+                + "00 02 00 01 11 22 33 44")); // IPv4
 
-        assertEquals(ExplicitLocatorPathLcaf.class, address.getAddressType());
+        assertEquals(ExplicitLocatorPathLcaf.VALUE, address.getAddressType());
         ExplicitLocatorPath elp = (ExplicitLocatorPath) address.getAddress();
 
         List<Hop> hops = elp.getExplicitLocatorPath().getHop();
         assertEquals(2, hops.size());
 
         assertEquals("170.187.204.221", hops.get(0).getAddress().stringValue());
-        assertEquals(true, hops.get(0).getLrsBits().isLookup().booleanValue());
-        assertEquals(false, hops.get(0).getLrsBits().isRlocProbe().booleanValue());
-        assertEquals(true, hops.get(0).getLrsBits().isStrict().booleanValue());
+        assertEquals(true, hops.get(0).getLrsBits().getLookup().booleanValue());
+        assertEquals(false, hops.get(0).getLrsBits().getRlocProbe().booleanValue());
+        assertEquals(true, hops.get(0).getLrsBits().getStrict().booleanValue());
         assertEquals("17.34.51.68", hops.get(1).getAddress().stringValue());
-        assertEquals(false, hops.get(1).getLrsBits().isLookup().booleanValue());
-        assertEquals(true, hops.get(1).getLrsBits().isRlocProbe().booleanValue());
-        assertEquals(false, hops.get(1).getLrsBits().isStrict().booleanValue());
+        assertEquals(false, hops.get(1).getLrsBits().getLookup().booleanValue());
+        assertEquals(true, hops.get(1).getLrsBits().getRlocProbe().booleanValue());
+        assertEquals(false, hops.get(1).getLrsBits().getStrict().booleanValue());
     }
 
     @Test
     public void deserialize__NoAddresses() throws Exception {
-        Rloc address = LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 " + //
-                "0A 00 00 00 "));
+        Rloc address = LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 "
+                + "0A 00 00 00 "));
 
-        assertEquals(ExplicitLocatorPathLcaf.class, address.getAddressType());
+        assertEquals(ExplicitLocatorPathLcaf.VALUE, address.getAddressType());
         ExplicitLocatorPath elp = (ExplicitLocatorPath) address.getAddress();
 
         List<Hop> hops = elp.getExplicitLocatorPath().getHop();
@@ -82,16 +82,17 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase {
 
     @Test(expected = LispSerializationException.class)
     public void deserialize__ShorterBuffer() throws Exception {
-        LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 " + //
-                "0A 00 00 18 " + //
-                "00 01 AA BB CC DD " + // IPv4
-                "00 02 11 22 33 44 11 22 33 44 11 22 33 44"));
+        LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("""
+            40 03 00 00 \
+            0A 00 00 18 \
+            00 01 AA BB CC DD \
+            00 02 11 22 33 44 11 22 33 44 11 22 33 44"""));
     }
 
     @Test(expected = LispSerializationException.class)
     public void deserialize__ShorterBuffer2() throws Exception {
-        LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 " + //
-                "0A 00 00 18 "));
+        LispAddressSerializer.getInstance().deserializeRloc(hexToByteBuffer("40 03 00 00 "
+                + "0A 00 00 18 "));
     }
 
     @Test
@@ -106,7 +107,7 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase {
         elpb.setHop(hops);
 
         RlocBuilder rb = new RlocBuilder();
-        rb.setAddressType(ExplicitLocatorPathLcaf.class);
+        rb.setAddressType(ExplicitLocatorPathLcaf.VALUE);
         rb.setVirtualNetworkId(null);
         rb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
             .lisp.address.address.ExplicitLocatorPathBuilder()
@@ -114,25 +115,25 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase {
 
         ByteBuffer buf = ByteBuffer.allocate(LispAddressSerializer.getInstance().getAddressSize(rb.build()));
         LispAddressSerializer.getInstance().serialize(buf, rb.build());
-        ByteBuffer expectedBuf = hexToByteBuffer("40 03 00 00 " + //
-                "0A 00 00 10 " + //
-                "00 00 00 01 AA BB CC DD " + // IPv4
-                "00 00 00 01 11 22 33 44"); // IPv4
-        ArrayAssert.assertEquals(expectedBuf.array(), buf.array());
+        ByteBuffer expectedBuf = hexToByteBuffer("40 03 00 00 "
+                + "0A 00 00 10 "
+                + "00 00 00 01 AA BB CC DD "  // IPv4
+                + "00 00 00 01 11 22 33 44"); // IPv4
+        assertArrayEquals(expectedBuf.array(), buf.array());
     }
 
     @Test
     public void serialize__NoAddresses() throws Exception {
         RlocBuilder rb = new RlocBuilder();
-        rb.setAddressType(ExplicitLocatorPathLcaf.class);
+        rb.setAddressType(ExplicitLocatorPathLcaf.VALUE);
         rb.setVirtualNetworkId(null);
         rb.setAddress(new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.lisp.address.types.rev151105
             .lisp.address.address.ExplicitLocatorPathBuilder().build());
 
         ByteBuffer buf = ByteBuffer.allocate(LispAddressSerializer.getInstance().getAddressSize(rb.build()));
         LispAddressSerializer.getInstance().serialize(buf, rb.build());
-        ByteBuffer expectedBuf = hexToByteBuffer("40 03 00 00 " + //
-                "0A 00 00 00");
-        ArrayAssert.assertEquals(expectedBuf.array(), buf.array());
+        ByteBuffer expectedBuf = hexToByteBuffer("40 03 00 00 "
+                + "0A 00 00 00");
+        assertArrayEquals(expectedBuf.array(), buf.array());
     }
 }