--- jsr166/src/test/tck/PriorityBlockingQueueTest.java	2014/12/31 20:17:39	1.57
+++ jsr166/src/test/tck/PriorityBlockingQueueTest.java	2015/01/17 22:55:06	1.58
@@ -576,13 +576,19 @@ public class PriorityBlockingQueueTest e
      */
     public void testIterator() {
         PriorityBlockingQueue q = populatedQueue(SIZE);
-        int i = 0;
         Iterator it = q.iterator();
-        while (it.hasNext()) {
+        int i;
+        for (i = 0; it.hasNext(); i++)
             assertTrue(q.contains(it.next()));
-            ++i;
-        }
         assertEquals(i, SIZE);
+        assertIteratorExhausted(it);
+    }
+
+    /**
+     * iterator of empty collection has no elements
+     */
+    public void testEmptyIterator() {
+        assertIteratorExhausted(new PriorityBlockingQueue().iterator());
     }
 
     /**