--- jsr166/src/test/tck/ArrayDequeTest.java 2005/09/14 23:50:31 1.2 +++ jsr166/src/test/tck/ArrayDequeTest.java 2005/09/15 16:55:48 1.3 @@ -528,16 +528,21 @@ public class ArrayDequeTest extends JSR1 */ public void testIteratorRemove () { final ArrayDeque q = new ArrayDeque(); - q.add(new Integer(1)); - q.add(new Integer(2)); - q.add(new Integer(3)); - Iterator it = q.iterator(); - it.next(); - it.remove(); - it = q.iterator(); - assertEquals(it.next(), new Integer(2)); - assertEquals(it.next(), new Integer(3)); - assertFalse(it.hasNext()); + for (int iters = 0; iters < 100; ++iters) { + q.add(new Integer(1)); + q.add(new Integer(2)); + q.add(new Integer(3)); + Iterator it = q.iterator(); + assertEquals(it.next(), new Integer(1)); + it.remove(); + assertEquals(it.next(), new Integer(2)); + it = q.iterator(); + assertEquals(it.next(), new Integer(2)); + assertEquals(it.next(), new Integer(3)); + it.remove(); + assertFalse(it.hasNext()); + q.remove(); + } } /** @@ -564,16 +569,21 @@ public class ArrayDequeTest extends JSR1 */ public void testDescendingIteratorOrdering() { final ArrayDeque q = new ArrayDeque(); - q.add(new Integer(3)); - q.add(new Integer(2)); - q.add(new Integer(1)); - int k = 0; - for (Iterator it = q.descendingIterator(); it.hasNext();) { - int i = ((Integer)(it.next())).intValue(); - assertEquals(++k, i); + for (int iters = 0; iters < 100; ++iters) { + q.add(new Integer(3)); + q.add(new Integer(2)); + q.add(new Integer(1)); + int k = 0; + for (Iterator it = q.descendingIterator(); it.hasNext();) { + int i = ((Integer)(it.next())).intValue(); + assertEquals(++k, i); + } + + assertEquals(3, k); + q.remove(); + q.remove(); + q.remove(); } - - assertEquals(3, k); } /** @@ -581,16 +591,21 @@ public class ArrayDequeTest extends JSR1 */ public void testDescendingIteratorRemove () { final ArrayDeque q = new ArrayDeque(); - q.add(new Integer(3)); - q.add(new Integer(2)); - q.add(new Integer(1)); - Iterator it = q.descendingIterator(); - it.next(); - it.remove(); - it = q.descendingIterator(); - assertEquals(it.next(), new Integer(2)); - assertEquals(it.next(), new Integer(3)); - assertFalse(it.hasNext()); + for (int iters = 0; iters < 100; ++iters) { + q.add(new Integer(3)); + q.add(new Integer(2)); + q.add(new Integer(1)); + Iterator it = q.descendingIterator(); + assertEquals(it.next(), new Integer(1)); + it.remove(); + assertEquals(it.next(), new Integer(2)); + it = q.descendingIterator(); + assertEquals(it.next(), new Integer(2)); + assertEquals(it.next(), new Integer(3)); + it.remove(); + assertFalse(it.hasNext()); + q.remove(); + } }