--- jsr166/src/test/tck/ConcurrentLinkedQueueTest.java	2011/05/27 19:49:56	1.26
+++ jsr166/src/test/tck/ConcurrentLinkedQueueTest.java	2011/05/31 16:16:23	1.27
@@ -7,9 +7,12 @@
  */
 
 import junit.framework.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentLinkedQueue;
 
 public class ConcurrentLinkedQueueTest extends JSR166TestCase {
 
@@ -497,18 +500,18 @@ public class ConcurrentLinkedQueueTest e
      * A deserialized serialized queue has same elements in same order
      */
     public void testSerialization() throws Exception {
-        ConcurrentLinkedQueue q = populatedQueue(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));
-        ConcurrentLinkedQueue r = (ConcurrentLinkedQueue)in.readObject();
-        assertEquals(q.size(), r.size());
-        while (!q.isEmpty())
-            assertEquals(q.remove(), r.remove());
+        Queue x = populatedQueue(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());
     }
 
 }