--- jsr166/src/test/tck/TreeMapTest.java	2009/11/21 17:38:06	1.11
+++ jsr166/src/test/tck/TreeMapTest.java	2010/09/01 20:12:39	1.15
@@ -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);
-
     }
 
     /**
@@ -660,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());
     }
@@ -693,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());
     }
 
@@ -775,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());
@@ -1000,7 +992,7 @@ public class TreeMapTest extends JSR166T
                 // BitSet should support this! Test would run much faster
                 while (key >= min) {
                     if (bs.get(key))
-                        return(key);
+                        return key;
                     key--;
                 }
                 return -1;