--- jsr166/src/test/tck/ConcurrentSkipListMapTest.java 2011/05/27 19:21:27 1.24 +++ jsr166/src/test/tck/ConcurrentSkipListMapTest.java 2011/05/31 16:16:23 1.25 @@ -6,8 +6,7 @@ import junit.framework.*; import java.util.*; -import java.util.concurrent.*; -import java.io.*; +import java.util.concurrent.ConcurrentSkipListMap; public class ConcurrentSkipListMapTest extends JSR166TestCase { public static void main(String[] args) { @@ -530,7 +529,6 @@ public class ConcurrentSkipListMapTest e } catch (UnsupportedOperationException success) {} } - /** * lowerKey returns preceding element */ @@ -794,19 +792,14 @@ public class ConcurrentSkipListMapTest e * A deserialized map equals original */ public void testSerialization() throws Exception { - ConcurrentSkipListMap q = map5(); + NavigableMap x = map5(); + NavigableMap y = serialClone(x); - 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)); - ConcurrentSkipListMap r = (ConcurrentSkipListMap)in.readObject(); - assertEquals(q.size(), r.size()); - assertTrue(q.equals(r)); - assertTrue(r.equals(q)); + assertTrue(x != y); + assertEquals(x.size(), y.size()); + assertEquals(x.toString(), y.toString()); + assertEquals(x, y); + assertEquals(y, x); } /**