--- jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java	2011/03/15 19:47:06	1.17
+++ jsr166/src/test/tck/ConcurrentSkipListSubMapTest.java	2011/05/27 19:21:27	1.18
@@ -72,7 +72,6 @@ public class ConcurrentSkipListSubMapTes
         assertEquals(map.size(), 0);
     }
 
-
     /**
      * Maps with same contents are equal
      */
@@ -141,7 +140,6 @@ public class ConcurrentSkipListSubMapTes
         assertEquals(five, map.lastKey());
     }
 
-
     /**
      * keySet returns a Set containing all the keys
      */
@@ -228,7 +226,6 @@ public class ConcurrentSkipListSubMapTes
         assertTrue(s.contains("E"));
     }
 
-
     /**
      * entrySet contains all pairs
      */
@@ -298,7 +295,6 @@ public class ConcurrentSkipListSubMapTes
         assertEquals("Z", map.get(one));
     }
 
-
     /**
      * replace value fails when the given key not mapped to expected value
      */
@@ -319,7 +315,6 @@ public class ConcurrentSkipListSubMapTes
         assertEquals("Z", map.get(one));
     }
 
-
     /**
      * remove removes the correct key-value pair from the map
      */
@@ -488,7 +483,7 @@ public class ConcurrentSkipListSubMapTes
         ConcurrentNavigableMap map = map5();
         String s = map.toString();
         for (int i = 1; i <= 5; ++i) {
-            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
+            assertTrue(s.contains(String.valueOf(i)));
         }
     }
 
@@ -527,7 +522,6 @@ public class ConcurrentSkipListSubMapTes
         } catch (NullPointerException success) {}
     }
 
-
     /**
      * put(null,x) throws NPE
      */
@@ -613,8 +607,6 @@ public class ConcurrentSkipListSubMapTes
         assertTrue(r.equals(q));
     }
 
-
-
     /**
      * subMap returns map with keys in requested range
      */
@@ -759,7 +751,6 @@ public class ConcurrentSkipListSubMapTes
         assertEquals(map.size(), 0);
     }
 
-
     /**
      * Maps with same contents are equal
      */
@@ -828,7 +819,6 @@ public class ConcurrentSkipListSubMapTes
         assertEquals(m5, map.lastKey());
     }
 
-
     /**
      * keySet returns a Set containing all the keys
      */
@@ -915,7 +905,6 @@ public class ConcurrentSkipListSubMapTes
         assertTrue(s.contains("E"));
     }
 
-
     /**
      * entrySet contains all pairs
      */
@@ -985,7 +974,6 @@ public class ConcurrentSkipListSubMapTes
         assertEquals("Z", map.get(m1));
     }
 
-
     /**
      * replace value fails when the given key not mapped to expected value
      */
@@ -1006,7 +994,6 @@ public class ConcurrentSkipListSubMapTes
         assertEquals("Z", map.get(m1));
     }
 
-
     /**
      * remove removes the correct key-value pair from the map
      */
@@ -1175,7 +1162,7 @@ public class ConcurrentSkipListSubMapTes
         ConcurrentNavigableMap map = dmap5();
         String s = map.toString();
         for (int i = 1; i <= 5; ++i) {
-            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
+            assertTrue(s.contains(String.valueOf(i)));
         }
     }
 
@@ -1214,7 +1201,6 @@ public class ConcurrentSkipListSubMapTes
         } catch (NullPointerException success) {}
     }
 
-
     /**
      * put(null,x) throws NPE
      */
@@ -1300,7 +1286,6 @@ public class ConcurrentSkipListSubMapTes
         assertTrue(r.equals(q));
     }
 
-
     /**
      * subMap returns map with keys in requested range
      */