--- jsr166/src/test/tck/JSR166TestCase.java	2013/03/21 00:26:43	1.104
+++ jsr166/src/test/tck/JSR166TestCase.java	2014/05/14 21:06:38	1.115
@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.Atomi
 import java.util.concurrent.atomic.AtomicReference;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import java.util.regex.Pattern;
 import java.security.CodeSource;
 import java.security.Permission;
 import java.security.PermissionCollection;
@@ -128,11 +129,34 @@ public class JSR166TestCase extends Test
     private static final long profileThreshold =
         Long.getLong("jsr166.profileThreshold", 100);
 
+    /**
+     * The number of repetitions per test (for tickling rare bugs).
+     */
+    private static final int runsPerTest =
+        Integer.getInteger("jsr166.runsPerTest", 1);
+
+    /**
+     * A filter for tests to run, matching strings of the form
+     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
+     * Usefully combined with jsr166.runsPerTest.
+     */
+    private static final Pattern methodFilter = methodFilter();
+
+    private static Pattern methodFilter() {
+        String regex = System.getProperty("jsr166.methodFilter");
+        return (regex == null) ? null : Pattern.compile(regex);
+    }
+
     protected void runTest() throws Throwable {
-        if (profileTests)
-            runTestProfiled();
-        else
-            super.runTest();
+        if (methodFilter == null
+            || methodFilter.matcher(toString()).find()) {
+            for (int i = 0; i < runsPerTest; i++) {
+                if (profileTests)
+                    runTestProfiled();
+                else
+                    super.runTest();
+            }
+        }
     }
 
     protected void runTestProfiled() throws Throwable {
@@ -197,12 +221,17 @@ public class JSR166TestCase extends Test
     }
 
     public static final double JAVA_CLASS_VERSION;
+    public static final String JAVA_SPECIFICATION_VERSION;
     static {
         try {
             JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
                 new java.security.PrivilegedAction<Double>() {
                 public Double run() {
                     return Double.valueOf(System.getProperty("java.class.version"));}});
+            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
+                new java.security.PrivilegedAction<String>() {
+                public String run() {
+                    return System.getProperty("java.specification.version");}});
         } catch (Throwable t) {
             throw new Error(t);
         }
@@ -211,6 +240,10 @@ public class JSR166TestCase extends Test
     public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
     public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
     public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
+    public static boolean atLeastJava9() {
+        // As of 2014-05, java9 still uses 52.0 class file version
+        return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
+    }
 
     /**
      * Collects all JSR166 unit tests as one suite.
@@ -286,28 +319,41 @@ public class JSR166TestCase extends Test
         // Java8+ test classes
         if (atLeastJava8()) {
             String[] java8TestClassNames = {
+                "Atomic8Test",
                 "CompletableFutureTest",
+                "ConcurrentHashMap8Test",
                 "CountedCompleterTest",
                 "DoubleAccumulatorTest",
                 "DoubleAdderTest",
                 "ForkJoinPool8Test",
+                "ForkJoinTask8Test",
                 "LongAccumulatorTest",
                 "LongAdderTest",
+                "SplittableRandomTest",
                 "StampedLockTest",
+                "ThreadLocalRandom8Test",
             };
             addNamedTestClasses(suite, java8TestClassNames);
         }
 
+        // Java9+ test classes
+        if (atLeastJava9()) {
+            String[] java9TestClassNames = {
+                "ThreadPoolExecutor9Test",
+            };
+            addNamedTestClasses(suite, java9TestClassNames);
+        }
+
         return suite;
     }
 
+    // Delays for timing-dependent tests, in milliseconds.
 
     public static long SHORT_DELAY_MS;
     public static long SMALL_DELAY_MS;
     public static long MEDIUM_DELAY_MS;
     public static long LONG_DELAY_MS;
 
-
     /**
      * Returns the shortest timed delay. This could
      * be reimplemented to use for example a Property.
@@ -700,7 +746,6 @@ public class JSR166TestCase extends Test
     public static final Integer m6  = new Integer(-6);
     public static final Integer m10 = new Integer(-10);
 
-
     /**
      * Runs Runnable r with a security policy that permits precisely
      * the specified permissions.  If there is no current security
@@ -1231,7 +1276,7 @@ public class JSR166TestCase extends Test
     public abstract class CheckedRecursiveAction extends RecursiveAction {
         protected abstract void realCompute() throws Throwable;
 
-        public final void compute() {
+        @Override protected final void compute() {
             try {
                 realCompute();
             } catch (Throwable t) {
@@ -1246,7 +1291,7 @@ public class JSR166TestCase extends Test
     public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
         protected abstract T realCompute() throws Throwable;
 
-        public final T compute() {
+        @Override protected final T compute() {
             try {
                 return realCompute();
             } catch (Throwable t) {
@@ -1347,4 +1392,25 @@ public class JSR166TestCase extends Test
             return null;
         }
     }
+
+    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
+                             Runnable... throwingActions) {
+        for (Runnable throwingAction : throwingActions) {
+            boolean threw = false;
+            try { throwingAction.run(); }
+            catch (Throwable t) {
+                threw = true;
+                if (!expectedExceptionClass.isInstance(t)) {
+                    AssertionFailedError afe =
+                        new AssertionFailedError
+                        ("Expected " + expectedExceptionClass.getName() +
+                         ", got " + t.getClass().getName());
+                    afe.initCause(t);
+                    threadUnexpectedException(afe);
+                }
+            }
+            if (!threw)
+                shouldThrow(expectedExceptionClass.getName());
+        }
+    }
 }