--- jsr166/src/test/tck/ConcurrentSkipListMapTest.java	2011/05/31 16:16:23	1.25
+++ jsr166/src/test/tck/ConcurrentSkipListMapTest.java	2013/05/30 03:28:55	1.32
@@ -17,7 +17,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();
@@ -38,11 +38,11 @@ public class ConcurrentSkipListMapTest e
     public void testClear() {
         ConcurrentSkipListMap map = map5();
         map.clear();
-        assertEquals(map.size(), 0);
+        assertEquals(0, map.size());
     }
 
     /**
-     *
+     * copy constructor creates map equal to source map
      */
     public void testConstructFromSorted() {
         ConcurrentSkipListMap map = map5();
@@ -174,7 +174,7 @@ public class ConcurrentSkipListMapTest e
             last = k;
             ++count;
         }
-        assertEquals(count ,5);
+        assertEquals(5, count);
     }
 
     /**
@@ -193,7 +193,7 @@ public class ConcurrentSkipListMapTest e
             last = k;
             ++count;
         }
-        assertEquals(count ,5);
+        assertEquals(5, count);
     }
 
     /**
@@ -212,7 +212,7 @@ public class ConcurrentSkipListMapTest e
             last = k;
             ++count;
         }
-        assertEquals(count, 5);
+        assertEquals(5, count);
     }
 
     /**
@@ -231,7 +231,7 @@ public class ConcurrentSkipListMapTest e
             last = k;
             ++count;
         }
-        assertEquals(count, 5);
+        assertEquals(5, count);
     }
 
     /**
@@ -501,7 +501,7 @@ public class ConcurrentSkipListMapTest e
      * lowerEntry, higherEntry, ceilingEntry, and floorEntry return
      * immutable entries
      */
-    public void testEntryImmutablity() {
+    public void testEntryImmutability() {
         ConcurrentSkipListMap map = map5();
         Map.Entry e = map.lowerEntry(three);
         assertEquals(two, e.getKey());
@@ -795,7 +795,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);
@@ -986,7 +986,7 @@ public class ConcurrentSkipListMapTest e
     static NavigableMap<Integer, Integer> newMap(Class cl) throws Exception {
         NavigableMap<Integer, Integer> result =
             (NavigableMap<Integer, Integer>) cl.newInstance();
-        assertEquals(result.size(), 0);
+        assertEquals(0, result.size());
         assertFalse(result.keySet().iterator().hasNext());
         return result;
     }
@@ -1213,7 +1213,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;