--- jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java	2011/05/31 16:16:23	1.19
+++ jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java	2017/08/04 03:30:21	1.26
@@ -4,21 +4,30 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
+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 java.util.*;
+
+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());
     }
 
     /**
@@ -589,13 +598,13 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     * A deserialized map equals original
+     * A deserialized/reserialized map equals original
      */
     public void testSerialization() throws Exception {
         NavigableMap x = map5();
         NavigableMap y = serialClone(x);
 
-        assertTrue(x != y);
+        assertNotSame(x, y);
         assertEquals(x.size(), y.size());
         assertEquals(x.toString(), y.toString());
         assertEquals(x, y);
@@ -743,7 +752,7 @@ public class ConcurrentSkipListSubMapTes
     public void testDescendingClear() {
         ConcurrentNavigableMap map = dmap5();
         map.clear();
-        assertEquals(map.size(), 0);
+        assertEquals(0, map.size());
     }
 
     /**
@@ -1263,13 +1272,13 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     * A deserialized map equals original
+     * A deserialized/reserialized map equals original
      */
     public void testDescendingSerialization() throws Exception {
         NavigableMap x = dmap5();
         NavigableMap y = serialClone(x);
 
-        assertTrue(x != y);
+        assertNotSame(x, y);
         assertEquals(x.size(), y.size());
         assertEquals(x.toString(), y.toString());
         assertEquals(x, y);