--- jsr166/src/test/tck/TreeMapTest.java	2009/11/21 10:25:05	1.10
+++ jsr166/src/test/tck/TreeMapTest.java	2009/12/01 06:03:49	1.12
@@ -516,8 +516,7 @@ public class TreeMapTest extends JSR166T
         try {
             e.setValue("A");
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (UnsupportedOperationException success) {}
         e = map.pollFirstEntry();
         assertNull(e);
     }
@@ -544,8 +543,7 @@ public class TreeMapTest extends JSR166T
         try {
             e.setValue("E");
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (UnsupportedOperationException success) {}
         e = map.pollLastEntry();
         assertNull(e);
     }
@@ -581,7 +579,7 @@ public class TreeMapTest extends JSR166T
             TreeMap c = map5();
             c.get(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -592,7 +590,7 @@ public class TreeMapTest extends JSR166T
             TreeMap c = map5();
             c.containsKey(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -604,7 +602,7 @@ public class TreeMapTest extends JSR166T
             c.put("sadsdf", "asdads");
             c.remove(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -662,7 +660,7 @@ public class TreeMapTest extends JSR166T
         assertEquals(1, sm.size());
         assertEquals(three, sm.firstKey());
         assertEquals(three, sm.lastKey());
-        assertTrue(sm.remove(three) != null);
+        assertEquals("C", sm.remove(three));
         assertTrue(sm.isEmpty());
         assertEquals(3, map.size());
     }
@@ -695,7 +693,7 @@ public class TreeMapTest extends JSR166T
         assertEquals(4, map.size());
         assertEquals(0, sm.size());
         assertTrue(sm.isEmpty());
-        assertTrue(sm.remove(three) == null);
+        assertSame(sm.remove(three), null);
         assertEquals(4, map.size());
     }
 
@@ -777,7 +775,7 @@ public class TreeMapTest extends JSR166T
         NavigableMap ssm = sm.tailMap(four, true);
         assertEquals(four, ssm.firstKey());
         assertEquals(five, ssm.lastKey());
-        assertTrue(ssm.remove(four) != null);
+        assertEquals("D", ssm.remove(four));
         assertEquals(1, ssm.size());
         assertEquals(3, sm.size());
         assertEquals(4, map.size());
@@ -789,7 +787,7 @@ public class TreeMapTest extends JSR166T
     /**
      * Submaps of submaps subdivide correctly
      */
-    public void testRecursiveSubMaps() {
+    public void testRecursiveSubMaps() throws Exception {
         int mapSize = 1000;
         Class cl = TreeMap.class;
         NavigableMap<Integer, Integer> map = newMap(cl);
@@ -807,13 +805,9 @@ public class TreeMapTest extends JSR166T
                    0, mapSize - 1, true);
     }
 
-    static NavigableMap<Integer, Integer> newMap(Class cl) {
-        NavigableMap<Integer, Integer> result = null;
-        try {
-            result = (NavigableMap<Integer, Integer>) cl.newInstance();
-        } catch (Exception e) {
-            fail();
-        }
+    static NavigableMap<Integer, Integer> newMap(Class cl) throws Exception {
+        NavigableMap<Integer, Integer> result
+            = (NavigableMap<Integer, Integer>) cl.newInstance();
         assertEquals(result.size(), 0);
         assertFalse(result.keySet().iterator().hasNext());
         return result;
@@ -876,10 +870,8 @@ public class TreeMapTest extends JSR166T
             } else {
                 try {
                     map.put(key, 2 * key);
-                    fail();
-                } catch (IllegalArgumentException e) {
-                    // expected
-                }
+                    shouldThrow();
+                } catch (IllegalArgumentException success) {}
             }
         }
     }
@@ -1074,16 +1066,12 @@ public class TreeMapTest extends JSR166T
             assertEq(rs.last(),  -1);
             try {
                 map.firstKey();
-                fail();
-            } catch (NoSuchElementException e) {
-                // expected
-            }
+                shouldThrow();
+            } catch (NoSuchElementException success) {}
             try {
                 map.lastKey();
-                fail();
-            } catch (NoSuchElementException e) {
-                // expected
-            }
+                shouldThrow();
+            } catch (NoSuchElementException success) {}
         }
     }