--- jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java	2009/11/21 17:38:05	1.11
+++ jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java	2010/08/25 00:07:03	1.15
@@ -11,7 +11,7 @@ import java.io.*;
 
 public class ConcurrentSkipListSubMapTest 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(ConcurrentSkipListSubMapTest.class);
@@ -343,7 +343,6 @@ public class ConcurrentSkipListSubMapTes
         map.remove(four, "A");
         assertEquals(4, map.size());
         assertTrue(map.containsKey(four));
-
     }
 
     /**
@@ -362,7 +361,6 @@ public class ConcurrentSkipListSubMapTes
 
         Map.Entry e4 = map.lowerEntry(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -381,7 +379,6 @@ public class ConcurrentSkipListSubMapTes
 
         Map.Entry e4 = map.higherEntry(six);
         assertNull(e4);
-
     }
 
     /**
@@ -400,7 +397,6 @@ public class ConcurrentSkipListSubMapTes
 
         Map.Entry e4 = map.floorEntry(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -419,7 +415,6 @@ public class ConcurrentSkipListSubMapTes
 
         Map.Entry e4 = map.ceilingEntry(six);
         assertNull(e4);
-
     }
 
     /**
@@ -649,7 +644,7 @@ public class ConcurrentSkipListSubMapTes
         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());
     }
@@ -677,7 +672,7 @@ public class ConcurrentSkipListSubMapTes
         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());
     }
 
@@ -749,7 +744,7 @@ public class ConcurrentSkipListSubMapTes
         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());
@@ -1035,7 +1030,6 @@ public class ConcurrentSkipListSubMapTes
         map.remove(m4, "A");
         assertEquals(4, map.size());
         assertTrue(map.containsKey(m4));
-
     }
 
     /**
@@ -1054,7 +1048,6 @@ public class ConcurrentSkipListSubMapTes
 
         Map.Entry e4 = map.lowerEntry(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -1073,7 +1066,6 @@ public class ConcurrentSkipListSubMapTes
 
         Map.Entry e4 = map.higherEntry(m6);
         assertNull(e4);
-
     }
 
     /**
@@ -1092,7 +1084,6 @@ public class ConcurrentSkipListSubMapTes
 
         Map.Entry e4 = map.floorEntry(zero);
         assertNull(e4);
-
     }
 
     /**
@@ -1111,7 +1102,6 @@ public class ConcurrentSkipListSubMapTes
 
         Map.Entry e4 = map.ceilingEntry(m6);
         assertNull(e4);
-
     }
 
     /**
@@ -1192,7 +1182,7 @@ public class ConcurrentSkipListSubMapTes
     // Exception testDescendings
 
     /**
-     * get(null) of nm1mpty map throws NPE
+     * get(null) of empty map throws NPE
      */
     public void testDescendingGet_NullPointerException() {
         try {
@@ -1203,7 +1193,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     * containsKey(null) of nm1mpty map throws NPE
+     * containsKey(null) of empty map throws NPE
      */
     public void testDescendingContainsKey_NullPointerException() {
         try {
@@ -1340,7 +1330,7 @@ public class ConcurrentSkipListSubMapTes
         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());
     }
@@ -1368,7 +1358,7 @@ public class ConcurrentSkipListSubMapTes
         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());
     }
 
@@ -1440,7 +1430,7 @@ public class ConcurrentSkipListSubMapTes
         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());