--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2011/05/31 16:16:23	1.23
+++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2012/02/21 02:04:17	1.28
@@ -32,7 +32,7 @@ public class ConcurrentSkipListSetTest e
     }
 
     /**
-     * Create a set of given size containing consecutive
+     * Returns a new set of given size containing consecutive
      * Integers 0 ... n.
      */
     private ConcurrentSkipListSet<Integer> populatedSet(int n) {
@@ -49,7 +49,7 @@ public class ConcurrentSkipListSetTest e
     }
 
     /**
-     * Create set of first 5 ints
+     * Returns a new set of first 5 ints.
      */
     private ConcurrentSkipListSet set5() {
         ConcurrentSkipListSet q = new ConcurrentSkipListSet();
@@ -461,8 +461,7 @@ public class ConcurrentSkipListSetTest e
     public void testToArray2() {
         ConcurrentSkipListSet<Integer> q = populatedSet(SIZE);
         Integer[] ints = new Integer[SIZE];
-        Integer[] array = q.toArray(ints);
-        assertSame(ints, array);
+        assertSame(ints, q.toArray(ints));
         for (int i = 0; i < ints.length; i++)
             assertSame(ints[i], q.pollFirst());
     }
@@ -492,7 +491,7 @@ public class ConcurrentSkipListSetTest e
             assertTrue(q.contains(it.next()));
             ++i;
         }
-        assertEquals(i, 0);
+        assertEquals(0, i);
     }
 
     /**
@@ -688,7 +687,7 @@ public class ConcurrentSkipListSetTest e
 
     static NavigableSet<Integer> newSet(Class cl) throws Exception {
         NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
-        assertEquals(result.size(), 0);
+        assertEquals(0, result.size());
         assertFalse(result.iterator().hasNext());
         return result;
     }
@@ -922,7 +921,7 @@ public class ConcurrentSkipListSetTest e
             if (bsContainsI)
                 size++;
         }
-        assertEquals(set.size(), size);
+        assertEquals(size, set.size());
 
         // Test contents using contains elementSet iterator
         int size2 = 0;