--- jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java	2009/12/01 06:03:49	1.12
+++ jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java	2010/10/09 19:30:34	1.16
@@ -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);
@@ -64,7 +64,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  clear removes all pairs
+     * clear removes all pairs
      */
     public void testClear() {
         ConcurrentNavigableMap map = map5();
@@ -74,7 +74,7 @@ public class ConcurrentSkipListSubMapTes
 
 
     /**
-     *  Maps with same contents are equal
+     * Maps with same contents are equal
      */
     public void testEquals() {
         ConcurrentNavigableMap map1 = map5();
@@ -87,7 +87,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  containsKey returns true for contained key
+     * containsKey returns true for contained key
      */
     public void testContainsKey() {
         ConcurrentNavigableMap map = map5();
@@ -96,7 +96,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  containsValue returns true for held values
+     * containsValue returns true for held values
      */
     public void testContainsValue() {
         ConcurrentNavigableMap map = map5();
@@ -105,8 +105,8 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  get returns the correct element at the given key,
-     *  or null if not present
+     * get returns the correct element at the given key,
+     * or null if not present
      */
     public void testGet() {
         ConcurrentNavigableMap map = map5();
@@ -116,7 +116,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  isEmpty is true of empty map and false for non-empty
+     * isEmpty is true of empty map and false for non-empty
      */
     public void testIsEmpty() {
         ConcurrentNavigableMap empty = map0();
@@ -126,7 +126,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   firstKey returns first key
+     * firstKey returns first key
      */
     public void testFirstKey() {
         ConcurrentNavigableMap map = map5();
@@ -134,7 +134,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   lastKey returns last key
+     * lastKey returns last key
      */
     public void testLastKey() {
         ConcurrentNavigableMap map = map5();
@@ -143,7 +143,7 @@ public class ConcurrentSkipListSubMapTes
 
 
     /**
-     *   keySet returns a Set containing all the keys
+     * keySet returns a Set containing all the keys
      */
     public void testKeySet() {
         ConcurrentNavigableMap map = map5();
@@ -157,7 +157,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   keySet is ordered
+     * keySet is ordered
      */
     public void testKeySetOrder() {
         ConcurrentNavigableMap map = map5();
@@ -187,7 +187,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  keySet.toArray returns contains all keys
+     * keySet.toArray returns contains all keys
      */
     public void testKeySetToArray() {
         ConcurrentNavigableMap map = map5();
@@ -200,7 +200,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  descendingkeySet.toArray returns contains all keys
+     * descendingkeySet.toArray returns contains all keys
      */
     public void testDescendingKeySetToArray() {
         ConcurrentNavigableMap map = map5();
@@ -213,7 +213,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  Values.toArray contains all values
+     * Values.toArray contains all values
      */
     public void testValuesToArray() {
         ConcurrentNavigableMap map = map5();
@@ -249,7 +249,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   putAll  adds all key-value pairs from the given map
+     * putAll adds all key-value pairs from the given map
      */
     public void testPutAll() {
         ConcurrentNavigableMap empty = map0();
@@ -264,7 +264,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   putIfAbsent works when the given key is not present
+     * putIfAbsent works when the given key is not present
      */
     public void testPutIfAbsent() {
         ConcurrentNavigableMap map = map5();
@@ -273,7 +273,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   putIfAbsent does not add the pair if the key is already present
+     * putIfAbsent does not add the pair if the key is already present
      */
     public void testPutIfAbsent2() {
         ConcurrentNavigableMap map = map5();
@@ -281,7 +281,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   replace fails when the given key is not present
+     * replace fails when the given key is not present
      */
     public void testReplace() {
         ConcurrentNavigableMap map = map5();
@@ -290,7 +290,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   replace succeeds if the key is already present
+     * replace succeeds if the key is already present
      */
     public void testReplace2() {
         ConcurrentNavigableMap map = map5();
@@ -321,7 +321,7 @@ public class ConcurrentSkipListSubMapTes
 
 
     /**
-     *   remove removes the correct key-value pair from the map
+     * remove removes the correct key-value pair from the map
      */
     public void testRemove() {
         ConcurrentNavigableMap map = map5();
@@ -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);
-
     }
 
     /**
@@ -477,7 +472,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   size returns the correct values
+     * size returns the correct values
      */
     public void testSize() {
         ConcurrentNavigableMap map = map5();
@@ -756,7 +751,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  clear removes all pairs
+     * clear removes all pairs
      */
     public void testDescendingClear() {
         ConcurrentNavigableMap map = dmap5();
@@ -766,7 +761,7 @@ public class ConcurrentSkipListSubMapTes
 
 
     /**
-     *  Maps with same contents are equal
+     * Maps with same contents are equal
      */
     public void testDescendingEquals() {
         ConcurrentNavigableMap map1 = dmap5();
@@ -779,7 +774,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  containsKey returns true for contained key
+     * containsKey returns true for contained key
      */
     public void testDescendingContainsKey() {
         ConcurrentNavigableMap map = dmap5();
@@ -788,7 +783,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  containsValue returns true for held values
+     * containsValue returns true for held values
      */
     public void testDescendingContainsValue() {
         ConcurrentNavigableMap map = dmap5();
@@ -797,8 +792,8 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  get returns the correct element at the given key,
-     *  or null if not present
+     * get returns the correct element at the given key,
+     * or null if not present
      */
     public void testDescendingGet() {
         ConcurrentNavigableMap map = dmap5();
@@ -808,7 +803,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  isEmpty is true of empty map and false for non-empty
+     * isEmpty is true of empty map and false for non-empty
      */
     public void testDescendingIsEmpty() {
         ConcurrentNavigableMap empty = dmap0();
@@ -818,7 +813,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   firstKey returns first key
+     * firstKey returns first key
      */
     public void testDescendingFirstKey() {
         ConcurrentNavigableMap map = dmap5();
@@ -826,7 +821,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   lastKey returns last key
+     * lastKey returns last key
      */
     public void testDescendingLastKey() {
         ConcurrentNavigableMap map = dmap5();
@@ -835,7 +830,7 @@ public class ConcurrentSkipListSubMapTes
 
 
     /**
-     *   keySet returns a Set containing all the keys
+     * keySet returns a Set containing all the keys
      */
     public void testDescendingKeySet() {
         ConcurrentNavigableMap map = dmap5();
@@ -849,7 +844,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   keySet is ordered
+     * keySet is ordered
      */
     public void testDescendingKeySetOrder() {
         ConcurrentNavigableMap map = dmap5();
@@ -879,7 +874,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  keySet.toArray returns contains all keys
+     * keySet.toArray returns contains all keys
      */
     public void testDescendingAscendingKeySetToArray() {
         ConcurrentNavigableMap map = dmap5();
@@ -892,7 +887,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  descendingkeySet.toArray returns contains all keys
+     * descendingkeySet.toArray returns contains all keys
      */
     public void testDescendingDescendingKeySetToArray() {
         ConcurrentNavigableMap map = dmap5();
@@ -905,7 +900,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *  Values.toArray contains all values
+     * Values.toArray contains all values
      */
     public void testDescendingValuesToArray() {
         ConcurrentNavigableMap map = dmap5();
@@ -941,7 +936,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   putAll  adds all key-value pairs from the given map
+     * putAll adds all key-value pairs from the given map
      */
     public void testDescendingPutAll() {
         ConcurrentNavigableMap empty = dmap0();
@@ -956,7 +951,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   putIfAbsent works when the given key is not present
+     * putIfAbsent works when the given key is not present
      */
     public void testDescendingPutIfAbsent() {
         ConcurrentNavigableMap map = dmap5();
@@ -965,7 +960,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   putIfAbsent does not add the pair if the key is already present
+     * putIfAbsent does not add the pair if the key is already present
      */
     public void testDescendingPutIfAbsent2() {
         ConcurrentNavigableMap map = dmap5();
@@ -973,7 +968,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   replace fails when the given key is not present
+     * replace fails when the given key is not present
      */
     public void testDescendingReplace() {
         ConcurrentNavigableMap map = dmap5();
@@ -982,7 +977,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   replace succeeds if the key is already present
+     * replace succeeds if the key is already present
      */
     public void testDescendingReplace2() {
         ConcurrentNavigableMap map = dmap5();
@@ -1013,7 +1008,7 @@ public class ConcurrentSkipListSubMapTes
 
 
     /**
-     *   remove removes the correct key-value pair from the map
+     * remove removes the correct key-value pair from the map
      */
     public void testDescendingRemove() {
         ConcurrentNavigableMap map = dmap5();
@@ -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);
-
     }
 
     /**
@@ -1169,7 +1159,7 @@ public class ConcurrentSkipListSubMapTes
     }
 
     /**
-     *   size returns the correct values
+     * size returns the correct values
      */
     public void testDescendingSize() {
         ConcurrentNavigableMap map = dmap5();
@@ -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 {