X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=third-party%2Ftriemap%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Ftriemap%2FTestHashCollisions.java;h=a2b6f03c137263b4f1480cda63180788ed9b1b11;hb=5d673fd89ed04fb3a9cdb1539758c499312917f2;hp=31659b531c29ac43440d69cd34ccef5e2b245d8e;hpb=cea1776eb4b541427c1c77a67cb95fa39595c0ac;p=yangtools.git

diff --git a/third-party/triemap/src/test/java/org/opendaylight/yangtools/triemap/TestHashCollisions.java b/third-party/triemap/src/test/java/org/opendaylight/yangtools/triemap/TestHashCollisions.java
index 31659b531c..a2b6f03c13 100644
--- a/third-party/triemap/src/test/java/org/opendaylight/yangtools/triemap/TestHashCollisions.java
+++ b/third-party/triemap/src/test/java/org/opendaylight/yangtools/triemap/TestHashCollisions.java
@@ -15,179 +15,181 @@
  */
 package org.opendaylight.yangtools.triemap;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
 import org.junit.Test;
 
 public class TestHashCollisions {
     @Test
     public void testHashCollisions () {
-        final TrieMap<Object, Object> bt = new TrieMap<> ();
-
-        insertStrings (bt);
-        insertChars (bt);
-        insertInts (bt);
-        insertBytes (bt);
-
-        removeStrings (bt);
-        removeChars (bt);
-        removeInts (bt);
-        removeBytes (bt);
-
-        insertStrings (bt);
-        insertInts (bt);
-        insertBytes (bt);
-        insertChars (bt);
-
-        removeBytes (bt);
-        removeStrings (bt);
-        removeChars (bt);
-        removeInts (bt);
-
-        insertStrings (bt);
-        insertInts (bt);
-        insertBytes (bt);
-        insertChars (bt);
-
-        removeStrings (bt);
-        removeChars (bt);
-        removeInts (bt);
-        removeBytes (bt);
-
-        insertStrings (bt);
-        insertInts (bt);
-        insertBytes (bt);
-        insertChars (bt);
-
-        removeChars (bt);
-        removeInts (bt);
-        removeBytes (bt);
-        removeStrings (bt);
-
-        insertStrings (bt);
-        insertInts (bt);
-        insertBytes (bt);
-        insertChars (bt);
-
-        removeInts (bt);
-        removeBytes (bt);
-        removeStrings (bt);
-        removeChars (bt);
-
-        System.out.println (bt);
+        final TrieMap<Object, Object> bt = new TrieMap<>();
+
+        insertStrings(bt);
+        insertChars(bt);
+        insertInts(bt);
+        insertBytes(bt);
+
+        removeStrings(bt);
+        removeChars(bt);
+        removeInts(bt);
+        removeBytes(bt);
+
+        insertStrings(bt);
+        insertInts(bt);
+        insertBytes(bt);
+        insertChars(bt);
+
+        removeBytes(bt);
+        removeStrings(bt);
+        removeChars(bt);
+        removeInts(bt);
+
+        insertStrings(bt);
+        insertInts(bt);
+        insertBytes(bt);
+        insertChars(bt);
+
+        removeStrings(bt);
+        removeChars(bt);
+        removeInts(bt);
+        removeBytes(bt);
+
+        insertStrings(bt);
+        insertInts(bt);
+        insertBytes(bt);
+        insertChars(bt);
+
+        removeChars(bt);
+        removeInts(bt);
+        removeBytes(bt);
+        removeStrings(bt);
+
+        insertStrings(bt);
+        insertInts(bt);
+        insertBytes(bt);
+        insertChars(bt);
+
+        removeInts(bt);
+        removeBytes(bt);
+        removeStrings(bt);
+        removeChars(bt);
     }
 
     private static void insertChars (final TrieMap<Object, Object> bt) {
-        TestHelper.assertEquals (null, bt.put ('a', 'a'));
-        TestHelper.assertEquals (null, bt.put ('b', 'b'));
-        TestHelper.assertEquals (null, bt.put ('c', 'c'));
-        TestHelper.assertEquals (null, bt.put ('d', 'd'));
-        TestHelper.assertEquals (null, bt.put ('e', 'e'));
-
-        TestHelper.assertEquals ('a', bt.put ('a', 'a'));
-        TestHelper.assertEquals ('b', bt.put ('b', 'b'));
-        TestHelper.assertEquals ('c', bt.put ('c', 'c'));
-        TestHelper.assertEquals ('d', bt.put ('d', 'd'));
-        TestHelper.assertEquals ('e', bt.put ('e', 'e'));
+        assertNull(bt.put('a', 'a'));
+        assertNull(bt.put('b', 'b'));
+        assertNull(bt.put('c', 'c'));
+        assertNull(bt.put('d', 'd'));
+        assertNull(bt.put('e', 'e'));
+
+        assertEquals('a', bt.put('a', 'a'));
+        assertEquals('b', bt.put('b', 'b'));
+        assertEquals('c', bt.put('c', 'c'));
+        assertEquals('d', bt.put('d', 'd'));
+        assertEquals('e', bt.put('e', 'e'));
     }
 
     private static void insertStrings (final TrieMap<Object, Object> bt) {
-        TestHelper.assertEquals (null, bt.put ("a", "a"));
-        TestHelper.assertEquals (null, bt.put ("b", "b"));
-        TestHelper.assertEquals (null, bt.put ("c", "c"));
-        TestHelper.assertEquals (null, bt.put ("d", "d"));
-        TestHelper.assertEquals (null, bt.put ("e", "e"));
-
-        TestHelper.assertEquals ("a", bt.put ("a", "a"));
-        TestHelper.assertEquals ("b", bt.put ("b", "b"));
-        TestHelper.assertEquals ("c", bt.put ("c", "c"));
-        TestHelper.assertEquals ("d", bt.put ("d", "d"));
-        TestHelper.assertEquals ("e", bt.put ("e", "e"));
+        assertNull(bt.put("a", "a"));
+        assertNull(bt.put("b", "b"));
+        assertNull(bt.put("c", "c"));
+        assertNull(bt.put("d", "d"));
+        assertNull(bt.put("e", "e"));
+
+        assertEquals("a", bt.put("a", "a"));
+        assertEquals("b", bt.put("b", "b"));
+        assertEquals("c", bt.put("c", "c"));
+        assertEquals("d", bt.put("d", "d"));
+        assertEquals("e", bt.put("e", "e"));
     }
 
     private static void insertBytes (final TrieMap<Object, Object> bt) {
         for (byte i = 0; i < 128 && i >= 0; i++) {
-            final Byte bigB = Byte.valueOf (i);
-            TestHelper.assertEquals (null, bt.put (bigB, bigB));
-            TestHelper.assertEquals (bigB, bt.put (bigB, bigB));
+            final Byte bigB = Byte.valueOf(i);
+            assertNull(bt.put(bigB, bigB));
+            assertEquals(bigB, bt.put(bigB, bigB));
         }
     }
 
     private static void insertInts (final TrieMap<Object, Object> bt) {
         for (int i = 0; i < 128; i++) {
-            final Integer bigI = Integer.valueOf (i);
-            TestHelper.assertEquals (null, bt.put (bigI, bigI));
-            TestHelper.assertEquals (bigI, bt.put (bigI, bigI));
+            final Integer bigI = Integer.valueOf(i);
+            assertNull(bt.put(bigI, bigI));
+            assertEquals(bigI, bt.put(bigI, bigI));
         }
     }
 
     private static void removeChars (final TrieMap<Object, Object> bt) {
-        TestHelper.assertTrue (null != bt.lookup ('a'));
-        TestHelper.assertTrue (null != bt.lookup ('b'));
-        TestHelper.assertTrue (null != bt.lookup ('c'));
-        TestHelper.assertTrue (null != bt.lookup ('d'));
-        TestHelper.assertTrue (null != bt.lookup ('e'));
-
-        TestHelper.assertTrue (null != bt.remove ('a'));
-        TestHelper.assertTrue (null != bt.remove ('b'));
-        TestHelper.assertTrue (null != bt.remove ('c'));
-        TestHelper.assertTrue (null != bt.remove ('d'));
-        TestHelper.assertTrue (null != bt.remove ('e'));
-
-        TestHelper.assertFalse (null != bt.remove ('a'));
-        TestHelper.assertFalse (null != bt.remove ('b'));
-        TestHelper.assertFalse (null != bt.remove ('c'));
-        TestHelper.assertFalse (null != bt.remove ('d'));
-        TestHelper.assertFalse (null != bt.remove ('e'));
-
-        TestHelper.assertTrue (null == bt.lookup ('a'));
-        TestHelper.assertTrue (null == bt.lookup ('b'));
-        TestHelper.assertTrue (null == bt.lookup ('c'));
-        TestHelper.assertTrue (null == bt.lookup ('d'));
-        TestHelper.assertTrue (null == bt.lookup ('e'));
+        assertNotNull(bt.lookup('a'));
+        assertNotNull(bt.lookup('b'));
+        assertNotNull(bt.lookup('c'));
+        assertNotNull(bt.lookup('d'));
+        assertNotNull(bt.lookup('e'));
+
+        assertNotNull(bt.remove('a'));
+        assertNotNull(bt.remove('b'));
+        assertNotNull(bt.remove('c'));
+        assertNotNull(bt.remove('d'));
+        assertNotNull(bt.remove('e'));
+
+        assertNull(bt.remove('a'));
+        assertNull(bt.remove('b'));
+        assertNull(bt.remove('c'));
+        assertNull(bt.remove('d'));
+        assertNull(bt.remove('e'));
+
+        assertNull(bt.lookup('a'));
+        assertNull(bt.lookup('b'));
+        assertNull(bt.lookup('c'));
+        assertNull(bt.lookup('d'));
+        assertNull(bt.lookup('e'));
     }
 
     private static void removeStrings (final TrieMap<Object, Object> bt) {
-        TestHelper.assertTrue (null != bt.lookup ("a"));
-        TestHelper.assertTrue (null != bt.lookup ("b"));
-        TestHelper.assertTrue (null != bt.lookup ("c"));
-        TestHelper.assertTrue (null != bt.lookup ("d"));
-        TestHelper.assertTrue (null != bt.lookup ("e"));
-
-        TestHelper.assertTrue (null != bt.remove ("a"));
-        TestHelper.assertTrue (null != bt.remove ("b"));
-        TestHelper.assertTrue (null != bt.remove ("c"));
-        TestHelper.assertTrue (null != bt.remove ("d"));
-        TestHelper.assertTrue (null != bt.remove ("e"));
-
-        TestHelper.assertFalse (null != bt.remove ("a"));
-        TestHelper.assertFalse (null != bt.remove ("b"));
-        TestHelper.assertFalse (null != bt.remove ("c"));
-        TestHelper.assertFalse (null != bt.remove ("d"));
-        TestHelper.assertFalse (null != bt.remove ("e"));
-
-        TestHelper.assertTrue (null == bt.lookup ("a"));
-        TestHelper.assertTrue (null == bt.lookup ("b"));
-        TestHelper.assertTrue (null == bt.lookup ("c"));
-        TestHelper.assertTrue (null == bt.lookup ("d"));
-        TestHelper.assertTrue (null == bt.lookup ("e"));
+        assertNotNull(bt.lookup("a"));
+        assertNotNull(bt.lookup("b"));
+        assertNotNull(bt.lookup("c"));
+        assertNotNull(bt.lookup("d"));
+        assertNotNull(bt.lookup("e"));
+
+        assertNotNull(bt.remove("a"));
+        assertNotNull(bt.remove("b"));
+        assertNotNull(bt.remove("c"));
+        assertNotNull(bt.remove("d"));
+        assertNotNull(bt.remove("e"));
+
+        assertNull(bt.remove("a"));
+        assertNull(bt.remove("b"));
+        assertNull(bt.remove("c"));
+        assertNull(bt.remove("d"));
+        assertNull(bt.remove("e"));
+
+        assertNull(bt.lookup("a"));
+        assertNull(bt.lookup("b"));
+        assertNull(bt.lookup("c"));
+        assertNull(bt.lookup("d"));
+        assertNull(bt.lookup("e"));
     }
 
     private static void removeInts (final TrieMap<Object, Object> bt) {
         for (int i = 0; i < 128; i++) {
             final Integer bigI = Integer.valueOf (i);
-            TestHelper.assertTrue (null != bt.lookup (bigI));
-            TestHelper.assertTrue (null != bt.remove (bigI));
-            TestHelper.assertFalse (null != bt.remove (bigI));
-            TestHelper.assertTrue (null == bt.lookup (bigI));
+            assertNotNull(bt.lookup(bigI));
+            assertNotNull(bt.remove(bigI));
+            assertNull(bt.remove(bigI));
+            assertNull(bt.lookup(bigI));
         }
     }
 
     private static void removeBytes (final TrieMap<Object, Object> bt) {
         for (byte i = 0; i < 128 && i >= 0; i++) {
             final Byte bigB = Byte.valueOf (i);
-            TestHelper.assertTrue (null != bt.lookup (bigB));
-            TestHelper.assertTrue (null != bt.remove (bigB));
-            TestHelper.assertFalse (null != bt.remove (bigB));
-            TestHelper.assertTrue (null == bt.lookup (bigB));
+            assertNotNull(bt.lookup(bigB));
+            assertNotNull(bt.remove(bigB));
+            assertNull(bt.remove(bigB));
+            assertNull(bt.lookup(bigB));
         }
     }
 }