BUG-7464: remove TestHelper

[yangtools.git] / third-party / triemap / src / test / java / org / opendaylight / yangtools / triemap / TestHashCollisionsRemoveIterator.java

diff --git a/third-party/triemap/src/test/java/org/opendaylight/yangtools/triemap/TestHashCollisionsRemoveIterator.java b/third-party/triemap/src/test/java/org/opendaylight/yangtools/triemap/TestHashCollisionsRemoveIterator.java
index bad975c4cd6b1b90abbc961c75fff1e208ea7728..a58d3ba350c684ae81340d7f6ae85a7a3c167dfd 100644 (file)
--- a/third-party/triemap/src/test/java/org/opendaylight/yangtools/triemap/TestHashCollisionsRemoveIterator.java
+++ b/third-party/triemap/src/test/java/org/opendaylight/yangtools/triemap/TestHashCollisionsRemoveIterator.java
@@ -15,6 +15,9 @@
  */
 package org.opendaylight.yangtools.triemap;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -23,23 +26,24 @@ import java.util.Map.Entry;
 import org.junit.Test;
 
 public class TestHashCollisionsRemoveIterator {
+    private static final int COUNT = 50000;
+
     @Test
     public void testHashCollisionsRemoveIterator () {
-        final Map<Object, Object> bt = new TrieMap<> ();
-        int count = 50000;
-        for (int j = 0; j < count; j++) {
-            bt.put (Integer.valueOf (j), Integer.valueOf (j));
+        final Map<Object, Object> bt = new TrieMap<>();
+        for (int j = 0; j < COUNT; j++) {
+            bt.put(Integer.valueOf(j), Integer.valueOf(j));
         }
 
-        final Collection<Object> list = new ArrayList <> ();
-        for (final Iterator<Map.Entry<Object, Object>> i = bt.entrySet ().iterator (); i.hasNext ();) {
-            final Entry<Object, Object> e = i.next ();
-            final Object key = e.getKey ();
-            list.add (key);
-            i.remove ();
+        final Collection<Object> list = new ArrayList<>(COUNT);
+        final Iterator<Entry<Object, Object>> it = bt.entrySet().iterator();
+        while (it.hasNext()) {
+            list.add(it.next().getKey());
+            it.remove();
         }
 
-        TestHelper.assertEquals (0, bt.size ());
-        TestHelper.assertTrue (bt.isEmpty ());
+        assertEquals(0, bt.size());
+        assertTrue(bt.isEmpty());
+        assertEquals(COUNT, list.size());
     }
 }