--- jsr166/src/test/tck/TreeSubMapTest.java	2009/11/21 02:07:27	1.7
+++ jsr166/src/test/tck/TreeSubMapTest.java	2009/12/01 09:44:58	1.11
@@ -246,7 +246,6 @@ public class TreeSubMapTest extends JSR1
 
         Map.Entry e4 = map.lowerEntry(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -265,7 +264,6 @@ public class TreeSubMapTest extends JSR1
 
         Map.Entry e4 = map.higherEntry(six);
         assertNull(e4);
-
     }
 
     /**
@@ -284,7 +282,6 @@ public class TreeSubMapTest extends JSR1
 
         Map.Entry e4 = map.floorEntry(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -303,7 +300,6 @@ public class TreeSubMapTest extends JSR1
 
         Map.Entry e4 = map.ceilingEntry(six);
         assertNull(e4);
-
     }
 
     /**
@@ -328,8 +324,7 @@ public class TreeSubMapTest extends JSR1
         try {
             e.setValue("A");
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (UnsupportedOperationException success) {}
         assertTrue(map.isEmpty());
         Map.Entry f = map.firstEntry();
         assertNull(f);
@@ -359,8 +354,7 @@ public class TreeSubMapTest extends JSR1
         try {
             e.setValue("E");
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (UnsupportedOperationException success) {}
         e = map.pollLastEntry();
         assertNull(e);
     }
@@ -396,7 +390,7 @@ public class TreeSubMapTest extends JSR1
             NavigableMap c = map5();
             c.get(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -407,7 +401,7 @@ public class TreeSubMapTest extends JSR1
             NavigableMap c = map5();
             c.containsKey(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -418,7 +412,7 @@ public class TreeSubMapTest extends JSR1
             NavigableMap c = map5();
             c.put(null, "whatever");
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -429,32 +423,27 @@ public class TreeSubMapTest extends JSR1
             NavigableMap c = map5();
             c.remove(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
      * A deserialized map equals original
      */
-    public void testSerialization() {
+    public void testSerialization() throws Exception {
         NavigableMap 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));
-            NavigableMap r = (NavigableMap)in.readObject();
-            assertFalse(r.isEmpty());
-            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));
+        NavigableMap r = (NavigableMap)in.readObject();
+        assertFalse(r.isEmpty());
+        assertEquals(q.size(), r.size());
+        assertTrue(q.equals(r));
+        assertTrue(r.equals(q));
     }
 
 
@@ -488,7 +477,7 @@ public class TreeSubMapTest extends JSR1
         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());
     }
@@ -516,7 +505,7 @@ public class TreeSubMapTest extends JSR1
         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());
     }
 
@@ -588,7 +577,7 @@ public class TreeSubMapTest extends JSR1
         SortedMap ssm = sm.tailMap(four);
         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());
@@ -821,7 +810,6 @@ public class TreeSubMapTest extends JSR1
 
         Map.Entry e4 = map.lowerEntry(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -840,7 +828,6 @@ public class TreeSubMapTest extends JSR1
 
         Map.Entry e4 = map.higherEntry(m6);
         assertNull(e4);
-
     }
 
     /**
@@ -859,7 +846,6 @@ public class TreeSubMapTest extends JSR1
 
         Map.Entry e4 = map.floorEntry(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -878,7 +864,6 @@ public class TreeSubMapTest extends JSR1
 
         Map.Entry e4 = map.ceilingEntry(m6);
         assertNull(e4);
-
     }
 
     /**
@@ -903,8 +888,7 @@ public class TreeSubMapTest extends JSR1
         try {
             e.setValue("A");
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (UnsupportedOperationException success) {}
         e = map.pollFirstEntry();
         assertNull(e);
     }
@@ -931,8 +915,7 @@ public class TreeSubMapTest extends JSR1
         try {
             e.setValue("E");
             shouldThrow();
-        } catch (Exception ok) {
-        }
+        } catch (UnsupportedOperationException success) {}
         e = map.pollLastEntry();
         assertNull(e);
     }
@@ -968,7 +951,7 @@ public class TreeSubMapTest extends JSR1
             NavigableMap c = dmap5();
             c.get(null);
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
@@ -979,35 +962,29 @@ public class TreeSubMapTest extends JSR1
             NavigableMap c = dmap5();
             c.put(null, "whatever");
             shouldThrow();
-        } catch (NullPointerException e) {}
+        } catch (NullPointerException success) {}
     }
 
     /**
      * A deserialized map equals original
      */
-    public void testDescendingSerialization() {
+    public void testDescendingSerialization() throws Exception {
         NavigableMap q = dmap5();
 
-        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));
-            NavigableMap r = (NavigableMap)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));
+        NavigableMap r = (NavigableMap)in.readObject();
+        assertEquals(q.size(), r.size());
+        assertTrue(q.equals(r));
+        assertTrue(r.equals(q));
     }
 
 
-
     /**
      * subMap returns map with keys in requested range
      */
@@ -1037,7 +1014,7 @@ public class TreeSubMapTest extends JSR1
         assertEquals(1, sm.size());
         assertEquals(m3, sm.firstKey());
         assertEquals(m3, sm.lastKey());
-        assertTrue(sm.remove(m3) != null);
+        assertEquals("C", sm.remove(m3));
         assertTrue(sm.isEmpty());
         assertEquals(3, map.size());
     }
@@ -1065,7 +1042,7 @@ public class TreeSubMapTest extends JSR1
         assertEquals(4, map.size());
         assertEquals(0, sm.size());
         assertTrue(sm.isEmpty());
-        assertTrue(sm.remove(m3) == null);
+        assertSame(sm.remove(m3), null);
         assertEquals(4, map.size());
     }
 
@@ -1137,7 +1114,7 @@ public class TreeSubMapTest extends JSR1
         SortedMap ssm = sm.tailMap(m4);
         assertEquals(m4, ssm.firstKey());
         assertEquals(m5, ssm.lastKey());
-        assertTrue(ssm.remove(m4) != null);
+        assertEquals("D", ssm.remove(m4));
         assertEquals(1, ssm.size());
         assertEquals(3, sm.size());
         assertEquals(4, map.size());