--- jsr166/src/test/tck/JSR166TestCase.java	2013/03/20 20:29:02	1.103
+++ jsr166/src/test/tck/JSR166TestCase.java	2013/04/01 20:06:26	1.106
@@ -286,12 +286,14 @@ public class JSR166TestCase extends Test
         // Java8+ test classes
         if (atLeastJava8()) {
             String[] java8TestClassNames = {
-                "LongAdderTest",
-                "LongAccumulatorTest",
-                "DoubleAdderTest",
-                "DoubleAccumulatorTest",
                 "CompletableFutureTest",
+                "ConcurrentHashMap8Test",
+                "CountedCompleterTest",
+                "DoubleAccumulatorTest",
+                "DoubleAdderTest",
                 "ForkJoinPool8Test",
+                "LongAccumulatorTest",
+                "LongAdderTest",
                 "StampedLockTest",
             };
             addNamedTestClasses(suite, java8TestClassNames);
@@ -1346,4 +1348,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());
+        }
+    }
 }