--- jsr166/src/test/tck/ConcurrentHashMap8Test.java	2015/02/27 21:03:10	1.24
+++ jsr166/src/test/tck/ConcurrentHashMap8Test.java	2016/08/24 22:22:39	1.31
@@ -11,7 +11,6 @@ import static java.util.Spliterator.NONN
 import java.util.AbstractMap;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -26,7 +25,7 @@ import junit.framework.TestSuite;
 
 public class ConcurrentHashMap8Test extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(ConcurrentHashMap8Test.class);
@@ -163,7 +162,7 @@ public class ConcurrentHashMap8Test exte
         Set<Integer> a = ConcurrentHashMap.<Integer>newKeySet();
         assertTrue(a.isEmpty());
         for (int i = 0; i < n; i++)
-            a.add(i);
+            assertTrue(a.add(i));
         assertEquals(n == 0, a.isEmpty());
         assertEquals(n, a.size());
         return a;
@@ -173,7 +172,7 @@ public class ConcurrentHashMap8Test exte
         Set<Integer> a = ConcurrentHashMap.<Integer>newKeySet();
         assertTrue(a.isEmpty());
         for (int i = 0; i < elements.length; i++)
-            a.add(elements[i]);
+            assertTrue(a.add(elements[i]));
         assertFalse(a.isEmpty());
         assertEquals(elements.length, a.size());
         return a;
@@ -275,7 +274,7 @@ public class ConcurrentHashMap8Test exte
         try {
             full.add(three);
             shouldThrow();
-        } catch (UnsupportedOperationException e){}
+        } catch (UnsupportedOperationException success) {}
     }
 
     /**
@@ -287,7 +286,7 @@ public class ConcurrentHashMap8Test exte
         try {
             full.add(null);
             shouldThrow();
-        } catch (NullPointerException e){}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -299,11 +298,11 @@ public class ConcurrentHashMap8Test exte
         try {
             map.keySet(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
         ConcurrentHashMap.KeySetView set = map.keySet(one);
-        set.add(one);
-        set.add(six);
-        set.add(seven);
+        assertFalse(set.add(one));
+        assertTrue(set.add(six));
+        assertTrue(set.add(seven));
         assertTrue(set.getMappedValue() == one);
         assertTrue(map.get(one) != one);
         assertTrue(map.get(six) == one);
@@ -406,7 +405,7 @@ public class ConcurrentHashMap8Test exte
         Integer[] elements = new Integer[size];
         for (int i = 0; i < size; i++)
             elements[i] = i;
-        Collections.shuffle(Arrays.asList(elements));
+        shuffle(elements);
         Collection<Integer> full = populatedSet(elements);
 
         Iterator it = full.iterator();
@@ -496,7 +495,7 @@ public class ConcurrentHashMap8Test exte
         Integer[] elements = new Integer[size];
         for (int i = 0; i < size; i++)
             elements[i] = i;
-        Collections.shuffle(Arrays.asList(elements));
+        shuffle(elements);
         Collection<Integer> full = populatedSet(elements);
 
         assertTrue(Arrays.asList(elements).containsAll(Arrays.asList(full.toArray())));
@@ -516,7 +515,7 @@ public class ConcurrentHashMap8Test exte
         a = new Integer[0];
         assertSame(a, empty.toArray(a));
 
-        a = new Integer[size/2];
+        a = new Integer[size / 2];
         Arrays.fill(a, 42);
         assertSame(a, empty.toArray(a));
         assertNull(a[0]);
@@ -526,7 +525,7 @@ public class ConcurrentHashMap8Test exte
         Integer[] elements = new Integer[size];
         for (int i = 0; i < size; i++)
             elements[i] = i;
-        Collections.shuffle(Arrays.asList(elements));
+        shuffle(elements);
         Collection<Integer> full = populatedSet(elements);
 
         Arrays.fill(a, 42);