--- jsr166/src/test/loops/NavigableMapCheck.java 2014/12/31 17:00:58 1.13 +++ jsr166/src/test/loops/NavigableMapCheck.java 2015/01/15 18:34:19 1.14 @@ -37,7 +37,6 @@ public class NavigableMapCheck { } } - if (args.length > 1) numTests = Integer.parseInt(args[1]); @@ -46,7 +45,6 @@ public class NavigableMapCheck { System.out.println("Testing " + mapClass.getName() + " trials: " + numTests + " size: " + size); - absentSize = 8; while (absentSize < size) absentSize <<= 1; absentMask = absentSize - 1; @@ -59,7 +57,6 @@ public class NavigableMapCheck { for (int i = 0; i < size; ++i) key[i] = new Integer(i * 2 + 1); - for (int rep = 0; rep < numTests; ++rep) { runTest(newMap(mapClass), key); } @@ -77,7 +74,6 @@ public class NavigableMapCheck { } } - static void runTest(NavigableMap s, Integer[] key) { shuffle(key); int size = key.length; @@ -171,7 +167,6 @@ public class NavigableMapCheck { reallyAssert(sum == expect); } - static void t9(NavigableMap s) { int sum = 0; int iters = 20; @@ -237,7 +232,6 @@ public class NavigableMapCheck { reallyAssert(sum == iters-1); } - static void ktest(NavigableMap s, int size, Integer[] key) { timer.start("ContainsKey ", size); Set ks = s.keySet(); @@ -249,7 +243,6 @@ public class NavigableMapCheck { reallyAssert(sum == size); } - static void ittest1(NavigableMap s, int size) { int sum = 0; timer.start("Iter Key ", size); @@ -299,13 +292,11 @@ public class NavigableMapCheck { reallyAssert(sum == size); } - static void rittest(NavigableMap s, int size) { rittest1(s, size); // rittest2(s, size); } - static void rtest(NavigableMap s, int size) { timer.start("Remove (iterator) ", size); for (Iterator it = s.keySet().iterator(); it.hasNext(); ) { @@ -324,7 +315,6 @@ public class NavigableMapCheck { timer.finish(); } - static void dtest(NavigableMap s, int size, Integer[] key) { timer.start("Put (putAll) ", size * 2); NavigableMap s2 = null; @@ -391,8 +381,6 @@ public class NavigableMapCheck { reallyAssert(s2.isEmpty() && s.isEmpty()); } - - static void test(NavigableMap s, Integer[] key) { int size = key.length; @@ -454,7 +442,6 @@ public class NavigableMapCheck { startTime = System.currentTimeMillis(); } - String classify() { if (name.startsWith("Get")) return "Get ";