--- jsr166/src/test/tck/TreeMapTest.java	2009/11/21 02:07:27	1.9
+++ jsr166/src/test/tck/TreeMapTest.java	2010/08/25 00:07:03	1.14
@@ -11,7 +11,7 @@ import java.io.*;
 
 public class TreeMapTest 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(TreeMapTest.class);
@@ -357,7 +357,6 @@ public class TreeMapTest extends JSR166T
 
         Map.Entry e4 = map.lowerEntry(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -376,7 +375,6 @@ public class TreeMapTest extends JSR166T
 
         Map.Entry e4 = map.higherEntry(six);
         assertNull(e4);
-
     }
 
     /**
@@ -395,7 +393,6 @@ public class TreeMapTest extends JSR166T
 
         Map.Entry e4 = map.floorEntry(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -414,7 +411,6 @@ public class TreeMapTest extends JSR166T
 
         Map.Entry e4 = map.ceilingEntry(six);
         assertNull(e4);
-
     }
 
 
@@ -434,7 +430,6 @@ public class TreeMapTest extends JSR166T
 
         Object e4 = q.lowerKey(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -453,7 +448,6 @@ public class TreeMapTest extends JSR166T
 
         Object e4 = q.higherKey(six);
         assertNull(e4);
-
     }
 
     /**
@@ -472,7 +466,6 @@ public class TreeMapTest extends JSR166T
 
         Object e4 = q.floorKey(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -491,7 +484,6 @@ public class TreeMapTest extends JSR166T
 
         Object e4 = q.ceilingKey(six);
         assertNull(e4);
-
     }
 
     /**
@@ -516,8 +508,7 @@ public class TreeMapTest extends JSR166T
         try {
             e.setValue("A");
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (UnsupportedOperationException success) {}
         e = map.pollFirstEntry();
         assertNull(e);
     }
@@ -544,8 +535,7 @@ public class TreeMapTest extends JSR166T
         try {
             e.setValue("E");
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (UnsupportedOperationException success) {}
         e = map.pollLastEntry();
         assertNull(e);
     }
@@ -581,7 +571,7 @@ public class TreeMapTest extends JSR166T
             TreeMap c = map5();
             c.get(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -592,7 +582,7 @@ public class TreeMapTest extends JSR166T
             TreeMap c = map5();
             c.containsKey(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -604,31 +594,26 @@ public class TreeMapTest extends JSR166T
             c.put("sadsdf", "asdads");
             c.remove(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
      * A deserialized map equals original
      */
-    public void testSerialization() {
+    public void testSerialization() throws Exception {
         TreeMap q = map5();
 
-        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));
-            TreeMap r = (TreeMap)in.readObject();
-            assertEquals(q.size(), r.size());
-            assertTrue(q.equals(r));
-            assertTrue(r.equals(q));
-        } 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));
+        TreeMap r = (TreeMap)in.readObject();
+        assertEquals(q.size(), r.size());
+        assertTrue(q.equals(r));
+        assertTrue(r.equals(q));
     }
 
     /**
@@ -667,7 +652,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());
     }
@@ -700,7 +685,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());
     }
 
@@ -782,7 +767,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());
@@ -794,7 +779,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);
@@ -812,13 +797,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;
@@ -881,10 +862,8 @@ public class TreeMapTest extends JSR166T
             } else {
                 try {
                     map.put(key, 2 * key);
-                    fail();
-                } catch (IllegalArgumentException e) {
-                    // expected
-                }
+                    shouldThrow();
+                } catch (IllegalArgumentException success) {}
             }
         }
     }
@@ -1079,16 +1058,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) {}
         }
     }