--- jsr166/src/test/tck/TreeMapTest.java	2011/05/31 16:16:24	1.21
+++ jsr166/src/test/tck/TreeMapTest.java	2014/12/31 19:05:43	1.28
@@ -4,8 +4,20 @@
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
-import junit.framework.*;
-import java.util.*;
+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.TreeMap;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class TreeMapTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -16,7 +28,7 @@ public class TreeMapTest extends JSR166T
     }
 
     /**
-     * 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 TreeMap map5() {
         TreeMap map = new TreeMap();
@@ -37,11 +49,11 @@ public class TreeMapTest extends JSR166T
     public void testClear() {
         TreeMap map = map5();
         map.clear();
-        assertEquals(map.size(), 0);
+        assertEquals(0, map.size());
     }
 
     /**
-     *
+     * copy constructor creates map equal to source map
      */
     public void testConstructFromSorted() {
         TreeMap map = map5();
@@ -173,7 +185,7 @@ public class TreeMapTest extends JSR166T
             last = k;
             ++count;
         }
-        assertEquals(count ,5);
+        assertEquals(5, count);
     }
 
     /**
@@ -192,7 +204,7 @@ public class TreeMapTest extends JSR166T
             last = k;
             ++count;
         }
-        assertEquals(count ,5);
+        assertEquals(5, count);
     }
 
     /**
@@ -211,7 +223,7 @@ public class TreeMapTest extends JSR166T
             last = k;
             ++count;
         }
-        assertEquals(count, 5);
+        assertEquals(5, count);
     }
 
     /**
@@ -230,7 +242,7 @@ public class TreeMapTest extends JSR166T
             last = k;
             ++count;
         }
-        assertEquals(count, 5);
+        assertEquals(5, count);
     }
 
     /**
@@ -600,7 +612,7 @@ public class TreeMapTest extends JSR166T
         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);
@@ -791,7 +803,7 @@ public class TreeMapTest extends JSR166T
     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;
     }
@@ -1018,7 +1030,7 @@ public class TreeMapTest extends JSR166T
             if (bsContainsI)
                 size++;
         }
-        assertEquals(map.size(), size);
+        assertEquals(size, map.size());
 
         // Test contents using contains keySet iterator
         int size2 = 0;