Remove use of junit-addons

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

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java
index 8d5b118b3afb12f8946b2fea48cb1f9674386714..bce35e483e939900562ab30ef56551598b7dd4f0 100644 (file)
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapRegisterSerializationTest.java
@@ -7,13 +7,13 @@
  */
 package org.opendaylight.lispflowmapping.serializer;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import junitx.framework.ArrayAssert;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer.Length;
@@ -77,7 +77,7 @@ public class MapRegisterSerializationTest extends BaseTestCase {
 
         byte[] actualAuthenticationData = new byte[20];
         bb.get(actualAuthenticationData);
-        ArrayAssert.assertEquals(authenticationData, actualAuthenticationData);
+        assertArrayEquals(authenticationData, actualAuthenticationData);
 
         bb.position(bb.position() + 12); // EID in first record
         assertEquals(0x1, bb.getInt());
@@ -87,11 +87,11 @@ public class MapRegisterSerializationTest extends BaseTestCase {
 
         byte[] actualXtrId  = new byte[Length.XTRID_SIZE];
         bb.get(actualXtrId);
-        ArrayAssert.assertEquals(xtrId.getValue(), actualXtrId);
+        assertArrayEquals(xtrId.getValue(), actualXtrId);
 
         byte[] actualSiteId = new byte[Length.SITEID_SIZE];
         bb.get(actualSiteId);
-        ArrayAssert.assertEquals(siteId.getValue(), actualSiteId);
+        assertArrayEquals(siteId.getValue(), actualSiteId);
 
         assertEquals(bb.position(), bb.capacity());
     }
@@ -125,8 +125,7 @@ public class MapRegisterSerializationTest extends BaseTestCase {
         mrBuilder.setAuthenticationData(authenticationData);
 
         MapRegister mapRegister = mrBuilder.build();
-        ArrayAssert.assertEquals(
-                MapRegisterSerializer.getInstance().serialize(mapRegister).array(),
+        assertArrayEquals(MapRegisterSerializer.getInstance().serialize(mapRegister).array(),
                 MapRegisterSerializer.getInstance()
                         .serialize(MapRegisterSerializer.getInstance().deserialize(MapRegisterSerializer.getInstance()
                                 .serialize(mapRegister), null)).array());
@@ -212,7 +211,7 @@ public class MapRegisterSerializationTest extends BaseTestCase {
         assertEquals(0xFFBB000000000000L, mr.getNonce().longValue());
         assertEquals(0x0000, mr.getKeyId().shortValue());
         byte[] expectedAuthenticationData = {};
-        ArrayAssert.assertEquals(expectedAuthenticationData, mr.getAuthenticationData());
+        assertArrayEquals(expectedAuthenticationData, mr.getAuthenticationData());
     }
 
     @Test
@@ -228,7 +227,7 @@ public class MapRegisterSerializationTest extends BaseTestCase {
 
         assertTrue(mr.getXtrSiteIdPresent());
 
-        ArrayAssert.assertEquals(bb.array(), MapRegisterSerializer.getInstance().serialize(mr).array());
+        assertArrayEquals(bb.array(), MapRegisterSerializer.getInstance().serialize(mr).array());
     }
 
     @Test
@@ -451,7 +450,7 @@ public class MapRegisterSerializationTest extends BaseTestCase {
         byte[] expectedAuthenticationData = { (byte) 0x2c, (byte) 0x61, (byte) 0xb9, (byte) 0xc9, (byte) 0x9a,
             (byte) 0x20, (byte) 0xba, (byte) 0xd8, (byte) 0xf5, (byte) 0x40, (byte) 0xd3, (byte) 0x55, (byte) 0x6f,
             (byte) 0x5f, (byte) 0x6e, (byte) 0x5a, (byte) 0xb2, (byte) 0x0a, (byte) 0xbf, (byte) 0xb5 };
-        ArrayAssert.assertEquals(expectedAuthenticationData, mr.getAuthenticationData());
+        assertArrayEquals(expectedAuthenticationData, mr.getAuthenticationData());
     }
 
     @Test
@@ -487,6 +486,6 @@ public class MapRegisterSerializationTest extends BaseTestCase {
             (byte) 0x8c, (byte) 0x57, (byte) 0x6d, (byte) 0x68, (byte) 0xa5, (byte) 0xbf, (byte) 0x32, (byte) 0x11,
             (byte) 0xc9, (byte) 0x7b, (byte) 0x58, (byte) 0xc4, (byte) 0xb9, (byte) 0x9f, (byte) 0x06, (byte) 0x11,
             (byte) 0x23, (byte) 0xb9, (byte) 0x38 };
-        ArrayAssert.assertEquals(expectedAuthenticationData, mr.getAuthenticationData());
+        assertArrayEquals(expectedAuthenticationData, mr.getAuthenticationData());
     }
 }