Remove use of junit-addons

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

diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapReplySerializationTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapReplySerializationTest.java
index d4c0af1417cbf79a1c74c0d94b48b7fea72e4bb2..74799536a6f2e9873208b2f7108fd61656dfb713 100644 (file)
--- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapReplySerializationTest.java
+++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapReplySerializationTest.java
@@ -12,7 +12,6 @@ import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
-import junitx.framework.ArrayAssert;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.lispflowmapping.lisp.serializer.MapReplySerializer;
@@ -25,11 +24,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.binary.address.typ
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.MapReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord.Action;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecordBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItem;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.list.MappingRecordItemBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecord.Action;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.list.MappingRecordItem;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.list.MappingRecordItemBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapreplymessage.MapReplyBuilder;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 public class MapReplySerializationTest extends BaseTestCase {
 
@@ -161,7 +161,7 @@ public class MapReplySerializationTest extends BaseTestCase {
             0x08 };
         byte[] actual = new byte[16];
         packet.get(actual);
-        ArrayAssert.assertEquals(expected, actual);
+        assertArrayEquals(expected, actual);
 
         packet.position(packet.position() + 12); // EID in second record
         assertEquals(0x08020405, packet.getInt());
@@ -278,10 +278,10 @@ public class MapReplySerializationTest extends BaseTestCase {
         eidToLocatorBuilder.setLocatorRecord(new ArrayList<LocatorRecord>());
 
         LocatorRecordBuilder locatorBuilder1 = new LocatorRecordBuilder();
-        locatorBuilder1.setPriority((short) 0xF3);
-        locatorBuilder1.setWeight((short) 0xF6);
-        locatorBuilder1.setMulticastPriority((short) 0xA3);
-        locatorBuilder1.setMulticastWeight((short) 0x06);
+        locatorBuilder1.setPriority(Uint8.valueOf(0xF3));
+        locatorBuilder1.setWeight(Uint8.valueOf(0xF6));
+        locatorBuilder1.setMulticastPriority(Uint8.valueOf(0xA3));
+        locatorBuilder1.setMulticastWeight(Uint8.valueOf(0x06));
         locatorBuilder1.setRloc(LispAddressUtil.asIpv4Rloc("0.0.0.1"));
         locatorBuilder1.setLocalLocator(true);
         locatorBuilder1.setRlocProbed(true);
@@ -290,10 +290,10 @@ public class MapReplySerializationTest extends BaseTestCase {
         eidToLocatorBuilder.getLocatorRecord().add(locatorBuilder1.build());
 
         LocatorRecordBuilder locatorBuilder2 = new LocatorRecordBuilder();
-        locatorBuilder2.setPriority((short) 0x03);
-        locatorBuilder2.setWeight((short) 0x06);
-        locatorBuilder2.setMulticastPriority((short) 0x03);
-        locatorBuilder2.setMulticastWeight((short) 0xF1);
+        locatorBuilder2.setPriority(Uint8.valueOf(0x03));
+        locatorBuilder2.setWeight(Uint8.valueOf(0x06));
+        locatorBuilder2.setMulticastPriority(Uint8.valueOf(0x03));
+        locatorBuilder2.setMulticastWeight(Uint8.valueOf(0xF1));
         locatorBuilder2.setRloc(LispAddressUtil.asIpv4Rloc("0.0.0.2"));
         locatorBuilder2.setLocalLocator(false);
         locatorBuilder2.setRlocProbed(false);