--- jsr166/src/test/tck/ArrayDequeTest.java	2005/09/14 23:50:31	1.2
+++ jsr166/src/test/tck/ArrayDequeTest.java	2005/09/17 12:50:49	1.4
@@ -528,16 +528,27 @@ 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());
+        final Random rng = new Random();
+        for (int iters = 0; iters < 100; ++iters) {
+            int max = rng.nextInt(5) + 2;
+            int split = rng.nextInt(max-1) + 1;
+            for (int j = 1; j <= max; ++j)
+                q.add(new Integer(j));
+            Iterator it = q.iterator();
+            for (int j = 1; j <= split; ++j) 
+                assertEquals(it.next(), new Integer(j));
+            it.remove();
+            assertEquals(it.next(), new Integer(split+1));
+            for (int j = 1; j <= split; ++j) 
+                q.remove(new Integer(j));
+            it = q.iterator();
+            for (int j = split+1; j <= max; ++j) {
+                assertEquals(it.next(), new Integer(j));
+                it.remove();
+            }
+            assertFalse(it.hasNext());
+            assertTrue(q.isEmpty());
+        }
     }
 
     /**
@@ -564,16 +575,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 +597,27 @@ 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());
+        final Random rng = new Random();
+        for (int iters = 0; iters < 100; ++iters) {
+            int max = rng.nextInt(5) + 2;
+            int split = rng.nextInt(max-1) + 1;
+            for (int j = max; j >= 1; --j)
+                q.add(new Integer(j));
+            Iterator it = q.descendingIterator();
+            for (int j = 1; j <= split; ++j) 
+                assertEquals(it.next(), new Integer(j));
+            it.remove();
+            assertEquals(it.next(), new Integer(split+1));
+            for (int j = 1; j <= split; ++j) 
+                q.remove(new Integer(j));
+            it = q.descendingIterator();
+            for (int j = split+1; j <= max; ++j) {
+                assertEquals(it.next(), new Integer(j));
+                it.remove();
+            }
+            assertFalse(it.hasNext());
+            assertTrue(q.isEmpty());
+        }
     }