--- jsr166/src/test/tck/ConcurrentHashMap8Test.java	2015/02/27 21:03:10	1.24
+++ jsr166/src/test/tck/ConcurrentHashMap8Test.java	2015/05/24 01:23:17	1.29
@@ -26,7 +26,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 +163,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 +173,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 +275,7 @@ public class ConcurrentHashMap8Test exte
         try {
             full.add(three);
             shouldThrow();
-        } catch (UnsupportedOperationException e){}
+        } catch (UnsupportedOperationException success) {}
     }
 
     /**
@@ -287,7 +287,7 @@ public class ConcurrentHashMap8Test exte
         try {
             full.add(null);
             shouldThrow();
-        } catch (NullPointerException e){}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -299,11 +299,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);
@@ -516,7 +516,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]);