--- jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java	2011/05/27 19:21:27	1.19
+++ jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java	2014/12/31 16:44:01	1.25
@@ -5,9 +5,12 @@
  */
 
 import junit.framework.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.io.*;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.NavigableSet;
+import java.util.SortedSet;
+import java.util.concurrent.ConcurrentSkipListSet;
 
 public class ConcurrentSkipListSubSetTest extends JSR166TestCase {
     public static void main(String[] args) {
@@ -24,7 +27,7 @@ public class ConcurrentSkipListSubSetTes
     }
 
     /**
-     * Create 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) {
@@ -45,7 +48,7 @@ public class ConcurrentSkipListSubSetTes
     }
 
     /**
-     * Create set of first 5 ints
+     * Returns a new set of first 5 ints.
      */
     private NavigableSet set5() {
         ConcurrentSkipListSet q = new ConcurrentSkipListSet();
@@ -63,7 +66,7 @@ public class ConcurrentSkipListSubSetTes
     }
 
     /**
-     * Create set of first 5 negative ints
+     * Returns a new set of first 5 negative ints.
      */
     private NavigableSet dset5() {
         ConcurrentSkipListSet q = new ConcurrentSkipListSet();
@@ -446,7 +449,7 @@ public class ConcurrentSkipListSubSetTes
             assertTrue(q.contains(it.next()));
             ++i;
         }
-        assertEquals(i, 0);
+        assertEquals(0, i);
     }
 
     /**
@@ -483,18 +486,18 @@ public class ConcurrentSkipListSubSetTes
      * A deserialized serialized set has same elements
      */
     public void testSerialization() throws Exception {
-        NavigableSet q = populatedSet(SIZE);
-        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
-        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
-        out.writeObject(q);
-        out.close();
-
-        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
-        NavigableSet r = (NavigableSet)in.readObject();
-        assertEquals(q.size(), r.size());
-        while (!q.isEmpty())
-            assertEquals(q.pollFirst(), r.pollFirst());
+        NavigableSet x = populatedSet(SIZE);
+        NavigableSet y = serialClone(x);
+
+        assertNotSame(y, x);
+        assertEquals(x.size(), y.size());
+        assertEquals(x, y);
+        assertEquals(y, x);
+        while (!x.isEmpty()) {
+            assertFalse(y.isEmpty());
+            assertEquals(x.pollFirst(), y.pollFirst());
+        }
+        assertTrue(y.isEmpty());
     }
 
     /**
@@ -946,7 +949,7 @@ public class ConcurrentSkipListSubSetTes
             assertTrue(q.contains(it.next()));
             ++i;
         }
-        assertEquals(i, 0);
+        assertEquals(0, i);
     }
 
     /**
@@ -983,18 +986,18 @@ public class ConcurrentSkipListSubSetTes
      * A deserialized serialized set has same elements
      */
     public void testDescendingSerialization() throws Exception {
-        NavigableSet q = populatedSet(SIZE);
-        ByteArrayOutputStream bout = new ByteArrayOutputStream(10000);
-        ObjectOutputStream out = new ObjectOutputStream(new BufferedOutputStream(bout));
-        out.writeObject(q);
-        out.close();
-
-        ByteArrayInputStream bin = new ByteArrayInputStream(bout.toByteArray());
-        ObjectInputStream in = new ObjectInputStream(new BufferedInputStream(bin));
-        NavigableSet r = (NavigableSet)in.readObject();
-        assertEquals(q.size(), r.size());
-        while (!q.isEmpty())
-            assertEquals(q.pollFirst(), r.pollFirst());
+        NavigableSet x = dset5();
+        NavigableSet y = serialClone(x);
+
+        assertNotSame(y, x);
+        assertEquals(x.size(), y.size());
+        assertEquals(x, y);
+        assertEquals(y, x);
+        while (!x.isEmpty()) {
+            assertFalse(y.isEmpty());
+            assertEquals(x.pollFirst(), y.pollFirst());
+        }
+        assertTrue(y.isEmpty());
     }
 
     /**