--- jsr166/src/test/tck/ConcurrentSkipListSetTest.java 2006/04/19 15:10:54 1.2 +++ jsr166/src/test/tck/ConcurrentSkipListSetTest.java 2006/04/20 20:35:00 1.3 @@ -700,7 +700,7 @@ public class ConcurrentSkipListSetTest e check(set, 0, setSize - 1, true); check(set.descendingSet(), 0, setSize - 1, false); - bashSubSet(set.navigableSubSet(0, true, setSize, false), + bashSubSet(set.subSet(0, true, setSize, false), 0, setSize - 1, true); } @@ -807,7 +807,7 @@ public class ConcurrentSkipListSetTest e // headSet - pick direction and endpoint inclusion randomly boolean incl = rnd.nextBoolean(); - NavigableSet hm = set.navigableHeadSet(midPoint, incl); + NavigableSet hm = set.headSet(midPoint, incl); if (ascending) { if (rnd.nextBoolean()) bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true); @@ -824,7 +824,7 @@ public class ConcurrentSkipListSetTest e // tailSet - pick direction and endpoint inclusion randomly incl = rnd.nextBoolean(); - NavigableSet tm = set.navigableTailSet(midPoint,incl); + NavigableSet tm = set.tailSet(midPoint,incl); if (ascending) { if (rnd.nextBoolean()) bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true); @@ -849,7 +849,7 @@ public class ConcurrentSkipListSetTest e boolean lowIncl = rnd.nextBoolean(); boolean highIncl = rnd.nextBoolean(); if (ascending) { - NavigableSet sm = set.navigableSubSet( + NavigableSet sm = set.subSet( endpoints[0], lowIncl, endpoints[1], highIncl); if (rnd.nextBoolean()) bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1), @@ -858,7 +858,7 @@ public class ConcurrentSkipListSetTest e bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1), endpoints[1] - (highIncl ? 0 : 1), false); } else { - NavigableSet sm = set.navigableSubSet( + NavigableSet sm = set.subSet( endpoints[1], highIncl, endpoints[0], lowIncl); if (rnd.nextBoolean()) bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),