--- jsr166/src/test/tck/ConcurrentSkipListMapTest.java 2011/03/15 19:47:06 1.22 +++ jsr166/src/test/tck/ConcurrentSkipListMapTest.java 2011/05/27 19:21:27 1.24 @@ -119,7 +119,6 @@ public class ConcurrentSkipListMapTest e assertEquals(five, map.lastKey()); } - /** * keySet.toArray returns contains all keys */ @@ -382,7 +381,6 @@ public class ConcurrentSkipListMapTest e assertEquals("Z", map.get(one)); } - /** * replace value fails when the given key not mapped to expected value */ @@ -403,7 +401,6 @@ public class ConcurrentSkipListMapTest e assertEquals("Z", map.get(one)); } - /** * remove removes the correct key-value pair from the map */ @@ -534,7 +531,6 @@ public class ConcurrentSkipListMapTest e } - /** * lowerKey returns preceding element */ @@ -678,7 +674,7 @@ public class ConcurrentSkipListMapTest e ConcurrentSkipListMap 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))); } } @@ -717,7 +713,6 @@ public class ConcurrentSkipListMapTest e } catch (NullPointerException success) {} } - /** * put(null,x) throws NPE */ @@ -814,8 +809,6 @@ public class ConcurrentSkipListMapTest e assertTrue(r.equals(q)); } - - /** * subMap returns map with keys in requested range */ @@ -1161,7 +1154,7 @@ public class ConcurrentSkipListMapTest e */ void check(NavigableMap map, final int min, final int max, final boolean ascending) { - class ReferenceSet { + class ReferenceSet { int lower(int key) { return ascending ? lowerAscending(key) : higherAscending(key); }