From 089c1da6128f7fa19c793d3042aed71eba59aa60 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Tue, 24 Jan 2023 17:12:00 +0100 Subject: [PATCH] Remove use of junit-addons We have a very modern JUnit by default, which includes the assertions we are using from junitx.framework. Migrate them to normal org.junit.Assert methods and remove the dependency. Change-Id: I8d951dbb6bf8f95b8853b1e0a882fd2f46d90b60 Signed-off-by: Robert Varga --- commons/parent/pom.xml | 5 ----- mappingservice/dsbackend/pom.xml | 4 ---- mappingservice/implementation/pom.xml | 4 ---- mappingservice/lisp-proto/pom.xml | 6 ------ .../LispAuthenticationTest.java | 8 ++++---- .../MapNotifySerializationTest.java | 12 ++++++------ .../MapRegisterSerializationTest.java | 19 +++++++++---------- .../serializer/MapReplySerializationTest.java | 3 +-- .../address/AfiListSerializerTest.java | 12 ++++++------ .../ApplicationDataSerializerTest.java | 4 ++-- .../DistinguishedNameSerializerTest.java | 4 ++-- .../ExplicitLocatorPathSerializerTest.java | 6 +++--- .../address/InstanceIdSerializerTest.java | 3 +-- .../KeyValueAddressSerializerTest.java | 4 ++-- .../serializer/address/ServicePathTest.java | 4 ++-- .../address/SourceDestKeySerializerTest.java | 4 ++-- mappingservice/pom.xml | 6 ------ mappingservice/southbound/pom.xml | 4 ---- .../lisp/LispSouthboundHandlerTest.java | 13 ++++++------- 19 files changed, 46 insertions(+), 79 deletions(-) diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml index 2db66078f..5da396f04 100644 --- a/commons/parent/pom.xml +++ b/commons/parent/pom.xml @@ -49,11 +49,6 @@ pom import - - junit-addons - junit-addons - 1.4 - org.jmock jmock diff --git a/mappingservice/dsbackend/pom.xml b/mappingservice/dsbackend/pom.xml index 025442ab1..78a424179 100644 --- a/mappingservice/dsbackend/pom.xml +++ b/mappingservice/dsbackend/pom.xml @@ -40,10 +40,6 @@ jakarta.xml.bind-api test - - junit-addons - junit-addons - org.mockito mockito-core diff --git a/mappingservice/implementation/pom.xml b/mappingservice/implementation/pom.xml index 3d19ecad4..71721286d 100644 --- a/mappingservice/implementation/pom.xml +++ b/mappingservice/implementation/pom.xml @@ -47,10 +47,6 @@ ${project.groupId} common.unittest.tools - - junit-addons - junit-addons - org.mockito mockito-core diff --git a/mappingservice/lisp-proto/pom.xml b/mappingservice/lisp-proto/pom.xml index 6b61fe95d..b0d8e2a26 100644 --- a/mappingservice/lisp-proto/pom.xml +++ b/mappingservice/lisp-proto/pom.xml @@ -48,11 +48,5 @@ and is available at http://www.eclipse.org/legal/epl-v10.html ${project.version} test - - junit-addons - junit-addons - 1.4 - test - diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/authentication/LispAuthenticationTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/authentication/LispAuthenticationTest.java index 0cdbd2fa7..7daabcc7b 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/authentication/LispAuthenticationTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/authentication/LispAuthenticationTest.java @@ -7,12 +7,12 @@ */ package org.opendaylight.lispflowmapping.lisp.authentication; +import static org.junit.Assert.assertArrayEquals; 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.MapNotifySerializer; import org.opendaylight.lispflowmapping.lisp.serializer.MapRegisterSerializer; @@ -187,13 +187,13 @@ public class LispAuthenticationTest extends BaseTestCase { new MappingRecordItemBuilder().setMappingRecord(etlrBuilder.build()).setMappingRecordItemId("xyzzy") .build()); final ByteBuffer serializedMapNotifyMsg = MapNotifySerializer.getInstance().serialize(mapNotifyBuilder.build()); - ArrayAssert.assertEquals(new byte[0], LispAuthenticationUtil.createAuthenticationData(serializedMapNotifyMsg, + assertArrayEquals(new byte[0], LispAuthenticationUtil.createAuthenticationData(serializedMapNotifyMsg, "password")); } - private static boolean validate(MapRegister mapRegister, ByteBuffer byteBuffer, Eid eid, Uint16 keyId, String - password) { + private static boolean validate(final MapRegister mapRegister, final ByteBuffer byteBuffer, final Eid eid, + final Uint16 keyId, final String password) { MappingAuthkey key = new MappingAuthkeyBuilder().setKeyType(keyId).setKeyString(password).build(); return LispAuthenticationUtil.validate(mapRegister,byteBuffer, eid, key); } diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapNotifySerializationTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapNotifySerializationTest.java index eb20c9e56..33e62c023 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapNotifySerializationTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/MapNotifySerializationTest.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.MapNotifySerializer; import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException; @@ -61,7 +61,7 @@ public class MapNotifySerializationTest 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()); @@ -93,7 +93,7 @@ public class MapNotifySerializationTest extends BaseTestCase { mnBuilder.setAuthenticationData(authenticationData); MapNotify mn = mnBuilder.build(); - ArrayAssert.assertEquals(MapNotifySerializer.getInstance().serialize(mn).array(), + assertArrayEquals(MapNotifySerializer.getInstance().serialize(mn).array(), MapNotifySerializer.getInstance().serialize(MapNotifySerializer.getInstance() .deserialize(MapNotifySerializer.getInstance().serialize(mn))).array()); @@ -127,7 +127,7 @@ public class MapNotifySerializationTest extends BaseTestCase { assertEquals(0xFFBB000000000000L, mn.getNonce().longValue()); assertEquals(0x0000, mn.getKeyId().shortValue()); byte[] expectedAuthenticationData = {}; - ArrayAssert.assertEquals(expectedAuthenticationData, mn.getAuthenticationData()); + assertArrayEquals(expectedAuthenticationData, mn.getAuthenticationData()); } @Test @@ -396,7 +396,7 @@ public class MapNotifySerializationTest 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, mn.getAuthenticationData()); + assertArrayEquals(expectedAuthenticationData, mn.getAuthenticationData()); } @Test @@ -429,6 +429,6 @@ public class MapNotifySerializationTest 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, mn.getAuthenticationData()); + assertArrayEquals(expectedAuthenticationData, mn.getAuthenticationData()); } } 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 8d5b118b3..bce35e483 100644 --- 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()); } } 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 d0a2bfc64..74799536a 100644 --- 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; @@ -162,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()); diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/AfiListSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/AfiListSerializerTest.java index 677a8f143..ef37d3866 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/AfiListSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/AfiListSerializerTest.java @@ -7,14 +7,14 @@ */ package org.opendaylight.lispflowmapping.serializer.address; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; import com.google.common.collect.ImmutableSet; import java.nio.ByteBuffer; import java.util.Iterator; import java.util.Set; -import junitx.framework.ArrayAssert; -import junitx.framework.Assert; import org.junit.Test; import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer; import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException; @@ -93,7 +93,7 @@ public class AfiListSerializerTest extends BaseTestCase { + "01 00 00 18 " + "00 01 AA BB CC DD " // IPv4 + "00 02 11 22 33 44 11 22 33 44 11 22 33 44 11 22 33 44"); - ArrayAssert.assertEquals(expectedBuf.array(), buf.array()); + assertArrayEquals(expectedBuf.array(), buf.array()); } @Test @@ -112,7 +112,7 @@ public class AfiListSerializerTest extends BaseTestCase { LispAddressSerializer.getInstance().serialize(buf, rb.build()); ByteBuffer expectedBuf = hexToByteBuffer("40 03 00 00 " + "01 00 00 00"); - ArrayAssert.assertEquals(expectedBuf.array(), buf.array()); + assertArrayEquals(expectedBuf.array(), buf.array()); } @Test @@ -132,7 +132,7 @@ public class AfiListSerializerTest extends BaseTestCase { .lisp.address.address.afi.list.AfiList address3 = listBuilder.build(); assertEquals(address1, address2); - Assert.assertNotEquals(address2, address3); - Assert.assertNotEquals(address1, address3); + assertNotEquals(address2, address3); + assertNotEquals(address1, address3); } } diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ApplicationDataSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ApplicationDataSerializerTest.java index c34e5aa96..c22ff7a32 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ApplicationDataSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ApplicationDataSerializerTest.java @@ -7,10 +7,10 @@ */ package org.opendaylight.lispflowmapping.serializer.address; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import java.nio.ByteBuffer; -import junitx.framework.ArrayAssert; import org.junit.Test; import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer; import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException; @@ -113,6 +113,6 @@ public class ApplicationDataSerializerTest extends BaseTestCase { + "A6 A1 A6 A2 " // local port range + "FF DD FF DE " // remote port range + "00 01 11 22 33 44"); // AFI=1, IP=0x11223344 - ArrayAssert.assertEquals(expectedBuf.array(), buf.array()); + assertArrayEquals(expectedBuf.array(), buf.array()); } } diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java index 351093a3c..d8bb2dec7 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/DistinguishedNameSerializerTest.java @@ -7,10 +7,10 @@ */ package org.opendaylight.lispflowmapping.serializer.address; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import java.nio.ByteBuffer; -import junitx.framework.ArrayAssert; import org.junit.Test; import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer; import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException; @@ -94,6 +94,6 @@ public class DistinguishedNameSerializerTest extends BaseTestCase { ByteBuffer buf = ByteBuffer.allocate(LispAddressSerializer.getInstance().getAddressSize(eb.build())); LispAddressSerializer.getInstance().serialize(buf, eb.build()); ByteBuffer expectedBuf = hexToByteBuffer("00 11 64 61 76 69 64 00"); - ArrayAssert.assertEquals(expectedBuf.array(), buf.array()); + assertArrayEquals(expectedBuf.array(), buf.array()); } } 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 fc6f2cbb2..0727c41e9 100644 --- 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; @@ -119,7 +119,7 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase { + "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()); + assertArrayEquals(expectedBuf.array(), buf.array()); } @Test @@ -134,6 +134,6 @@ public class ExplicitLocatorPathSerializerTest extends BaseTestCase { LispAddressSerializer.getInstance().serialize(buf, rb.build()); ByteBuffer expectedBuf = hexToByteBuffer("40 03 00 00 " + "0A 00 00 00"); - ArrayAssert.assertEquals(expectedBuf.array(), buf.array()); + assertArrayEquals(expectedBuf.array(), buf.array()); } } diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java index dfaaa5cee..f910a38ae 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/InstanceIdSerializerTest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import java.nio.ByteBuffer; -import junitx.framework.ArrayAssert; import org.junit.Test; import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer; import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext; @@ -96,6 +95,6 @@ public class InstanceIdSerializerTest extends BaseTestCase { + "02 20 00 0A " + "00 02 03 04 " // instance ID + "00 01 11 22 33 44"); - ArrayAssert.assertEquals(expectedBuf.array(), buf.array()); + assertArrayEquals(expectedBuf.array(), buf.array()); } } diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/KeyValueAddressSerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/KeyValueAddressSerializerTest.java index 05e16ce79..63705aec7 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/KeyValueAddressSerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/KeyValueAddressSerializerTest.java @@ -7,10 +7,10 @@ */ package org.opendaylight.lispflowmapping.serializer.address; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import java.nio.ByteBuffer; -import junitx.framework.ArrayAssert; import org.junit.Test; import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer; import org.opendaylight.lispflowmapping.lisp.serializer.exception.LispSerializationException; @@ -92,6 +92,6 @@ public class KeyValueAddressSerializerTest extends BaseTestCase { + "0F 00 00 0C " + "00 01 11 22 33 44 " // AFI=1, IP=0x11223344 + "00 01 22 33 44 55"); // AFI=1, IP=0x22334455 - ArrayAssert.assertEquals(expectedBuf.array(), buf.array()); + assertArrayEquals(expectedBuf.array(), buf.array()); } } diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java index c10e334cf..6b7ee1817 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/ServicePathTest.java @@ -7,10 +7,10 @@ */ package org.opendaylight.lispflowmapping.serializer.address; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import java.nio.ByteBuffer; -import junitx.framework.ArrayAssert; import org.junit.Test; import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer; import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext; @@ -51,6 +51,6 @@ public class ServicePathTest extends BaseTestCase { ByteBuffer expectedBuf = hexToByteBuffer("40 03 00 00 " + "11 00 00 04 " + "00 00 01 FF"); - ArrayAssert.assertEquals(expectedBuf.array(), buf.array()); + assertArrayEquals(expectedBuf.array(), buf.array()); } } diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/SourceDestKeySerializerTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/SourceDestKeySerializerTest.java index 564bcc8ae..7564dab45 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/SourceDestKeySerializerTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/serializer/address/SourceDestKeySerializerTest.java @@ -7,10 +7,10 @@ */ package org.opendaylight.lispflowmapping.serializer.address; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import java.nio.ByteBuffer; -import junitx.framework.ArrayAssert; import org.junit.Test; import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializer; import org.opendaylight.lispflowmapping.lisp.serializer.address.LispAddressSerializerContext; @@ -104,6 +104,6 @@ public class SourceDestKeySerializerTest extends BaseTestCase { + "00 00 08 10 " // reserved + masks + "00 01 11 22 33 44 " // AFI=1, IP=0x11223344 + "00 01 22 33 44 55"); // AFI=1, IP=0x22334455 - ArrayAssert.assertEquals(expectedBuf.array(), buf.array()); + assertArrayEquals(expectedBuf.array(), buf.array()); } } diff --git a/mappingservice/pom.xml b/mappingservice/pom.xml index 94d9d24a6..593042325 100644 --- a/mappingservice/pom.xml +++ b/mappingservice/pom.xml @@ -55,12 +55,6 @@ ${project.version} test - - junit-addons - junit-addons - 1.4 - test - diff --git a/mappingservice/southbound/pom.xml b/mappingservice/southbound/pom.xml index 6edf0cd67..fad93c529 100644 --- a/mappingservice/southbound/pom.xml +++ b/mappingservice/southbound/pom.xml @@ -60,10 +60,6 @@ netty-transport-native-epoll linux-x86_64 - - junit-addons - junit-addons - org.opendaylight.lispflowmapping common.unittest.tools diff --git a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java index 641acb874..9c66d7312 100644 --- a/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java +++ b/mappingservice/southbound/src/test/java/org/opendaylight/lispflowmapping/southbound/lisp/LispSouthboundHandlerTest.java @@ -9,6 +9,7 @@ package org.opendaylight.lispflowmapping.southbound.lisp; import static io.netty.buffer.Unpooled.wrappedBuffer; +import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -29,7 +30,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; -import junitx.framework.ArrayAssert; import org.apache.commons.lang3.ArrayUtils; import org.junit.Before; import org.junit.BeforeClass; @@ -704,8 +704,7 @@ public class LispSouthboundHandlerTest extends BaseTestCase { Arrays.copyOfRange(mapRegisterPacket, 36, mapRegisterPacket.length)); byte[] notifyWithoutTypeWithOutAuthenticationData = ArrayUtils.addAll(Arrays.copyOfRange(result, 3, 16), Arrays.copyOfRange(result, 36, result.length)); - ArrayAssert.assertEquals(registerWithoutTypeWithoutAuthenticationData, - notifyWithoutTypeWithOutAuthenticationData); + assertArrayEquals(registerWithoutTypeWithoutAuthenticationData, notifyWithoutTypeWithOutAuthenticationData); } @Ignore @@ -859,7 +858,7 @@ public class LispSouthboundHandlerTest extends BaseTestCase { assertEquals(AddressFamily.IpV6.getIntValue(), ByteUtil.getInt(result, MapReplyIpv4SingleLocatorPos.AFI_TYPE)); byte[] expectedIpv6 = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; - ArrayAssert.assertEquals(expectedIpv6, Arrays.copyOfRange(result, 24, 40)); + assertArrayEquals(expectedIpv6, Arrays.copyOfRange(result, 24, 40)); } @Test @@ -876,10 +875,10 @@ public class LispSouthboundHandlerTest extends BaseTestCase { assertEquals(64, result.length); byte[] expectedIpv6Eid = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; - ArrayAssert.assertEquals(expectedIpv6Eid, Arrays.copyOfRange(result, 24, 40)); + assertArrayEquals(expectedIpv6Eid, Arrays.copyOfRange(result, 24, 40)); byte[] expectedIpv6Rloc = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2 }; - ArrayAssert.assertEquals(expectedIpv6Rloc, Arrays.copyOfRange(result, 48, 64)); + assertArrayEquals(expectedIpv6Rloc, Arrays.copyOfRange(result, 48, 64)); } @Ignore @@ -944,7 +943,7 @@ public class LispSouthboundHandlerTest extends BaseTestCase { assertEquals(AddressFamily.IpV6.getIntValue(), ByteUtil.getInt(result, MapReplyIpv4SecondLocatorPos.LOC_AFI)); byte[] expectedIpv6Rloc = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }; - ArrayAssert.assertEquals(expectedIpv6Rloc, Arrays.copyOfRange(result, MapReplyIpv4SecondLocatorPos.LOCATOR, + assertArrayEquals(expectedIpv6Rloc, Arrays.copyOfRange(result, MapReplyIpv4SecondLocatorPos.LOCATOR, MapReplyIpv4SecondLocatorPos.LOCATOR + 16)); assertEquals(0x01, result[MapReplyIpv4SecondLocatorPos.LOCATOR_RBIT] & 0x01); -- 2.36.6