--- jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java	2006/04/20 20:35:00	1.4
+++ jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java	2010/11/04 01:04:54	1.15
@@ -11,19 +11,15 @@ import java.io.*;
 
 public class ConcurrentSkipListSubSetTest extends JSR166TestCase {
     public static void main(String[] args) {
-	junit.textui.TestRunner.run (suite());	
+        junit.textui.TestRunner.run(suite());
     }
     public static Test suite() {
-	return new TestSuite(ConcurrentSkipListSubSetTest.class);
+        return new TestSuite(ConcurrentSkipListSubSetTest.class);
     }
 
-    static class MyReverseComparator implements Comparator { 
+    static class MyReverseComparator implements Comparator {
         public int compare(Object x, Object y) {
-            int i = ((Integer)x).intValue();
-            int j = ((Integer)y).intValue();
-            if (i < j) return 1;
-            if (i > j) return -1;
-            return 0;
+            return ((Comparable)y).compareTo(x);
         }
     }
 
@@ -35,15 +31,15 @@ public class ConcurrentSkipListSubSetTes
         ConcurrentSkipListSet q = new ConcurrentSkipListSet();
         assertTrue(q.isEmpty());
 
-	for(int i = n-1; i >= 0; i-=2)
-	    assertTrue(q.add(new Integer(i)));
-	for(int i = (n & 1); i < n; i+=2)
-	    assertTrue(q.add(new Integer(i)));
+        for (int i = n-1; i >= 0; i-=2)
+            assertTrue(q.add(new Integer(i)));
+        for (int i = (n & 1); i < n; i+=2)
+            assertTrue(q.add(new Integer(i)));
         assertTrue(q.add(new Integer(-n)));
         assertTrue(q.add(new Integer(n)));
         NavigableSet s = q.subSet(new Integer(0), true, new Integer(n), false);
         assertFalse(s.isEmpty());
-	assertEquals(n, s.size());
+        assertEquals(n, s.size());
         return s;
     }
 
@@ -61,7 +57,7 @@ public class ConcurrentSkipListSubSetTes
         q.add(zero);
         q.add(seven);
         NavigableSet s = q.subSet(one, true, seven, false);
-	assertEquals(5, s.size());
+        assertEquals(5, s.size());
         return s;
     }
 
@@ -77,22 +73,22 @@ public class ConcurrentSkipListSubSetTes
         q.add(m4);
         q.add(m5);
         NavigableSet s = q.descendingSet();
-	assertEquals(5, s.size());
+        assertEquals(5, s.size());
         return s;
     }
 
-    private static NavigableSet set0() {   
-	ConcurrentSkipListSet set = new ConcurrentSkipListSet();
+    private static NavigableSet set0() {
+        ConcurrentSkipListSet set = new ConcurrentSkipListSet();
         assertTrue(set.isEmpty());
         return set.tailSet(m1, true);
     }
 
-    private static NavigableSet dset0() {   
-	ConcurrentSkipListSet set = new ConcurrentSkipListSet();
+    private static NavigableSet dset0() {
+        ConcurrentSkipListSet set = new ConcurrentSkipListSet();
         assertTrue(set.isEmpty());
         return set;
     }
- 
+
     /**
      * A new set has unbounded capacity
      */
@@ -134,11 +130,11 @@ public class ConcurrentSkipListSubSetTes
      * add(null) throws NPE
      */
     public void testAddNull() {
-	try {
+        try {
             NavigableSet q = set0();
             q.add(null);
             shouldThrow();
-        } catch (NullPointerException success) { }   
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -168,8 +164,7 @@ public class ConcurrentSkipListSubSetTes
             q.add(new Object());
             q.add(new Object());
             shouldThrow();
-        }
-        catch(ClassCastException success) {}
+        } catch (ClassCastException success) {}
     }
 
 
@@ -181,9 +176,9 @@ public class ConcurrentSkipListSubSetTes
             NavigableSet q = set0();
             q.addAll(null);
             shouldThrow();
-        }
-        catch (NullPointerException success) {}
+        } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with null elements throws NPE
      */
@@ -193,9 +188,9 @@ public class ConcurrentSkipListSubSetTes
             Integer[] ints = new Integer[SIZE];
             q.addAll(Arrays.asList(ints));
             shouldThrow();
