--- jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java	2011/05/27 19:21:27	1.18
+++ jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java	2015/04/25 04:55:30	1.25
@@ -4,21 +4,30 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.concurrent.ConcurrentNavigableMap;
+import java.util.concurrent.ConcurrentSkipListMap;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class ConcurrentSkipListSubMapTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(ConcurrentSkipListSubMapTest.class);
     }
 
     /**
-     * Create a map from Integers 1-5 to Strings "A"-"E".
+     * Returns a new map from Integers 1-5 to Strings "A"-"E".
      */
     private static ConcurrentNavigableMap map5() {
         ConcurrentSkipListMap map = new ConcurrentSkipListMap();
@@ -36,7 +45,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     * Create a map from Integers -5 to -1 to Strings "A"-"E".
+     * Returns a new map from Integers -5 to -1 to Strings "A"-"E".
      */
     private static ConcurrentNavigableMap dmap5() {
         ConcurrentSkipListMap map = new ConcurrentSkipListMap();
@@ -69,7 +78,7 @@ public class ConcurrentSkipListSubMapTes
     public void testClear() {
         ConcurrentNavigableMap map = map5();
         map.clear();
-        assertEquals(map.size(), 0);
+        assertEquals(0, map.size());
     }
 
     /**
@@ -592,19 +601,14 @@ public class ConcurrentSkipListSubMapTes
      * A deserialized map equals original
      */
     public void testSerialization() throws Exception {
-        ConcurrentNavigableMap 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));
-        ConcurrentNavigableMap r = (ConcurrentNavigableMap)in.readObject();
-        assertEquals(q.size(), r.size());
-        assertTrue(q.equals(r));
-        assertTrue(r.equals(q));
+        assertNotSame(x, y);
+        assertEquals(x.size(), y.size());
+        assertEquals(x.toString(), y.toString());
+        assertEquals(x, y);
+        assertEquals(y, x);
     }
 
     /**
@@ -748,7 +752,7 @@ public class ConcurrentSkipListSubMapTes
     public void testDescendingClear() {
         ConcurrentNavigableMap map = dmap5();
         map.clear();
-        assertEquals(map.size(), 0);
+        assertEquals(0, map.size());
     }
 
     /**
@@ -1271,19 +1275,14 @@ public class ConcurrentSkipListSubMapTes
      * A deserialized map equals original
      */
     public void testDescendingSerialization() throws Exception {
-        ConcurrentNavigableMap q = dmap5();
+        NavigableMap x = dmap5();
+        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));
-        ConcurrentNavigableMap r = (ConcurrentNavigableMap)in.readObject();
-        assertEquals(q.size(), r.size());
-        assertTrue(q.equals(r));
-        assertTrue(r.equals(q));
+        assertNotSame(x, y);
+        assertEquals(x.size(), y.size());
+        assertEquals(x.toString(), y.toString());
+        assertEquals(x, y);
+        assertEquals(y, x);
     }
 
     /**