--- jsr166/src/test/tck/ConcurrentHashMap8Test.java	2014/12/31 19:05:42	1.18
+++ jsr166/src/test/tck/ConcurrentHashMap8Test.java	2015/01/17 22:55:06	1.22
@@ -180,12 +180,12 @@ public class ConcurrentHashMap8Test exte
         return a;
     }
 
-    /*
+    /**
      * replaceAll replaces all matching values.
      */
     public void testReplaceAll() {
         ConcurrentHashMap<Integer, String> map = map5();
-        map.replaceAll((x, y) -> {return x > 3 ? "Z" : y;});
+        map.replaceAll((x, y) -> { return x > 3 ? "Z" : y; });
         assertEquals("A", map.get(one));
         assertEquals("B", map.get(two));
         assertEquals("C", map.get(three));
@@ -223,7 +223,6 @@ public class ConcurrentHashMap8Test exte
         assertFalse(set2.contains(six));
     }
 
-
     /**
      * keySet.addAll adds each element from the given collection
      */
@@ -420,11 +419,17 @@ public class ConcurrentHashMap8Test exte
             assertTrue(it.hasNext());
             it.next();
         }
-        assertFalse(it.hasNext());
-        try {
-            it.next();
-            shouldThrow();
-        } catch (NoSuchElementException success) {}
+        assertIteratorExhausted(it);
+    }
+
+    /**
+     * iterator of empty collections has no elements
+     */
+    public void testEmptyIterator() {
+        assertIteratorExhausted(ConcurrentHashMap.newKeySet().iterator());
+        assertIteratorExhausted(new ConcurrentHashMap().entrySet().iterator());
+        assertIteratorExhausted(new ConcurrentHashMap().values().iterator());
+        assertIteratorExhausted(new ConcurrentHashMap().keySet().iterator());
     }
 
     /**
@@ -1003,9 +1008,11 @@ public class ConcurrentHashMap8Test exte
     public void testSearchValuesSequentially() {
         ConcurrentHashMap<Long, Long> m = longMap();
         Long r;
-        r = m.searchValues(Long.MAX_VALUE, (Long x) -> x.longValue() == (long)(SIZE/2)? x : null);
+        r = m.searchValues(Long.MAX_VALUE,
+            (Long x) -> (x.longValue() == (long)(SIZE/2)) ? x : null);
         assertEquals((long)r, (long)(SIZE/2));
-        r = m.searchValues(Long.MAX_VALUE, (Long x) -> x.longValue() < 0L ? x : null);
+        r = m.searchValues(Long.MAX_VALUE,
+            (Long x) -> (x.longValue() < 0L) ? x : null);
         assertNull(r);
     }