--- jsr166/src/test/tck/ArrayDequeTest.java	2010/11/03 16:46:34	1.18
+++ jsr166/src/test/tck/ArrayDequeTest.java	2010/11/18 20:21:53	1.21
@@ -26,8 +26,8 @@ public class ArrayDequeTest extends JSR1
      * Create a deque of given size containing consecutive
      * Integers 0 ... n.
      */
-    private ArrayDeque populatedDeque(int n) {
-        ArrayDeque q = new ArrayDeque();
+    private ArrayDeque<Integer> populatedDeque(int n) {
+        ArrayDeque<Integer> q = new ArrayDeque<Integer>();
         assertTrue(q.isEmpty());
         for (int i = 0; i < n; ++i)
             assertTrue(q.offerLast(new Integer(i)));
@@ -391,11 +391,17 @@ public class ArrayDequeTest extends JSR1
     public void testRemoveElement() {
         ArrayDeque q = populatedDeque(SIZE);
         for (int i = 1; i < SIZE; i+=2) {
-            assertTrue(q.remove(new Integer(i)));
+            assertTrue(q.contains(i));
+            assertTrue(q.remove(i));
+            assertFalse(q.contains(i));
+            assertTrue(q.contains(i-1));
         }
         for (int i = 0; i < SIZE; i+=2) {
-            assertTrue(q.remove(new Integer(i)));
-            assertFalse(q.remove(new Integer(i+1)));
+            assertTrue(q.contains(i));
+            assertTrue(q.remove(i));
+            assertFalse(q.contains(i));
+            assertFalse(q.remove(i+1));
+            assertFalse(q.contains(i+1));
         }
         assertTrue(q.isEmpty());
     }
@@ -620,26 +626,25 @@ public class ArrayDequeTest extends JSR1
     }
 
     /**
-     * toArray() contains all elements
+     * toArray() contains all elements in FIFO order
      */
     public void testToArray() {
         ArrayDeque q = populatedDeque(SIZE);
         Object[] o = q.toArray();
-        Arrays.sort(o);
         for (int i = 0; i < o.length; i++)
-            assertEquals(o[i], q.pollFirst());
+            assertSame(o[i], q.pollFirst());
     }
 
     /**
-     * toArray(a) contains all elements
+     * toArray(a) contains all elements in FIFO order
      */
     public void testToArray2() {
-        ArrayDeque q = populatedDeque(SIZE);
+        ArrayDeque<Integer> q = populatedDeque(SIZE);
         Integer[] ints = new Integer[SIZE];
-        ints = (Integer[])q.toArray(ints);
-        Arrays.sort(ints);
+        Integer[] array = q.toArray(ints);
+        assertSame(ints, array);
         for (int i = 0; i < ints.length; i++)
-            assertEquals(ints[i], q.pollFirst());
+            assertSame(ints[i], q.remove());
     }
 
     /**