--- jsr166/src/test/tck/TreeMapTest.java 2004/12/28 16:15:59 1.1 +++ jsr166/src/test/tck/TreeMapTest.java 2005/03/22 01:30:22 1.2 @@ -592,7 +592,7 @@ public class TreeMapTest extends JSR166T */ public void testSubMapContents() { TreeMap map = map5(); - NavigableMap sm = map.subMap(two, four); + NavigableMap sm = map.navigableSubMap(two, four); assertEquals(two, sm.firstKey()); assertEquals(three, sm.lastKey()); assertEquals(2, sm.size()); @@ -630,7 +630,7 @@ public class TreeMapTest extends JSR166T public void testSubMapContents2() { TreeMap map = map5(); - NavigableMap sm = map.subMap(two, three); + NavigableMap sm = map.navigableSubMap(two, three); assertEquals(1, sm.size()); assertEquals(two, sm.firstKey()); assertEquals(two, sm.lastKey()); @@ -665,7 +665,7 @@ public class TreeMapTest extends JSR166T */ public void testHeadMapContents() { TreeMap map = map5(); - NavigableMap sm = map.headMap(four); + NavigableMap sm = map.navigableHeadMap(four); assertTrue(sm.containsKey(one)); assertTrue(sm.containsKey(two)); assertTrue(sm.containsKey(three)); @@ -691,7 +691,7 @@ public class TreeMapTest extends JSR166T */ public void testTailMapContents() { TreeMap map = map5(); - NavigableMap sm = map.tailMap(two); + NavigableMap sm = map.navigableTailMap(two); assertFalse(sm.containsKey(one)); assertTrue(sm.containsKey(two)); assertTrue(sm.containsKey(three)); @@ -735,7 +735,7 @@ public class TreeMapTest extends JSR166T assertEquals("E", e.getValue()); assertFalse(i.hasNext()); - NavigableMap ssm = sm.tailMap(four); + NavigableMap ssm = sm.navigableTailMap(four); assertEquals(four, ssm.firstKey()); assertEquals(five, ssm.lastKey()); assertTrue(ssm.remove(four) != null);