--- jsr166/src/test/loops/NavigableSetCheck.java 2014/12/31 17:00:58 1.11 +++ jsr166/src/test/loops/NavigableSetCheck.java 2015/08/10 03:13:33 1.13 @@ -37,7 +37,6 @@ public class NavigableSetCheck { } } - if (args.length > 1) numTests = Integer.parseInt(args[1]); @@ -46,7 +45,6 @@ public class NavigableSetCheck { System.out.println("Testing " + setClass.getName() + " trials: " + numTests + " size: " + size); - absentSize = 8; while (absentSize < size) absentSize <<= 1; absentMask = absentSize - 1; @@ -59,13 +57,11 @@ public class NavigableSetCheck { for (int i = 0; i < size; ++i) key[i] = new Integer(i * 2 + 1); - for (int rep = 0; rep < numTests; ++rep) { runTest(newSet(setClass), key); } TestTimer.printStats(); - } static NavigableSet newSet(Class cl) { @@ -77,7 +73,6 @@ public class NavigableSetCheck { } } - static void runTest(NavigableSet s, Integer[] key) { shuffle(key); int size = key.length; @@ -171,7 +166,6 @@ public class NavigableSetCheck { reallyAssert(sum == expect); } - static void higherTest(NavigableSet s) { int sum = 0; int iters = s.size(); @@ -226,7 +220,6 @@ public class NavigableSetCheck { reallyAssert(sum == iters-1); } - static void ktest(NavigableSet s, int size, Integer[] key) { timer.start("Contains ", size); int sum = 0; @@ -237,7 +230,6 @@ public class NavigableSetCheck { reallyAssert(sum == size); } - static void ittest1(NavigableSet s, int size) { int sum = 0; timer.start("Iter Key ", size); @@ -268,7 +260,6 @@ public class NavigableSetCheck { rittest1(s, size); } - static void rtest(NavigableSet s, int size) { timer.start("Remove (iterator) ", size); for (Iterator it = s.iterator(); it.hasNext(); ) { @@ -278,8 +269,6 @@ public class NavigableSetCheck { timer.finish(); } - - static void dtest(NavigableSet s, int size, Integer[] key) { timer.start("Add (addAll) ", size * 2); NavigableSet s2 = null; @@ -329,8 +318,6 @@ public class NavigableSetCheck { reallyAssert(s2.isEmpty() && s.isEmpty()); } - - static void test(NavigableSet s, Integer[] key) { int size = key.length; @@ -391,7 +378,6 @@ public class NavigableSetCheck { startTime = System.currentTimeMillis(); } - String classify() { if (name.startsWith("Contains")) return "Contains ";