--- jsr166/src/test/tck/ArrayDequeTest.java 2014/12/31 20:09:08 1.31 +++ jsr166/src/test/tck/ArrayDequeTest.java 2015/01/17 22:55:06 1.32 @@ -742,13 +742,21 @@ public class ArrayDequeTest extends JSR1 */ public void testIterator() { ArrayDeque q = populatedDeque(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() { + Deque c = new ArrayDeque(); + assertIteratorExhausted(c.iterator()); + assertIteratorExhausted(c.descendingIterator()); } /**