--- jsr166/src/test/tck/ArrayDequeTest.java	2005/09/15 16:55:48	1.3
+++ jsr166/src/test/tck/ArrayDequeTest.java	2009/11/02 20:28:31	1.5
@@ -10,7 +10,7 @@ import java.util.concurrent.*;
 
 public class ArrayDequeTest extends JSR166TestCase {
     public static void main(String[] args) {
-	junit.textui.TestRunner.run (suite());	
+	junit.textui.TestRunner.run (suite());
     }
 
     public static Test suite() {
@@ -30,7 +30,7 @@ public class ArrayDequeTest extends JSR1
 	assertEquals(n, q.size());
         return q;
     }
- 
+
     /**
      * new queue is empty
      */
@@ -102,7 +102,7 @@ public class ArrayDequeTest extends JSR1
             ArrayDeque q = new ArrayDeque(1);
             q.push(null);
             shouldThrow();
-        } catch (NullPointerException success) { }   
+        } catch (NullPointerException success) { }
     }
 
     /**
@@ -113,7 +113,7 @@ public class ArrayDequeTest extends JSR1
         q.pollLast();
 	q.push(four);
 	assertEquals(four,q.peekFirst());
-    }	
+    }
 
     /**
      *  pop removes next element, or throws NSEE if empty
@@ -127,7 +127,7 @@ public class ArrayDequeTest extends JSR1
             q.pop();
             shouldThrow();
         } catch (NoSuchElementException success){
-	}   
+	}
     }
 
     /**
@@ -138,12 +138,12 @@ public class ArrayDequeTest extends JSR1
             ArrayDeque q = new ArrayDeque();
             q.offerFirst(null);
             shouldThrow();
-        } catch (NullPointerException success) { 
-        }   
+        } catch (NullPointerException success) {
+        }
     }
 
     /**
-     * OfferFirst succeeds 
+     * OfferFirst succeeds
      */
     public void testOfferFirst() {
         ArrayDeque q = new ArrayDeque();
@@ -152,7 +152,7 @@ public class ArrayDequeTest extends JSR1
     }
 
     /**
-     * OfferLast succeeds 
+     * OfferLast succeeds
      */
     public void testOfferLast() {
         ArrayDeque q = new ArrayDeque();
@@ -246,7 +246,7 @@ public class ArrayDequeTest extends JSR1
             q.remove();
             shouldThrow();
         } catch (NoSuchElementException success){
-	}   
+	}
     }
 
     /**
@@ -337,7 +337,7 @@ public class ArrayDequeTest extends JSR1
             q.removeFirst();
             shouldThrow();
         } catch (NoSuchElementException success){
-	}   
+	}
     }
 
     /**
@@ -491,7 +491,7 @@ public class ArrayDequeTest extends JSR1
 	    shouldThrow();
 	} catch(ArrayStoreException  success){}
     }
-    
+
     /**
      *  iterator iterates through all elements
      */
@@ -528,20 +528,26 @@ public class ArrayDequeTest extends JSR1
      */
     public void testIteratorRemove () {
         final ArrayDeque q = new ArrayDeque();
+        final Random rng = new Random();
         for (int iters = 0; iters < 100; ++iters) {
-            q.add(new Integer(1));
-            q.add(new Integer(2));
-            q.add(new Integer(3));
+            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();
-            assertEquals(it.next(), new Integer(1));
+            for (int j = 1; j <= split; ++j)
+                assertEquals(it.next(), new Integer(j));
             it.remove();
-            assertEquals(it.next(), new Integer(2));
+            assertEquals(it.next(), new Integer(split+1));
+            for (int j = 1; j <= split; ++j)
+                q.remove(new Integer(j));
             it = q.iterator();
-            assertEquals(it.next(), new Integer(2));
-            assertEquals(it.next(), new Integer(3));
-            it.remove();
+            for (int j = split+1; j <= max; ++j) {
+                assertEquals(it.next(), new Integer(j));
+                it.remove();
+            }
             assertFalse(it.hasNext());
-            q.remove();
+            assertTrue(q.isEmpty());
         }
     }
 
@@ -578,7 +584,7 @@ public class ArrayDequeTest extends JSR1
                 int i = ((Integer)(it.next())).intValue();
                 assertEquals(++k, i);
             }
-            
+
             assertEquals(3, k);
             q.remove();
             q.remove();
@@ -591,20 +597,26 @@ public class ArrayDequeTest extends JSR1
      */
     public void testDescendingIteratorRemove () {
         final ArrayDeque q = new ArrayDeque();
+        final Random rng = new Random();
         for (int iters = 0; iters < 100; ++iters) {
-            q.add(new Integer(3));
-            q.add(new Integer(2));
-            q.add(new Integer(1));
+            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();
-            assertEquals(it.next(), new Integer(1));
+            for (int j = 1; j <= split; ++j)
+                assertEquals(it.next(), new Integer(j));
             it.remove();
-            assertEquals(it.next(), new Integer(2));
+            assertEquals(it.next(), new Integer(split+1));
+            for (int j = 1; j <= split; ++j)
+                q.remove(new Integer(j));
             it = q.descendingIterator();
-            assertEquals(it.next(), new Integer(2));
-            assertEquals(it.next(), new Integer(3));
-            it.remove();
+            for (int j = split+1; j <= max; ++j) {
+                assertEquals(it.next(), new Integer(j));
+                it.remove();
+            }
             assertFalse(it.hasNext());
-            q.remove();
+            assertTrue(q.isEmpty());
         }
     }
 
@@ -618,7 +630,7 @@ public class ArrayDequeTest extends JSR1
         for (int i = 0; i < SIZE; ++i) {
             assertTrue(s.indexOf(String.valueOf(i)) >= 0);
         }
-    }        
+    }
 
     /**
      * peekFirst returns element inserted with addFirst
@@ -627,7 +639,7 @@ public class ArrayDequeTest extends JSR1
         ArrayDeque q = populatedDeque(3);
 	q.addFirst(four);
 	assertEquals(four,q.peekFirst());
-    }	
+    }
 
     /**
      * peekLast returns element inserted with addLast
@@ -636,6 +648,6 @@ public class ArrayDequeTest extends JSR1
         ArrayDeque q = populatedDeque(3);
 	q.addLast(four);
 	assertEquals(four,q.peekLast());
-    }	
+    }
 
 }