ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/TreeSetTest.java
(Generate patch)

Comparing jsr166/src/test/tck/TreeSetTest.java (file contents):
Revision 1.2 by dl, Wed Apr 19 15:10:54 2006 UTC vs.
Revision 1.3 by dl, Thu Apr 20 20:35:00 2006 UTC

# Line 705 | Line 705 | public class TreeSetTest extends JSR166T
705          check(set,                 0, setSize - 1, true);
706          check(set.descendingSet(), 0, setSize - 1, false);
707  
708 <        bashSubSet(set.navigableSubSet(0, true, setSize, false),
708 >        bashSubSet(set.subSet(0, true, setSize, false),
709                     0, setSize - 1, true);
710      }
711  
# Line 812 | Line 812 | public class TreeSetTest extends JSR166T
812  
813          // headSet - pick direction and endpoint inclusion randomly
814          boolean incl = rnd.nextBoolean();
815 <        NavigableSet<Integer> hm = set.navigableHeadSet(midPoint, incl);
815 >        NavigableSet<Integer> hm = set.headSet(midPoint, incl);
816          if (ascending) {
817              if (rnd.nextBoolean())
818                  bashSubSet(hm, min, midPoint - (incl ? 0 : 1), true);
# Line 829 | Line 829 | public class TreeSetTest extends JSR166T
829  
830          // tailSet - pick direction and endpoint inclusion randomly
831          incl = rnd.nextBoolean();
832 <        NavigableSet<Integer> tm = set.navigableTailSet(midPoint,incl);
832 >        NavigableSet<Integer> tm = set.tailSet(midPoint,incl);
833          if (ascending) {
834              if (rnd.nextBoolean())
835                  bashSubSet(tm, midPoint + (incl ? 0 : 1), max, true);
# Line 854 | Line 854 | public class TreeSetTest extends JSR166T
854          boolean lowIncl = rnd.nextBoolean();
855          boolean highIncl = rnd.nextBoolean();
856          if (ascending) {
857 <            NavigableSet<Integer> sm = set.navigableSubSet(
857 >            NavigableSet<Integer> sm = set.subSet(
858                  endpoints[0], lowIncl, endpoints[1], highIncl);
859              if (rnd.nextBoolean())
860                  bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),
# Line 863 | Line 863 | public class TreeSetTest extends JSR166T
863                  bashSubSet(sm.descendingSet(), endpoints[0] + (lowIncl ? 0 : 1),
864                             endpoints[1] - (highIncl ? 0 : 1), false);
865          } else {
866 <            NavigableSet<Integer> sm = set.navigableSubSet(
866 >            NavigableSet<Integer> sm = set.subSet(
867                  endpoints[1], highIncl, endpoints[0], lowIncl);
868              if (rnd.nextBoolean())
869                  bashSubSet(sm, endpoints[0] + (lowIncl ? 0 : 1),

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines