--- jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java	2012/02/21 01:54:04	1.22
+++ jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java	2014/12/31 16:44:01	1.25
@@ -6,14 +6,9 @@
 
 import junit.framework.*;
 import java.util.Arrays;
-import java.util.BitSet;
-import java.util.Collection;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.NavigableSet;
-import java.util.NoSuchElementException;
-import java.util.Random;
-import java.util.Set;
 import java.util.SortedSet;
 import java.util.concurrent.ConcurrentSkipListSet;
 
@@ -32,7 +27,7 @@ public class ConcurrentSkipListSubSetTes
     }
 
     /**
-     * Creates a set of given size containing consecutive
+     * Returns a new set of given size containing consecutive
      * Integers 0 ... n.
      */
     private NavigableSet<Integer> populatedSet(int n) {
@@ -53,7 +48,7 @@ public class ConcurrentSkipListSubSetTes
     }
 
     /**
-     * Creates set of first 5 ints.
+     * Returns a new set of first 5 ints.
      */
     private NavigableSet set5() {
         ConcurrentSkipListSet q = new ConcurrentSkipListSet();
@@ -71,7 +66,7 @@ public class ConcurrentSkipListSubSetTes
     }
 
     /**
-     * Creates set of first 5 negative ints.
+     * Returns a new set of first 5 negative ints.
      */
     private NavigableSet dset5() {
         ConcurrentSkipListSet q = new ConcurrentSkipListSet();
@@ -494,7 +489,7 @@ public class ConcurrentSkipListSubSetTes
         NavigableSet x = populatedSet(SIZE);
         NavigableSet y = serialClone(x);
 
-        assertTrue(x != y);
+        assertNotSame(y, x);
         assertEquals(x.size(), y.size());
         assertEquals(x, y);
         assertEquals(y, x);
@@ -994,7 +989,7 @@ public class ConcurrentSkipListSubSetTes
         NavigableSet x = dset5();
         NavigableSet y = serialClone(x);
 
-        assertTrue(x != y);
+        assertNotSame(y, x);
         assertEquals(x.size(), y.size());
         assertEquals(x, y);
         assertEquals(y, x);