-        }
-        catch (NullPointerException success) {}
+        } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with any null elements throws NPE after
      * possibly adding some elements
@@ -208,26 +203,22 @@ public class ConcurrentSkipListSubSetTes
                 ints[i] = new Integer(i+SIZE);
             q.addAll(Arrays.asList(ints));
             shouldThrow();
-        }
-        catch (NullPointerException success) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
      * Set contains all elements of successful addAll
      */
     public void testAddAll5() {
-        try {
-            Integer[] empty = new Integer[0];
-            Integer[] ints = new Integer[SIZE];
-            for (int i = 0; i < SIZE; ++i)
-                ints[i] = new Integer(SIZE-1- i);
-            NavigableSet q = set0();
-            assertFalse(q.addAll(Arrays.asList(empty)));
-            assertTrue(q.addAll(Arrays.asList(ints)));
-            for (int i = 0; i < SIZE; ++i)
-                assertEquals(new Integer(i), q.pollFirst());
-        }
-        finally {}
+        Integer[] empty = new Integer[0];
+        Integer[] ints = new Integer[SIZE];
+        for (int i = 0; i < SIZE; ++i)
+            ints[i] = new Integer(SIZE-1- i);
+        NavigableSet q = set0();
+        assertFalse(q.addAll(Arrays.asList(empty)));
+        assertTrue(q.addAll(Arrays.asList(ints)));
+        for (int i = 0; i < SIZE; ++i)
+            assertEquals(new Integer(i), q.pollFirst());
     }
 
     /**
@@ -236,9 +227,9 @@ public class ConcurrentSkipListSubSetTes
     public void testPoll() {
         NavigableSet q = populatedSet(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, ((Integer)q.pollFirst()).intValue());
+            assertEquals(i, q.pollFirst());
         }
-	assertNull(q.pollFirst());
+        assertNull(q.pollFirst());
     }
 
     /**
@@ -255,7 +246,7 @@ public class ConcurrentSkipListSubSetTes
         }
         assertTrue(q.isEmpty());
     }
-	
+
     /**
      * contains(x) reports true when elements added but not yet removed
      */
@@ -331,7 +322,7 @@ public class ConcurrentSkipListSubSetTes
         }
     }
 
-    
+
 
     /**
      * lower returns preceding element
@@ -349,7 +340,6 @@ public class ConcurrentSkipListSubSetTes
 
         Object e4 = q.lower(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -368,7 +358,6 @@ public class ConcurrentSkipListSubSetTes
 
         Object e4 = q.higher(six);
         assertNull(e4);
-
     }
 
     /**
@@ -387,7 +376,6 @@ public class ConcurrentSkipListSubSetTes
 
         Object e4 = q.floor(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -406,40 +394,37 @@ public class ConcurrentSkipListSubSetTes
 
         Object e4 = q.ceiling(six);
         assertNull(e4);
-
     }
 
     /**
-     * toArray contains all elements
+     * toArray contains all elements in sorted order
      */
     public void testToArray() {
         NavigableSet q = populatedSet(SIZE);
-	Object[] o = q.toArray();
-        Arrays.sort(o);
-	for(int i = 0; i < o.length; i++)
-	    assertEquals(o[i], q.pollFirst());
+        Object[] o = q.toArray();
+        for (int i = 0; i < o.length; i++)
+            assertSame(o[i], q.pollFirst());
     }
 
     /**
-     * toArray(a) contains all elements
+     * toArray(a) contains all elements in sorted order
      */
     public void testToArray2() {
         NavigableSet q = populatedSet(SIZE);
-	Integer[] ints = new Integer[SIZE];
-	ints = (Integer[])q.toArray(ints);
-        Arrays.sort(ints);
-        for(int i = 0; i < ints.length; i++)
-            assertEquals(ints[i], q.pollFirst());
+        Integer[] ints = new Integer[SIZE];
+        assertSame(ints, q.toArray(ints));
+        for (int i = 0; i < ints.length; i++)
+            assertSame(ints[i], q.pollFirst());
     }
-    
+
     /**
      * iterator iterates through all elements
      */
     public void testIterator() {
         NavigableSet q = populatedSet(SIZE);
         int i = 0;
-	Iterator it = q.iterator();
-        while(it.hasNext()) {
+        Iterator it = q.iterator();
+        while (it.hasNext()) {
             assertTrue(q.contains(it.next()));
             ++i;
         }
@@ -452,8 +437,8 @@ public class ConcurrentSkipListSubSetTes
     public void testEmptyIterator() {
         NavigableSet q = set0();
         int i = 0;
-	Iterator it = q.iterator();
-        while(it.hasNext()) {
+        Iterator it = q.iterator();
+        while (it.hasNext()) {
             assertTrue(q.contains(it.next()));
             ++i;
         }
@@ -463,7 +448,7 @@ public class ConcurrentSkipListSubSetTes
     /**
      * iterator.remove removes current element
      */
-    public void testIteratorRemove () {
+    public void testIteratorRemove() {
         final NavigableSet q = set0();
         q.add(new Integer(2));
         q.add(new Integer(1));
@@ -489,29 +474,24 @@ public class ConcurrentSkipListSubSetTes
         for (int i = 0; i < SIZE; ++i) {
             assertTrue(s.indexOf(String.valueOf(i)) >= 0);
         }
-    }        
+    }
 
     /**
-     * A deserialized serialized set has same elements 
+     * A deserialized serialized set has same elements
      */
-    public void testSerialization() {
+    public void testSerialization() throws Exception {
         NavigableSet q = populatedSet(SIZE);
-        try {
-            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());
-        } catch(Exception e){
-            e.printStackTrace();
-            unexpectedException();
-        }
+        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());
     }
 
     /**
@@ -652,11 +632,11 @@ public class ConcurrentSkipListSubSetTes
      * add(null) throws NPE
      */
     public void testDescendingAddNull() {
-	try {
+        try {
             NavigableSet q = dset0();
             q.add(null);
             shouldThrow();
-        } catch (NullPointerException success) { }   
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -686,8 +666,7 @@ public class ConcurrentSkipListSubSetTes
             q.add(new Object());
             q.add(new Object());
             shouldThrow();
-        }
-        catch(ClassCastException success) {}
+        } catch (ClassCastException success) {}
     }
 
 
@@ -699,9 +678,9 @@ public class ConcurrentSkipListSubSetTes
             NavigableSet q = dset0();
             q.addAll(null);
             shouldThrow();
-        }
-        catch (NullPointerException success) {}
+        } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with null elements throws NPE
      */
@@ -711,9 +690,9 @@ public class ConcurrentSkipListSubSetTes
             Integer[] ints = new Integer[SIZE];
             q.addAll(Arrays.asList(ints));
             shouldThrow();
-        }
-        catch (NullPointerException success) {}
+        } catch (NullPointerException success) {}
     }
+
     /**
      * addAll of a collection with any null elements throws NPE after
      * possibly adding some elements
@@ -726,26 +705,22 @@ public class ConcurrentSkipListSubSetTes
                 ints[i] = new Integer(i+SIZE);
             q.addAll(Arrays.asList(ints));
             shouldThrow();
-        }
-        catch (NullPointerException success) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
      * Set contains all elements of successful addAll
      */
     public void testDescendingAddAll5() {
-        try {
-            Integer[] empty = new Integer[0];
-            Integer[] ints = new Integer[SIZE];
-            for (int i = 0; i < SIZE; ++i)
-                ints[i] = new Integer(SIZE-1- i);
-            NavigableSet q = dset0();
-            assertFalse(q.addAll(Arrays.asList(empty)));
-            assertTrue(q.addAll(Arrays.asList(ints)));
-            for (int i = 0; i < SIZE; ++i)
-                assertEquals(new Integer(i), q.pollFirst());
-        }
-        finally {}
+        Integer[] empty = new Integer[0];
+        Integer[] ints = new Integer[SIZE];
+        for (int i = 0; i < SIZE; ++i)
+            ints[i] = new Integer(SIZE-1- i);
+        NavigableSet q = dset0();
+        assertFalse(q.addAll(Arrays.asList(empty)));
+        assertTrue(q.addAll(Arrays.asList(ints)));
+        for (int i = 0; i < SIZE; ++i)
+            assertEquals(new Integer(i), q.pollFirst());
     }
 
     /**
@@ -754,9 +729,9 @@ public class ConcurrentSkipListSubSetTes
     public void testDescendingPoll() {
         NavigableSet q = populatedSet(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, ((Integer)q.pollFirst()).intValue());
+            assertEquals(i, q.pollFirst());
         }
-	assertNull(q.pollFirst());
+        assertNull(q.pollFirst());
     }
 
     /**
@@ -773,7 +748,7 @@ public class ConcurrentSkipListSubSetTes
         }
         assertTrue(q.isEmpty());
     }
-	
+
     /**
      * contains(x) reports true when elements added but not yet removed
      */
@@ -849,7 +824,7 @@ public class ConcurrentSkipListSubSetTes
         }
     }
 
-    
+
 
     /**
      * lower returns preceding element
@@ -867,7 +842,6 @@ public class ConcurrentSkipListSubSetTes
 
         Object e4 = q.lower(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -886,7 +860,6 @@ public class ConcurrentSkipListSubSetTes
 
         Object e4 = q.higher(m6);
         assertNull(e4);
-
     }
 
     /**
@@ -905,7 +878,6 @@ public class ConcurrentSkipListSubSetTes
 
         Object e4 = q.floor(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -924,7 +896,6 @@ public class ConcurrentSkipListSubSetTes
 
         Object e4 = q.ceiling(m6);
         assertNull(e4);
-
     }
 
     /**
@@ -932,10 +903,10 @@ public class ConcurrentSkipListSubSetTes
      */
     public void testDescendingToArray() {
         NavigableSet q = populatedSet(SIZE);
-	Object[] o = q.toArray();
+        Object[] o = q.toArray();
         Arrays.sort(o);
-	for(int i = 0; i < o.length; i++)
-	    assertEquals(o[i], q.pollFirst());
+        for (int i = 0; i < o.length; i++)
+            assertEquals(o[i], q.pollFirst());
     }
 
     /**
@@ -943,21 +914,21 @@ public class ConcurrentSkipListSubSetTes
      */
     public void testDescendingToArray2() {
         NavigableSet q = populatedSet(SIZE);
-	Integer[] ints = new Integer[SIZE];
-	ints = (Integer[])q.toArray(ints);
+        Integer[] ints = new Integer[SIZE];
+        assertSame(ints, q.toArray(ints));
         Arrays.sort(ints);
-        for(int i = 0; i < ints.length; i++)
+        for (int i = 0; i < ints.length; i++)
             assertEquals(ints[i], q.pollFirst());
     }
-    
+
     /**
      * iterator iterates through all elements
      */
     public void testDescendingIterator() {
         NavigableSet q = populatedSet(SIZE);
         int i = 0;
-	Iterator it = q.iterator();
-        while(it.hasNext()) {
+        Iterator it = q.iterator();
+        while (it.hasNext()) {
             assertTrue(q.contains(it.next()));
             ++i;
         }
@@ -970,8 +941,8 @@ public class ConcurrentSkipListSubSetTes
     public void testDescendingEmptyIterator() {
         NavigableSet q = dset0();
         int i = 0;
-	Iterator it = q.iterator();
-        while(it.hasNext()) {
+        Iterator it = q.iterator();
+        while (it.hasNext()) {
             assertTrue(q.contains(it.next()));
             ++i;
         }
@@ -981,7 +952,7 @@ public class ConcurrentSkipListSubSetTes
     /**
      * iterator.remove removes current element
      */
-    public void testDescendingIteratorRemove () {
+    public void testDescendingIteratorRemove() {
         final NavigableSet q = dset0();
         q.add(new Integer(2));
         q.add(new Integer(1));
@@ -1007,29 +978,24 @@ public class ConcurrentSkipListSubSetTes
         for (int i = 0; i < SIZE; ++i) {
             assertTrue(s.indexOf(String.valueOf(i)) >= 0);
         }
-    }        
+    }
 
     /**
-     * A deserialized serialized set has same elements 
+     * A deserialized serialized set has same elements
      */
-    public void testDescendingSerialization() {
+    public void testDescendingSerialization() throws Exception {
         NavigableSet q = populatedSet(SIZE);
-        try {
-            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());
-        } catch(Exception e){
-            e.printStackTrace();
-            unexpectedException();
-        }
+        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());
     }
 
     /**