--- jsr166/src/test/tck/ArrayDequeTest.java	2010/11/03 16:46:34	1.18
+++ jsr166/src/test/tck/ArrayDequeTest.java	2011/05/31 16:16:23	1.24
@@ -1,17 +1,18 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 import junit.framework.*;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.*;
+import java.util.Arrays;
+import java.util.ArrayDeque;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.Random;
 
 public class ArrayDequeTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -26,8 +27,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 +392,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());
     }
@@ -488,7 +495,6 @@ public class ArrayDequeTest extends JSR1
         assertNull(q.peekLast());
     }
 
-
     /**
      * removeFirst() removes first element, or throws NSEE if empty
      */
@@ -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());
     }
 
     /**
@@ -792,7 +797,6 @@ public class ArrayDequeTest extends JSR1
         }
     }
 
-
     /**
      * toString() contains toStrings of elements
      */
@@ -800,7 +804,7 @@ public class ArrayDequeTest extends JSR1
         ArrayDeque q = populatedDeque(SIZE);
         String s = q.toString();
         for (int i = 0; i < SIZE; ++i) {
-            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
+            assertTrue(s.contains(String.valueOf(i)));
         }
     }
 
@@ -808,18 +812,18 @@ public class ArrayDequeTest extends JSR1
      * A deserialized serialized deque has same elements in same order
      */
     public void testSerialization() throws Exception {
-        ArrayDeque q = populatedDeque(SIZE);
-        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
-        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
-        out.writeObject(q);
-        out.close();
-
-        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
-        ArrayDeque r = (ArrayDeque)in.readObject();
-        assertEquals(q.size(), r.size());
-        while (!q.isEmpty())
-            assertEquals(q.remove(), r.remove());
+        Queue x = populatedDeque(SIZE);
+        Queue y = serialClone(x);
+
+        assertTrue(x != y);
+        assertEquals(x.size(), y.size());
+        assertEquals(x.toString(), y.toString());
+        assertTrue(Arrays.equals(x.toArray(), y.toArray()));
+        while (!x.isEmpty()) {
+            assertFalse(y.isEmpty());
+            assertEquals(x.remove(), y.remove());
+        }
+        assertTrue(y.isEmpty());
     }
 
 }