Concepts cleanup.

Change-Id: I7ecc2989c14d26c47a8b0add293cd678871ef6fe
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/IPAddressesAndPrefixesTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/IPAddressesAndPrefixesTest.java
index 7c36feeb69f345fb741f635e80da25061296e88c..e46eb5d006ef631c753c1b4cb7013063c04c7cbe 100644 (file)
--- a/concepts/src/test/java/org/opendaylight/protocol/concepts/IPAddressesAndPrefixesTest.java
+++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/IPAddressesAndPrefixesTest.java
@@ -104,12 +104,10 @@ public class IPAddressesAndPrefixesTest {
 
        @Test
        public void testPrefixList6ForBytes() {
-               final List<Ipv6Prefix> prefs = Lists.newArrayList();
-               prefs.add(new Ipv6Prefix("2001:db8:1:2::/64"));
-               prefs.add(new Ipv6Prefix("2001:db8:1:1::/64"));
-               prefs.add(new Ipv6Prefix("2001:db8:1::/64"));
+               final byte[] bytes = new byte[] { 0x40, 0x20, 0x01, 0x0d, (byte) 0xb8, 0x00, 0x01, 0x00, 0x02, 0x40, 0x20, 0x01, 0x0d, (byte) 0xb8, 0x00, 0x01, 0x00, 0x01,};
+               final List<Ipv6Prefix> prefs = Ipv6Util.prefixListForBytes(bytes);
                assertEquals(prefs,
-                               Lists.newArrayList(new Ipv6Prefix("2001:db8:1:2::/64"), new Ipv6Prefix("2001:db8:1:1::/64"), new Ipv6Prefix("2001:db8:1::/64")));
+                               Lists.newArrayList(new Ipv6Prefix("2001:db8:1:2::/64"), new Ipv6Prefix("2001:db8:1:1::/64")));
        }
 
        @Test

diff --git a/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java b/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java
index f6c87a10f2fc416dc245e141ec1c6606f032d9fa..8f250f6a75c22980f47bb2fa4a0ff784f881b3e2 100644 (file)
--- a/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java
+++ b/concepts/src/test/java/org/opendaylight/protocol/concepts/MultiRegistryTest.java
@@ -8,6 +8,7 @@
 package org.opendaylight.protocol.concepts;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import org.junit.Test;
 
@@ -20,7 +21,7 @@ public class MultiRegistryTest {
                String second = "second";
                String third = "third";
 
-               registry.register(first, 1);
+               AbstractRegistration a = registry.register(first, 1);
                registry.register(second, 2);
                registry.register(third, 3);
 
@@ -35,6 +36,9 @@ public class MultiRegistryTest {
                registry.register(Character.valueOf('c'), 5);
 
                assertEquals(Integer.valueOf(5), registry.get('c'));
-       }
 
+               a.close();
+
+               assertNull(registry.get("first"));
+       }
 }