--- jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java	2010/11/18 20:21:53	1.17
+++ jsr166/src/test/tck/ConcurrentSkipListSubSetTest.java	2011/05/27 19:21:27	1.19
@@ -1,7 +1,7 @@
 /*
  * Written by Doug Lea with assistance from members of JCP JSR-166
  * Expert Group and released to the public domain, as explained at
- * http://creativecommons.org/licenses/publicdomain
+ * http://creativecommons.org/publicdomain/zero/1.0/
  */
 
 import junit.framework.*;
@@ -97,7 +97,6 @@ public class ConcurrentSkipListSubSetTes
         assertEquals(0, set0().size());
     }
 
-
     /**
      * isEmpty is true before add, false after
      */
@@ -168,7 +167,6 @@ public class ConcurrentSkipListSubSetTes
         } catch (ClassCastException success) {}
     }
 
-
     /**
      * addAll(null) throws NPE
      */
@@ -329,8 +327,6 @@ public class ConcurrentSkipListSubSetTes
         }
     }
 
-
-
     /**
      * lower returns preceding element
      */
@@ -472,7 +468,6 @@ public class ConcurrentSkipListSubSetTes
         assertFalse(it.hasNext());
     }
 
-
     /**
      * toString contains toStrings of elements
      */
@@ -480,7 +475,7 @@ public class ConcurrentSkipListSubSetTes
         NavigableSet q = populatedSet(SIZE);
         String s = q.toString();
         for (int i = 0; i < SIZE; ++i) {
-            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
+            assertTrue(s.contains(String.valueOf(i)));
         }
     }
 
@@ -677,7 +672,6 @@ public class ConcurrentSkipListSubSetTes
         } catch (ClassCastException success) {}
     }
 
-
     /**
      * addAll(null) throws NPE
      */
@@ -832,8 +826,6 @@ public class ConcurrentSkipListSubSetTes
         }
     }
 
-
-
     /**
      * lower returns preceding element
      */
@@ -976,7 +968,6 @@ public class ConcurrentSkipListSubSetTes
         assertFalse(it.hasNext());
     }
 
-
     /**
      * toString contains toStrings of elements
      */
@@ -984,7 +975,7 @@ public class ConcurrentSkipListSubSetTes
         NavigableSet q = populatedSet(SIZE);
         String s = q.toString();
         for (int i = 0; i < SIZE; ++i) {
-            assertTrue(s.indexOf(String.valueOf(i)) >= 0);
+            assertTrue(s.contains(String.valueOf(i)));
         }
     }