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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.55 by jsr166, Mon Sep 20 20:42:37 2010 UTC vs.
Revision 1.238 by jsr166, Mon Dec 11 00:27:08 2017 UTC

# Line 1 | Line 1
1   /*
2 < * Written by Doug Lea with assistance from members of JCP JSR-166
3 < * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
2 > * Written by Doug Lea and Martin Buchholz with assistance from
3 > * members of JCP JSR-166 Expert Group and released to the public
4 > * domain, as explained at
5 > * http://creativecommons.org/publicdomain/zero/1.0/
6   * Other contributors include Andrew Wright, Jeffrey Hayes,
7   * Pat Fisher, Mike Judd.
8   */
9  
10 < import junit.framework.*;
11 < import java.util.PropertyPermission;
12 < import java.util.concurrent.*;
13 < import java.util.concurrent.atomic.AtomicReference;
10 > /*
11 > * @test
12 > * @summary JSR-166 tck tests, in a number of variations.
13 > *          The first is the conformance testing variant,
14 > *          while others also test implementation details.
15 > * @build *
16 > * @modules java.management
17 > * @run junit/othervm/timeout=1000 JSR166TestCase
18 > * @run junit/othervm/timeout=1000
19 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
20 > *      --add-opens java.base/java.lang=ALL-UNNAMED
21 > *      -Djsr166.testImplementationDetails=true
22 > *      JSR166TestCase
23 > * @run junit/othervm/timeout=1000
24 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
25 > *      --add-opens java.base/java.lang=ALL-UNNAMED
26 > *      -Djsr166.testImplementationDetails=true
27 > *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
28 > *      JSR166TestCase
29 > * @run junit/othervm/timeout=1000
30 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
31 > *      --add-opens java.base/java.lang=ALL-UNNAMED
32 > *      -Djsr166.testImplementationDetails=true
33 > *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
34 > *      -Djava.util.secureRandomSeed=true
35 > *      JSR166TestCase
36 > * @run junit/othervm/timeout=1000/policy=tck.policy
37 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
38 > *      --add-opens java.base/java.lang=ALL-UNNAMED
39 > *      -Djsr166.testImplementationDetails=true
40 > *      JSR166TestCase
41 > */
42 >
43   import static java.util.concurrent.TimeUnit.MILLISECONDS;
44 + import static java.util.concurrent.TimeUnit.MINUTES;
45 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
46 +
47 + import java.io.ByteArrayInputStream;
48 + import java.io.ByteArrayOutputStream;
49 + import java.io.ObjectInputStream;
50 + import java.io.ObjectOutputStream;
51 + import java.lang.management.ManagementFactory;
52 + import java.lang.management.ThreadInfo;
53 + import java.lang.management.ThreadMXBean;
54 + import java.lang.reflect.Constructor;
55 + import java.lang.reflect.Method;
56 + import java.lang.reflect.Modifier;
57   import java.security.CodeSource;
58   import java.security.Permission;
59   import java.security.PermissionCollection;
# Line 18 | Line 61 | import java.security.Permissions;
61   import java.security.Policy;
62   import java.security.ProtectionDomain;
63   import java.security.SecurityPermission;
64 + import java.util.ArrayList;
65 + import java.util.Arrays;
66 + import java.util.Collection;
67 + import java.util.Collections;
68 + import java.util.Date;
69 + import java.util.Enumeration;
70 + import java.util.Iterator;
71 + import java.util.List;
72 + import java.util.NoSuchElementException;
73 + import java.util.PropertyPermission;
74 + import java.util.concurrent.BlockingQueue;
75 + import java.util.concurrent.Callable;
76 + import java.util.concurrent.CountDownLatch;
77 + import java.util.concurrent.CyclicBarrier;
78 + import java.util.concurrent.ExecutionException;
79 + import java.util.concurrent.Executor;
80 + import java.util.concurrent.Executors;
81 + import java.util.concurrent.ExecutorService;
82 + import java.util.concurrent.ForkJoinPool;
83 + import java.util.concurrent.Future;
84 + import java.util.concurrent.FutureTask;
85 + import java.util.concurrent.RecursiveAction;
86 + import java.util.concurrent.RecursiveTask;
87 + import java.util.concurrent.RejectedExecutionException;
88 + import java.util.concurrent.RejectedExecutionHandler;
89 + import java.util.concurrent.Semaphore;
90 + import java.util.concurrent.ScheduledExecutorService;
91 + import java.util.concurrent.ScheduledFuture;
92 + import java.util.concurrent.SynchronousQueue;
93 + import java.util.concurrent.ThreadFactory;
94 + import java.util.concurrent.ThreadLocalRandom;
95 + import java.util.concurrent.ThreadPoolExecutor;
96 + import java.util.concurrent.TimeUnit;
97 + import java.util.concurrent.TimeoutException;
98 + import java.util.concurrent.atomic.AtomicBoolean;
99 + import java.util.concurrent.atomic.AtomicReference;
100 + import java.util.regex.Pattern;
101 +
102 + import junit.framework.AssertionFailedError;
103 + import junit.framework.Test;
104 + import junit.framework.TestCase;
105 + import junit.framework.TestResult;
106 + import junit.framework.TestSuite;
107  
108   /**
109   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 29 | Line 115 | import java.security.SecurityPermission;
115   *
116   * <ol>
117   *
118 < * <li> All assertions in code running in generated threads must use
118 > * <li>All assertions in code running in generated threads must use
119   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
120   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
121   * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
122   * particularly recommended) for other code to use these forms too.
123   * Only the most typically used JUnit assertion methods are defined
124 < * this way, but enough to live with.</li>
124 > * this way, but enough to live with.
125   *
126 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
126 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
127   * to invoke {@code super.setUp} and {@code super.tearDown} within
128   * them. These methods are used to clear and check for thread
129 < * assertion failures.</li>
129 > * assertion failures.
130   *
131   * <li>All delays and timeouts must use one of the constants {@code
132   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 51 | Line 137 | import java.security.SecurityPermission;
137   * is always discriminable as larger than SHORT and smaller than
138   * MEDIUM.  And so on. These constants are set to conservative values,
139   * but even so, if there is ever any doubt, they can all be increased
140 < * in one spot to rerun tests on slower platforms.</li>
140 > * in one spot to rerun tests on slower platforms.
141   *
142 < * <li> All threads generated must be joined inside each test case
142 > * <li>All threads generated must be joined inside each test case
143   * method (or {@code fail} to do so) before returning from the
144   * method. The {@code joinPool} method can be used to do this when
145 < * using Executors.</li>
145 > * using Executors.
146   *
147   * </ol>
148   *
149 < * <p> <b>Other notes</b>
149 > * <p><b>Other notes</b>
150   * <ul>
151   *
152 < * <li> Usually, there is one testcase method per JSR166 method
152 > * <li>Usually, there is one testcase method per JSR166 method
153   * covering "normal" operation, and then as many exception-testing
154   * methods as there are exceptions the method can throw. Sometimes
155   * there are multiple tests per JSR166 method when the different
156   * "normal" behaviors differ significantly. And sometimes testcases
157 < * cover multiple methods when they cannot be tested in
72 < * isolation.</li>
157 > * cover multiple methods when they cannot be tested in isolation.
158   *
159 < * <li> The documentation style for testcases is to provide as javadoc
159 > * <li>The documentation style for testcases is to provide as javadoc
160   * a simple sentence or two describing the property that the testcase
161   * method purports to test. The javadocs do not say anything about how
162 < * the property is tested. To find out, read the code.</li>
162 > * the property is tested. To find out, read the code.
163   *
164 < * <li> These tests are "conformance tests", and do not attempt to
164 > * <li>These tests are "conformance tests", and do not attempt to
165   * test throughput, latency, scalability or other performance factors
166   * (see the separate "jtreg" tests for a set intended to check these
167   * for the most central aspects of functionality.) So, most tests use
168   * the smallest sensible numbers of threads, collection sizes, etc
169 < * needed to check basic conformance.</li>
169 > * needed to check basic conformance.
170   *
171   * <li>The test classes currently do not declare inclusion in
172   * any particular package to simplify things for people integrating
173 < * them in TCK test suites.</li>
173 > * them in TCK test suites.
174   *
175 < * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
176 < * runs all JSR166 unit tests.</li>
175 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
176 > * runs all JSR166 unit tests.
177   *
178   * </ul>
179   */
# Line 96 | Line 181 | public class JSR166TestCase extends Test
181      private static final boolean useSecurityManager =
182          Boolean.getBoolean("jsr166.useSecurityManager");
183  
184 +    protected static final boolean expensiveTests =
185 +        Boolean.getBoolean("jsr166.expensiveTests");
186 +
187 +    /**
188 +     * If true, also run tests that are not part of the official tck
189 +     * because they test unspecified implementation details.
190 +     */
191 +    protected static final boolean testImplementationDetails =
192 +        Boolean.getBoolean("jsr166.testImplementationDetails");
193 +
194 +    /**
195 +     * If true, report on stdout all "slow" tests, that is, ones that
196 +     * take more than profileThreshold milliseconds to execute.
197 +     */
198 +    private static final boolean profileTests =
199 +        Boolean.getBoolean("jsr166.profileTests");
200 +
201 +    /**
202 +     * The number of milliseconds that tests are permitted for
203 +     * execution without being reported, when profileTests is set.
204 +     */
205 +    private static final long profileThreshold =
206 +        Long.getLong("jsr166.profileThreshold", 100);
207 +
208 +    /**
209 +     * The number of repetitions per test (for tickling rare bugs).
210 +     */
211 +    private static final int runsPerTest =
212 +        Integer.getInteger("jsr166.runsPerTest", 1);
213 +
214 +    /**
215 +     * The number of repetitions of the test suite (for finding leaks?).
216 +     */
217 +    private static final int suiteRuns =
218 +        Integer.getInteger("jsr166.suiteRuns", 1);
219 +
220 +    /**
221 +     * Returns the value of the system property, or NaN if not defined.
222 +     */
223 +    private static float systemPropertyValue(String name) {
224 +        String floatString = System.getProperty(name);
225 +        if (floatString == null)
226 +            return Float.NaN;
227 +        try {
228 +            return Float.parseFloat(floatString);
229 +        } catch (NumberFormatException ex) {
230 +            throw new IllegalArgumentException(
231 +                String.format("Bad float value in system property %s=%s",
232 +                              name, floatString));
233 +        }
234 +    }
235 +
236 +    /**
237 +     * The scaling factor to apply to standard delays used in tests.
238 +     * May be initialized from any of:
239 +     * - the "jsr166.delay.factor" system property
240 +     * - the "test.timeout.factor" system property (as used by jtreg)
241 +     *   See: http://openjdk.java.net/jtreg/tag-spec.html
242 +     * - hard-coded fuzz factor when using a known slowpoke VM
243 +     */
244 +    private static final float delayFactor = delayFactor();
245 +
246 +    private static float delayFactor() {
247 +        float x;
248 +        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
249 +            return x;
250 +        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
251 +            return x;
252 +        String prop = System.getProperty("java.vm.version");
253 +        if (prop != null && prop.matches(".*debug.*"))
254 +            return 4.0f; // How much slower is fastdebug than product?!
255 +        return 1.0f;
256 +    }
257 +
258 +    public JSR166TestCase() { super(); }
259 +    public JSR166TestCase(String name) { super(name); }
260 +
261 +    /**
262 +     * A filter for tests to run, matching strings of the form
263 +     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
264 +     * Usefully combined with jsr166.runsPerTest.
265 +     */
266 +    private static final Pattern methodFilter = methodFilter();
267 +
268 +    private static Pattern methodFilter() {
269 +        String regex = System.getProperty("jsr166.methodFilter");
270 +        return (regex == null) ? null : Pattern.compile(regex);
271 +    }
272 +
273 +    // Instrumentation to debug very rare, but very annoying hung test runs.
274 +    static volatile TestCase currentTestCase;
275 +    // static volatile int currentRun = 0;
276 +    static {
277 +        Runnable checkForWedgedTest = new Runnable() { public void run() {
278 +            // Avoid spurious reports with enormous runsPerTest.
279 +            // A single test case run should never take more than 1 second.
280 +            // But let's cap it at the high end too ...
281 +            final int timeoutMinutes =
282 +                Math.min(15, Math.max(runsPerTest / 60, 1));
283 +            for (TestCase lastTestCase = currentTestCase;;) {
284 +                try { MINUTES.sleep(timeoutMinutes); }
285 +                catch (InterruptedException unexpected) { break; }
286 +                if (lastTestCase == currentTestCase) {
287 +                    System.err.printf(
288 +                        "Looks like we're stuck running test: %s%n",
289 +                        lastTestCase);
290 + //                     System.err.printf(
291 + //                         "Looks like we're stuck running test: %s (%d/%d)%n",
292 + //                         lastTestCase, currentRun, runsPerTest);
293 + //                     System.err.println("availableProcessors=" +
294 + //                         Runtime.getRuntime().availableProcessors());
295 + //                     System.err.printf("cpu model = %s%n", cpuModel());
296 +                    dumpTestThreads();
297 +                    // one stack dump is probably enough; more would be spam
298 +                    break;
299 +                }
300 +                lastTestCase = currentTestCase;
301 +            }}};
302 +        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
303 +        thread.setDaemon(true);
304 +        thread.start();
305 +    }
306 +
307 + //     public static String cpuModel() {
308 + //         try {
309 + //             java.util.regex.Matcher matcher
310 + //               = Pattern.compile("model name\\s*: (.*)")
311 + //                 .matcher(new String(
312 + //                     java.nio.file.Files.readAllBytes(
313 + //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
314 + //             matcher.find();
315 + //             return matcher.group(1);
316 + //         } catch (Exception ex) { return null; }
317 + //     }
318 +
319 +    public void runBare() throws Throwable {
320 +        currentTestCase = this;
321 +        if (methodFilter == null
322 +            || methodFilter.matcher(toString()).find())
323 +            super.runBare();
324 +    }
325 +
326 +    protected void runTest() throws Throwable {
327 +        for (int i = 0; i < runsPerTest; i++) {
328 +            // currentRun = i;
329 +            if (profileTests)
330 +                runTestProfiled();
331 +            else
332 +                super.runTest();
333 +        }
334 +    }
335 +
336 +    protected void runTestProfiled() throws Throwable {
337 +        for (int i = 0; i < 2; i++) {
338 +            long startTime = System.nanoTime();
339 +            super.runTest();
340 +            long elapsedMillis = millisElapsedSince(startTime);
341 +            if (elapsedMillis < profileThreshold)
342 +                break;
343 +            // Never report first run of any test; treat it as a
344 +            // warmup run, notably to trigger all needed classloading,
345 +            if (i > 0)
346 +                System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
347 +        }
348 +    }
349 +
350      /**
351 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
351 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
352       */
353      public static void main(String[] args) {
354 +        main(suite(), args);
355 +    }
356 +
357 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
358 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
359 +        long runTime;
360 +        public void startTest(Test test) {}
361 +        protected void printHeader(long runTime) {
362 +            this.runTime = runTime; // defer printing for later
363 +        }
364 +        protected void printFooter(TestResult result) {
365 +            if (result.wasSuccessful()) {
366 +                getWriter().println("OK (" + result.runCount() + " tests)"
367 +                    + "  Time: " + elapsedTimeAsString(runTime));
368 +            } else {
369 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
370 +                super.printFooter(result);
371 +            }
372 +        }
373 +    }
374 +
375 +    /**
376 +     * Returns a TestRunner that doesn't bother with unnecessary
377 +     * fluff, like printing a "." for each test case.
378 +     */
379 +    static junit.textui.TestRunner newPithyTestRunner() {
380 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
381 +        runner.setPrinter(new PithyResultPrinter(System.out));
382 +        return runner;
383 +    }
384 +
385 +    /**
386 +     * Runs all unit tests in the given test suite.
387 +     * Actual behavior influenced by jsr166.* system properties.
388 +     */
389 +    static void main(Test suite, String[] args) {
390          if (useSecurityManager) {
391              System.err.println("Setting a permissive security manager");
392              Policy.setPolicy(permissivePolicy());
393              System.setSecurityManager(new SecurityManager());
394          }
395 <        int iters = 1;
396 <        if (args.length > 0)
397 <            iters = Integer.parseInt(args[0]);
398 <        Test s = suite();
112 <        for (int i = 0; i < iters; ++i) {
113 <            junit.textui.TestRunner.run(s);
395 >        for (int i = 0; i < suiteRuns; i++) {
396 >            TestResult result = newPithyTestRunner().doRun(suite);
397 >            if (!result.wasSuccessful())
398 >                System.exit(1);
399              System.gc();
400              System.runFinalization();
401          }
117        System.exit(0);
402      }
403  
404 +    public static TestSuite newTestSuite(Object... suiteOrClasses) {
405 +        TestSuite suite = new TestSuite();
406 +        for (Object suiteOrClass : suiteOrClasses) {
407 +            if (suiteOrClass instanceof TestSuite)
408 +                suite.addTest((TestSuite) suiteOrClass);
409 +            else if (suiteOrClass instanceof Class)
410 +                suite.addTest(new TestSuite((Class<?>) suiteOrClass));
411 +            else
412 +                throw new ClassCastException("not a test suite or class");
413 +        }
414 +        return suite;
415 +    }
416 +
417 +    public static void addNamedTestClasses(TestSuite suite,
418 +                                           String... testClassNames) {
419 +        for (String testClassName : testClassNames) {
420 +            try {
421 +                Class<?> testClass = Class.forName(testClassName);
422 +                Method m = testClass.getDeclaredMethod("suite",
423 +                                                       new Class<?>[0]);
424 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
425 +            } catch (Exception e) {
426 +                throw new Error("Missing test class", e);
427 +            }
428 +        }
429 +    }
430 +
431 +    public static final double JAVA_CLASS_VERSION;
432 +    public static final String JAVA_SPECIFICATION_VERSION;
433 +    static {
434 +        try {
435 +            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
436 +                new java.security.PrivilegedAction<Double>() {
437 +                public Double run() {
438 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
439 +            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
440 +                new java.security.PrivilegedAction<String>() {
441 +                public String run() {
442 +                    return System.getProperty("java.specification.version");}});
443 +        } catch (Throwable t) {
444 +            throw new Error(t);
445 +        }
446 +    }
447 +
448 +    public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
449 +    public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
450 +    public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
451 +    public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
452 +    public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
453 +
454      /**
455 <     * Collects all JSR166 unit tests as one suite
455 >     * Collects all JSR166 unit tests as one suite.
456       */
457      public static Test suite() {
458 <        TestSuite suite = new TestSuite("JSR166 Unit Tests");
459 <
460 <        suite.addTest(new TestSuite(ForkJoinPoolTest.class));
461 <        suite.addTest(new TestSuite(ForkJoinTaskTest.class));
462 <        suite.addTest(new TestSuite(RecursiveActionTest.class));
463 <        suite.addTest(new TestSuite(RecursiveTaskTest.class));
464 <        suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
465 <        suite.addTest(new TestSuite(PhaserTest.class));
466 <        suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
467 <        suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
468 <        suite.addTest(new TestSuite(AbstractQueueTest.class));
469 <        suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
470 <        suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
471 <        suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
472 <        suite.addTest(new TestSuite(ArrayDequeTest.class));
473 <        suite.addTest(new TestSuite(AtomicBooleanTest.class));
474 <        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
475 <        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
476 <        suite.addTest(new TestSuite(AtomicIntegerTest.class));
477 <        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
478 <        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
479 <        suite.addTest(new TestSuite(AtomicLongTest.class));
480 <        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
481 <        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
482 <        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
483 <        suite.addTest(new TestSuite(AtomicReferenceTest.class));
484 <        suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
485 <        suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
486 <        suite.addTest(new TestSuite(ConcurrentLinkedDequeTest.class));
487 <        suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
488 <        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
489 <        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
490 <        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
491 <        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
492 <        suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
493 <        suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
494 <        suite.addTest(new TestSuite(CountDownLatchTest.class));
495 <        suite.addTest(new TestSuite(CyclicBarrierTest.class));
496 <        suite.addTest(new TestSuite(DelayQueueTest.class));
497 <        suite.addTest(new TestSuite(EntryTest.class));
498 <        suite.addTest(new TestSuite(ExchangerTest.class));
499 <        suite.addTest(new TestSuite(ExecutorsTest.class));
500 <        suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
501 <        suite.addTest(new TestSuite(FutureTaskTest.class));
502 <        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
503 <        suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
504 <        suite.addTest(new TestSuite(LinkedListTest.class));
505 <        suite.addTest(new TestSuite(LockSupportTest.class));
506 <        suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
507 <        suite.addTest(new TestSuite(PriorityQueueTest.class));
508 <        suite.addTest(new TestSuite(ReentrantLockTest.class));
509 <        suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
510 <        suite.addTest(new TestSuite(ScheduledExecutorTest.class));
511 <        suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
512 <        suite.addTest(new TestSuite(SemaphoreTest.class));
513 <        suite.addTest(new TestSuite(SynchronousQueueTest.class));
514 <        suite.addTest(new TestSuite(SystemTest.class));
515 <        suite.addTest(new TestSuite(ThreadLocalTest.class));
516 <        suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
517 <        suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
518 <        suite.addTest(new TestSuite(ThreadTest.class));
519 <        suite.addTest(new TestSuite(TimeUnitTest.class));
520 <        suite.addTest(new TestSuite(TreeMapTest.class));
521 <        suite.addTest(new TestSuite(TreeSetTest.class));
522 <        suite.addTest(new TestSuite(TreeSubMapTest.class));
523 <        suite.addTest(new TestSuite(TreeSubSetTest.class));
458 >        // Java7+ test classes
459 >        TestSuite suite = newTestSuite(
460 >            ForkJoinPoolTest.suite(),
461 >            ForkJoinTaskTest.suite(),
462 >            RecursiveActionTest.suite(),
463 >            RecursiveTaskTest.suite(),
464 >            LinkedTransferQueueTest.suite(),
465 >            PhaserTest.suite(),
466 >            ThreadLocalRandomTest.suite(),
467 >            AbstractExecutorServiceTest.suite(),
468 >            AbstractQueueTest.suite(),
469 >            AbstractQueuedSynchronizerTest.suite(),
470 >            AbstractQueuedLongSynchronizerTest.suite(),
471 >            ArrayBlockingQueueTest.suite(),
472 >            ArrayDequeTest.suite(),
473 >            ArrayListTest.suite(),
474 >            AtomicBooleanTest.suite(),
475 >            AtomicIntegerArrayTest.suite(),
476 >            AtomicIntegerFieldUpdaterTest.suite(),
477 >            AtomicIntegerTest.suite(),
478 >            AtomicLongArrayTest.suite(),
479 >            AtomicLongFieldUpdaterTest.suite(),
480 >            AtomicLongTest.suite(),
481 >            AtomicMarkableReferenceTest.suite(),
482 >            AtomicReferenceArrayTest.suite(),
483 >            AtomicReferenceFieldUpdaterTest.suite(),
484 >            AtomicReferenceTest.suite(),
485 >            AtomicStampedReferenceTest.suite(),
486 >            ConcurrentHashMapTest.suite(),
487 >            ConcurrentLinkedDequeTest.suite(),
488 >            ConcurrentLinkedQueueTest.suite(),
489 >            ConcurrentSkipListMapTest.suite(),
490 >            ConcurrentSkipListSubMapTest.suite(),
491 >            ConcurrentSkipListSetTest.suite(),
492 >            ConcurrentSkipListSubSetTest.suite(),
493 >            CopyOnWriteArrayListTest.suite(),
494 >            CopyOnWriteArraySetTest.suite(),
495 >            CountDownLatchTest.suite(),
496 >            CountedCompleterTest.suite(),
497 >            CyclicBarrierTest.suite(),
498 >            DelayQueueTest.suite(),
499 >            EntryTest.suite(),
500 >            ExchangerTest.suite(),
501 >            ExecutorsTest.suite(),
502 >            ExecutorCompletionServiceTest.suite(),
503 >            FutureTaskTest.suite(),
504 >            LinkedBlockingDequeTest.suite(),
505 >            LinkedBlockingQueueTest.suite(),
506 >            LinkedListTest.suite(),
507 >            LockSupportTest.suite(),
508 >            PriorityBlockingQueueTest.suite(),
509 >            PriorityQueueTest.suite(),
510 >            ReentrantLockTest.suite(),
511 >            ReentrantReadWriteLockTest.suite(),
512 >            ScheduledExecutorTest.suite(),
513 >            ScheduledExecutorSubclassTest.suite(),
514 >            SemaphoreTest.suite(),
515 >            SynchronousQueueTest.suite(),
516 >            SystemTest.suite(),
517 >            ThreadLocalTest.suite(),
518 >            ThreadPoolExecutorTest.suite(),
519 >            ThreadPoolExecutorSubclassTest.suite(),
520 >            ThreadTest.suite(),
521 >            TimeUnitTest.suite(),
522 >            TreeMapTest.suite(),
523 >            TreeSetTest.suite(),
524 >            TreeSubMapTest.suite(),
525 >            TreeSubSetTest.suite(),
526 >            VectorTest.suite());
527 >
528 >        // Java8+ test classes
529 >        if (atLeastJava8()) {
530 >            String[] java8TestClassNames = {
531 >                "ArrayDeque8Test",
532 >                "Atomic8Test",
533 >                "CompletableFutureTest",
534 >                "ConcurrentHashMap8Test",
535 >                "CountedCompleter8Test",
536 >                "DoubleAccumulatorTest",
537 >                "DoubleAdderTest",
538 >                "ForkJoinPool8Test",
539 >                "ForkJoinTask8Test",
540 >                "HashMapTest",
541 >                "LinkedBlockingDeque8Test",
542 >                "LinkedBlockingQueue8Test",
543 >                "LongAccumulatorTest",
544 >                "LongAdderTest",
545 >                "SplittableRandomTest",
546 >                "StampedLockTest",
547 >                "SubmissionPublisherTest",
548 >                "ThreadLocalRandom8Test",
549 >                "TimeUnit8Test",
550 >            };
551 >            addNamedTestClasses(suite, java8TestClassNames);
552 >        }
553 >
554 >        // Java9+ test classes
555 >        if (atLeastJava9()) {
556 >            String[] java9TestClassNames = {
557 >                "AtomicBoolean9Test",
558 >                "AtomicInteger9Test",
559 >                "AtomicIntegerArray9Test",
560 >                "AtomicLong9Test",
561 >                "AtomicLongArray9Test",
562 >                "AtomicReference9Test",
563 >                "AtomicReferenceArray9Test",
564 >                "ExecutorCompletionService9Test",
565 >                "ForkJoinPool9Test",
566 >            };
567 >            addNamedTestClasses(suite, java9TestClassNames);
568 >        }
569  
570          return suite;
571      }
572  
573 +    /** Returns list of junit-style test method names in given class. */
574 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
575 +        Method[] methods = testClass.getDeclaredMethods();
576 +        ArrayList<String> names = new ArrayList<>(methods.length);
577 +        for (Method method : methods) {
578 +            if (method.getName().startsWith("test")
579 +                && Modifier.isPublic(method.getModifiers())
580 +                // method.getParameterCount() requires jdk8+
581 +                && method.getParameterTypes().length == 0) {
582 +                names.add(method.getName());
583 +            }
584 +        }
585 +        return names;
586 +    }
587 +
588 +    /**
589 +     * Returns junit-style testSuite for the given test class, but
590 +     * parameterized by passing extra data to each test.
591 +     */
592 +    public static <ExtraData> Test parameterizedTestSuite
593 +        (Class<? extends JSR166TestCase> testClass,
594 +         Class<ExtraData> dataClass,
595 +         ExtraData data) {
596 +        try {
597 +            TestSuite suite = new TestSuite();
598 +            Constructor c =
599 +                testClass.getDeclaredConstructor(dataClass, String.class);
600 +            for (String methodName : testMethodNames(testClass))
601 +                suite.addTest((Test) c.newInstance(data, methodName));
602 +            return suite;
603 +        } catch (Exception e) {
604 +            throw new Error(e);
605 +        }
606 +    }
607 +
608 +    /**
609 +     * Returns junit-style testSuite for the jdk8 extension of the
610 +     * given test class, but parameterized by passing extra data to
611 +     * each test.  Uses reflection to allow compilation in jdk7.
612 +     */
613 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
614 +        (Class<? extends JSR166TestCase> testClass,
615 +         Class<ExtraData> dataClass,
616 +         ExtraData data) {
617 +        if (atLeastJava8()) {
618 +            String name = testClass.getName();
619 +            String name8 = name.replaceAll("Test$", "8Test");
620 +            if (name.equals(name8)) throw new Error(name);
621 +            try {
622 +                return (Test)
623 +                    Class.forName(name8)
624 +                    .getMethod("testSuite", new Class[] { dataClass })
625 +                    .invoke(null, data);
626 +            } catch (Exception e) {
627 +                throw new Error(e);
628 +            }
629 +        } else {
630 +            return new TestSuite();
631 +        }
632 +    }
633 +
634 +    // Delays for timing-dependent tests, in milliseconds.
635  
636      public static long SHORT_DELAY_MS;
637      public static long SMALL_DELAY_MS;
638      public static long MEDIUM_DELAY_MS;
639      public static long LONG_DELAY_MS;
640  
641 +    private static final long RANDOM_TIMEOUT;
642 +    private static final long RANDOM_EXPIRED_TIMEOUT;
643 +    private static final TimeUnit RANDOM_TIMEUNIT;
644 +    static {
645 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
646 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
647 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
648 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
649 +        TimeUnit[] timeUnits = TimeUnit.values();
650 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
651 +    }
652 +
653 +    /**
654 +     * Returns a timeout for use when any value at all will do.
655 +     */
656 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
657 +
658 +    /**
659 +     * Returns a timeout that means "no waiting", i.e. not positive.
660 +     */
661 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
662 +
663 +    /**
664 +     * Returns a random non-null TimeUnit.
665 +     */
666 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
667  
668      /**
669 <     * Returns the shortest timed delay. This could
670 <     * be reimplemented to use for example a Property.
669 >     * Returns the shortest timed delay. This can be scaled up for
670 >     * slow machines using the jsr166.delay.factor system property,
671 >     * or via jtreg's -timeoutFactor: flag.
672 >     * http://openjdk.java.net/jtreg/command-help.html
673       */
674      protected long getShortDelay() {
675 <        return 50;
675 >        return (long) (50 * delayFactor);
676      }
677  
209
678      /**
679       * Sets delays as multiples of SHORT_DELAY.
680       */
# Line 214 | Line 682 | public class JSR166TestCase extends Test
682          SHORT_DELAY_MS = getShortDelay();
683          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
684          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
685 <        LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
685 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
686 >    }
687 >
688 >    private static final long TIMEOUT_DELAY_MS
689 >        = (long) (12.0 * Math.cbrt(delayFactor));
690 >
691 >    /**
692 >     * Returns a timeout in milliseconds to be used in tests that verify
693 >     * that operations block or time out.  We want this to be longer
694 >     * than the OS scheduling quantum, but not too long, so don't scale
695 >     * linearly with delayFactor; we use "crazy" cube root instead.
696 >     */
697 >    static long timeoutMillis() {
698 >        return TIMEOUT_DELAY_MS;
699 >    }
700 >
701 >    /**
702 >     * Returns a new Date instance representing a time at least
703 >     * delayMillis milliseconds in the future.
704 >     */
705 >    Date delayedDate(long delayMillis) {
706 >        // Add 1 because currentTimeMillis is known to round into the past.
707 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
708      }
709  
710      /**
711       * The first exception encountered if any threadAssertXXX method fails.
712       */
713      private final AtomicReference<Throwable> threadFailure
714 <        = new AtomicReference<Throwable>(null);
714 >        = new AtomicReference<>(null);
715  
716      /**
717       * Records an exception so that it can be rethrown later in the test
# Line 230 | Line 720 | public class JSR166TestCase extends Test
720       * the same test have no effect.
721       */
722      public void threadRecordFailure(Throwable t) {
723 +        System.err.println(t);
724 +        dumpTestThreads();
725          threadFailure.compareAndSet(null, t);
726      }
727  
# Line 237 | Line 729 | public class JSR166TestCase extends Test
729          setDelays();
730      }
731  
732 +    void tearDownFail(String format, Object... args) {
733 +        String msg = toString() + ": " + String.format(format, args);
734 +        System.err.println(msg);
735 +        dumpTestThreads();
736 +        throw new AssertionFailedError(msg);
737 +    }
738 +
739      /**
740 +     * Extra checks that get done for all test cases.
741 +     *
742       * Triggers test case failure if any thread assertions have failed,
743       * by rethrowing, in the test harness thread, any exception recorded
744       * earlier by threadRecordFailure.
745 +     *
746 +     * Triggers test case failure if interrupt status is set in the main thread.
747       */
748      public void tearDown() throws Exception {
749 <        Throwable t = threadFailure.get();
749 >        Throwable t = threadFailure.getAndSet(null);
750          if (t != null) {
751              if (t instanceof Error)
752                  throw (Error) t;
# Line 251 | Line 754 | public class JSR166TestCase extends Test
754                  throw (RuntimeException) t;
755              else if (t instanceof Exception)
756                  throw (Exception) t;
757 <            else
758 <                throw new AssertionError(t);
757 >            else {
758 >                AssertionFailedError afe =
759 >                    new AssertionFailedError(t.toString());
760 >                afe.initCause(t);
761 >                throw afe;
762 >            }
763 >        }
764 >
765 >        if (Thread.interrupted())
766 >            tearDownFail("interrupt status set in main thread");
767 >
768 >        checkForkJoinPoolThreadLeaks();
769 >    }
770 >
771 >    /**
772 >     * Finds missing PoolCleaners
773 >     */
774 >    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
775 >        Thread[] survivors = new Thread[7];
776 >        int count = Thread.enumerate(survivors);
777 >        for (int i = 0; i < count; i++) {
778 >            Thread thread = survivors[i];
779 >            String name = thread.getName();
780 >            if (name.startsWith("ForkJoinPool-")) {
781 >                // give thread some time to terminate
782 >                thread.join(LONG_DELAY_MS);
783 >                if (thread.isAlive())
784 >                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
785 >                                 thread);
786 >            }
787          }
788 +
789 +        if (!ForkJoinPool.commonPool()
790 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
791 +            tearDownFail("ForkJoin common pool thread stuck");
792      }
793  
794      /**
795       * Just like fail(reason), but additionally recording (using
796 <     * threadRecordFailure) any AssertionError thrown, so that the current
797 <     * testcase will fail.
796 >     * threadRecordFailure) any AssertionFailedError thrown, so that
797 >     * the current testcase will fail.
798       */
799      public void threadFail(String reason) {
800          try {
801              fail(reason);
802 <        } catch (Throwable t) {
802 >        } catch (AssertionFailedError t) {
803              threadRecordFailure(t);
804 <            fail(reason);
804 >            throw t;
805          }
806      }
807  
808      /**
809       * Just like assertTrue(b), but additionally recording (using
810 <     * threadRecordFailure) any AssertionError thrown, so that the current
811 <     * testcase will fail.
810 >     * threadRecordFailure) any AssertionFailedError thrown, so that
811 >     * the current testcase will fail.
812       */
813      public void threadAssertTrue(boolean b) {
814          try {
815              assertTrue(b);
816 <        } catch (AssertionError t) {
816 >        } catch (AssertionFailedError t) {
817              threadRecordFailure(t);
818              throw t;
819          }
# Line 286 | Line 821 | public class JSR166TestCase extends Test
821  
822      /**
823       * Just like assertFalse(b), but additionally recording (using
824 <     * threadRecordFailure) any AssertionError thrown, so that the
825 <     * current testcase will fail.
824 >     * threadRecordFailure) any AssertionFailedError thrown, so that
825 >     * the current testcase will fail.
826       */
827      public void threadAssertFalse(boolean b) {
828          try {
829              assertFalse(b);
830 <        } catch (AssertionError t) {
830 >        } catch (AssertionFailedError t) {
831              threadRecordFailure(t);
832              throw t;
833          }
# Line 300 | Line 835 | public class JSR166TestCase extends Test
835  
836      /**
837       * Just like assertNull(x), but additionally recording (using
838 <     * threadRecordFailure) any AssertionError thrown, so that the
839 <     * current testcase will fail.
838 >     * threadRecordFailure) any AssertionFailedError thrown, so that
839 >     * the current testcase will fail.
840       */
841      public void threadAssertNull(Object x) {
842          try {
843              assertNull(x);
844 <        } catch (AssertionError t) {
844 >        } catch (AssertionFailedError t) {
845              threadRecordFailure(t);
846              throw t;
847          }
# Line 314 | Line 849 | public class JSR166TestCase extends Test
849  
850      /**
851       * Just like assertEquals(x, y), but additionally recording (using
852 <     * threadRecordFailure) any AssertionError thrown, so that the
853 <     * current testcase will fail.
852 >     * threadRecordFailure) any AssertionFailedError thrown, so that
853 >     * the current testcase will fail.
854       */
855      public void threadAssertEquals(long x, long y) {
856          try {
857              assertEquals(x, y);
858 <        } catch (AssertionError t) {
858 >        } catch (AssertionFailedError t) {
859              threadRecordFailure(t);
860              throw t;
861          }
# Line 328 | Line 863 | public class JSR166TestCase extends Test
863  
864      /**
865       * Just like assertEquals(x, y), but additionally recording (using
866 <     * threadRecordFailure) any AssertionError thrown, so that the
867 <     * current testcase will fail.
866 >     * threadRecordFailure) any AssertionFailedError thrown, so that
867 >     * the current testcase will fail.
868       */
869      public void threadAssertEquals(Object x, Object y) {
870          try {
871              assertEquals(x, y);
872 <        } catch (AssertionError t) {
873 <            threadRecordFailure(t);
874 <            throw t;
872 >        } catch (AssertionFailedError fail) {
873 >            threadRecordFailure(fail);
874 >            throw fail;
875 >        } catch (Throwable fail) {
876 >            threadUnexpectedException(fail);
877          }
878      }
879  
880      /**
881       * Just like assertSame(x, y), but additionally recording (using
882 <     * threadRecordFailure) any AssertionError thrown, so that the
883 <     * current testcase will fail.
882 >     * threadRecordFailure) any AssertionFailedError thrown, so that
883 >     * the current testcase will fail.
884       */
885      public void threadAssertSame(Object x, Object y) {
886          try {
887              assertSame(x, y);
888 <        } catch (AssertionError t) {
889 <            threadRecordFailure(t);
890 <            throw t;
888 >        } catch (AssertionFailedError fail) {
889 >            threadRecordFailure(fail);
890 >            throw fail;
891          }
892      }
893  
# Line 369 | Line 906 | public class JSR166TestCase extends Test
906      }
907  
908      /**
909 <     * Calls threadFail with message "Unexpected exception" + ex.
909 >     * Records the given exception using {@link #threadRecordFailure},
910 >     * then rethrows the exception, wrapping it in an
911 >     * AssertionFailedError if necessary.
912       */
913      public void threadUnexpectedException(Throwable t) {
914          threadRecordFailure(t);
915          t.printStackTrace();
377        // Rethrow, wrapping in an AssertionError if necessary
916          if (t instanceof RuntimeException)
917              throw (RuntimeException) t;
918          else if (t instanceof Error)
919              throw (Error) t;
920          else {
921 <            AssertionError ae = new AssertionError("unexpected exception: " + t);
922 <            t.initCause(t);
923 <            throw ae;
921 >            AssertionFailedError afe =
922 >                new AssertionFailedError("unexpected exception: " + t);
923 >            afe.initCause(t);
924 >            throw afe;
925          }
926      }
927  
928      /**
929 +     * Delays, via Thread.sleep, for the given millisecond delay, but
930 +     * if the sleep is shorter than specified, may re-sleep or yield
931 +     * until time elapses.  Ensures that the given time, as measured
932 +     * by System.nanoTime(), has elapsed.
933 +     */
934 +    static void delay(long millis) throws InterruptedException {
935 +        long nanos = millis * (1000 * 1000);
936 +        final long wakeupTime = System.nanoTime() + nanos;
937 +        do {
938 +            if (millis > 0L)
939 +                Thread.sleep(millis);
940 +            else // too short to sleep
941 +                Thread.yield();
942 +            nanos = wakeupTime - System.nanoTime();
943 +            millis = nanos / (1000 * 1000);
944 +        } while (nanos >= 0L);
945 +    }
946 +
947 +    /**
948 +     * Allows use of try-with-resources with per-test thread pools.
949 +     */
950 +    class PoolCleaner implements AutoCloseable {
951 +        private final ExecutorService pool;
952 +        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
953 +        public void close() { joinPool(pool); }
954 +    }
955 +
956 +    /**
957 +     * An extension of PoolCleaner that has an action to release the pool.
958 +     */
959 +    class PoolCleanerWithReleaser extends PoolCleaner {
960 +        private final Runnable releaser;
961 +        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
962 +            super(pool);
963 +            this.releaser = releaser;
964 +        }
965 +        public void close() {
966 +            try {
967 +                releaser.run();
968 +            } finally {
969 +                super.close();
970 +            }
971 +        }
972 +    }
973 +
974 +    PoolCleaner cleaner(ExecutorService pool) {
975 +        return new PoolCleaner(pool);
976 +    }
977 +
978 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
979 +        return new PoolCleanerWithReleaser(pool, releaser);
980 +    }
981 +
982 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
983 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
984 +    }
985 +
986 +    Runnable releaser(final CountDownLatch latch) {
987 +        return new Runnable() { public void run() {
988 +            do { latch.countDown(); }
989 +            while (latch.getCount() > 0);
990 +        }};
991 +    }
992 +
993 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
994 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
995 +    }
996 +
997 +    Runnable releaser(final AtomicBoolean flag) {
998 +        return new Runnable() { public void run() { flag.set(true); }};
999 +    }
1000 +
1001 +    /**
1002       * Waits out termination of a thread pool or fails doing so.
1003       */
1004 <    public void joinPool(ExecutorService exec) {
1004 >    void joinPool(ExecutorService pool) {
1005          try {
1006 <            exec.shutdown();
1007 <            assertTrue("ExecutorService did not terminate in a timely manner",
1008 <                       exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
1006 >            pool.shutdown();
1007 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
1008 >                try {
1009 >                    threadFail("ExecutorService " + pool +
1010 >                               " did not terminate in a timely manner");
1011 >                } finally {
1012 >                    // last resort, for the benefit of subsequent tests
1013 >                    pool.shutdownNow();
1014 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
1015 >                }
1016 >            }
1017          } catch (SecurityException ok) {
1018              // Allowed in case test doesn't have privs
1019 <        } catch (InterruptedException ie) {
1020 <            fail("Unexpected InterruptedException");
1019 >        } catch (InterruptedException fail) {
1020 >            threadFail("Unexpected InterruptedException");
1021          }
1022      }
1023  
1024 +    /**
1025 +     * Like Runnable, but with the freedom to throw anything.
1026 +     * junit folks had the same idea:
1027 +     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1028 +     */
1029 +    interface Action { public void run() throws Throwable; }
1030 +
1031 +    /**
1032 +     * Runs all the given actions in parallel, failing if any fail.
1033 +     * Useful for running multiple variants of tests that are
1034 +     * necessarily individually slow because they must block.
1035 +     */
1036 +    void testInParallel(Action ... actions) {
1037 +        ExecutorService pool = Executors.newCachedThreadPool();
1038 +        try (PoolCleaner cleaner = cleaner(pool)) {
1039 +            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1040 +            for (final Action action : actions)
1041 +                futures.add(pool.submit(new CheckedRunnable() {
1042 +                    public void realRun() throws Throwable { action.run();}}));
1043 +            for (Future<?> future : futures)
1044 +                try {
1045 +                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
1046 +                } catch (ExecutionException ex) {
1047 +                    threadUnexpectedException(ex.getCause());
1048 +                } catch (Exception ex) {
1049 +                    threadUnexpectedException(ex);
1050 +                }
1051 +        }
1052 +    }
1053 +
1054 +    /**
1055 +     * A debugging tool to print stack traces of most threads, as jstack does.
1056 +     * Uninteresting threads are filtered out.
1057 +     */
1058 +    static void dumpTestThreads() {
1059 +        SecurityManager sm = System.getSecurityManager();
1060 +        if (sm != null) {
1061 +            try {
1062 +                System.setSecurityManager(null);
1063 +            } catch (SecurityException giveUp) {
1064 +                return;
1065 +            }
1066 +        }
1067 +
1068 +        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1069 +        System.err.println("------ stacktrace dump start ------");
1070 +        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1071 +            final String name = info.getThreadName();
1072 +            String lockName;
1073 +            if ("Signal Dispatcher".equals(name))
1074 +                continue;
1075 +            if ("Reference Handler".equals(name)
1076 +                && (lockName = info.getLockName()) != null
1077 +                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1078 +                continue;
1079 +            if ("Finalizer".equals(name)
1080 +                && (lockName = info.getLockName()) != null
1081 +                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1082 +                continue;
1083 +            if ("checkForWedgedTest".equals(name))
1084 +                continue;
1085 +            System.err.print(info);
1086 +        }
1087 +        System.err.println("------ stacktrace dump end ------");
1088 +
1089 +        if (sm != null) System.setSecurityManager(sm);
1090 +    }
1091 +
1092 +    /**
1093 +     * Checks that thread eventually enters the expected blocked thread state.
1094 +     */
1095 +    void assertThreadBlocks(Thread thread, Thread.State expected) {
1096 +        // always sleep at least 1 ms, with high probability avoiding
1097 +        // transitory states
1098 +        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1099 +            try { delay(1); }
1100 +            catch (InterruptedException fail) {
1101 +                fail("Unexpected InterruptedException");
1102 +            }
1103 +            Thread.State s = thread.getState();
1104 +            if (s == expected)
1105 +                return;
1106 +            else if (s == Thread.State.TERMINATED)
1107 +                fail("Unexpected thread termination");
1108 +        }
1109 +        fail("timed out waiting for thread to enter thread state " + expected);
1110 +    }
1111 +
1112 +    /**
1113 +     * Checks that future.get times out, with the default timeout of
1114 +     * {@code timeoutMillis()}.
1115 +     */
1116 +    void assertFutureTimesOut(Future future) {
1117 +        assertFutureTimesOut(future, timeoutMillis());
1118 +    }
1119 +
1120 +    /**
1121 +     * Checks that future.get times out, with the given millisecond timeout.
1122 +     */
1123 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
1124 +        long startTime = System.nanoTime();
1125 +        try {
1126 +            future.get(timeoutMillis, MILLISECONDS);
1127 +            shouldThrow();
1128 +        } catch (TimeoutException success) {
1129 +        } catch (Exception fail) {
1130 +            threadUnexpectedException(fail);
1131 +        } finally { future.cancel(true); }
1132 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1133 +    }
1134  
1135      /**
1136       * Fails with message "should throw exception".
# Line 417 | Line 1147 | public class JSR166TestCase extends Test
1147      }
1148  
1149      /**
1150 <     * Fails with message "Unexpected exception: " + ex.
1150 >     * The maximum number of consecutive spurious wakeups we should
1151 >     * tolerate (from APIs like LockSupport.park) before failing a test.
1152       */
1153 <    public void unexpectedException(Throwable ex) {
423 <        ex.printStackTrace();
424 <        fail("Unexpected exception: " + ex);
425 <    }
426 <
1153 >    static final int MAX_SPURIOUS_WAKEUPS = 10;
1154  
1155      /**
1156       * The number of elements to place in collections, arrays, etc.
# Line 450 | Line 1177 | public class JSR166TestCase extends Test
1177      public static final Integer m6  = new Integer(-6);
1178      public static final Integer m10 = new Integer(-10);
1179  
453
1180      /**
1181       * Runs Runnable r with a security policy that permits precisely
1182       * the specified permissions.  If there is no current security
# Line 462 | Line 1188 | public class JSR166TestCase extends Test
1188          SecurityManager sm = System.getSecurityManager();
1189          if (sm == null) {
1190              r.run();
1191 +        }
1192 +        runWithSecurityManagerWithPermissions(r, permissions);
1193 +    }
1194 +
1195 +    /**
1196 +     * Runs Runnable r with a security policy that permits precisely
1197 +     * the specified permissions.  If there is no current security
1198 +     * manager, a temporary one is set for the duration of the
1199 +     * Runnable.  We require that any security manager permit
1200 +     * getPolicy/setPolicy.
1201 +     */
1202 +    public void runWithSecurityManagerWithPermissions(Runnable r,
1203 +                                                      Permission... permissions) {
1204 +        SecurityManager sm = System.getSecurityManager();
1205 +        if (sm == null) {
1206              Policy savedPolicy = Policy.getPolicy();
1207              try {
1208                  Policy.setPolicy(permissivePolicy());
1209                  System.setSecurityManager(new SecurityManager());
1210 <                runWithPermissions(r, permissions);
1210 >                runWithSecurityManagerWithPermissions(r, permissions);
1211              } finally {
1212                  System.setSecurityManager(null);
1213                  Policy.setPolicy(savedPolicy);
# Line 514 | Line 1255 | public class JSR166TestCase extends Test
1255              return perms.implies(p);
1256          }
1257          public void refresh() {}
1258 +        public String toString() {
1259 +            List<Permission> ps = new ArrayList<>();
1260 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1261 +                ps.add(e.nextElement());
1262 +            return "AdjustablePolicy with permissions " + ps;
1263 +        }
1264      }
1265  
1266      /**
# Line 536 | Line 1283 | public class JSR166TestCase extends Test
1283      }
1284  
1285      /**
1286 <     * Sleep until the timeout has elapsed, or interrupted.
1287 <     * Does <em>NOT</em> throw InterruptedException.
1286 >     * Sleeps until the given time has elapsed.
1287 >     * Throws AssertionFailedError if interrupted.
1288 >     */
1289 >    static void sleep(long millis) {
1290 >        try {
1291 >            delay(millis);
1292 >        } catch (InterruptedException fail) {
1293 >            AssertionFailedError afe =
1294 >                new AssertionFailedError("Unexpected InterruptedException");
1295 >            afe.initCause(fail);
1296 >            throw afe;
1297 >        }
1298 >    }
1299 >
1300 >    /**
1301 >     * Spin-waits up to the specified number of milliseconds for the given
1302 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1303 >     */
1304 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1305 >        long startTime = 0L;
1306 >        for (;;) {
1307 >            Thread.State s = thread.getState();
1308 >            if (s == Thread.State.BLOCKED ||
1309 >                s == Thread.State.WAITING ||
1310 >                s == Thread.State.TIMED_WAITING)
1311 >                return;
1312 >            else if (s == Thread.State.TERMINATED)
1313 >                fail("Unexpected thread termination");
1314 >            else if (startTime == 0L)
1315 >                startTime = System.nanoTime();
1316 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1317 >                threadAssertTrue(thread.isAlive());
1318 >                fail("timed out waiting for thread to enter wait state");
1319 >            }
1320 >            Thread.yield();
1321 >        }
1322 >    }
1323 >
1324 >    /**
1325 >     * Spin-waits up to the specified number of milliseconds for the given
1326 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1327 >     * and additionally satisfy the given condition.
1328 >     */
1329 >    void waitForThreadToEnterWaitState(
1330 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1331 >        long startTime = 0L;
1332 >        for (;;) {
1333 >            Thread.State s = thread.getState();
1334 >            if (s == Thread.State.BLOCKED ||
1335 >                s == Thread.State.WAITING ||
1336 >                s == Thread.State.TIMED_WAITING) {
1337 >                try {
1338 >                    if (waitingForGodot.call())
1339 >                        return;
1340 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1341 >            }
1342 >            else if (s == Thread.State.TERMINATED)
1343 >                fail("Unexpected thread termination");
1344 >            else if (startTime == 0L)
1345 >                startTime = System.nanoTime();
1346 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1347 >                threadAssertTrue(thread.isAlive());
1348 >                fail("timed out waiting for thread to enter wait state");
1349 >            }
1350 >            Thread.yield();
1351 >        }
1352 >    }
1353 >
1354 >    /**
1355 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1356 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1357 >     */
1358 >    void waitForThreadToEnterWaitState(Thread thread) {
1359 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1360 >    }
1361 >
1362 >    /**
1363 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1364 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1365 >     * and additionally satisfy the given condition.
1366 >     */
1367 >    void waitForThreadToEnterWaitState(
1368 >        Thread thread, Callable<Boolean> waitingForGodot) {
1369 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1370 >    }
1371 >
1372 >    /**
1373 >     * Returns the number of milliseconds since time given by
1374 >     * startNanoTime, which must have been previously returned from a
1375 >     * call to {@link System#nanoTime()}.
1376 >     */
1377 >    static long millisElapsedSince(long startNanoTime) {
1378 >        return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1379 >    }
1380 >
1381 > //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1382 > //         long startTime = System.nanoTime();
1383 > //         try {
1384 > //             r.run();
1385 > //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1386 > //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1387 > //             throw new AssertionFailedError("did not return promptly");
1388 > //     }
1389 >
1390 > //     void assertTerminatesPromptly(Runnable r) {
1391 > //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1392 > //     }
1393 >
1394 >    /**
1395 >     * Checks that timed f.get() returns the expected value, and does not
1396 >     * wait for the timeout to elapse before returning.
1397       */
1398 <    void sleepTillInterrupted(long timeoutMillis) {
1398 >    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1399 >        long startTime = System.nanoTime();
1400          try {
1401 <            Thread.sleep(timeoutMillis);
1402 <        } catch (InterruptedException wakeup) {}
1401 >            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1402 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
1403 >        if (millisElapsedSince(startTime) > timeoutMillis/2)
1404 >            throw new AssertionFailedError("timed get did not return promptly");
1405 >    }
1406 >
1407 >    <T> void checkTimedGet(Future<T> f, T expectedValue) {
1408 >        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1409      }
1410  
1411      /**
1412 <     * Returns a new started Thread running the given runnable.
1412 >     * Returns a new started daemon Thread running the given runnable.
1413       */
1414      Thread newStartedThread(Runnable runnable) {
1415          Thread t = new Thread(runnable);
1416 +        t.setDaemon(true);
1417          t.start();
1418          return t;
1419      }
1420  
1421 +    /**
1422 +     * Waits for the specified time (in milliseconds) for the thread
1423 +     * to terminate (using {@link Thread#join(long)}), else interrupts
1424 +     * the thread (in the hope that it may terminate later) and fails.
1425 +     */
1426 +    void awaitTermination(Thread t, long timeoutMillis) {
1427 +        try {
1428 +            t.join(timeoutMillis);
1429 +        } catch (InterruptedException fail) {
1430 +            threadUnexpectedException(fail);
1431 +        } finally {
1432 +            if (t.getState() != Thread.State.TERMINATED) {
1433 +                t.interrupt();
1434 +                threadFail("timed out waiting for thread to terminate");
1435 +            }
1436 +        }
1437 +    }
1438 +
1439 +    /**
1440 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
1441 +     * terminate (using {@link Thread#join(long)}), else interrupts
1442 +     * the thread (in the hope that it may terminate later) and fails.
1443 +     */
1444 +    void awaitTermination(Thread t) {
1445 +        awaitTermination(t, LONG_DELAY_MS);
1446 +    }
1447 +
1448      // Some convenient Runnable classes
1449  
1450      public abstract class CheckedRunnable implements Runnable {
# Line 562 | Line 1453 | public class JSR166TestCase extends Test
1453          public final void run() {
1454              try {
1455                  realRun();
1456 <            } catch (Throwable t) {
1457 <                threadUnexpectedException(t);
1456 >            } catch (Throwable fail) {
1457 >                threadUnexpectedException(fail);
1458              }
1459          }
1460      }
# Line 616 | Line 1507 | public class JSR166TestCase extends Test
1507                  realRun();
1508                  threadShouldThrow("InterruptedException");
1509              } catch (InterruptedException success) {
1510 <            } catch (Throwable t) {
1511 <                threadUnexpectedException(t);
1510 >                threadAssertFalse(Thread.interrupted());
1511 >            } catch (Throwable fail) {
1512 >                threadUnexpectedException(fail);
1513              }
1514          }
1515      }
# Line 628 | Line 1520 | public class JSR166TestCase extends Test
1520          public final T call() {
1521              try {
1522                  return realCall();
1523 <            } catch (Throwable t) {
1524 <                threadUnexpectedException(t);
1523 >            } catch (Throwable fail) {
1524 >                threadUnexpectedException(fail);
1525                  return null;
1526              }
1527          }
# Line 645 | Line 1537 | public class JSR166TestCase extends Test
1537                  threadShouldThrow("InterruptedException");
1538                  return result;
1539              } catch (InterruptedException success) {
1540 <            } catch (Throwable t) {
1541 <                threadUnexpectedException(t);
1540 >                threadAssertFalse(Thread.interrupted());
1541 >            } catch (Throwable fail) {
1542 >                threadUnexpectedException(fail);
1543              }
1544              return null;
1545          }
# Line 663 | Line 1556 | public class JSR166TestCase extends Test
1556      public static final String TEST_STRING = "a test string";
1557  
1558      public static class StringTask implements Callable<String> {
1559 <        public String call() { return TEST_STRING; }
1559 >        final String value;
1560 >        public StringTask() { this(TEST_STRING); }
1561 >        public StringTask(String value) { this.value = value; }
1562 >        public String call() { return value; }
1563      }
1564  
1565      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
1566          return new CheckedCallable<String>() {
1567 <            public String realCall() {
1567 >            protected String realCall() {
1568                  try {
1569                      latch.await();
1570                  } catch (InterruptedException quittingTime) {}
# Line 676 | Line 1572 | public class JSR166TestCase extends Test
1572              }};
1573      }
1574  
1575 <    public static class NPETask implements Callable<String> {
1576 <        public String call() { throw new NullPointerException(); }
1577 <    }
1578 <
1579 <    public static class CallableOne implements Callable<Integer> {
684 <        public Integer call() { return one; }
1575 >    public Runnable countDowner(final CountDownLatch latch) {
1576 >        return new CheckedRunnable() {
1577 >            public void realRun() throws InterruptedException {
1578 >                latch.countDown();
1579 >            }};
1580      }
1581  
1582 <    public class ShortRunnable extends CheckedRunnable {
1583 <        protected void realRun() throws Throwable {
1584 <            Thread.sleep(SHORT_DELAY_MS);
1582 >    class LatchAwaiter extends CheckedRunnable {
1583 >        static final int NEW = 0;
1584 >        static final int RUNNING = 1;
1585 >        static final int DONE = 2;
1586 >        final CountDownLatch latch;
1587 >        int state = NEW;
1588 >        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1589 >        public void realRun() throws InterruptedException {
1590 >            state = 1;
1591 >            await(latch);
1592 >            state = 2;
1593          }
1594      }
1595  
1596 <    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1597 <        protected void realRun() throws InterruptedException {
695 <            Thread.sleep(SHORT_DELAY_MS);
696 <        }
1596 >    public LatchAwaiter awaiter(CountDownLatch latch) {
1597 >        return new LatchAwaiter(latch);
1598      }
1599  
1600 <    public class SmallRunnable extends CheckedRunnable {
1601 <        protected void realRun() throws Throwable {
1602 <            Thread.sleep(SMALL_DELAY_MS);
1600 >    public void await(CountDownLatch latch, long timeoutMillis) {
1601 >        try {
1602 >            if (!latch.await(timeoutMillis, MILLISECONDS))
1603 >                fail("timed out waiting for CountDownLatch for "
1604 >                     + (timeoutMillis/1000) + " sec");
1605 >        } catch (Throwable fail) {
1606 >            threadUnexpectedException(fail);
1607          }
1608      }
1609  
1610 <    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1611 <        protected void realRun() {
707 <            try {
708 <                Thread.sleep(SMALL_DELAY_MS);
709 <            } catch (InterruptedException ok) {}
710 <        }
1610 >    public void await(CountDownLatch latch) {
1611 >        await(latch, LONG_DELAY_MS);
1612      }
1613  
1614 <    public class SmallCallable extends CheckedCallable {
1615 <        protected Object realCall() throws InterruptedException {
1616 <            Thread.sleep(SMALL_DELAY_MS);
1617 <            return Boolean.TRUE;
1614 >    public void await(Semaphore semaphore) {
1615 >        try {
1616 >            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1617 >                fail("timed out waiting for Semaphore for "
1618 >                     + (LONG_DELAY_MS/1000) + " sec");
1619 >        } catch (Throwable fail) {
1620 >            threadUnexpectedException(fail);
1621          }
1622      }
1623  
1624 <    public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
1625 <        protected void realRun() throws InterruptedException {
1626 <            Thread.sleep(SMALL_DELAY_MS);
1624 >    public void await(CyclicBarrier barrier) {
1625 >        try {
1626 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1627 >        } catch (Throwable fail) {
1628 >            threadUnexpectedException(fail);
1629          }
1630      }
1631  
1632 <    public class MediumRunnable extends CheckedRunnable {
1633 <        protected void realRun() throws Throwable {
1634 <            Thread.sleep(MEDIUM_DELAY_MS);
1635 <        }
1636 <    }
1632 > //     /**
1633 > //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1634 > //      */
1635 > //     public void await(AtomicBoolean flag) {
1636 > //         await(flag, LONG_DELAY_MS);
1637 > //     }
1638 >
1639 > //     /**
1640 > //      * Spin-waits up to the specified timeout until flag becomes true.
1641 > //      */
1642 > //     public void await(AtomicBoolean flag, long timeoutMillis) {
1643 > //         long startTime = System.nanoTime();
1644 > //         while (!flag.get()) {
1645 > //             if (millisElapsedSince(startTime) > timeoutMillis)
1646 > //                 throw new AssertionFailedError("timed out");
1647 > //             Thread.yield();
1648 > //         }
1649 > //     }
1650  
1651 <    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1652 <        protected void realRun() throws InterruptedException {
734 <            Thread.sleep(MEDIUM_DELAY_MS);
735 <        }
1651 >    public static class NPETask implements Callable<String> {
1652 >        public String call() { throw new NullPointerException(); }
1653      }
1654  
1655 <    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1655 >    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1656          protected void realRun() {
1657              try {
1658 <                Thread.sleep(MEDIUM_DELAY_MS);
1658 >                delay(SMALL_DELAY_MS);
1659              } catch (InterruptedException ok) {}
1660          }
1661      }
1662  
1663 <    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1664 <        protected void realRun() {
1665 <            try {
1666 <                Thread.sleep(LONG_DELAY_MS);
1667 <            } catch (InterruptedException ok) {}
1668 <        }
1663 >    public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1664 >        return new CheckedRunnable() {
1665 >            protected void realRun() {
1666 >                try {
1667 >                    delay(timeoutMillis);
1668 >                } catch (InterruptedException ok) {}
1669 >            }};
1670      }
1671  
1672      /**
# Line 760 | Line 1678 | public class JSR166TestCase extends Test
1678          }
1679      }
1680  
1681 <    public static class TrackedShortRunnable implements Runnable {
1682 <        public volatile boolean done = false;
765 <        public void run() {
766 <            try {
767 <                Thread.sleep(SMALL_DELAY_MS);
768 <                done = true;
769 <            } catch (InterruptedException ok) {}
770 <        }
771 <    }
772 <
773 <    public static class TrackedMediumRunnable implements Runnable {
774 <        public volatile boolean done = false;
775 <        public void run() {
776 <            try {
777 <                Thread.sleep(MEDIUM_DELAY_MS);
778 <                done = true;
779 <            } catch (InterruptedException ok) {}
780 <        }
781 <    }
782 <
783 <    public static class TrackedLongRunnable implements Runnable {
784 <        public volatile boolean done = false;
785 <        public void run() {
786 <            try {
787 <                Thread.sleep(LONG_DELAY_MS);
788 <                done = true;
789 <            } catch (InterruptedException ok) {}
790 <        }
1681 >    public interface TrackedRunnable extends Runnable {
1682 >        boolean isDone();
1683      }
1684  
1685      public static class TrackedNoOpRunnable implements Runnable {
# Line 797 | Line 1689 | public class JSR166TestCase extends Test
1689          }
1690      }
1691  
800    public static class TrackedCallable implements Callable {
801        public volatile boolean done = false;
802        public Object call() {
803            try {
804                Thread.sleep(SMALL_DELAY_MS);
805                done = true;
806            } catch (InterruptedException ok) {}
807            return Boolean.TRUE;
808        }
809    }
810
1692      /**
1693       * Analog of CheckedRunnable for RecursiveAction
1694       */
1695      public abstract class CheckedRecursiveAction extends RecursiveAction {
1696          protected abstract void realCompute() throws Throwable;
1697  
1698 <        public final void compute() {
1698 >        @Override protected final void compute() {
1699              try {
1700                  realCompute();
1701 <            } catch (Throwable t) {
1702 <                threadUnexpectedException(t);
1701 >            } catch (Throwable fail) {
1702 >                threadUnexpectedException(fail);
1703              }
1704          }
1705      }
# Line 829 | Line 1710 | public class JSR166TestCase extends Test
1710      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1711          protected abstract T realCompute() throws Throwable;
1712  
1713 <        public final T compute() {
1713 >        @Override protected final T compute() {
1714              try {
1715                  return realCompute();
1716 <            } catch (Throwable t) {
1717 <                threadUnexpectedException(t);
1716 >            } catch (Throwable fail) {
1717 >                threadUnexpectedException(fail);
1718                  return null;
1719              }
1720          }
# Line 847 | Line 1728 | public class JSR166TestCase extends Test
1728                                        ThreadPoolExecutor executor) {}
1729      }
1730  
1731 +    /**
1732 +     * A CyclicBarrier that uses timed await and fails with
1733 +     * AssertionFailedErrors instead of throwing checked exceptions.
1734 +     */
1735 +    public static class CheckedBarrier extends CyclicBarrier {
1736 +        public CheckedBarrier(int parties) { super(parties); }
1737 +
1738 +        public int await() {
1739 +            try {
1740 +                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1741 +            } catch (TimeoutException timedOut) {
1742 +                throw new AssertionFailedError("timed out");
1743 +            } catch (Exception fail) {
1744 +                AssertionFailedError afe =
1745 +                    new AssertionFailedError("Unexpected exception: " + fail);
1746 +                afe.initCause(fail);
1747 +                throw afe;
1748 +            }
1749 +        }
1750 +    }
1751 +
1752 +    void checkEmpty(BlockingQueue q) {
1753 +        try {
1754 +            assertTrue(q.isEmpty());
1755 +            assertEquals(0, q.size());
1756 +            assertNull(q.peek());
1757 +            assertNull(q.poll());
1758 +            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1759 +            assertEquals(q.toString(), "[]");
1760 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1761 +            assertFalse(q.iterator().hasNext());
1762 +            try {
1763 +                q.element();
1764 +                shouldThrow();
1765 +            } catch (NoSuchElementException success) {}
1766 +            try {
1767 +                q.iterator().next();
1768 +                shouldThrow();
1769 +            } catch (NoSuchElementException success) {}
1770 +            try {
1771 +                q.remove();
1772 +                shouldThrow();
1773 +            } catch (NoSuchElementException success) {}
1774 +        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1775 +    }
1776 +
1777 +    void assertSerialEquals(Object x, Object y) {
1778 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1779 +    }
1780 +
1781 +    void assertNotSerialEquals(Object x, Object y) {
1782 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1783 +    }
1784 +
1785 +    byte[] serialBytes(Object o) {
1786 +        try {
1787 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1788 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1789 +            oos.writeObject(o);
1790 +            oos.flush();
1791 +            oos.close();
1792 +            return bos.toByteArray();
1793 +        } catch (Throwable fail) {
1794 +            threadUnexpectedException(fail);
1795 +            return new byte[0];
1796 +        }
1797 +    }
1798 +
1799 +    void assertImmutable(final Object o) {
1800 +        if (o instanceof Collection) {
1801 +            assertThrows(
1802 +                UnsupportedOperationException.class,
1803 +                new Runnable() { public void run() {
1804 +                        ((Collection) o).add(null);}});
1805 +        }
1806 +    }
1807 +
1808 +    @SuppressWarnings("unchecked")
1809 +    <T> T serialClone(T o) {
1810 +        try {
1811 +            ObjectInputStream ois = new ObjectInputStream
1812 +                (new ByteArrayInputStream(serialBytes(o)));
1813 +            T clone = (T) ois.readObject();
1814 +            if (o == clone) assertImmutable(o);
1815 +            assertSame(o.getClass(), clone.getClass());
1816 +            return clone;
1817 +        } catch (Throwable fail) {
1818 +            threadUnexpectedException(fail);
1819 +            return null;
1820 +        }
1821 +    }
1822 +
1823 +    /**
1824 +     * A version of serialClone that leaves error handling (for
1825 +     * e.g. NotSerializableException) up to the caller.
1826 +     */
1827 +    @SuppressWarnings("unchecked")
1828 +    <T> T serialClonePossiblyFailing(T o)
1829 +        throws ReflectiveOperationException, java.io.IOException {
1830 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1831 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1832 +        oos.writeObject(o);
1833 +        oos.flush();
1834 +        oos.close();
1835 +        ObjectInputStream ois = new ObjectInputStream
1836 +            (new ByteArrayInputStream(bos.toByteArray()));
1837 +        T clone = (T) ois.readObject();
1838 +        if (o == clone) assertImmutable(o);
1839 +        assertSame(o.getClass(), clone.getClass());
1840 +        return clone;
1841 +    }
1842 +
1843 +    /**
1844 +     * If o implements Cloneable and has a public clone method,
1845 +     * returns a clone of o, else null.
1846 +     */
1847 +    @SuppressWarnings("unchecked")
1848 +    <T> T cloneableClone(T o) {
1849 +        if (!(o instanceof Cloneable)) return null;
1850 +        final T clone;
1851 +        try {
1852 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1853 +        } catch (NoSuchMethodException ok) {
1854 +            return null;
1855 +        } catch (ReflectiveOperationException unexpected) {
1856 +            throw new Error(unexpected);
1857 +        }
1858 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1859 +        assertSame(o.getClass(), clone.getClass());
1860 +        return clone;
1861 +    }
1862 +
1863 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1864 +                             Runnable... throwingActions) {
1865 +        for (Runnable throwingAction : throwingActions) {
1866 +            boolean threw = false;
1867 +            try { throwingAction.run(); }
1868 +            catch (Throwable t) {
1869 +                threw = true;
1870 +                if (!expectedExceptionClass.isInstance(t)) {
1871 +                    AssertionFailedError afe =
1872 +                        new AssertionFailedError
1873 +                        ("Expected " + expectedExceptionClass.getName() +
1874 +                         ", got " + t.getClass().getName());
1875 +                    afe.initCause(t);
1876 +                    threadUnexpectedException(afe);
1877 +                }
1878 +            }
1879 +            if (!threw)
1880 +                shouldThrow(expectedExceptionClass.getName());
1881 +        }
1882 +    }
1883 +
1884 +    public void assertIteratorExhausted(Iterator<?> it) {
1885 +        try {
1886 +            it.next();
1887 +            shouldThrow();
1888 +        } catch (NoSuchElementException success) {}
1889 +        assertFalse(it.hasNext());
1890 +    }
1891 +
1892 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1893 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1894 +    }
1895 +
1896 +    public Runnable runnableThrowing(final RuntimeException ex) {
1897 +        return new Runnable() { public void run() { throw ex; }};
1898 +    }
1899 +
1900 +    /** A reusable thread pool to be shared by tests. */
1901 +    static final ExecutorService cachedThreadPool =
1902 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1903 +                               1000L, MILLISECONDS,
1904 +                               new SynchronousQueue<Runnable>());
1905 +
1906 +    static <T> void shuffle(T[] array) {
1907 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1908 +    }
1909 +
1910 +    /**
1911 +     * Returns the same String as would be returned by {@link
1912 +     * Object#toString}, whether or not the given object's class
1913 +     * overrides toString().
1914 +     *
1915 +     * @see System#identityHashCode
1916 +     */
1917 +    static String identityString(Object x) {
1918 +        return x.getClass().getName()
1919 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1920 +    }
1921 +
1922 +    // --- Shared assertions for Executor tests ---
1923 +
1924 +    /**
1925 +     * Returns maximum number of tasks that can be submitted to given
1926 +     * pool (with bounded queue) before saturation (when submission
1927 +     * throws RejectedExecutionException).
1928 +     */
1929 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1930 +        BlockingQueue<Runnable> q = pool.getQueue();
1931 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1932 +    }
1933 +
1934 +    @SuppressWarnings("FutureReturnValueIgnored")
1935 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1936 +        try {
1937 +            e.execute((Runnable) null);
1938 +            shouldThrow();
1939 +        } catch (NullPointerException success) {}
1940 +
1941 +        if (! (e instanceof ExecutorService)) return;
1942 +        ExecutorService es = (ExecutorService) e;
1943 +        try {
1944 +            es.submit((Runnable) null);
1945 +            shouldThrow();
1946 +        } catch (NullPointerException success) {}
1947 +        try {
1948 +            es.submit((Runnable) null, Boolean.TRUE);
1949 +            shouldThrow();
1950 +        } catch (NullPointerException success) {}
1951 +        try {
1952 +            es.submit((Callable) null);
1953 +            shouldThrow();
1954 +        } catch (NullPointerException success) {}
1955 +
1956 +        if (! (e instanceof ScheduledExecutorService)) return;
1957 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1958 +        try {
1959 +            ses.schedule((Runnable) null,
1960 +                         randomTimeout(), randomTimeUnit());
1961 +            shouldThrow();
1962 +        } catch (NullPointerException success) {}
1963 +        try {
1964 +            ses.schedule((Callable) null,
1965 +                         randomTimeout(), randomTimeUnit());
1966 +            shouldThrow();
1967 +        } catch (NullPointerException success) {}
1968 +        try {
1969 +            ses.scheduleAtFixedRate((Runnable) null,
1970 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1971 +            shouldThrow();
1972 +        } catch (NullPointerException success) {}
1973 +        try {
1974 +            ses.scheduleWithFixedDelay((Runnable) null,
1975 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1976 +            shouldThrow();
1977 +        } catch (NullPointerException success) {}
1978 +    }
1979 +
1980 +    void setRejectedExecutionHandler(
1981 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1982 +        p.setRejectedExecutionHandler(handler);
1983 +        assertSame(handler, p.getRejectedExecutionHandler());
1984 +    }
1985 +
1986 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1987 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1988 +        final long savedTaskCount = p.getTaskCount();
1989 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1990 +        final int savedQueueSize = p.getQueue().size();
1991 +        final boolean stock = (p.getClass().getClassLoader() == null);
1992 +
1993 +        Runnable r = () -> {};
1994 +        Callable<Boolean> c = () -> Boolean.TRUE;
1995 +
1996 +        class Recorder implements RejectedExecutionHandler {
1997 +            public volatile Runnable r = null;
1998 +            public volatile ThreadPoolExecutor p = null;
1999 +            public void reset() { r = null; p = null; }
2000 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
2001 +                assertNull(this.r);
2002 +                assertNull(this.p);
2003 +                this.r = r;
2004 +                this.p = p;
2005 +            }
2006 +        }
2007 +
2008 +        // check custom handler is invoked exactly once per task
2009 +        Recorder recorder = new Recorder();
2010 +        setRejectedExecutionHandler(p, recorder);
2011 +        for (int i = 2; i--> 0; ) {
2012 +            recorder.reset();
2013 +            p.execute(r);
2014 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
2015 +                assertSame(r, recorder.r);
2016 +            assertSame(p, recorder.p);
2017 +
2018 +            recorder.reset();
2019 +            assertFalse(p.submit(r).isDone());
2020 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2021 +            assertSame(p, recorder.p);
2022 +
2023 +            recorder.reset();
2024 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2025 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2026 +            assertSame(p, recorder.p);
2027 +
2028 +            recorder.reset();
2029 +            assertFalse(p.submit(c).isDone());
2030 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2031 +            assertSame(p, recorder.p);
2032 +
2033 +            if (p instanceof ScheduledExecutorService) {
2034 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2035 +                ScheduledFuture<?> future;
2036 +
2037 +                recorder.reset();
2038 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2039 +                assertFalse(future.isDone());
2040 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2041 +                assertSame(p, recorder.p);
2042 +
2043 +                recorder.reset();
2044 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2045 +                assertFalse(future.isDone());
2046 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2047 +                assertSame(p, recorder.p);
2048 +
2049 +                recorder.reset();
2050 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2051 +                assertFalse(future.isDone());
2052 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2053 +                assertSame(p, recorder.p);
2054 +
2055 +                recorder.reset();
2056 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2057 +                assertFalse(future.isDone());
2058 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2059 +                assertSame(p, recorder.p);
2060 +            }
2061 +        }
2062 +
2063 +        // Checking our custom handler above should be sufficient, but
2064 +        // we add some integration tests of standard handlers.
2065 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2066 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2067 +
2068 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2069 +        try {
2070 +            p.execute(setThread);
2071 +            shouldThrow();
2072 +        } catch (RejectedExecutionException success) {}
2073 +        assertNull(thread.get());
2074 +
2075 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2076 +        p.execute(setThread);
2077 +        assertNull(thread.get());
2078 +
2079 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2080 +        p.execute(setThread);
2081 +        if (p.isShutdown())
2082 +            assertNull(thread.get());
2083 +        else
2084 +            assertSame(Thread.currentThread(), thread.get());
2085 +
2086 +        setRejectedExecutionHandler(p, savedHandler);
2087 +
2088 +        // check that pool was not perturbed by handlers
2089 +        assertEquals(savedTaskCount, p.getTaskCount());
2090 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2091 +        assertEquals(savedQueueSize, p.getQueue().size());
2092 +    }
2093   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines