--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2009/11/21 10:25:05	1.8
+++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java	2009/11/22 18:57:17	1.11
@@ -19,11 +19,7 @@ public class ConcurrentSkipListSetTest e
 
     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);
         }
     }
 
@@ -115,18 +111,15 @@ public class ConcurrentSkipListSetTest e
      * The comparator used in constructor is used
      */
     public void testConstructor7() {
-        try {
-            MyReverseComparator cmp = new MyReverseComparator();
-            ConcurrentSkipListSet q = new ConcurrentSkipListSet(cmp);
-            assertEquals(cmp, q.comparator());
-            Integer[] ints = new Integer[SIZE];
-            for (int i = 0; i < SIZE; ++i)
-                ints[i] = new Integer(i);
-            q.addAll(Arrays.asList(ints));
-            for (int i = SIZE-1; i >= 0; --i)
-                assertEquals(ints[i], q.pollFirst());
-        }
-        finally {}
+        MyReverseComparator cmp = new MyReverseComparator();
+        ConcurrentSkipListSet q = new ConcurrentSkipListSet(cmp);
+        assertEquals(cmp, q.comparator());
+        Integer[] ints = new Integer[SIZE];
+        for (int i = 0; i < SIZE; ++i)
+            ints[i] = new Integer(i);
+        q.addAll(Arrays.asList(ints));
+        for (int i = SIZE-1; i >= 0; --i)
+            assertEquals(ints[i], q.pollFirst());
     }
 
     /**
@@ -240,18 +233,15 @@ public class ConcurrentSkipListSetTest e
      * 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);
-            ConcurrentSkipListSet q = new ConcurrentSkipListSet();
-            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);
+        ConcurrentSkipListSet q = new ConcurrentSkipListSet();
+        assertFalse(q.addAll(Arrays.asList(empty)));
+        assertTrue(q.addAll(Arrays.asList(ints)));
+        for (int i = 0; i < SIZE; ++i)
+            assertEquals(i, q.pollFirst());
     }
 
     /**
@@ -260,7 +250,7 @@ public class ConcurrentSkipListSetTest e
     public void testPollFirst() {
         ConcurrentSkipListSet q = populatedSet(SIZE);
         for (int i = 0; i < SIZE; ++i) {
-            assertEquals(i, ((Integer)q.pollFirst()).intValue());
+            assertEquals(i, q.pollFirst());
         }
         assertNull(q.pollFirst());
     }
@@ -271,7 +261,7 @@ public class ConcurrentSkipListSetTest e
     public void testPollLast() {
         ConcurrentSkipListSet q = populatedSet(SIZE);
         for (int i = SIZE-1; i >= 0; --i) {
-            assertEquals(i, ((Integer)q.pollLast()).intValue());
+            assertEquals(i, q.pollLast());
         }
         assertNull(q.pollFirst());
     }
@@ -670,7 +660,7 @@ public class ConcurrentSkipListSetTest e
     /**
      * Subsets of subsets subdivide correctly
      */
-    public void testRecursiveSubSets() {
+    public void testRecursiveSubSets() throws Exception {
         int setSize = 1000;
         Class cl = ConcurrentSkipListSet.class;
 
@@ -689,13 +679,8 @@ public class ConcurrentSkipListSetTest e
                    0, setSize - 1, true);
     }
 
-    static NavigableSet<Integer> newSet(Class cl) {
-        NavigableSet<Integer> result = null;
-        try {
-            result = (NavigableSet<Integer>) cl.newInstance();
-        } catch (Exception e) {
-            fail();
-        }
+    static NavigableSet<Integer> newSet(Class cl) throws Exception {
+        NavigableSet<Integer> result = (NavigableSet<Integer>) cl.newInstance();
         assertEquals(result.size(), 0);
         assertFalse(result.iterator().hasNext());
         return result;
@@ -758,10 +743,8 @@ public class ConcurrentSkipListSetTest e
             } else {
                 try {
                     set.add(element);
-                    fail();
-                } catch (IllegalArgumentException e) {
-                    // expected
-                }
+                    shouldThrow();
+                } catch (IllegalArgumentException success) {}
             }
         }
     }
@@ -960,16 +943,12 @@ public class ConcurrentSkipListSetTest e
             assertEq(rs.last(),  -1);
             try {
                 set.first();
-                fail();
-            } catch (NoSuchElementException e) {
-                // expected
-            }
+                shouldThrow();
+            } catch (NoSuchElementException success) {}
             try {
                 set.last();
-                fail();
-            } catch (NoSuchElementException e) {
-                // expected
-            }
+                shouldThrow();
+            } catch (NoSuchElementException success) {}
         }
     }