--- jsr166/src/test/tck/ConcurrentLinkedDequeTest.java 2011/05/27 19:47:55 1.8 +++ jsr166/src/test/tck/ConcurrentLinkedDequeTest.java 2011/05/31 16:16:23 1.9 @@ -7,9 +7,13 @@ */ 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.Random; +import java.util.concurrent.ConcurrentLinkedDeque; public class ConcurrentLinkedDequeTest extends JSR166TestCase { @@ -843,18 +847,18 @@ public class ConcurrentLinkedDequeTest e * A deserialized serialized deque has same elements in same order */ public void testSerialization() throws Exception { - ConcurrentLinkedDeque 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)); - ConcurrentLinkedDeque r = (ConcurrentLinkedDeque)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()); } }