--- jsr166/src/test/tck/ConcurrentHashMap8Test.java	2015/01/15 18:34:19	1.21
+++ jsr166/src/test/tck/ConcurrentHashMap8Test.java	2015/01/17 22:55:06	1.22
@@ -419,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());
     }
 
     /**