--- jsr166/src/test/tck/ArrayDequeTest.java	2011/05/27 19:26:42	1.23
+++ jsr166/src/test/tck/ArrayDequeTest.java	2012/02/21 01:54:03	1.25
@@ -5,13 +5,14 @@
  */
 
 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) {
@@ -23,7 +24,7 @@ public class ArrayDequeTest extends JSR1
     }
 
     /**
-     * Create a deque of given size containing consecutive
+     * Creates a deque of given size containing consecutive
      * Integers 0 ... n.
      */
     private ArrayDeque<Integer> populatedDeque(int n) {
@@ -811,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());
     }
 
 }