--- jsr166/src/test/tck/ConcurrentSkipListMapTest.java	2011/11/26 05:19:17	1.27
+++ jsr166/src/test/tck/ConcurrentSkipListMapTest.java	2014/12/31 19:05:42	1.33
@@ -4,10 +4,22 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.BitSet;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.NavigableMap;
+import java.util.NavigableSet;
+import java.util.NoSuchElementException;
+import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.ConcurrentSkipListMap;
 
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
 public class ConcurrentSkipListMapTest extends JSR166TestCase {
     public static void main(String[] args) {
         junit.textui.TestRunner.run(suite());
@@ -17,7 +29,7 @@ public class ConcurrentSkipListMapTest e
     }
 
     /**
-     * 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 ConcurrentSkipListMap map5() {
         ConcurrentSkipListMap map = new ConcurrentSkipListMap();
@@ -42,7 +54,7 @@ public class ConcurrentSkipListMapTest e
     }
 
     /**
-     *
+     * copy constructor creates map equal to source map
      */
     public void testConstructFromSorted() {
         ConcurrentSkipListMap map = map5();
@@ -795,7 +807,7 @@ public class ConcurrentSkipListMapTest e
         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);
@@ -1213,7 +1225,7 @@ public class ConcurrentSkipListMapTest e
             if (bsContainsI)
                 size++;
         }
-        assertEquals(map.size(), size);
+        assertEquals(size, map.size());
 
         // Test contents using contains keySet iterator
         int size2 = 0;