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.96 by jsr166, Mon Jan 21 19:51:46 2013 UTC vs.
Revision 1.276 by jsr166, Fri Nov 25 16:39:49 2022 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
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.*;
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.LockInfo;
53   import java.lang.management.ThreadInfo;
54 + import java.lang.management.ThreadMXBean;
55 + import java.lang.reflect.Constructor;
56 + import java.lang.reflect.Method;
57 + import java.lang.reflect.Modifier;
58 + import java.security.CodeSource;
59 + import java.security.Permission;
60 + import java.security.PermissionCollection;
61 + import java.security.Permissions;
62 + import java.security.Policy;
63 + import java.security.ProtectionDomain;
64 + import java.security.SecurityPermission;
65   import java.util.ArrayList;
66   import java.util.Arrays;
67 + import java.util.Collection;
68 + import java.util.Collections;
69   import java.util.Date;
70 + import java.util.Deque;
71   import java.util.Enumeration;
72 + import java.util.HashSet;
73 + import java.util.Iterator;
74   import java.util.List;
75   import java.util.NoSuchElementException;
76   import java.util.PropertyPermission;
77 < import java.util.concurrent.*;
77 > import java.util.Queue;
78 > import java.util.Set;
79 > import java.util.concurrent.BlockingQueue;
80 > import java.util.concurrent.Callable;
81 > import java.util.concurrent.CountDownLatch;
82 > import java.util.concurrent.CyclicBarrier;
83 > import java.util.concurrent.ExecutionException;
84 > import java.util.concurrent.Executor;
85 > import java.util.concurrent.Executors;
86 > import java.util.concurrent.ExecutorService;
87 > import java.util.concurrent.ForkJoinPool;
88 > import java.util.concurrent.Future;
89 > import java.util.concurrent.FutureTask;
90 > import java.util.concurrent.RecursiveAction;
91 > import java.util.concurrent.RecursiveTask;
92 > import java.util.concurrent.RejectedExecutionException;
93 > import java.util.concurrent.RejectedExecutionHandler;
94 > import java.util.concurrent.Semaphore;
95 > import java.util.concurrent.ScheduledExecutorService;
96 > import java.util.concurrent.ScheduledFuture;
97 > import java.util.concurrent.SynchronousQueue;
98 > import java.util.concurrent.ThreadFactory;
99 > import java.util.concurrent.ThreadLocalRandom;
100 > import java.util.concurrent.ThreadPoolExecutor;
101 > import java.util.concurrent.TimeUnit;
102 > import java.util.concurrent.TimeoutException;
103   import java.util.concurrent.atomic.AtomicBoolean;
104   import java.util.concurrent.atomic.AtomicReference;
105 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
106 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
107 < import java.security.CodeSource;
108 < import java.security.Permission;
109 < import java.security.PermissionCollection;
110 < import java.security.Permissions;
32 < import java.security.Policy;
33 < import java.security.ProtectionDomain;
34 < import java.security.SecurityPermission;
105 > import java.util.regex.Pattern;
106 >
107 > import junit.framework.Test;
108 > import junit.framework.TestCase;
109 > import junit.framework.TestResult;
110 > import junit.framework.TestSuite;
111  
112   /**
113   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 43 | Line 119 | import java.security.SecurityPermission;
119   *
120   * <ol>
121   *
122 < * <li> All assertions in code running in generated threads must use
123 < * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
124 < * #threadAssertEquals}, or {@link #threadAssertNull}, (not
125 < * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
126 < * particularly recommended) for other code to use these forms too.
127 < * Only the most typically used JUnit assertion methods are defined
128 < * this way, but enough to live with.</li>
122 > * <li>All code not running in the main test thread (manually spawned threads
123 > * or the common fork join pool) must be checked for failure (and completion!).
124 > * Mechanisms that can be used to ensure this are:
125 > *   <ol>
126 > *   <li>Signalling via a synchronizer like AtomicInteger or CountDownLatch
127 > *    that the task completed normally, which is checked before returning from
128 > *    the test method in the main thread.
129 > *   <li>Using the forms {@link #threadFail}, {@link #threadAssertTrue},
130 > *    or {@link #threadAssertNull}, (not {@code fail}, {@code assertTrue}, etc.)
131 > *    Only the most typically used JUnit assertion methods are defined
132 > *    this way, but enough to live with.
133 > *   <li>Recording failure explicitly using {@link #threadUnexpectedException}
134 > *    or {@link #threadRecordFailure}.
135 > *   <li>Using a wrapper like CheckedRunnable that uses one the mechanisms above.
136 > *   </ol>
137   *
138 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
138 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
139   * to invoke {@code super.setUp} and {@code super.tearDown} within
140   * them. These methods are used to clear and check for thread
141 < * assertion failures.</li>
141 > * assertion failures.
142   *
143   * <li>All delays and timeouts must use one of the constants {@code
144   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 65 | Line 149 | import java.security.SecurityPermission;
149   * is always discriminable as larger than SHORT and smaller than
150   * MEDIUM.  And so on. These constants are set to conservative values,
151   * but even so, if there is ever any doubt, they can all be increased
152 < * in one spot to rerun tests on slower platforms.</li>
152 > * in one spot to rerun tests on slower platforms.
153   *
154 < * <li> All threads generated must be joined inside each test case
154 > * Class Item is used for elements of collections and related
155 > * purposes. Many tests rely on their keys being equal to ints. To
156 > * check these, methods mustEqual, mustContain, etc adapt the JUnit
157 > * assert methods to intercept ints.
158 > *
159 > * <li>All threads generated must be joined inside each test case
160   * method (or {@code fail} to do so) before returning from the
161   * method. The {@code joinPool} method can be used to do this when
162 < * using Executors.</li>
162 > * using Executors.
163   *
164   * </ol>
165   *
166   * <p><b>Other notes</b>
167   * <ul>
168   *
169 < * <li> Usually, there is one testcase method per JSR166 method
169 > * <li>Usually, there is one testcase method per JSR166 method
170   * covering "normal" operation, and then as many exception-testing
171   * methods as there are exceptions the method can throw. Sometimes
172   * there are multiple tests per JSR166 method when the different
173   * "normal" behaviors differ significantly. And sometimes testcases
174 < * cover multiple methods when they cannot be tested in
86 < * isolation.</li>
174 > * cover multiple methods when they cannot be tested in isolation.
175   *
176 < * <li> The documentation style for testcases is to provide as javadoc
176 > * <li>The documentation style for testcases is to provide as javadoc
177   * a simple sentence or two describing the property that the testcase
178   * method purports to test. The javadocs do not say anything about how
179 < * the property is tested. To find out, read the code.</li>
179 > * the property is tested. To find out, read the code.
180   *
181 < * <li> These tests are "conformance tests", and do not attempt to
181 > * <li>These tests are "conformance tests", and do not attempt to
182   * test throughput, latency, scalability or other performance factors
183   * (see the separate "jtreg" tests for a set intended to check these
184   * for the most central aspects of functionality.) So, most tests use
185   * the smallest sensible numbers of threads, collection sizes, etc
186 < * needed to check basic conformance.</li>
186 > * needed to check basic conformance.
187   *
188   * <li>The test classes currently do not declare inclusion in
189   * any particular package to simplify things for people integrating
190 < * them in TCK test suites.</li>
190 > * them in TCK test suites.
191   *
192 < * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
193 < * runs all JSR166 unit tests.</li>
192 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
193 > * runs all JSR166 unit tests.
194   *
195   * </ul>
196   */
197   public class JSR166TestCase extends TestCase {
198 +    // No longer run with custom securityManagers
199      private static final boolean useSecurityManager =
200 <        Boolean.getBoolean("jsr166.useSecurityManager");
200 >    Boolean.getBoolean("jsr166.useSecurityManager");
201  
202      protected static final boolean expensiveTests =
203          Boolean.getBoolean("jsr166.expensiveTests");
204  
205      /**
206 +     * If true, also run tests that are not part of the official tck
207 +     * because they test unspecified implementation details.
208 +     */
209 +    protected static final boolean testImplementationDetails =
210 +        Boolean.getBoolean("jsr166.testImplementationDetails");
211 +
212 +    /**
213       * If true, report on stdout all "slow" tests, that is, ones that
214       * take more than profileThreshold milliseconds to execute.
215       */
# Line 127 | Line 223 | public class JSR166TestCase extends Test
223      private static final long profileThreshold =
224          Long.getLong("jsr166.profileThreshold", 100);
225  
226 +    /**
227 +     * The number of repetitions per test (for tickling rare bugs).
228 +     */
229 +    private static final int runsPerTest =
230 +        Integer.getInteger("jsr166.runsPerTest", 1);
231 +
232 +    /**
233 +     * The number of repetitions of the test suite (for finding leaks?).
234 +     */
235 +    private static final int suiteRuns =
236 +        Integer.getInteger("jsr166.suiteRuns", 1);
237 +
238 +    /**
239 +     * Returns the value of the system property, or NaN if not defined.
240 +     */
241 +    private static float systemPropertyValue(String name) {
242 +        String floatString = System.getProperty(name);
243 +        if (floatString == null)
244 +            return Float.NaN;
245 +        try {
246 +            return Float.parseFloat(floatString);
247 +        } catch (NumberFormatException ex) {
248 +            throw new IllegalArgumentException(
249 +                String.format("Bad float value in system property %s=%s",
250 +                              name, floatString));
251 +        }
252 +    }
253 +
254 +    private static final ThreadMXBean THREAD_MXBEAN
255 +        = ManagementFactory.getThreadMXBean();
256 +
257 +    /**
258 +     * The scaling factor to apply to standard delays used in tests.
259 +     * May be initialized from any of:
260 +     * - the "jsr166.delay.factor" system property
261 +     * - the "test.timeout.factor" system property (as used by jtreg)
262 +     *   See: http://openjdk.java.net/jtreg/tag-spec.html
263 +     * - hard-coded fuzz factor when using a known slowpoke VM
264 +     */
265 +    private static final float delayFactor = delayFactor();
266 +
267 +    private static float delayFactor() {
268 +        float x;
269 +        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
270 +            return x;
271 +        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
272 +            return x;
273 +        String prop = System.getProperty("java.vm.version");
274 +        if (prop != null && prop.matches(".*debug.*"))
275 +            return 4.0f; // How much slower is fastdebug than product?!
276 +        return 1.0f;
277 +    }
278 +
279 +    public JSR166TestCase() { super(); }
280 +    public JSR166TestCase(String name) { super(name); }
281 +
282 +    /**
283 +     * A filter for tests to run, matching strings of the form
284 +     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
285 +     * Usefully combined with jsr166.runsPerTest.
286 +     */
287 +    private static final Pattern methodFilter = methodFilter();
288 +
289 +    private static Pattern methodFilter() {
290 +        String regex = System.getProperty("jsr166.methodFilter");
291 +        return (regex == null) ? null : Pattern.compile(regex);
292 +    }
293 +
294 +    // Instrumentation to debug very rare, but very annoying hung test runs.
295 +    static volatile TestCase currentTestCase;
296 +    // static volatile int currentRun = 0;
297 +    static {
298 +        Runnable wedgedTestDetector = new Runnable() { public void run() {
299 +            // Avoid spurious reports with enormous runsPerTest.
300 +            // A single test case run should never take more than 1 second.
301 +            // But let's cap it at the high end too ...
302 +            final int timeoutMinutesMin = Math.max(runsPerTest / 60, 1)
303 +                * Math.max((int) delayFactor, 1);
304 +            final int timeoutMinutes = Math.min(15, timeoutMinutesMin);
305 +            for (TestCase lastTestCase = currentTestCase;;) {
306 +                try { MINUTES.sleep(timeoutMinutes); }
307 +                catch (InterruptedException unexpected) { break; }
308 +                if (lastTestCase == currentTestCase) {
309 +                    System.err.printf(
310 +                        "Looks like we're stuck running test: %s%n",
311 +                        lastTestCase);
312 + //                     System.err.printf(
313 + //                         "Looks like we're stuck running test: %s (%d/%d)%n",
314 + //                         lastTestCase, currentRun, runsPerTest);
315 + //                     System.err.println("availableProcessors=" +
316 + //                         Runtime.getRuntime().availableProcessors());
317 + //                     System.err.printf("cpu model = %s%n", cpuModel());
318 +                    dumpTestThreads();
319 +                    // one stack dump is probably enough; more would be spam
320 +                    break;
321 +                }
322 +                lastTestCase = currentTestCase;
323 +            }}};
324 +        Thread thread = new Thread(wedgedTestDetector, "WedgedTestDetector");
325 +        thread.setDaemon(true);
326 +        thread.start();
327 +    }
328 +
329 + //     public static String cpuModel() {
330 + //         try {
331 + //             java.util.regex.Matcher matcher
332 + //               = Pattern.compile("model name\\s*: (.*)")
333 + //                 .matcher(new String(
334 + //                     java.nio.file.Files.readAllBytes(
335 + //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
336 + //             matcher.find();
337 + //             return matcher.group(1);
338 + //         } catch (Exception ex) { return null; }
339 + //     }
340 +
341 +    public void runBare() throws Throwable {
342 +        currentTestCase = this;
343 +        if (methodFilter == null
344 +            || methodFilter.matcher(toString()).find())
345 +            super.runBare();
346 +    }
347 +
348      protected void runTest() throws Throwable {
349 <        if (profileTests)
350 <            runTestProfiled();
351 <        else
352 <            super.runTest();
349 >        for (int i = 0; i < runsPerTest; i++) {
350 >            // currentRun = i;
351 >            if (profileTests)
352 >                runTestProfiled();
353 >            else
354 >                super.runTest();
355 >        }
356      }
357  
358      protected void runTestProfiled() throws Throwable {
359 <        long t0 = System.nanoTime();
360 <        try {
359 >        for (int i = 0; i < 2; i++) {
360 >            long startTime = System.nanoTime();
361              super.runTest();
362 <        } finally {
363 <            long elapsedMillis =
364 <                (System.nanoTime() - t0) / (1000L * 1000L);
365 <            if (elapsedMillis >= profileThreshold)
366 <                System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
362 >            long elapsedMillis = millisElapsedSince(startTime);
363 >            if (elapsedMillis < profileThreshold)
364 >                break;
365 >            // Never report first run of any test; treat it as a
366 >            // warmup run, notably to trigger all needed classloading,
367 >            if (i > 0)
368 >                System.out.printf("%s: %d%n", toString(), elapsedMillis);
369          }
370      }
371  
372      /**
373       * Runs all JSR166 unit tests using junit.textui.TestRunner.
151     * Optional command line arg provides the number of iterations to
152     * repeat running the tests.
374       */
375      public static void main(String[] args) {
376 +        main(suite(), args);
377 +    }
378 +
379 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
380 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
381 +        long runTime;
382 +        public void startTest(Test test) {}
383 +        protected void printHeader(long runTime) {
384 +            this.runTime = runTime; // defer printing for later
385 +        }
386 +        protected void printFooter(TestResult result) {
387 +            if (result.wasSuccessful()) {
388 +                getWriter().println("OK (" + result.runCount() + " tests)"
389 +                    + "  Time: " + elapsedTimeAsString(runTime));
390 +            } else {
391 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
392 +                super.printFooter(result);
393 +            }
394 +        }
395 +    }
396 +
397 +    /**
398 +     * Returns a TestRunner that doesn't bother with unnecessary
399 +     * fluff, like printing a "." for each test case.
400 +     */
401 +    static junit.textui.TestRunner newPithyTestRunner() {
402 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
403 +        runner.setPrinter(new PithyResultPrinter(System.out));
404 +        return runner;
405 +    }
406 +
407 +    /**
408 +     * Runs all unit tests in the given test suite.
409 +     * Actual behavior influenced by jsr166.* system properties.
410 +     */
411 +    @SuppressWarnings("removal")
412 +    static void main(Test suite, String[] args) {
413          if (useSecurityManager) {
414              System.err.println("Setting a permissive security manager");
415              Policy.setPolicy(permissivePolicy());
416 <            System.setSecurityManager(new SecurityManager());
416 >            try {
417 >                System.setSecurityManager(new SecurityManager());
418 >            } catch (Throwable ok) {  // failure OK during deprecation
419 >            }
420          }
421 <        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
422 <
423 <        Test s = suite();
424 <        for (int i = 0; i < iters; ++i) {
164 <            junit.textui.TestRunner.run(s);
421 >        for (int i = 0; i < suiteRuns; i++) {
422 >            TestResult result = newPithyTestRunner().doRun(suite);
423 >            if (!result.wasSuccessful())
424 >                System.exit(1);
425              System.gc();
426              System.runFinalization();
427          }
168        System.exit(0);
428      }
429  
430      public static TestSuite newTestSuite(Object... suiteOrClasses) {
# Line 181 | Line 440 | public class JSR166TestCase extends Test
440          return suite;
441      }
442  
443 +    public static void addNamedTestClasses(TestSuite suite,
444 +                                           String... testClassNames) {
445 +        for (String testClassName : testClassNames) {
446 +            try {
447 +                Class<?> testClass = Class.forName(testClassName);
448 +                Method m = testClass.getDeclaredMethod("suite");
449 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
450 +            } catch (ReflectiveOperationException e) {
451 +                throw new AssertionError("Missing test class", e);
452 +            }
453 +        }
454 +    }
455 +
456 +    public static final double JAVA_CLASS_VERSION;
457 +    public static final String JAVA_SPECIFICATION_VERSION;
458 +    static {
459 +        try {
460 +            @SuppressWarnings("removal") double jcv =
461 +            java.security.AccessController.doPrivileged(
462 +                new java.security.PrivilegedAction<Double>() {
463 +                public Double run() {
464 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
465 +            JAVA_CLASS_VERSION = jcv;
466 +            @SuppressWarnings("removal") String jsv =
467 +            java.security.AccessController.doPrivileged(
468 +                new java.security.PrivilegedAction<String>() {
469 +                public String run() {
470 +                    return System.getProperty("java.specification.version");}});
471 +            JAVA_SPECIFICATION_VERSION = jsv;
472 +        } catch (Throwable t) {
473 +            throw new Error(t);
474 +        }
475 +    }
476 +
477 +    public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
478 +    public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
479 +    public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
480 +    public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
481 +    public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
482 +    public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
483 +    public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
484 +    public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
485 +    public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
486 +    public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
487 +    public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
488 +    public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
489 +
490      /**
491       * Collects all JSR166 unit tests as one suite.
492       */
493      public static Test suite() {
494 <        return newTestSuite(
494 >        // Java7+ test classes
495 >        TestSuite suite = newTestSuite(
496              ForkJoinPoolTest.suite(),
497              ForkJoinTaskTest.suite(),
498              RecursiveActionTest.suite(),
# Line 199 | Line 506 | public class JSR166TestCase extends Test
506              AbstractQueuedLongSynchronizerTest.suite(),
507              ArrayBlockingQueueTest.suite(),
508              ArrayDequeTest.suite(),
509 +            ArrayListTest.suite(),
510              AtomicBooleanTest.suite(),
511              AtomicIntegerArrayTest.suite(),
512              AtomicIntegerFieldUpdaterTest.suite(),
# Line 221 | Line 529 | public class JSR166TestCase extends Test
529              CopyOnWriteArrayListTest.suite(),
530              CopyOnWriteArraySetTest.suite(),
531              CountDownLatchTest.suite(),
532 +            CountedCompleterTest.suite(),
533              CyclicBarrierTest.suite(),
534              DelayQueueTest.suite(),
535              EntryTest.suite(),
# Line 228 | Line 537 | public class JSR166TestCase extends Test
537              ExecutorsTest.suite(),
538              ExecutorCompletionServiceTest.suite(),
539              FutureTaskTest.suite(),
540 +            HashtableTest.suite(),
541              LinkedBlockingDequeTest.suite(),
542              LinkedBlockingQueueTest.suite(),
543              LinkedListTest.suite(),
# Line 249 | Line 559 | public class JSR166TestCase extends Test
559              TreeMapTest.suite(),
560              TreeSetTest.suite(),
561              TreeSubMapTest.suite(),
562 <            TreeSubSetTest.suite());
562 >            TreeSubSetTest.suite(),
563 >            VectorTest.suite());
564 >
565 >        // Java8+ test classes
566 >        if (atLeastJava8()) {
567 >            String[] java8TestClassNames = {
568 >                "ArrayDeque8Test",
569 >                "Atomic8Test",
570 >                "CompletableFutureTest",
571 >                "ConcurrentHashMap8Test",
572 >                "CountedCompleter8Test",
573 >                "DoubleAccumulatorTest",
574 >                "DoubleAdderTest",
575 >                "ForkJoinPool8Test",
576 >                "ForkJoinTask8Test",
577 >                "HashMapTest",
578 >                "LinkedBlockingDeque8Test",
579 >                "LinkedBlockingQueue8Test",
580 >                "LinkedHashMapTest",
581 >                "LongAccumulatorTest",
582 >                "LongAdderTest",
583 >                "SplittableRandomTest",
584 >                "StampedLockTest",
585 >                "SubmissionPublisherTest",
586 >                "ThreadLocalRandom8Test",
587 >                "TimeUnit8Test",
588 >            };
589 >            addNamedTestClasses(suite, java8TestClassNames);
590 >        }
591 >
592 >        // Java9+ test classes
593 >        if (atLeastJava9()) {
594 >            String[] java9TestClassNames = {
595 >                "AtomicBoolean9Test",
596 >                "AtomicInteger9Test",
597 >                "AtomicIntegerArray9Test",
598 >                "AtomicLong9Test",
599 >                "AtomicLongArray9Test",
600 >                "AtomicReference9Test",
601 >                "AtomicReferenceArray9Test",
602 >                "ExecutorCompletionService9Test",
603 >                "ForkJoinPool9Test",
604 >            };
605 >            addNamedTestClasses(suite, java9TestClassNames);
606 >        }
607 >
608 >        if (atLeastJava17()) {
609 >            String[] java17TestClassNames = {
610 >                "ForkJoinPool19Test",
611 >            };
612 >            addNamedTestClasses(suite, java17TestClassNames);
613 >        }
614 >        return suite;
615      }
616  
617 +    /** Returns list of junit-style test method names in given class. */
618 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
619 +        Method[] methods = testClass.getDeclaredMethods();
620 +        ArrayList<String> names = new ArrayList<>(methods.length);
621 +        for (Method method : methods) {
622 +            if (method.getName().startsWith("test")
623 +                && Modifier.isPublic(method.getModifiers())
624 +                // method.getParameterCount() requires jdk8+
625 +                && method.getParameterTypes().length == 0) {
626 +                names.add(method.getName());
627 +            }
628 +        }
629 +        return names;
630 +    }
631 +
632 +    /**
633 +     * Returns junit-style testSuite for the given test class, but
634 +     * parameterized by passing extra data to each test.
635 +     */
636 +    public static <ExtraData> Test parameterizedTestSuite
637 +        (Class<? extends JSR166TestCase> testClass,
638 +         Class<ExtraData> dataClass,
639 +         ExtraData data) {
640 +        try {
641 +            TestSuite suite = new TestSuite();
642 +            Constructor c =
643 +                testClass.getDeclaredConstructor(dataClass, String.class);
644 +            for (String methodName : testMethodNames(testClass))
645 +                suite.addTest((Test) c.newInstance(data, methodName));
646 +            return suite;
647 +        } catch (ReflectiveOperationException e) {
648 +            throw new AssertionError(e);
649 +        }
650 +    }
651 +
652 +    /**
653 +     * Returns junit-style testSuite for the jdk8 extension of the
654 +     * given test class, but parameterized by passing extra data to
655 +     * each test.  Uses reflection to allow compilation in jdk7.
656 +     */
657 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
658 +        (Class<? extends JSR166TestCase> testClass,
659 +         Class<ExtraData> dataClass,
660 +         ExtraData data) {
661 +        if (atLeastJava8()) {
662 +            String name = testClass.getName();
663 +            String name8 = name.replaceAll("Test$", "8Test");
664 +            if (name.equals(name8)) throw new AssertionError(name);
665 +            try {
666 +                return (Test)
667 +                    Class.forName(name8)
668 +                    .getMethod("testSuite", dataClass)
669 +                    .invoke(null, data);
670 +            } catch (ReflectiveOperationException e) {
671 +                throw new AssertionError(e);
672 +            }
673 +        } else {
674 +            return new TestSuite();
675 +        }
676 +    }
677 +
678 +    // Delays for timing-dependent tests, in milliseconds.
679  
680      public static long SHORT_DELAY_MS;
681      public static long SMALL_DELAY_MS;
682      public static long MEDIUM_DELAY_MS;
683      public static long LONG_DELAY_MS;
684  
685 +    /**
686 +     * A delay significantly longer than LONG_DELAY_MS.
687 +     * Use this in a thread that is waited for via awaitTermination(Thread).
688 +     */
689 +    public static long LONGER_DELAY_MS;
690 +
691 +    private static final long RANDOM_TIMEOUT;
692 +    private static final long RANDOM_EXPIRED_TIMEOUT;
693 +    private static final TimeUnit RANDOM_TIMEUNIT;
694 +    static {
695 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
696 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
697 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
698 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
699 +        TimeUnit[] timeUnits = TimeUnit.values();
700 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
701 +    }
702 +
703 +    /**
704 +     * Returns a timeout for use when any value at all will do.
705 +     */
706 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
707 +
708 +    /**
709 +     * Returns a timeout that means "no waiting", i.e. not positive.
710 +     */
711 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
712 +
713 +    /**
714 +     * Returns a random non-null TimeUnit.
715 +     */
716 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
717 +
718 +    /**
719 +     * Returns a random boolean; a "coin flip".
720 +     */
721 +    static boolean randomBoolean() {
722 +        return ThreadLocalRandom.current().nextBoolean();
723 +    }
724 +
725 +    /**
726 +     * Returns a random element from given choices.
727 +     */
728 +    <T> T chooseRandomly(List<T> choices) {
729 +        return choices.get(ThreadLocalRandom.current().nextInt(choices.size()));
730 +    }
731 +
732 +    /**
733 +     * Returns a random element from given choices.
734 +     */
735 +    @SuppressWarnings("unchecked")
736 +    <T> T chooseRandomly(T... choices) {
737 +        return choices[ThreadLocalRandom.current().nextInt(choices.length)];
738 +    }
739  
740      /**
741 <     * Returns the shortest timed delay. This could
742 <     * be reimplemented to use for example a Property.
741 >     * Returns the shortest timed delay. This can be scaled up for
742 >     * slow machines using the jsr166.delay.factor system property,
743 >     * or via jtreg's -timeoutFactor: flag.
744 >     * http://openjdk.java.net/jtreg/command-help.html
745       */
746      protected long getShortDelay() {
747 <        return 50;
747 >        return (long) (50 * delayFactor);
748      }
749  
750      /**
# Line 275 | Line 755 | public class JSR166TestCase extends Test
755          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
756          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
757          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
758 +        LONGER_DELAY_MS = 2 * LONG_DELAY_MS;
759      }
760  
761 +    private static final long TIMEOUT_DELAY_MS
762 +        = (long) (12.0 * Math.cbrt(delayFactor));
763 +
764      /**
765 <     * Returns a timeout in milliseconds to be used in tests that
766 <     * verify that operations block or time out.
765 >     * Returns a timeout in milliseconds to be used in tests that verify
766 >     * that operations block or time out.  We want this to be longer
767 >     * than the OS scheduling quantum, but not too long, so don't scale
768 >     * linearly with delayFactor; we use "crazy" cube root instead.
769       */
770 <    long timeoutMillis() {
771 <        return SHORT_DELAY_MS / 4;
770 >    static long timeoutMillis() {
771 >        return TIMEOUT_DELAY_MS;
772      }
773  
774      /**
775 <     * Returns a new Date instance representing a time delayMillis
776 <     * milliseconds in the future.
775 >     * Returns a new Date instance representing a time at least
776 >     * delayMillis milliseconds in the future.
777       */
778      Date delayedDate(long delayMillis) {
779 <        return new Date(System.currentTimeMillis() + delayMillis);
779 >        // Add 1 because currentTimeMillis is known to round into the past.
780 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
781      }
782  
783      /**
784       * The first exception encountered if any threadAssertXXX method fails.
785       */
786      private final AtomicReference<Throwable> threadFailure
787 <        = new AtomicReference<Throwable>(null);
787 >        = new AtomicReference<>(null);
788  
789      /**
790       * Records an exception so that it can be rethrown later in the test
# Line 306 | Line 793 | public class JSR166TestCase extends Test
793       * the same test have no effect.
794       */
795      public void threadRecordFailure(Throwable t) {
796 <        threadFailure.compareAndSet(null, t);
796 >        System.err.println(t);
797 >        if (threadFailure.compareAndSet(null, t))
798 >            dumpTestThreads();
799      }
800  
801      public void setUp() {
802          setDelays();
803      }
804  
805 +    void tearDownFail(String format, Object... args) {
806 +        String msg = toString() + ": " + String.format(format, args);
807 +        System.err.println(msg);
808 +        dumpTestThreads();
809 +        throw new AssertionError(msg);
810 +    }
811 +
812      /**
813       * Extra checks that get done for all test cases.
814       *
# Line 331 | Line 827 | public class JSR166TestCase extends Test
827                  throw (RuntimeException) t;
828              else if (t instanceof Exception)
829                  throw (Exception) t;
830 <            else {
831 <                AssertionFailedError afe =
336 <                    new AssertionFailedError(t.toString());
337 <                afe.initCause(t);
338 <                throw afe;
339 <            }
830 >            else
831 >                throw new AssertionError(t.toString(), t);
832          }
833  
834          if (Thread.interrupted())
835 <            throw new AssertionFailedError("interrupt status set in main thread");
835 >            tearDownFail("interrupt status set in main thread");
836 >
837 >        checkForkJoinPoolThreadLeaks();
838 >    }
839 >
840 >    /**
841 >     * Finds missing PoolCleaners
842 >     */
843 >    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
844 >        Thread[] survivors = new Thread[7];
845 >        int count = Thread.enumerate(survivors);
846 >        for (int i = 0; i < count; i++) {
847 >            Thread thread = survivors[i];
848 >            String name = thread.getName();
849 >            if (name.startsWith("ForkJoinPool-")) {
850 >                // give thread some time to terminate
851 >                thread.join(LONG_DELAY_MS);
852 >                if (thread.isAlive())
853 >                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
854 >                                 thread);
855 >            }
856 >        }
857 >
858 >        if (!ForkJoinPool.commonPool()
859 >            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
860 >            tearDownFail("ForkJoin common pool thread stuck");
861      }
862  
863      /**
864       * Just like fail(reason), but additionally recording (using
865 <     * threadRecordFailure) any AssertionFailedError thrown, so that
866 <     * the current testcase will fail.
865 >     * threadRecordFailure) any AssertionError thrown, so that the
866 >     * current testcase will fail.
867       */
868      public void threadFail(String reason) {
869          try {
870              fail(reason);
871 <        } catch (AssertionFailedError t) {
872 <            threadRecordFailure(t);
873 <            fail(reason);
871 >        } catch (AssertionError fail) {
872 >            threadRecordFailure(fail);
873 >            throw fail;
874          }
875      }
876  
877      /**
878       * Just like assertTrue(b), but additionally recording (using
879 <     * threadRecordFailure) any AssertionFailedError thrown, so that
880 <     * the current testcase will fail.
879 >     * threadRecordFailure) any AssertionError thrown, so that the
880 >     * current testcase will fail.
881       */
882      public void threadAssertTrue(boolean b) {
883          try {
884              assertTrue(b);
885 <        } catch (AssertionFailedError t) {
886 <            threadRecordFailure(t);
887 <            throw t;
885 >        } catch (AssertionError fail) {
886 >            threadRecordFailure(fail);
887 >            throw fail;
888          }
889      }
890  
891      /**
892       * Just like assertFalse(b), but additionally recording (using
893 <     * threadRecordFailure) any AssertionFailedError thrown, so that
894 <     * the current testcase will fail.
893 >     * threadRecordFailure) any AssertionError thrown, so that the
894 >     * current testcase will fail.
895       */
896      public void threadAssertFalse(boolean b) {
897          try {
898              assertFalse(b);
899 <        } catch (AssertionFailedError t) {
900 <            threadRecordFailure(t);
901 <            throw t;
899 >        } catch (AssertionError fail) {
900 >            threadRecordFailure(fail);
901 >            throw fail;
902          }
903      }
904  
905      /**
906       * Just like assertNull(x), but additionally recording (using
907 <     * threadRecordFailure) any AssertionFailedError thrown, so that
908 <     * the current testcase will fail.
907 >     * threadRecordFailure) any AssertionError thrown, so that the
908 >     * current testcase will fail.
909       */
910      public void threadAssertNull(Object x) {
911          try {
912              assertNull(x);
913 <        } catch (AssertionFailedError t) {
914 <            threadRecordFailure(t);
915 <            throw t;
913 >        } catch (AssertionError fail) {
914 >            threadRecordFailure(fail);
915 >            throw fail;
916          }
917      }
918  
919      /**
920       * Just like assertEquals(x, y), but additionally recording (using
921 <     * threadRecordFailure) any AssertionFailedError thrown, so that
922 <     * the current testcase will fail.
921 >     * threadRecordFailure) any AssertionError thrown, so that the
922 >     * current testcase will fail.
923       */
924      public void threadAssertEquals(long x, long y) {
925          try {
926              assertEquals(x, y);
927 <        } catch (AssertionFailedError t) {
928 <            threadRecordFailure(t);
929 <            throw t;
927 >        } catch (AssertionError fail) {
928 >            threadRecordFailure(fail);
929 >            throw fail;
930          }
931      }
932  
933      /**
934       * Just like assertEquals(x, y), but additionally recording (using
935 <     * threadRecordFailure) any AssertionFailedError thrown, so that
936 <     * the current testcase will fail.
935 >     * threadRecordFailure) any AssertionError thrown, so that the
936 >     * current testcase will fail.
937       */
938      public void threadAssertEquals(Object x, Object y) {
939          try {
940              assertEquals(x, y);
941 <        } catch (AssertionFailedError t) {
942 <            threadRecordFailure(t);
943 <            throw t;
944 <        } catch (Throwable t) {
945 <            threadUnexpectedException(t);
941 >        } catch (AssertionError fail) {
942 >            threadRecordFailure(fail);
943 >            throw fail;
944 >        } catch (Throwable fail) {
945 >            threadUnexpectedException(fail);
946          }
947      }
948  
949      /**
950       * Just like assertSame(x, y), but additionally recording (using
951 <     * threadRecordFailure) any AssertionFailedError thrown, so that
952 <     * the current testcase will fail.
951 >     * threadRecordFailure) any AssertionError thrown, so that the
952 >     * current testcase will fail.
953       */
954      public void threadAssertSame(Object x, Object y) {
955          try {
956              assertSame(x, y);
957 <        } catch (AssertionFailedError t) {
958 <            threadRecordFailure(t);
959 <            throw t;
957 >        } catch (AssertionError fail) {
958 >            threadRecordFailure(fail);
959 >            throw fail;
960          }
961      }
962  
# Line 459 | Line 976 | public class JSR166TestCase extends Test
976  
977      /**
978       * Records the given exception using {@link #threadRecordFailure},
979 <     * then rethrows the exception, wrapping it in an
980 <     * AssertionFailedError if necessary.
979 >     * then rethrows the exception, wrapping it in an AssertionError
980 >     * if necessary.
981       */
982      public void threadUnexpectedException(Throwable t) {
983          threadRecordFailure(t);
# Line 469 | Line 986 | public class JSR166TestCase extends Test
986              throw (RuntimeException) t;
987          else if (t instanceof Error)
988              throw (Error) t;
989 <        else {
990 <            AssertionFailedError afe =
474 <                new AssertionFailedError("unexpected exception: " + t);
475 <            afe.initCause(t);
476 <            throw afe;
477 <        }
989 >        else
990 >            throw new AssertionError("unexpected exception: " + t, t);
991      }
992  
993      /**
994       * Delays, via Thread.sleep, for the given millisecond delay, but
995       * if the sleep is shorter than specified, may re-sleep or yield
996 <     * until time elapses.
996 >     * until time elapses.  Ensures that the given time, as measured
997 >     * by System.nanoTime(), has elapsed.
998       */
999      static void delay(long millis) throws InterruptedException {
1000 <        long startTime = System.nanoTime();
1001 <        long ns = millis * 1000 * 1000;
1002 <        for (;;) {
1000 >        long nanos = millis * (1000 * 1000);
1001 >        final long wakeupTime = System.nanoTime() + nanos;
1002 >        do {
1003              if (millis > 0L)
1004                  Thread.sleep(millis);
1005              else // too short to sleep
1006                  Thread.yield();
1007 <            long d = ns - (System.nanoTime() - startTime);
1008 <            if (d > 0L)
1009 <                millis = d / (1000 * 1000);
1010 <            else
1011 <                break;
1007 >            nanos = wakeupTime - System.nanoTime();
1008 >            millis = nanos / (1000 * 1000);
1009 >        } while (nanos >= 0L);
1010 >    }
1011 >
1012 >    /**
1013 >     * Allows use of try-with-resources with per-test thread pools.
1014 >     */
1015 >    class PoolCleaner implements AutoCloseable {
1016 >        private final ExecutorService pool;
1017 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
1018 >        public void close() { joinPool(pool); }
1019 >    }
1020 >
1021 >    /**
1022 >     * An extension of PoolCleaner that has an action to release the pool.
1023 >     */
1024 >    class PoolCleanerWithReleaser extends PoolCleaner {
1025 >        private final Runnable releaser;
1026 >        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
1027 >            super(pool);
1028 >            this.releaser = releaser;
1029          }
1030 +        public void close() {
1031 +            try {
1032 +                releaser.run();
1033 +            } finally {
1034 +                super.close();
1035 +            }
1036 +        }
1037 +    }
1038 +
1039 +    PoolCleaner cleaner(ExecutorService pool) {
1040 +        return new PoolCleaner(pool);
1041 +    }
1042 +
1043 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
1044 +        return new PoolCleanerWithReleaser(pool, releaser);
1045 +    }
1046 +
1047 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
1048 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
1049 +    }
1050 +
1051 +    Runnable releaser(final CountDownLatch latch) {
1052 +        return new Runnable() { public void run() {
1053 +            do { latch.countDown(); }
1054 +            while (latch.getCount() > 0);
1055 +        }};
1056 +    }
1057 +
1058 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
1059 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
1060 +    }
1061 +
1062 +    Runnable releaser(final AtomicBoolean flag) {
1063 +        return new Runnable() { public void run() { flag.set(true); }};
1064      }
1065  
1066      /**
1067       * Waits out termination of a thread pool or fails doing so.
1068       */
1069 <    void joinPool(ExecutorService exec) {
1069 >    void joinPool(ExecutorService pool) {
1070          try {
1071 <            exec.shutdown();
1072 <            assertTrue("ExecutorService did not terminate in a timely manner",
1073 <                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
1071 >            pool.shutdown();
1072 >            if (!pool.awaitTermination(20 * LONG_DELAY_MS, MILLISECONDS)) {
1073 >                try {
1074 >                    threadFail("ExecutorService " + pool +
1075 >                               " did not terminate in a timely manner");
1076 >                } finally {
1077 >                    // last resort, for the benefit of subsequent tests
1078 >                    pool.shutdownNow();
1079 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
1080 >                }
1081 >            }
1082          } catch (SecurityException ok) {
1083              // Allowed in case test doesn't have privs
1084 <        } catch (InterruptedException ie) {
1085 <            fail("Unexpected InterruptedException");
1084 >        } catch (InterruptedException fail) {
1085 >            threadFail("Unexpected InterruptedException");
1086          }
1087      }
1088  
1089      /**
1090 <     * A debugging tool to print all stack traces, as jstack does.
1090 >     * Like Runnable, but with the freedom to throw anything.
1091 >     * junit folks had the same idea:
1092 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1093       */
1094 <    static void printAllStackTraces() {
520 <        for (ThreadInfo info :
521 <                 ManagementFactory.getThreadMXBean()
522 <                 .dumpAllThreads(true, true))
523 <            System.err.print(info);
524 <    }
1094 >    interface Action { public void run() throws Throwable; }
1095  
1096      /**
1097 <     * Checks that thread does not terminate within the default
1098 <     * millisecond delay of {@code timeoutMillis()}.
1097 >     * Runs all the given actions in parallel, failing if any fail.
1098 >     * Useful for running multiple variants of tests that are
1099 >     * necessarily individually slow because they must block.
1100       */
1101 <    void assertThreadStaysAlive(Thread thread) {
1102 <        assertThreadStaysAlive(thread, timeoutMillis());
1101 >    void testInParallel(Action ... actions) {
1102 >        ExecutorService pool = Executors.newCachedThreadPool();
1103 >        try (PoolCleaner cleaner = cleaner(pool)) {
1104 >            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1105 >            for (final Action action : actions)
1106 >                futures.add(pool.submit(new CheckedRunnable() {
1107 >                    public void realRun() throws Throwable { action.run();}}));
1108 >            for (Future<?> future : futures)
1109 >                try {
1110 >                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
1111 >                } catch (ExecutionException ex) {
1112 >                    threadUnexpectedException(ex.getCause());
1113 >                } catch (Exception ex) {
1114 >                    threadUnexpectedException(ex);
1115 >                }
1116 >        }
1117 >    }
1118 >
1119 >    /** Returns true if thread info might be useful in a thread dump. */
1120 >    static boolean threadOfInterest(ThreadInfo info) {
1121 >        final String name = info.getThreadName();
1122 >        String lockName;
1123 >        if (name == null)
1124 >            return true;
1125 >        if (name.equals("Signal Dispatcher")
1126 >            || name.equals("WedgedTestDetector"))
1127 >            return false;
1128 >        if (name.equals("Reference Handler")) {
1129 >            // Reference Handler stacktrace changed in JDK-8156500
1130 >            StackTraceElement[] stackTrace; String methodName;
1131 >            if ((stackTrace = info.getStackTrace()) != null
1132 >                && stackTrace.length > 0
1133 >                && (methodName = stackTrace[0].getMethodName()) != null
1134 >                && methodName.equals("waitForReferencePendingList"))
1135 >                return false;
1136 >            // jdk8 Reference Handler stacktrace
1137 >            if ((lockName = info.getLockName()) != null
1138 >                && lockName.startsWith("java.lang.ref"))
1139 >                return false;
1140 >        }
1141 >        if ((name.equals("Finalizer") || name.equals("Common-Cleaner"))
1142 >            && (lockName = info.getLockName()) != null
1143 >            && lockName.startsWith("java.lang.ref"))
1144 >            return false;
1145 >        if (name.startsWith("ForkJoinPool.commonPool-worker")
1146 >            && (lockName = info.getLockName()) != null
1147 >            && lockName.startsWith("java.util.concurrent.ForkJoinPool"))
1148 >            return false;
1149 >        return true;
1150      }
1151  
1152      /**
1153 <     * Checks that thread does not terminate within the given millisecond delay.
1153 >     * A debugging tool to print stack traces of most threads, as jstack does.
1154 >     * Uninteresting threads are filtered out.
1155       */
1156 <    void assertThreadStaysAlive(Thread thread, long millis) {
1157 <        try {
1158 <            // No need to optimize the failing case via Thread.join.
1159 <            delay(millis);
1160 <            assertTrue(thread.isAlive());
1161 <        } catch (InterruptedException ie) {
1162 <            fail("Unexpected InterruptedException");
1156 >    @SuppressWarnings("removal")
1157 >    static void dumpTestThreads() {
1158 >        SecurityManager sm = System.getSecurityManager();
1159 >        if (sm != null) {
1160 >            try {
1161 >                System.setSecurityManager(null);
1162 >            } catch (SecurityException giveUp) {
1163 >                return;
1164 >            }
1165          }
1166 +
1167 +        System.err.println("------ stacktrace dump start ------");
1168 +        for (ThreadInfo info : THREAD_MXBEAN.dumpAllThreads(true, true))
1169 +            if (threadOfInterest(info))
1170 +                System.err.print(info);
1171 +        System.err.println("------ stacktrace dump end ------");
1172 +
1173 +        if (sm != null) System.setSecurityManager(sm);
1174      }
1175  
1176      /**
1177 <     * Checks that the threads do not terminate within the default
549 <     * millisecond delay of {@code timeoutMillis()}.
1177 >     * Checks that thread eventually enters the expected blocked thread state.
1178       */
1179 <    void assertThreadsStayAlive(Thread... threads) {
1180 <        assertThreadsStayAlive(timeoutMillis(), threads);
1179 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1180 >        // always sleep at least 1 ms, with high probability avoiding
1181 >        // transitory states
1182 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1183 >            try { delay(1); }
1184 >            catch (InterruptedException fail) {
1185 >                throw new AssertionError("Unexpected InterruptedException", fail);
1186 >            }
1187 >            Thread.State s = thread.getState();
1188 >            if (s == expected)
1189 >                return;
1190 >            else if (s == Thread.State.TERMINATED)
1191 >                fail("Unexpected thread termination");
1192 >        }
1193 >        fail("timed out waiting for thread to enter thread state " + expected);
1194      }
1195  
1196      /**
1197 <     * Checks that the threads do not terminate within the given millisecond delay.
1197 >     * Returns the thread's blocker's class name, if any, else null.
1198       */
1199 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1200 <        try {
1201 <            // No need to optimize the failing case via Thread.join.
1202 <            delay(millis);
1203 <            for (Thread thread : threads)
1204 <                assertTrue(thread.isAlive());
564 <        } catch (InterruptedException ie) {
565 <            fail("Unexpected InterruptedException");
566 <        }
1199 >    String blockerClassName(Thread thread) {
1200 >        ThreadInfo threadInfo; LockInfo lockInfo;
1201 >        if ((threadInfo = THREAD_MXBEAN.getThreadInfo(thread.getId(), 0)) != null
1202 >            && (lockInfo = threadInfo.getLockInfo()) != null)
1203 >            return lockInfo.getClassName();
1204 >        return null;
1205      }
1206  
1207      /**
1208       * Checks that future.get times out, with the default timeout of
1209       * {@code timeoutMillis()}.
1210       */
1211 <    void assertFutureTimesOut(Future future) {
1211 >    void assertFutureTimesOut(Future<?> future) {
1212          assertFutureTimesOut(future, timeoutMillis());
1213      }
1214  
1215      /**
1216       * Checks that future.get times out, with the given millisecond timeout.
1217       */
1218 <    void assertFutureTimesOut(Future future, long timeoutMillis) {
1218 >    void assertFutureTimesOut(Future<?> future, long timeoutMillis) {
1219          long startTime = System.nanoTime();
1220          try {
1221              future.get(timeoutMillis, MILLISECONDS);
1222              shouldThrow();
1223          } catch (TimeoutException success) {
1224 <        } catch (Exception e) {
1225 <            threadUnexpectedException(e);
1226 <        } finally { future.cancel(true); }
1224 >        } catch (Exception fail) {
1225 >            threadUnexpectedException(fail);
1226 >        }
1227          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1228 +        assertFalse(future.isDone());
1229      }
1230  
1231      /**
# Line 604 | Line 1243 | public class JSR166TestCase extends Test
1243      }
1244  
1245      /**
1246 <     * The number of elements to place in collections, arrays, etc.
1246 >     * The maximum number of consecutive spurious wakeups we should
1247 >     * tolerate (from APIs like LockSupport.park) before failing a test.
1248       */
1249 <    public static final int SIZE = 20;
1249 >    static final int MAX_SPURIOUS_WAKEUPS = 10;
1250  
1251 <    // Some convenient Integer constants
1252 <
1253 <    public static final Integer zero  = new Integer(0);
1254 <    public static final Integer one   = new Integer(1);
1255 <    public static final Integer two   = new Integer(2);
616 <    public static final Integer three = new Integer(3);
617 <    public static final Integer four  = new Integer(4);
618 <    public static final Integer five  = new Integer(5);
619 <    public static final Integer six   = new Integer(6);
620 <    public static final Integer seven = new Integer(7);
621 <    public static final Integer eight = new Integer(8);
622 <    public static final Integer nine  = new Integer(9);
623 <    public static final Integer m1  = new Integer(-1);
624 <    public static final Integer m2  = new Integer(-2);
625 <    public static final Integer m3  = new Integer(-3);
626 <    public static final Integer m4  = new Integer(-4);
627 <    public static final Integer m5  = new Integer(-5);
628 <    public static final Integer m6  = new Integer(-6);
629 <    public static final Integer m10 = new Integer(-10);
1251 >    /**
1252 >     * The number of elements to place in collections, arrays, etc.
1253 >     * Must be at least ten;
1254 >     */
1255 >    public static final int SIZE = 32;
1256  
1257 +    static Item[] seqItems(int size) {
1258 +        Item[] s = new Item[size];
1259 +        for (int i = 0; i < size; ++i)
1260 +            s[i] = new Item(i);
1261 +        return s;
1262 +    }
1263 +    static Item[] negativeSeqItems(int size) {
1264 +        Item[] s = new Item[size];
1265 +        for (int i = 0; i < size; ++i)
1266 +            s[i] = new Item(-i);
1267 +        return s;
1268 +    }
1269 +
1270 +    // Many tests rely on defaultItems all being sequential nonnegative
1271 +    public static final Item[] defaultItems = seqItems(SIZE);
1272 +
1273 +    static Item itemFor(int i) { // check cache for defaultItems
1274 +        Item[] items = defaultItems;
1275 +        return (i >= 0 && i < items.length) ? items[i] : new Item(i);
1276 +    }
1277 +
1278 +    public static final Item zero  = defaultItems[0];
1279 +    public static final Item one   = defaultItems[1];
1280 +    public static final Item two   = defaultItems[2];
1281 +    public static final Item three = defaultItems[3];
1282 +    public static final Item four  = defaultItems[4];
1283 +    public static final Item five  = defaultItems[5];
1284 +    public static final Item six   = defaultItems[6];
1285 +    public static final Item seven = defaultItems[7];
1286 +    public static final Item eight = defaultItems[8];
1287 +    public static final Item nine  = defaultItems[9];
1288 +    public static final Item ten   = defaultItems[10];
1289 +
1290 +    public static final Item[] negativeItems = negativeSeqItems(SIZE);
1291 +
1292 +    public static final Item minusOne   = negativeItems[1];
1293 +    public static final Item minusTwo   = negativeItems[2];
1294 +    public static final Item minusThree = negativeItems[3];
1295 +    public static final Item minusFour  = negativeItems[4];
1296 +    public static final Item minusFive  = negativeItems[5];
1297 +    public static final Item minusSix   = negativeItems[6];
1298 +    public static final Item minusSeven = negativeItems[7];
1299 +    public static final Item minusEight = negativeItems[8];
1300 +    public static final Item minusNone  = negativeItems[9];
1301 +    public static final Item minusTen   = negativeItems[10];
1302 +
1303 +    // elements expected to be missing
1304 +    public static final Item fortytwo = new Item(42);
1305 +    public static final Item eightysix = new Item(86);
1306 +    public static final Item ninetynine = new Item(99);
1307 +
1308 +    // Interop across Item, int
1309 +
1310 +    static void mustEqual(Item x, Item y) {
1311 +        if (x != y)
1312 +            assertEquals(x.value, y.value);
1313 +    }
1314 +    static void mustEqual(Item x, int y) {
1315 +        assertEquals(x.value, y);
1316 +    }
1317 +    static void mustEqual(int x, Item y) {
1318 +        assertEquals(x, y.value);
1319 +    }
1320 +    static void mustEqual(int x, int y) {
1321 +        assertEquals(x, y);
1322 +    }
1323 +    static void mustEqual(Object x, Object y) {
1324 +        if (x != y)
1325 +            assertEquals(x, y);
1326 +    }
1327 +    static void mustEqual(int x, Object y) {
1328 +        if (y instanceof Item)
1329 +            assertEquals(x, ((Item)y).value);
1330 +        else fail();
1331 +    }
1332 +    static void mustEqual(Object x, int y) {
1333 +        if (x instanceof Item)
1334 +            assertEquals(((Item)x).value, y);
1335 +        else fail();
1336 +    }
1337 +    static void mustEqual(boolean x, boolean y) {
1338 +        assertEquals(x, y);
1339 +    }
1340 +    static void mustEqual(long x, long y) {
1341 +        assertEquals(x, y);
1342 +    }
1343 +    static void mustEqual(double x, double y) {
1344 +        assertEquals(x, y);
1345 +    }
1346 +    static void mustContain(Collection<Item> c, int i) {
1347 +        assertTrue(c.contains(itemFor(i)));
1348 +    }
1349 +    static void mustContain(Collection<Item> c, Item i) {
1350 +        assertTrue(c.contains(i));
1351 +    }
1352 +    static void mustNotContain(Collection<Item> c, int i) {
1353 +        assertFalse(c.contains(itemFor(i)));
1354 +    }
1355 +    static void mustNotContain(Collection<Item> c, Item i) {
1356 +        assertFalse(c.contains(i));
1357 +    }
1358 +    static void mustRemove(Collection<Item> c, int i) {
1359 +        assertTrue(c.remove(itemFor(i)));
1360 +    }
1361 +    static void mustRemove(Collection<Item> c, Item i) {
1362 +        assertTrue(c.remove(i));
1363 +    }
1364 +    static void mustNotRemove(Collection<Item> c, int i) {
1365 +        assertFalse(c.remove(itemFor(i)));
1366 +    }
1367 +    static void mustNotRemove(Collection<Item> c, Item i) {
1368 +        assertFalse(c.remove(i));
1369 +    }
1370 +    static void mustAdd(Collection<Item> c, int i) {
1371 +        assertTrue(c.add(itemFor(i)));
1372 +    }
1373 +    static void mustAdd(Collection<Item> c, Item i) {
1374 +        assertTrue(c.add(i));
1375 +    }
1376 +    static void mustOffer(Queue<Item> c, int i) {
1377 +        assertTrue(c.offer(itemFor(i)));
1378 +    }
1379 +    static void mustOffer(Queue<Item> c, Item i) {
1380 +        assertTrue(c.offer(i));
1381 +    }
1382  
1383      /**
1384       * Runs Runnable r with a security policy that permits precisely
# Line 636 | Line 1387 | public class JSR166TestCase extends Test
1387       * security manager.  We require that any security manager permit
1388       * getPolicy/setPolicy.
1389       */
1390 +    @SuppressWarnings("removal")
1391      public void runWithPermissions(Runnable r, Permission... permissions) {
1392          SecurityManager sm = System.getSecurityManager();
1393          if (sm == null) {
# Line 651 | Line 1403 | public class JSR166TestCase extends Test
1403       * Runnable.  We require that any security manager permit
1404       * getPolicy/setPolicy.
1405       */
1406 +    @SuppressWarnings("removal")
1407      public void runWithSecurityManagerWithPermissions(Runnable r,
1408                                                        Permission... permissions) {
1409 +        if (!useSecurityManager) return;
1410          SecurityManager sm = System.getSecurityManager();
1411          if (sm == null) {
1412              Policy savedPolicy = Policy.getPolicy();
# Line 660 | Line 1414 | public class JSR166TestCase extends Test
1414                  Policy.setPolicy(permissivePolicy());
1415                  System.setSecurityManager(new SecurityManager());
1416                  runWithSecurityManagerWithPermissions(r, permissions);
1417 +            } catch (UnsupportedOperationException ok) {
1418              } finally {
1419 <                System.setSecurityManager(null);
1420 <                Policy.setPolicy(savedPolicy);
1419 >                try {
1420 >                    System.setSecurityManager(null);
1421 >                    Policy.setPolicy(savedPolicy);
1422 >                } catch (Exception ok) {
1423 >                }
1424              }
1425          } else {
1426              Policy savedPolicy = Policy.getPolicy();
# Line 689 | Line 1447 | public class JSR166TestCase extends Test
1447       * A security policy where new permissions can be dynamically added
1448       * or all cleared.
1449       */
1450 +    @SuppressWarnings("removal")
1451      public static class AdjustablePolicy extends java.security.Policy {
1452          Permissions perms = new Permissions();
1453          AdjustablePolicy(Permission... permissions) {
# Line 708 | Line 1467 | public class JSR166TestCase extends Test
1467          }
1468          public void refresh() {}
1469          public String toString() {
1470 <            List<Permission> ps = new ArrayList<Permission>();
1470 >            List<Permission> ps = new ArrayList<>();
1471              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1472                  ps.add(e.nextElement());
1473              return "AdjustablePolicy with permissions " + ps;
# Line 718 | Line 1477 | public class JSR166TestCase extends Test
1477      /**
1478       * Returns a policy containing all the permissions we ever need.
1479       */
1480 +    @SuppressWarnings("removal")
1481      public static Policy permissivePolicy() {
1482          return new AdjustablePolicy
1483              // Permissions j.u.c. needs directly
# Line 736 | Line 1496 | public class JSR166TestCase extends Test
1496  
1497      /**
1498       * Sleeps until the given time has elapsed.
1499 <     * Throws AssertionFailedError if interrupted.
1499 >     * Throws AssertionError if interrupted.
1500       */
1501 <    void sleep(long millis) {
1501 >    static void sleep(long millis) {
1502          try {
1503              delay(millis);
1504 <        } catch (InterruptedException ie) {
1505 <            AssertionFailedError afe =
746 <                new AssertionFailedError("Unexpected InterruptedException");
747 <            afe.initCause(ie);
748 <            throw afe;
1504 >        } catch (InterruptedException fail) {
1505 >            throw new AssertionError("Unexpected InterruptedException", fail);
1506          }
1507      }
1508  
1509      /**
1510       * Spin-waits up to the specified number of milliseconds for the given
1511       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1512 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1513       */
1514 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1515 <        long startTime = System.nanoTime();
1516 <        for (;;) {
1517 <            Thread.State s = thread.getState();
1518 <            if (s == Thread.State.BLOCKED ||
1519 <                s == Thread.State.WAITING ||
1520 <                s == Thread.State.TIMED_WAITING)
1521 <                return;
1522 <            else if (s == Thread.State.TERMINATED)
1514 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1515 >                                       Callable<Boolean> waitingForGodot) {
1516 >        for (long startTime = 0L;;) {
1517 >            switch (thread.getState()) {
1518 >            default: break;
1519 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1520 >                try {
1521 >                    if (waitingForGodot == null || waitingForGodot.call())
1522 >                        return;
1523 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1524 >                break;
1525 >            case TERMINATED:
1526                  fail("Unexpected thread termination");
1527 +            }
1528 +
1529 +            if (startTime == 0L)
1530 +                startTime = System.nanoTime();
1531              else if (millisElapsedSince(startTime) > timeoutMillis) {
1532 <                threadAssertTrue(thread.isAlive());
1533 <                return;
1532 >                assertTrue(thread.isAlive());
1533 >                if (waitingForGodot == null
1534 >                    || thread.getState() == Thread.State.RUNNABLE)
1535 >                    fail("timed out waiting for thread to enter wait state");
1536 >                else
1537 >                    fail("timed out waiting for condition, thread state="
1538 >                         + thread.getState());
1539              }
1540              Thread.yield();
1541          }
1542      }
1543  
1544      /**
1545 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1546 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1545 >     * Spin-waits up to the specified number of milliseconds for the given
1546 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1547 >     */
1548 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1549 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1550 >    }
1551 >
1552 >    /**
1553 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1554 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1555       */
1556      void waitForThreadToEnterWaitState(Thread thread) {
1557 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1557 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1558 >    }
1559 >
1560 >    /**
1561 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1562 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1563 >     * and additionally satisfy the given condition.
1564 >     */
1565 >    void waitForThreadToEnterWaitState(Thread thread,
1566 >                                       Callable<Boolean> waitingForGodot) {
1567 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1568 >    }
1569 >
1570 >    /**
1571 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1572 >     * be interrupted.  Clears the interrupt status before returning.
1573 >     */
1574 >    void awaitInterrupted() {
1575 >        for (long startTime = 0L; !Thread.interrupted(); ) {
1576 >            if (startTime == 0L)
1577 >                startTime = System.nanoTime();
1578 >            else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1579 >                fail("timed out waiting for thread interrupt");
1580 >            Thread.yield();
1581 >        }
1582      }
1583  
1584      /**
1585       * Returns the number of milliseconds since time given by
1586       * startNanoTime, which must have been previously returned from a
1587 <     * call to {@link System.nanoTime()}.
1587 >     * call to {@link System#nanoTime()}.
1588       */
1589 <    long millisElapsedSince(long startNanoTime) {
1589 >    static long millisElapsedSince(long startNanoTime) {
1590          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1591      }
1592  
1593      /**
1594 +     * Checks that timed f.get() returns the expected value, and does not
1595 +     * wait for the timeout to elapse before returning.
1596 +     */
1597 +    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1598 +        long startTime = System.nanoTime();
1599 +        T actual = null;
1600 +        try {
1601 +            actual = f.get(timeoutMillis, MILLISECONDS);
1602 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
1603 +        assertEquals(expectedValue, actual);
1604 +        if (millisElapsedSince(startTime) > timeoutMillis/2)
1605 +            throw new AssertionError("timed get did not return promptly");
1606 +    }
1607 +
1608 +    <T> void checkTimedGet(Future<T> f, T expectedValue) {
1609 +        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1610 +    }
1611 +
1612 +    /**
1613       * Returns a new started daemon Thread running the given runnable.
1614       */
1615      Thread newStartedThread(Runnable runnable) {
# Line 799 | Line 1620 | public class JSR166TestCase extends Test
1620      }
1621  
1622      /**
1623 +     * Returns a new started daemon Thread running the given action,
1624 +     * wrapped in a CheckedRunnable.
1625 +     */
1626 +    Thread newStartedThread(Action action) {
1627 +        return newStartedThread(checkedRunnable(action));
1628 +    }
1629 +
1630 +    /**
1631       * Waits for the specified time (in milliseconds) for the thread
1632       * to terminate (using {@link Thread#join(long)}), else interrupts
1633       * the thread (in the hope that it may terminate later) and fails.
1634       */
1635 <    void awaitTermination(Thread t, long timeoutMillis) {
1635 >    void awaitTermination(Thread thread, long timeoutMillis) {
1636          try {
1637 <            t.join(timeoutMillis);
1638 <        } catch (InterruptedException ie) {
1639 <            threadUnexpectedException(ie);
1640 <        } finally {
1641 <            if (t.getState() != Thread.State.TERMINATED) {
1642 <                t.interrupt();
1643 <                fail("Test timed out");
1637 >            thread.join(timeoutMillis);
1638 >        } catch (InterruptedException fail) {
1639 >            threadUnexpectedException(fail);
1640 >        }
1641 >        if (thread.getState() != Thread.State.TERMINATED) {
1642 >            String detail = String.format(
1643 >                    "timed out waiting for thread to terminate, thread=%s, state=%s" ,
1644 >                    thread, thread.getState());
1645 >            try {
1646 >                threadFail(detail);
1647 >            } finally {
1648 >                // Interrupt thread __after__ having reported its stack trace
1649 >                thread.interrupt();
1650              }
1651          }
1652      }
# Line 833 | Line 1668 | public class JSR166TestCase extends Test
1668          public final void run() {
1669              try {
1670                  realRun();
1671 <            } catch (Throwable t) {
1672 <                threadUnexpectedException(t);
1671 >            } catch (Throwable fail) {
1672 >                threadUnexpectedException(fail);
1673              }
1674          }
1675      }
1676  
1677 <    public abstract class RunnableShouldThrow implements Runnable {
1678 <        protected abstract void realRun() throws Throwable;
1679 <
1680 <        final Class<?> exceptionClass;
1681 <
847 <        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
848 <            this.exceptionClass = exceptionClass;
849 <        }
850 <
851 <        public final void run() {
852 <            try {
853 <                realRun();
854 <                threadShouldThrow(exceptionClass.getSimpleName());
855 <            } catch (Throwable t) {
856 <                if (! exceptionClass.isInstance(t))
857 <                    threadUnexpectedException(t);
858 <            }
859 <        }
1677 >    Runnable checkedRunnable(Action action) {
1678 >        return new CheckedRunnable() {
1679 >            public void realRun() throws Throwable {
1680 >                action.run();
1681 >            }};
1682      }
1683  
1684      public abstract class ThreadShouldThrow extends Thread {
# Line 871 | Line 1693 | public class JSR166TestCase extends Test
1693          public final void run() {
1694              try {
1695                  realRun();
874                threadShouldThrow(exceptionClass.getSimpleName());
1696              } catch (Throwable t) {
1697                  if (! exceptionClass.isInstance(t))
1698                      threadUnexpectedException(t);
1699 +                return;
1700              }
1701 +            threadShouldThrow(exceptionClass.getSimpleName());
1702          }
1703      }
1704  
# Line 885 | Line 1708 | public class JSR166TestCase extends Test
1708          public final void run() {
1709              try {
1710                  realRun();
888                threadShouldThrow("InterruptedException");
1711              } catch (InterruptedException success) {
1712                  threadAssertFalse(Thread.interrupted());
1713 <            } catch (Throwable t) {
1714 <                threadUnexpectedException(t);
1713 >                return;
1714 >            } catch (Throwable fail) {
1715 >                threadUnexpectedException(fail);
1716              }
1717 +            threadShouldThrow("InterruptedException");
1718          }
1719      }
1720  
# Line 900 | Line 1724 | public class JSR166TestCase extends Test
1724          public final T call() {
1725              try {
1726                  return realCall();
1727 <            } catch (Throwable t) {
1728 <                threadUnexpectedException(t);
905 <                return null;
1727 >            } catch (Throwable fail) {
1728 >                threadUnexpectedException(fail);
1729              }
1730 <        }
908 <    }
909 <
910 <    public abstract class CheckedInterruptedCallable<T>
911 <        implements Callable<T> {
912 <        protected abstract T realCall() throws Throwable;
913 <
914 <        public final T call() {
915 <            try {
916 <                T result = realCall();
917 <                threadShouldThrow("InterruptedException");
918 <                return result;
919 <            } catch (InterruptedException success) {
920 <                threadAssertFalse(Thread.interrupted());
921 <            } catch (Throwable t) {
922 <                threadUnexpectedException(t);
923 <            }
924 <            return null;
1730 >            throw new AssertionError("unreached");
1731          }
1732      }
1733  
# Line 929 | Line 1735 | public class JSR166TestCase extends Test
1735          public void run() {}
1736      }
1737  
1738 <    public static class NoOpCallable implements Callable {
1738 >    public static class NoOpCallable implements Callable<Object> {
1739          public Object call() { return Boolean.TRUE; }
1740      }
1741  
1742      public static final String TEST_STRING = "a test string";
1743  
1744      public static class StringTask implements Callable<String> {
1745 <        public String call() { return TEST_STRING; }
1745 >        final String value;
1746 >        public StringTask() { this(TEST_STRING); }
1747 >        public StringTask(String value) { this.value = value; }
1748 >        public String call() { return value; }
1749      }
1750  
1751      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 949 | Line 1758 | public class JSR166TestCase extends Test
1758              }};
1759      }
1760  
1761 <    public Runnable awaiter(final CountDownLatch latch) {
1761 >    public Runnable countDowner(final CountDownLatch latch) {
1762          return new CheckedRunnable() {
1763              public void realRun() throws InterruptedException {
1764 <                await(latch);
1764 >                latch.countDown();
1765              }};
1766      }
1767  
1768 +    class LatchAwaiter extends CheckedRunnable {
1769 +        static final int NEW = 0;
1770 +        static final int RUNNING = 1;
1771 +        static final int DONE = 2;
1772 +        final CountDownLatch latch;
1773 +        int state = NEW;
1774 +        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1775 +        public void realRun() throws InterruptedException {
1776 +            state = 1;
1777 +            await(latch);
1778 +            state = 2;
1779 +        }
1780 +    }
1781 +
1782 +    public LatchAwaiter awaiter(CountDownLatch latch) {
1783 +        return new LatchAwaiter(latch);
1784 +    }
1785 +
1786 +    public void await(CountDownLatch latch, long timeoutMillis) {
1787 +        boolean timedOut = false;
1788 +        try {
1789 +            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1790 +        } catch (Throwable fail) {
1791 +            threadUnexpectedException(fail);
1792 +        }
1793 +        if (timedOut)
1794 +            fail("timed out waiting for CountDownLatch for "
1795 +                 + (timeoutMillis/1000) + " sec");
1796 +    }
1797 +
1798      public void await(CountDownLatch latch) {
1799 +        await(latch, LONG_DELAY_MS);
1800 +    }
1801 +
1802 +    public void await(Semaphore semaphore) {
1803 +        boolean timedOut = false;
1804          try {
1805 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1806 <        } catch (Throwable t) {
1807 <            threadUnexpectedException(t);
1805 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1806 >        } catch (Throwable fail) {
1807 >            threadUnexpectedException(fail);
1808          }
1809 +        if (timedOut)
1810 +            fail("timed out waiting for Semaphore for "
1811 +                 + (LONG_DELAY_MS/1000) + " sec");
1812      }
1813  
1814 <    public void await(Semaphore semaphore) {
1814 >    public void await(CyclicBarrier barrier) {
1815          try {
1816 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1817 <        } catch (Throwable t) {
1818 <            threadUnexpectedException(t);
1816 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1817 >        } catch (Throwable fail) {
1818 >            threadUnexpectedException(fail);
1819          }
1820      }
1821  
# Line 986 | Line 1833 | public class JSR166TestCase extends Test
1833   //         long startTime = System.nanoTime();
1834   //         while (!flag.get()) {
1835   //             if (millisElapsedSince(startTime) > timeoutMillis)
1836 < //                 throw new AssertionFailedError("timed out");
1836 > //                 throw new AssertionError("timed out");
1837   //             Thread.yield();
1838   //         }
1839   //     }
# Line 995 | Line 1842 | public class JSR166TestCase extends Test
1842          public String call() { throw new NullPointerException(); }
1843      }
1844  
998    public static class CallableOne implements Callable<Integer> {
999        public Integer call() { return one; }
1000    }
1001
1002    public class ShortRunnable extends CheckedRunnable {
1003        protected void realRun() throws Throwable {
1004            delay(SHORT_DELAY_MS);
1005        }
1006    }
1007
1008    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1009        protected void realRun() throws InterruptedException {
1010            delay(SHORT_DELAY_MS);
1011        }
1012    }
1013
1014    public class SmallRunnable extends CheckedRunnable {
1015        protected void realRun() throws Throwable {
1016            delay(SMALL_DELAY_MS);
1017        }
1018    }
1019
1020    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1021        protected void realRun() {
1022            try {
1023                delay(SMALL_DELAY_MS);
1024            } catch (InterruptedException ok) {}
1025        }
1026    }
1027
1028    public class SmallCallable extends CheckedCallable {
1029        protected Object realCall() throws InterruptedException {
1030            delay(SMALL_DELAY_MS);
1031            return Boolean.TRUE;
1032        }
1033    }
1034
1035    public class MediumRunnable extends CheckedRunnable {
1036        protected void realRun() throws Throwable {
1037            delay(MEDIUM_DELAY_MS);
1038        }
1039    }
1040
1041    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1042        protected void realRun() throws InterruptedException {
1043            delay(MEDIUM_DELAY_MS);
1044        }
1045    }
1046
1845      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1846          return new CheckedRunnable() {
1847              protected void realRun() {
# Line 1053 | Line 1851 | public class JSR166TestCase extends Test
1851              }};
1852      }
1853  
1056    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1057        protected void realRun() {
1058            try {
1059                delay(MEDIUM_DELAY_MS);
1060            } catch (InterruptedException ok) {}
1061        }
1062    }
1063
1064    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1065        protected void realRun() {
1066            try {
1067                delay(LONG_DELAY_MS);
1068            } catch (InterruptedException ok) {}
1069        }
1070    }
1071
1854      /**
1855       * For use as ThreadFactory in constructors
1856       */
# Line 1082 | Line 1864 | public class JSR166TestCase extends Test
1864          boolean isDone();
1865      }
1866  
1085    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1086        return new TrackedRunnable() {
1087                private volatile boolean done = false;
1088                public boolean isDone() { return done; }
1089                public void run() {
1090                    try {
1091                        delay(timeoutMillis);
1092                        done = true;
1093                    } catch (InterruptedException ok) {}
1094                }
1095            };
1096    }
1097
1098    public static class TrackedShortRunnable implements Runnable {
1099        public volatile boolean done = false;
1100        public void run() {
1101            try {
1102                delay(SHORT_DELAY_MS);
1103                done = true;
1104            } catch (InterruptedException ok) {}
1105        }
1106    }
1107
1108    public static class TrackedSmallRunnable implements Runnable {
1109        public volatile boolean done = false;
1110        public void run() {
1111            try {
1112                delay(SMALL_DELAY_MS);
1113                done = true;
1114            } catch (InterruptedException ok) {}
1115        }
1116    }
1117
1118    public static class TrackedMediumRunnable implements Runnable {
1119        public volatile boolean done = false;
1120        public void run() {
1121            try {
1122                delay(MEDIUM_DELAY_MS);
1123                done = true;
1124            } catch (InterruptedException ok) {}
1125        }
1126    }
1127
1128    public static class TrackedLongRunnable implements Runnable {
1129        public volatile boolean done = false;
1130        public void run() {
1131            try {
1132                delay(LONG_DELAY_MS);
1133                done = true;
1134            } catch (InterruptedException ok) {}
1135        }
1136    }
1137
1867      public static class TrackedNoOpRunnable implements Runnable {
1868          public volatile boolean done = false;
1869          public void run() {
# Line 1142 | Line 1871 | public class JSR166TestCase extends Test
1871          }
1872      }
1873  
1145    public static class TrackedCallable implements Callable {
1146        public volatile boolean done = false;
1147        public Object call() {
1148            try {
1149                delay(SMALL_DELAY_MS);
1150                done = true;
1151            } catch (InterruptedException ok) {}
1152            return Boolean.TRUE;
1153        }
1154    }
1155
1874      /**
1875       * Analog of CheckedRunnable for RecursiveAction
1876       */
1877      public abstract class CheckedRecursiveAction extends RecursiveAction {
1878          protected abstract void realCompute() throws Throwable;
1879  
1880 <        public final void compute() {
1880 >        @Override protected final void compute() {
1881              try {
1882                  realCompute();
1883 <            } catch (Throwable t) {
1884 <                threadUnexpectedException(t);
1883 >            } catch (Throwable fail) {
1884 >                threadUnexpectedException(fail);
1885              }
1886          }
1887      }
# Line 1174 | Line 1892 | public class JSR166TestCase extends Test
1892      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1893          protected abstract T realCompute() throws Throwable;
1894  
1895 <        public final T compute() {
1895 >        @Override protected final T compute() {
1896              try {
1897                  return realCompute();
1898 <            } catch (Throwable t) {
1899 <                threadUnexpectedException(t);
1182 <                return null;
1898 >            } catch (Throwable fail) {
1899 >                threadUnexpectedException(fail);
1900              }
1901 +            throw new AssertionError("unreached");
1902          }
1903      }
1904  
# Line 1194 | Line 1912 | public class JSR166TestCase extends Test
1912  
1913      /**
1914       * A CyclicBarrier that uses timed await and fails with
1915 <     * AssertionFailedErrors instead of throwing checked exceptions.
1915 >     * AssertionErrors instead of throwing checked exceptions.
1916       */
1917 <    public class CheckedBarrier extends CyclicBarrier {
1917 >    public static class CheckedBarrier extends CyclicBarrier {
1918          public CheckedBarrier(int parties) { super(parties); }
1919  
1920          public int await() {
1921              try {
1922 <                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1923 <            } catch (TimeoutException e) {
1924 <                throw new AssertionFailedError("timed out");
1925 <            } catch (Exception e) {
1926 <                AssertionFailedError afe =
1209 <                    new AssertionFailedError("Unexpected exception: " + e);
1210 <                afe.initCause(e);
1211 <                throw afe;
1922 >                return super.await(LONGER_DELAY_MS, MILLISECONDS);
1923 >            } catch (TimeoutException timedOut) {
1924 >                throw new AssertionError("timed out");
1925 >            } catch (Exception fail) {
1926 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1927              }
1928          }
1929      }
1930  
1931 <    void checkEmpty(BlockingQueue q) {
1931 >    void checkEmpty(BlockingQueue<?> q) {
1932          try {
1933              assertTrue(q.isEmpty());
1934              assertEquals(0, q.size());
1935              assertNull(q.peek());
1936              assertNull(q.poll());
1937 <            assertNull(q.poll(0, MILLISECONDS));
1937 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1938              assertEquals(q.toString(), "[]");
1939              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1940              assertFalse(q.iterator().hasNext());
# Line 1235 | Line 1950 | public class JSR166TestCase extends Test
1950                  q.remove();
1951                  shouldThrow();
1952              } catch (NoSuchElementException success) {}
1953 <        } catch (InterruptedException ie) {
1239 <            threadUnexpectedException(ie);
1240 <        }
1953 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1954      }
1955  
1956      void assertSerialEquals(Object x, Object y) {
# Line 1256 | Line 1969 | public class JSR166TestCase extends Test
1969              oos.flush();
1970              oos.close();
1971              return bos.toByteArray();
1972 <        } catch (Throwable t) {
1973 <            threadUnexpectedException(t);
1972 >        } catch (Throwable fail) {
1973 >            threadUnexpectedException(fail);
1974              return new byte[0];
1975          }
1976      }
1977  
1978      @SuppressWarnings("unchecked")
1979 +    void assertImmutable(Object o) {
1980 +        if (o instanceof Collection) {
1981 +            assertThrows(
1982 +                UnsupportedOperationException.class,
1983 +                () -> ((Collection) o).add(null));
1984 +        }
1985 +    }
1986 +
1987 +    @SuppressWarnings("unchecked")
1988      <T> T serialClone(T o) {
1989 +        T clone = null;
1990          try {
1991              ObjectInputStream ois = new ObjectInputStream
1992                  (new ByteArrayInputStream(serialBytes(o)));
1993 <            T clone = (T) ois.readObject();
1994 <            assertSame(o.getClass(), clone.getClass());
1995 <            return clone;
1996 <        } catch (Throwable t) {
1997 <            threadUnexpectedException(t);
1993 >            clone = (T) ois.readObject();
1994 >        } catch (Throwable fail) {
1995 >            threadUnexpectedException(fail);
1996 >        }
1997 >        if (o == clone) assertImmutable(o);
1998 >        else assertSame(o.getClass(), clone.getClass());
1999 >        return clone;
2000 >    }
2001 >
2002 >    /**
2003 >     * A version of serialClone that leaves error handling (for
2004 >     * e.g. NotSerializableException) up to the caller.
2005 >     */
2006 >    @SuppressWarnings("unchecked")
2007 >    <T> T serialClonePossiblyFailing(T o)
2008 >        throws ReflectiveOperationException, java.io.IOException {
2009 >        ByteArrayOutputStream bos = new ByteArrayOutputStream();
2010 >        ObjectOutputStream oos = new ObjectOutputStream(bos);
2011 >        oos.writeObject(o);
2012 >        oos.flush();
2013 >        oos.close();
2014 >        ObjectInputStream ois = new ObjectInputStream
2015 >            (new ByteArrayInputStream(bos.toByteArray()));
2016 >        T clone = (T) ois.readObject();
2017 >        if (o == clone) assertImmutable(o);
2018 >        else assertSame(o.getClass(), clone.getClass());
2019 >        return clone;
2020 >    }
2021 >
2022 >    /**
2023 >     * If o implements Cloneable and has a public clone method,
2024 >     * returns a clone of o, else null.
2025 >     */
2026 >    @SuppressWarnings("unchecked")
2027 >    <T> T cloneableClone(T o) {
2028 >        if (!(o instanceof Cloneable)) return null;
2029 >        final T clone;
2030 >        try {
2031 >            clone = (T) o.getClass().getMethod("clone").invoke(o);
2032 >        } catch (NoSuchMethodException ok) {
2033              return null;
2034 +        } catch (ReflectiveOperationException unexpected) {
2035 +            throw new Error(unexpected);
2036 +        }
2037 +        assertNotSame(o, clone); // not 100% guaranteed by spec
2038 +        assertSame(o.getClass(), clone.getClass());
2039 +        return clone;
2040 +    }
2041 +
2042 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
2043 +                             Action... throwingActions) {
2044 +        for (Action throwingAction : throwingActions) {
2045 +            boolean threw = false;
2046 +            try { throwingAction.run(); }
2047 +            catch (Throwable t) {
2048 +                threw = true;
2049 +                if (!expectedExceptionClass.isInstance(t))
2050 +                    throw new AssertionError(
2051 +                            "Expected " + expectedExceptionClass.getName() +
2052 +                            ", got " + t.getClass().getName(),
2053 +                            t);
2054 +            }
2055 +            if (!threw)
2056 +                shouldThrow(expectedExceptionClass.getName());
2057 +        }
2058 +    }
2059 +
2060 +    public void assertIteratorExhausted(Iterator<?> it) {
2061 +        try {
2062 +            it.next();
2063 +            shouldThrow();
2064 +        } catch (NoSuchElementException success) {}
2065 +        assertFalse(it.hasNext());
2066 +    }
2067 +
2068 +    public <T> Callable<T> callableThrowing(final Exception ex) {
2069 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
2070 +    }
2071 +
2072 +    public Runnable runnableThrowing(final RuntimeException ex) {
2073 +        return new Runnable() { public void run() { throw ex; }};
2074 +    }
2075 +
2076 +    /** A reusable thread pool to be shared by tests. */
2077 +    static final ExecutorService cachedThreadPool =
2078 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2079 +                               1000L, MILLISECONDS,
2080 +                               new SynchronousQueue<Runnable>());
2081 +
2082 +    static <T> void shuffle(T[] array) {
2083 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2084 +    }
2085 +
2086 +    /**
2087 +     * Returns the same String as would be returned by {@link
2088 +     * Object#toString}, whether or not the given object's class
2089 +     * overrides toString().
2090 +     *
2091 +     * @see System#identityHashCode
2092 +     */
2093 +    static String identityString(Object x) {
2094 +        return x.getClass().getName()
2095 +            + "@" + Integer.toHexString(System.identityHashCode(x));
2096 +    }
2097 +
2098 +    // --- Shared assertions for Executor tests ---
2099 +
2100 +    /**
2101 +     * Returns maximum number of tasks that can be submitted to given
2102 +     * pool (with bounded queue) before saturation (when submission
2103 +     * throws RejectedExecutionException).
2104 +     */
2105 +    static final int saturatedSize(ThreadPoolExecutor pool) {
2106 +        BlockingQueue<Runnable> q = pool.getQueue();
2107 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
2108 +    }
2109 +
2110 +    @SuppressWarnings("FutureReturnValueIgnored")
2111 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
2112 +        try {
2113 +            e.execute((Runnable) null);
2114 +            shouldThrow();
2115 +        } catch (NullPointerException success) {}
2116 +
2117 +        if (! (e instanceof ExecutorService)) return;
2118 +        ExecutorService es = (ExecutorService) e;
2119 +        try {
2120 +            es.submit((Runnable) null);
2121 +            shouldThrow();
2122 +        } catch (NullPointerException success) {}
2123 +        try {
2124 +            es.submit((Runnable) null, Boolean.TRUE);
2125 +            shouldThrow();
2126 +        } catch (NullPointerException success) {}
2127 +        try {
2128 +            es.submit((Callable<?>) null);
2129 +            shouldThrow();
2130 +        } catch (NullPointerException success) {}
2131 +
2132 +        if (! (e instanceof ScheduledExecutorService)) return;
2133 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
2134 +        try {
2135 +            ses.schedule((Runnable) null,
2136 +                         randomTimeout(), randomTimeUnit());
2137 +            shouldThrow();
2138 +        } catch (NullPointerException success) {}
2139 +        try {
2140 +            ses.schedule((Callable<?>) null,
2141 +                         randomTimeout(), randomTimeUnit());
2142 +            shouldThrow();
2143 +        } catch (NullPointerException success) {}
2144 +        try {
2145 +            ses.scheduleAtFixedRate((Runnable) null,
2146 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2147 +            shouldThrow();
2148 +        } catch (NullPointerException success) {}
2149 +        try {
2150 +            ses.scheduleWithFixedDelay((Runnable) null,
2151 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2152 +            shouldThrow();
2153 +        } catch (NullPointerException success) {}
2154 +    }
2155 +
2156 +    void setRejectedExecutionHandler(
2157 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
2158 +        p.setRejectedExecutionHandler(handler);
2159 +        assertSame(handler, p.getRejectedExecutionHandler());
2160 +    }
2161 +
2162 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
2163 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
2164 +        final long savedTaskCount = p.getTaskCount();
2165 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
2166 +        final int savedQueueSize = p.getQueue().size();
2167 +        final boolean stock = (p.getClass().getClassLoader() == null);
2168 +
2169 +        Runnable r = () -> {};
2170 +        Callable<Boolean> c = () -> Boolean.TRUE;
2171 +
2172 +        class Recorder implements RejectedExecutionHandler {
2173 +            public volatile Runnable r = null;
2174 +            public volatile ThreadPoolExecutor p = null;
2175 +            public void reset() { r = null; p = null; }
2176 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
2177 +                assertNull(this.r);
2178 +                assertNull(this.p);
2179 +                this.r = r;
2180 +                this.p = p;
2181 +            }
2182 +        }
2183 +
2184 +        // check custom handler is invoked exactly once per task
2185 +        Recorder recorder = new Recorder();
2186 +        setRejectedExecutionHandler(p, recorder);
2187 +        for (int i = 2; i--> 0; ) {
2188 +            recorder.reset();
2189 +            p.execute(r);
2190 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
2191 +                assertSame(r, recorder.r);
2192 +            assertSame(p, recorder.p);
2193 +
2194 +            recorder.reset();
2195 +            assertFalse(p.submit(r).isDone());
2196 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2197 +            assertSame(p, recorder.p);
2198 +
2199 +            recorder.reset();
2200 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2201 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2202 +            assertSame(p, recorder.p);
2203 +
2204 +            recorder.reset();
2205 +            assertFalse(p.submit(c).isDone());
2206 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2207 +            assertSame(p, recorder.p);
2208 +
2209 +            if (p instanceof ScheduledExecutorService) {
2210 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2211 +                ScheduledFuture<?> future;
2212 +
2213 +                recorder.reset();
2214 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2215 +                assertFalse(future.isDone());
2216 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2217 +                assertSame(p, recorder.p);
2218 +
2219 +                recorder.reset();
2220 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2221 +                assertFalse(future.isDone());
2222 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2223 +                assertSame(p, recorder.p);
2224 +
2225 +                recorder.reset();
2226 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2227 +                assertFalse(future.isDone());
2228 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2229 +                assertSame(p, recorder.p);
2230 +
2231 +                recorder.reset();
2232 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2233 +                assertFalse(future.isDone());
2234 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2235 +                assertSame(p, recorder.p);
2236 +            }
2237 +        }
2238 +
2239 +        // Checking our custom handler above should be sufficient, but
2240 +        // we add some integration tests of standard handlers.
2241 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2242 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2243 +
2244 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2245 +        try {
2246 +            p.execute(setThread);
2247 +            shouldThrow();
2248 +        } catch (RejectedExecutionException success) {}
2249 +        assertNull(thread.get());
2250 +
2251 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2252 +        p.execute(setThread);
2253 +        assertNull(thread.get());
2254 +
2255 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2256 +        p.execute(setThread);
2257 +        if (p.isShutdown())
2258 +            assertNull(thread.get());
2259 +        else
2260 +            assertSame(Thread.currentThread(), thread.get());
2261 +
2262 +        setRejectedExecutionHandler(p, savedHandler);
2263 +
2264 +        // check that pool was not perturbed by handlers
2265 +        assertEquals(savedTaskCount, p.getTaskCount());
2266 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2267 +        assertEquals(savedQueueSize, p.getQueue().size());
2268 +    }
2269 +
2270 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2271 +        assertEquals(x, y);
2272 +        assertEquals(y, x);
2273 +        assertEquals(x.isEmpty(), y.isEmpty());
2274 +        assertEquals(x.size(), y.size());
2275 +        if (x instanceof List) {
2276 +            assertEquals(x.toString(), y.toString());
2277 +        }
2278 +        if (x instanceof List || x instanceof Set) {
2279 +            assertEquals(x.hashCode(), y.hashCode());
2280 +        }
2281 +        if (x instanceof List || x instanceof Deque) {
2282 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2283 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2284 +                                     y.toArray(new Object[0])));
2285 +        }
2286 +    }
2287 +
2288 +    /**
2289 +     * A weaker form of assertCollectionsEquals which does not insist
2290 +     * that the two collections satisfy Object#equals(Object), since
2291 +     * they may use identity semantics as Deques do.
2292 +     */
2293 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2294 +        if (x instanceof List || x instanceof Set)
2295 +            assertCollectionsEquals(x, y);
2296 +        else {
2297 +            assertEquals(x.isEmpty(), y.isEmpty());
2298 +            assertEquals(x.size(), y.size());
2299 +            assertEquals(new HashSet<Object>(x), new HashSet<Object>(y));
2300 +            if (x instanceof Deque) {
2301 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2302 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2303 +                                         y.toArray(new Object[0])));
2304 +            }
2305          }
2306      }
2307   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines