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.139 by jsr166, Sun Sep 6 21:14:12 2015 UTC vs.
Revision 1.250 by jsr166, Sat Nov 24 21:48:19 2018 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 + /*
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;
# Line 15 | Line 50 | import java.io.ObjectInputStream;
50   import java.io.ObjectOutputStream;
51   import java.lang.management.ManagementFactory;
52   import java.lang.management.ThreadInfo;
53 + import java.lang.management.ThreadMXBean;
54   import java.lang.reflect.Constructor;
55   import java.lang.reflect.Method;
56   import java.lang.reflect.Modifier;
# Line 27 | Line 63 | import java.security.ProtectionDomain;
63   import java.security.SecurityPermission;
64   import java.util.ArrayList;
65   import java.util.Arrays;
66 + import java.util.Collection;
67 + import java.util.Collections;
68   import java.util.Date;
69 + import java.util.Deque;
70   import java.util.Enumeration;
71 + import java.util.HashSet;
72   import java.util.Iterator;
73   import java.util.List;
74   import java.util.NoSuchElementException;
75   import java.util.PropertyPermission;
76 + import java.util.Set;
77   import java.util.concurrent.BlockingQueue;
78   import java.util.concurrent.Callable;
79   import java.util.concurrent.CountDownLatch;
80   import java.util.concurrent.CyclicBarrier;
81   import java.util.concurrent.ExecutionException;
82 + import java.util.concurrent.Executor;
83   import java.util.concurrent.Executors;
84   import java.util.concurrent.ExecutorService;
85 + import java.util.concurrent.ForkJoinPool;
86   import java.util.concurrent.Future;
87 + import java.util.concurrent.FutureTask;
88   import java.util.concurrent.RecursiveAction;
89   import java.util.concurrent.RecursiveTask;
90 + import java.util.concurrent.RejectedExecutionException;
91   import java.util.concurrent.RejectedExecutionHandler;
92   import java.util.concurrent.Semaphore;
93 + import java.util.concurrent.ScheduledExecutorService;
94 + import java.util.concurrent.ScheduledFuture;
95 + import java.util.concurrent.SynchronousQueue;
96   import java.util.concurrent.ThreadFactory;
97 + import java.util.concurrent.ThreadLocalRandom;
98   import java.util.concurrent.ThreadPoolExecutor;
99 + import java.util.concurrent.TimeUnit;
100   import java.util.concurrent.TimeoutException;
101 + import java.util.concurrent.atomic.AtomicBoolean;
102   import java.util.concurrent.atomic.AtomicReference;
103   import java.util.regex.Pattern;
104  
54 import junit.framework.AssertionFailedError;
105   import junit.framework.Test;
106   import junit.framework.TestCase;
107   import junit.framework.TestResult;
# Line 67 | Line 117 | import junit.framework.TestSuite;
117   *
118   * <ol>
119   *
120 < * <li> All assertions in code running in generated threads must use
121 < * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
122 < * #threadAssertEquals}, or {@link #threadAssertNull}, (not
123 < * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
124 < * particularly recommended) for other code to use these forms too.
125 < * Only the most typically used JUnit assertion methods are defined
126 < * this way, but enough to live with.</li>
120 > * <li>All code not running in the main test thread (manually spawned threads
121 > * or the common fork join pool) must be checked for failure (and completion!).
122 > * Mechanisms that can be used to ensure this are:
123 > *   <ol>
124 > *   <li>Signalling via a synchronizer like AtomicInteger or CountDownLatch
125 > *    that the task completed normally, which is checked before returning from
126 > *    the test method in the main thread.
127 > *   <li>Using the forms {@link #threadFail}, {@link #threadAssertTrue},
128 > *    or {@link #threadAssertNull}, (not {@code fail}, {@code assertTrue}, etc.)
129 > *    Only the most typically used JUnit assertion methods are defined
130 > *    this way, but enough to live with.
131 > *   <li>Recording failure explicitly using {@link #threadUnexpectedException}
132 > *    or {@link #threadRecordFailure}.
133 > *   <li>Using a wrapper like CheckedRunnable that uses one the mechanisms above.
134 > *   </ol>
135   *
136 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
136 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
137   * to invoke {@code super.setUp} and {@code super.tearDown} within
138   * them. These methods are used to clear and check for thread
139 < * assertion failures.</li>
139 > * assertion failures.
140   *
141   * <li>All delays and timeouts must use one of the constants {@code
142   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 89 | Line 147 | import junit.framework.TestSuite;
147   * is always discriminable as larger than SHORT and smaller than
148   * MEDIUM.  And so on. These constants are set to conservative values,
149   * but even so, if there is ever any doubt, they can all be increased
150 < * in one spot to rerun tests on slower platforms.</li>
150 > * in one spot to rerun tests on slower platforms.
151   *
152 < * <li> All threads generated must be joined inside each test case
152 > * <li>All threads generated must be joined inside each test case
153   * method (or {@code fail} to do so) before returning from the
154   * method. The {@code joinPool} method can be used to do this when
155 < * using Executors.</li>
155 > * using Executors.
156   *
157   * </ol>
158   *
159   * <p><b>Other notes</b>
160   * <ul>
161   *
162 < * <li> Usually, there is one testcase method per JSR166 method
162 > * <li>Usually, there is one testcase method per JSR166 method
163   * covering "normal" operation, and then as many exception-testing
164   * methods as there are exceptions the method can throw. Sometimes
165   * there are multiple tests per JSR166 method when the different
166   * "normal" behaviors differ significantly. And sometimes testcases
167 < * cover multiple methods when they cannot be tested in
110 < * isolation.</li>
167 > * cover multiple methods when they cannot be tested in isolation.
168   *
169 < * <li> The documentation style for testcases is to provide as javadoc
169 > * <li>The documentation style for testcases is to provide as javadoc
170   * a simple sentence or two describing the property that the testcase
171   * method purports to test. The javadocs do not say anything about how
172 < * the property is tested. To find out, read the code.</li>
172 > * the property is tested. To find out, read the code.
173   *
174 < * <li> These tests are "conformance tests", and do not attempt to
174 > * <li>These tests are "conformance tests", and do not attempt to
175   * test throughput, latency, scalability or other performance factors
176   * (see the separate "jtreg" tests for a set intended to check these
177   * for the most central aspects of functionality.) So, most tests use
178   * the smallest sensible numbers of threads, collection sizes, etc
179 < * needed to check basic conformance.</li>
179 > * needed to check basic conformance.
180   *
181   * <li>The test classes currently do not declare inclusion in
182   * any particular package to simplify things for people integrating
183 < * them in TCK test suites.</li>
183 > * them in TCK test suites.
184   *
185 < * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
186 < * runs all JSR166 unit tests.</li>
185 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
186 > * runs all JSR166 unit tests.
187   *
188   * </ul>
189   */
# Line 170 | Line 227 | public class JSR166TestCase extends Test
227      private static final int suiteRuns =
228          Integer.getInteger("jsr166.suiteRuns", 1);
229  
230 +    /**
231 +     * Returns the value of the system property, or NaN if not defined.
232 +     */
233 +    private static float systemPropertyValue(String name) {
234 +        String floatString = System.getProperty(name);
235 +        if (floatString == null)
236 +            return Float.NaN;
237 +        try {
238 +            return Float.parseFloat(floatString);
239 +        } catch (NumberFormatException ex) {
240 +            throw new IllegalArgumentException(
241 +                String.format("Bad float value in system property %s=%s",
242 +                              name, floatString));
243 +        }
244 +    }
245 +
246 +    /**
247 +     * The scaling factor to apply to standard delays used in tests.
248 +     * May be initialized from any of:
249 +     * - the "jsr166.delay.factor" system property
250 +     * - the "test.timeout.factor" system property (as used by jtreg)
251 +     *   See: http://openjdk.java.net/jtreg/tag-spec.html
252 +     * - hard-coded fuzz factor when using a known slowpoke VM
253 +     */
254 +    private static final float delayFactor = delayFactor();
255 +
256 +    private static float delayFactor() {
257 +        float x;
258 +        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
259 +            return x;
260 +        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
261 +            return x;
262 +        String prop = System.getProperty("java.vm.version");
263 +        if (prop != null && prop.matches(".*debug.*"))
264 +            return 4.0f; // How much slower is fastdebug than product?!
265 +        return 1.0f;
266 +    }
267 +
268      public JSR166TestCase() { super(); }
269      public JSR166TestCase(String name) { super(name); }
270  
# Line 185 | Line 280 | public class JSR166TestCase extends Test
280          return (regex == null) ? null : Pattern.compile(regex);
281      }
282  
283 <    protected void runTest() throws Throwable {
283 >    // Instrumentation to debug very rare, but very annoying hung test runs.
284 >    static volatile TestCase currentTestCase;
285 >    // static volatile int currentRun = 0;
286 >    static {
287 >        Runnable checkForWedgedTest = new Runnable() { public void run() {
288 >            // Avoid spurious reports with enormous runsPerTest.
289 >            // A single test case run should never take more than 1 second.
290 >            // But let's cap it at the high end too ...
291 >            final int timeoutMinutes =
292 >                Math.min(15, Math.max(runsPerTest / 60, 1));
293 >            for (TestCase lastTestCase = currentTestCase;;) {
294 >                try { MINUTES.sleep(timeoutMinutes); }
295 >                catch (InterruptedException unexpected) { break; }
296 >                if (lastTestCase == currentTestCase) {
297 >                    System.err.printf(
298 >                        "Looks like we're stuck running test: %s%n",
299 >                        lastTestCase);
300 > //                     System.err.printf(
301 > //                         "Looks like we're stuck running test: %s (%d/%d)%n",
302 > //                         lastTestCase, currentRun, runsPerTest);
303 > //                     System.err.println("availableProcessors=" +
304 > //                         Runtime.getRuntime().availableProcessors());
305 > //                     System.err.printf("cpu model = %s%n", cpuModel());
306 >                    dumpTestThreads();
307 >                    // one stack dump is probably enough; more would be spam
308 >                    break;
309 >                }
310 >                lastTestCase = currentTestCase;
311 >            }}};
312 >        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
313 >        thread.setDaemon(true);
314 >        thread.start();
315 >    }
316 >
317 > //     public static String cpuModel() {
318 > //         try {
319 > //             java.util.regex.Matcher matcher
320 > //               = Pattern.compile("model name\\s*: (.*)")
321 > //                 .matcher(new String(
322 > //                     java.nio.file.Files.readAllBytes(
323 > //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
324 > //             matcher.find();
325 > //             return matcher.group(1);
326 > //         } catch (Exception ex) { return null; }
327 > //     }
328 >
329 >    public void runBare() throws Throwable {
330 >        currentTestCase = this;
331          if (methodFilter == null
332 <            || methodFilter.matcher(toString()).find()) {
333 <            for (int i = 0; i < runsPerTest; i++) {
334 <                if (profileTests)
335 <                    runTestProfiled();
336 <                else
337 <                    super.runTest();
338 <            }
332 >            || methodFilter.matcher(toString()).find())
333 >            super.runBare();
334 >    }
335 >
336 >    protected void runTest() throws Throwable {
337 >        for (int i = 0; i < runsPerTest; i++) {
338 >            // currentRun = i;
339 >            if (profileTests)
340 >                runTestProfiled();
341 >            else
342 >                super.runTest();
343          }
344      }
345  
346      protected void runTestProfiled() throws Throwable {
347 <        // Warmup run, notably to trigger all needed classloading.
348 <        super.runTest();
203 <        long t0 = System.nanoTime();
204 <        try {
347 >        for (int i = 0; i < 2; i++) {
348 >            long startTime = System.nanoTime();
349              super.runTest();
350 <        } finally {
351 <            long elapsedMillis = millisElapsedSince(t0);
352 <            if (elapsedMillis >= profileThreshold)
350 >            long elapsedMillis = millisElapsedSince(startTime);
351 >            if (elapsedMillis < profileThreshold)
352 >                break;
353 >            // Never report first run of any test; treat it as a
354 >            // warmup run, notably to trigger all needed classloading,
355 >            if (i > 0)
356                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
357          }
358      }
# Line 217 | Line 364 | public class JSR166TestCase extends Test
364          main(suite(), args);
365      }
366  
367 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
368 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
369 +        long runTime;
370 +        public void startTest(Test test) {}
371 +        protected void printHeader(long runTime) {
372 +            this.runTime = runTime; // defer printing for later
373 +        }
374 +        protected void printFooter(TestResult result) {
375 +            if (result.wasSuccessful()) {
376 +                getWriter().println("OK (" + result.runCount() + " tests)"
377 +                    + "  Time: " + elapsedTimeAsString(runTime));
378 +            } else {
379 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
380 +                super.printFooter(result);
381 +            }
382 +        }
383 +    }
384 +
385 +    /**
386 +     * Returns a TestRunner that doesn't bother with unnecessary
387 +     * fluff, like printing a "." for each test case.
388 +     */
389 +    static junit.textui.TestRunner newPithyTestRunner() {
390 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
391 +        runner.setPrinter(new PithyResultPrinter(System.out));
392 +        return runner;
393 +    }
394 +
395      /**
396       * Runs all unit tests in the given test suite.
397       * Actual behavior influenced by jsr166.* system properties.
# Line 228 | Line 403 | public class JSR166TestCase extends Test
403              System.setSecurityManager(new SecurityManager());
404          }
405          for (int i = 0; i < suiteRuns; i++) {
406 <            TestResult result = junit.textui.TestRunner.run(suite);
406 >            TestResult result = newPithyTestRunner().doRun(suite);
407              if (!result.wasSuccessful())
408                  System.exit(1);
409              System.gc();
# Line 254 | Line 429 | public class JSR166TestCase extends Test
429          for (String testClassName : testClassNames) {
430              try {
431                  Class<?> testClass = Class.forName(testClassName);
432 <                Method m = testClass.getDeclaredMethod("suite",
258 <                                                       new Class<?>[0]);
432 >                Method m = testClass.getDeclaredMethod("suite");
433                  suite.addTest(newTestSuite((Test)m.invoke(null)));
434 <            } catch (Exception e) {
435 <                throw new Error("Missing test class", e);
434 >            } catch (ReflectiveOperationException e) {
435 >                throw new AssertionError("Missing test class", e);
436              }
437          }
438      }
# Line 280 | Line 454 | public class JSR166TestCase extends Test
454          }
455      }
456  
457 <    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
458 <    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
459 <    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
460 <    public static boolean atLeastJava9() {
461 <        return JAVA_CLASS_VERSION >= 53.0
462 <            // As of 2015-09, java9 still uses 52.0 class file version
289 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
290 <    }
291 <    public static boolean atLeastJava10() {
292 <        return JAVA_CLASS_VERSION >= 54.0
293 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
294 <    }
457 >    public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
458 >    public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
459 >    public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
460 >    public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
461 >    public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
462 >    public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
463  
464      /**
465       * Collects all JSR166 unit tests as one suite.
# Line 312 | Line 480 | public class JSR166TestCase extends Test
480              AbstractQueuedLongSynchronizerTest.suite(),
481              ArrayBlockingQueueTest.suite(),
482              ArrayDequeTest.suite(),
483 +            ArrayListTest.suite(),
484              AtomicBooleanTest.suite(),
485              AtomicIntegerArrayTest.suite(),
486              AtomicIntegerFieldUpdaterTest.suite(),
# Line 334 | Line 503 | public class JSR166TestCase extends Test
503              CopyOnWriteArrayListTest.suite(),
504              CopyOnWriteArraySetTest.suite(),
505              CountDownLatchTest.suite(),
506 +            CountedCompleterTest.suite(),
507              CyclicBarrierTest.suite(),
508              DelayQueueTest.suite(),
509              EntryTest.suite(),
# Line 362 | Line 532 | public class JSR166TestCase extends Test
532              TreeMapTest.suite(),
533              TreeSetTest.suite(),
534              TreeSubMapTest.suite(),
535 <            TreeSubSetTest.suite());
535 >            TreeSubSetTest.suite(),
536 >            VectorTest.suite());
537  
538          // Java8+ test classes
539          if (atLeastJava8()) {
540              String[] java8TestClassNames = {
541 +                "ArrayDeque8Test",
542                  "Atomic8Test",
543                  "CompletableFutureTest",
544                  "ConcurrentHashMap8Test",
545 <                "CountedCompleterTest",
545 >                "CountedCompleter8Test",
546                  "DoubleAccumulatorTest",
547                  "DoubleAdderTest",
548                  "ForkJoinPool8Test",
549                  "ForkJoinTask8Test",
550 +                "HashMapTest",
551 +                "LinkedBlockingDeque8Test",
552 +                "LinkedBlockingQueue8Test",
553                  "LongAccumulatorTest",
554                  "LongAdderTest",
555                  "SplittableRandomTest",
556                  "StampedLockTest",
557 +                "SubmissionPublisherTest",
558                  "ThreadLocalRandom8Test",
559 +                "TimeUnit8Test",
560              };
561              addNamedTestClasses(suite, java8TestClassNames);
562          }
# Line 387 | Line 564 | public class JSR166TestCase extends Test
564          // Java9+ test classes
565          if (atLeastJava9()) {
566              String[] java9TestClassNames = {
567 <                // Currently empty
567 >                "AtomicBoolean9Test",
568 >                "AtomicInteger9Test",
569 >                "AtomicIntegerArray9Test",
570 >                "AtomicLong9Test",
571 >                "AtomicLongArray9Test",
572 >                "AtomicReference9Test",
573 >                "AtomicReferenceArray9Test",
574 >                "ExecutorCompletionService9Test",
575 >                "ForkJoinPool9Test",
576              };
577              addNamedTestClasses(suite, java9TestClassNames);
578          }
# Line 398 | Line 583 | public class JSR166TestCase extends Test
583      /** Returns list of junit-style test method names in given class. */
584      public static ArrayList<String> testMethodNames(Class<?> testClass) {
585          Method[] methods = testClass.getDeclaredMethods();
586 <        ArrayList<String> names = new ArrayList<String>(methods.length);
586 >        ArrayList<String> names = new ArrayList<>(methods.length);
587          for (Method method : methods) {
588              if (method.getName().startsWith("test")
589                  && Modifier.isPublic(method.getModifiers())
# Line 425 | Line 610 | public class JSR166TestCase extends Test
610              for (String methodName : testMethodNames(testClass))
611                  suite.addTest((Test) c.newInstance(data, methodName));
612              return suite;
613 <        } catch (Exception e) {
614 <            throw new Error(e);
613 >        } catch (ReflectiveOperationException e) {
614 >            throw new AssertionError(e);
615          }
616      }
617  
# Line 442 | Line 627 | public class JSR166TestCase extends Test
627          if (atLeastJava8()) {
628              String name = testClass.getName();
629              String name8 = name.replaceAll("Test$", "8Test");
630 <            if (name.equals(name8)) throw new Error(name);
630 >            if (name.equals(name8)) throw new AssertionError(name);
631              try {
632                  return (Test)
633                      Class.forName(name8)
634 <                    .getMethod("testSuite", new Class[] { dataClass })
634 >                    .getMethod("testSuite", dataClass)
635                      .invoke(null, data);
636 <            } catch (Exception e) {
637 <                throw new Error(e);
636 >            } catch (ReflectiveOperationException e) {
637 >                throw new AssertionError(e);
638              }
639          } else {
640              return new TestSuite();
641          }
457
642      }
643  
644      // Delays for timing-dependent tests, in milliseconds.
# Line 464 | Line 648 | public class JSR166TestCase extends Test
648      public static long MEDIUM_DELAY_MS;
649      public static long LONG_DELAY_MS;
650  
651 +    private static final long RANDOM_TIMEOUT;
652 +    private static final long RANDOM_EXPIRED_TIMEOUT;
653 +    private static final TimeUnit RANDOM_TIMEUNIT;
654 +    static {
655 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
656 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
657 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
658 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
659 +        TimeUnit[] timeUnits = TimeUnit.values();
660 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
661 +    }
662 +
663 +    /**
664 +     * Returns a timeout for use when any value at all will do.
665 +     */
666 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
667 +
668      /**
669 <     * Returns the shortest timed delay. This could
670 <     * be reimplemented to use for example a Property.
669 >     * Returns a timeout that means "no waiting", i.e. not positive.
670 >     */
671 >    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
672 >
673 >    /**
674 >     * Returns a random non-null TimeUnit.
675 >     */
676 >    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
677 >
678 >    /**
679 >     * Returns the shortest timed delay. This can be scaled up for
680 >     * slow machines using the jsr166.delay.factor system property,
681 >     * or via jtreg's -timeoutFactor: flag.
682 >     * http://openjdk.java.net/jtreg/command-help.html
683       */
684      protected long getShortDelay() {
685 <        return 50;
685 >        return (long) (50 * delayFactor);
686      }
687  
688      /**
# Line 482 | Line 695 | public class JSR166TestCase extends Test
695          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
696      }
697  
698 +    private static final long TIMEOUT_DELAY_MS
699 +        = (long) (12.0 * Math.cbrt(delayFactor));
700 +
701      /**
702 <     * Returns a timeout in milliseconds to be used in tests that
703 <     * verify that operations block or time out.
702 >     * Returns a timeout in milliseconds to be used in tests that verify
703 >     * that operations block or time out.  We want this to be longer
704 >     * than the OS scheduling quantum, but not too long, so don't scale
705 >     * linearly with delayFactor; we use "crazy" cube root instead.
706       */
707 <    long timeoutMillis() {
708 <        return SHORT_DELAY_MS / 4;
707 >    static long timeoutMillis() {
708 >        return TIMEOUT_DELAY_MS;
709      }
710  
711      /**
# Line 503 | Line 721 | public class JSR166TestCase extends Test
721       * The first exception encountered if any threadAssertXXX method fails.
722       */
723      private final AtomicReference<Throwable> threadFailure
724 <        = new AtomicReference<Throwable>(null);
724 >        = new AtomicReference<>(null);
725  
726      /**
727       * Records an exception so that it can be rethrown later in the test
# Line 512 | Line 730 | public class JSR166TestCase extends Test
730       * the same test have no effect.
731       */
732      public void threadRecordFailure(Throwable t) {
733 +        System.err.println(t);
734 +        dumpTestThreads();
735          threadFailure.compareAndSet(null, t);
736      }
737  
# Line 519 | Line 739 | public class JSR166TestCase extends Test
739          setDelays();
740      }
741  
742 +    void tearDownFail(String format, Object... args) {
743 +        String msg = toString() + ": " + String.format(format, args);
744 +        System.err.println(msg);
745 +        dumpTestThreads();
746 +        throw new AssertionError(msg);
747 +    }
748 +
749      /**
750       * Extra checks that get done for all test cases.
751       *
# Line 537 | Line 764 | public class JSR166TestCase extends Test
764                  throw (RuntimeException) t;
765              else if (t instanceof Exception)
766                  throw (Exception) t;
767 <            else {
768 <                AssertionFailedError afe =
542 <                    new AssertionFailedError(t.toString());
543 <                afe.initCause(t);
544 <                throw afe;
545 <            }
767 >            else
768 >                throw new AssertionError(t.toString(), t);
769          }
770  
771          if (Thread.interrupted())
772 <            throw new AssertionFailedError("interrupt status set in main thread");
772 >            tearDownFail("interrupt status set in main thread");
773  
774          checkForkJoinPoolThreadLeaks();
775      }
776  
777      /**
778 <     * Finds missing try { ... } finally { joinPool(e); }
778 >     * Finds missing PoolCleaners
779       */
780      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
781 <        Thread[] survivors = new Thread[5];
781 >        Thread[] survivors = new Thread[7];
782          int count = Thread.enumerate(survivors);
783          for (int i = 0; i < count; i++) {
784              Thread thread = survivors[i];
# Line 563 | Line 786 | public class JSR166TestCase extends Test
786              if (name.startsWith("ForkJoinPool-")) {
787                  // give thread some time to terminate
788                  thread.join(LONG_DELAY_MS);
789 <                if (!thread.isAlive()) continue;
790 <                throw new AssertionFailedError
791 <                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
569 <                                   toString(), name));
789 >                if (thread.isAlive())
790 >                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
791 >                                 thread);
792              }
793          }
794 +
795 +        if (!ForkJoinPool.commonPool()
796 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
797 +            tearDownFail("ForkJoin common pool thread stuck");
798      }
799  
800      /**
801       * Just like fail(reason), but additionally recording (using
802 <     * threadRecordFailure) any AssertionFailedError thrown, so that
803 <     * the current testcase will fail.
802 >     * threadRecordFailure) any AssertionError thrown, so that the
803 >     * current testcase will fail.
804       */
805      public void threadFail(String reason) {
806          try {
807              fail(reason);
808 <        } catch (AssertionFailedError t) {
809 <            threadRecordFailure(t);
810 <            fail(reason);
808 >        } catch (AssertionError fail) {
809 >            threadRecordFailure(fail);
810 >            throw fail;
811          }
812      }
813  
814      /**
815       * Just like assertTrue(b), but additionally recording (using
816 <     * threadRecordFailure) any AssertionFailedError thrown, so that
817 <     * the current testcase will fail.
816 >     * threadRecordFailure) any AssertionError thrown, so that the
817 >     * current testcase will fail.
818       */
819      public void threadAssertTrue(boolean b) {
820          try {
821              assertTrue(b);
822 <        } catch (AssertionFailedError t) {
823 <            threadRecordFailure(t);
824 <            throw t;
822 >        } catch (AssertionError fail) {
823 >            threadRecordFailure(fail);
824 >            throw fail;
825          }
826      }
827  
828      /**
829       * Just like assertFalse(b), but additionally recording (using
830 <     * threadRecordFailure) any AssertionFailedError thrown, so that
831 <     * the current testcase will fail.
830 >     * threadRecordFailure) any AssertionError thrown, so that the
831 >     * current testcase will fail.
832       */
833      public void threadAssertFalse(boolean b) {
834          try {
835              assertFalse(b);
836 <        } catch (AssertionFailedError t) {
837 <            threadRecordFailure(t);
838 <            throw t;
836 >        } catch (AssertionError fail) {
837 >            threadRecordFailure(fail);
838 >            throw fail;
839          }
840      }
841  
842      /**
843       * Just like assertNull(x), but additionally recording (using
844 <     * threadRecordFailure) any AssertionFailedError thrown, so that
845 <     * the current testcase will fail.
844 >     * threadRecordFailure) any AssertionError thrown, so that the
845 >     * current testcase will fail.
846       */
847      public void threadAssertNull(Object x) {
848          try {
849              assertNull(x);
850 <        } catch (AssertionFailedError t) {
851 <            threadRecordFailure(t);
852 <            throw t;
850 >        } catch (AssertionError fail) {
851 >            threadRecordFailure(fail);
852 >            throw fail;
853          }
854      }
855  
856      /**
857       * Just like assertEquals(x, y), but additionally recording (using
858 <     * threadRecordFailure) any AssertionFailedError thrown, so that
859 <     * the current testcase will fail.
858 >     * threadRecordFailure) any AssertionError thrown, so that the
859 >     * current testcase will fail.
860       */
861      public void threadAssertEquals(long x, long y) {
862          try {
863              assertEquals(x, y);
864 <        } catch (AssertionFailedError t) {
865 <            threadRecordFailure(t);
866 <            throw t;
864 >        } catch (AssertionError fail) {
865 >            threadRecordFailure(fail);
866 >            throw fail;
867          }
868      }
869  
870      /**
871       * Just like assertEquals(x, y), but additionally recording (using
872 <     * threadRecordFailure) any AssertionFailedError thrown, so that
873 <     * the current testcase will fail.
872 >     * threadRecordFailure) any AssertionError thrown, so that the
873 >     * current testcase will fail.
874       */
875      public void threadAssertEquals(Object x, Object y) {
876          try {
877              assertEquals(x, y);
878 <        } catch (AssertionFailedError fail) {
878 >        } catch (AssertionError fail) {
879              threadRecordFailure(fail);
880              throw fail;
881          } catch (Throwable fail) {
# Line 659 | Line 885 | public class JSR166TestCase extends Test
885  
886      /**
887       * Just like assertSame(x, y), but additionally recording (using
888 <     * threadRecordFailure) any AssertionFailedError thrown, so that
889 <     * the current testcase will fail.
888 >     * threadRecordFailure) any AssertionError thrown, so that the
889 >     * current testcase will fail.
890       */
891      public void threadAssertSame(Object x, Object y) {
892          try {
893              assertSame(x, y);
894 <        } catch (AssertionFailedError fail) {
894 >        } catch (AssertionError fail) {
895              threadRecordFailure(fail);
896              throw fail;
897          }
# Line 687 | Line 913 | public class JSR166TestCase extends Test
913  
914      /**
915       * Records the given exception using {@link #threadRecordFailure},
916 <     * then rethrows the exception, wrapping it in an
917 <     * AssertionFailedError if necessary.
916 >     * then rethrows the exception, wrapping it in an AssertionError
917 >     * if necessary.
918       */
919      public void threadUnexpectedException(Throwable t) {
920          threadRecordFailure(t);
# Line 697 | Line 923 | public class JSR166TestCase extends Test
923              throw (RuntimeException) t;
924          else if (t instanceof Error)
925              throw (Error) t;
926 <        else {
927 <            AssertionFailedError afe =
702 <                new AssertionFailedError("unexpected exception: " + t);
703 <            afe.initCause(t);
704 <            throw afe;
705 <        }
926 >        else
927 >            throw new AssertionError("unexpected exception: " + t, t);
928      }
929  
930      /**
931       * Delays, via Thread.sleep, for the given millisecond delay, but
932       * if the sleep is shorter than specified, may re-sleep or yield
933 <     * until time elapses.
933 >     * until time elapses.  Ensures that the given time, as measured
934 >     * by System.nanoTime(), has elapsed.
935       */
936      static void delay(long millis) throws InterruptedException {
937 <        long startTime = System.nanoTime();
938 <        long ns = millis * 1000 * 1000;
939 <        for (;;) {
937 >        long nanos = millis * (1000 * 1000);
938 >        final long wakeupTime = System.nanoTime() + nanos;
939 >        do {
940              if (millis > 0L)
941                  Thread.sleep(millis);
942              else // too short to sleep
943                  Thread.yield();
944 <            long d = ns - (System.nanoTime() - startTime);
945 <            if (d > 0L)
946 <                millis = d / (1000 * 1000);
947 <            else
948 <                break;
944 >            nanos = wakeupTime - System.nanoTime();
945 >            millis = nanos / (1000 * 1000);
946 >        } while (nanos >= 0L);
947 >    }
948 >
949 >    /**
950 >     * Allows use of try-with-resources with per-test thread pools.
951 >     */
952 >    class PoolCleaner implements AutoCloseable {
953 >        private final ExecutorService pool;
954 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
955 >        public void close() { joinPool(pool); }
956 >    }
957 >
958 >    /**
959 >     * An extension of PoolCleaner that has an action to release the pool.
960 >     */
961 >    class PoolCleanerWithReleaser extends PoolCleaner {
962 >        private final Runnable releaser;
963 >        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
964 >            super(pool);
965 >            this.releaser = releaser;
966          }
967 +        public void close() {
968 +            try {
969 +                releaser.run();
970 +            } finally {
971 +                super.close();
972 +            }
973 +        }
974 +    }
975 +
976 +    PoolCleaner cleaner(ExecutorService pool) {
977 +        return new PoolCleaner(pool);
978 +    }
979 +
980 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
981 +        return new PoolCleanerWithReleaser(pool, releaser);
982 +    }
983 +
984 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
985 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
986 +    }
987 +
988 +    Runnable releaser(final CountDownLatch latch) {
989 +        return new Runnable() { public void run() {
990 +            do { latch.countDown(); }
991 +            while (latch.getCount() > 0);
992 +        }};
993 +    }
994 +
995 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
996 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
997 +    }
998 +
999 +    Runnable releaser(final AtomicBoolean flag) {
1000 +        return new Runnable() { public void run() { flag.set(true); }};
1001      }
1002  
1003      /**
# Line 732 | Line 1006 | public class JSR166TestCase extends Test
1006      void joinPool(ExecutorService pool) {
1007          try {
1008              pool.shutdown();
1009 <            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
1010 <                fail("ExecutorService " + pool +
1011 <                     " did not terminate in a timely manner");
1009 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
1010 >                try {
1011 >                    threadFail("ExecutorService " + pool +
1012 >                               " did not terminate in a timely manner");
1013 >                } finally {
1014 >                    // last resort, for the benefit of subsequent tests
1015 >                    pool.shutdownNow();
1016 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
1017 >                }
1018 >            }
1019          } catch (SecurityException ok) {
1020              // Allowed in case test doesn't have privs
1021          } catch (InterruptedException fail) {
1022 <            fail("Unexpected InterruptedException");
1022 >            threadFail("Unexpected InterruptedException");
1023          }
1024      }
1025  
1026 <    /** Like Runnable, but with the freedom to throw anything */
1027 <    interface Thunk { public void run() throws Throwable; }
1026 >    /**
1027 >     * Like Runnable, but with the freedom to throw anything.
1028 >     * junit folks had the same idea:
1029 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1030 >     */
1031 >    interface Action { public void run() throws Throwable; }
1032  
1033      /**
1034 <     * Runs all the given tasks in parallel, failing if any fail.
1034 >     * Runs all the given actions in parallel, failing if any fail.
1035       * Useful for running multiple variants of tests that are
1036       * necessarily individually slow because they must block.
1037       */
1038 <    void testInParallel(Thunk ... thunks) {
1038 >    void testInParallel(Action ... actions) {
1039          ExecutorService pool = Executors.newCachedThreadPool();
1040 <        try {
1041 <            ArrayList<Future<?>> futures = new ArrayList<>(thunks.length);
1042 <            for (final Thunk thunk : thunks)
1040 >        try (PoolCleaner cleaner = cleaner(pool)) {
1041 >            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1042 >            for (final Action action : actions)
1043                  futures.add(pool.submit(new CheckedRunnable() {
1044 <                    public void realRun() throws Throwable { thunk.run();}}));
1044 >                    public void realRun() throws Throwable { action.run();}}));
1045              for (Future<?> future : futures)
1046                  try {
1047                      assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
# Line 765 | Line 1050 | public class JSR166TestCase extends Test
1050                  } catch (Exception ex) {
1051                      threadUnexpectedException(ex);
1052                  }
768        } finally {
769            joinPool(pool);
1053          }
1054      }
1055  
1056      /**
1057 <     * A debugging tool to print all stack traces, as jstack does.
1057 >     * A debugging tool to print stack traces of most threads, as jstack does.
1058 >     * Uninteresting threads are filtered out.
1059       */
1060 <    static void printAllStackTraces() {
1061 <        for (ThreadInfo info :
1062 <                 ManagementFactory.getThreadMXBean()
1063 <                 .dumpAllThreads(true, true))
1064 <            System.err.print(info);
1065 <    }
1066 <
1067 <    /**
1068 <     * Checks that thread does not terminate within the default
785 <     * millisecond delay of {@code timeoutMillis()}.
786 <     */
787 <    void assertThreadStaysAlive(Thread thread) {
788 <        assertThreadStaysAlive(thread, timeoutMillis());
789 <    }
1060 >    static void dumpTestThreads() {
1061 >        SecurityManager sm = System.getSecurityManager();
1062 >        if (sm != null) {
1063 >            try {
1064 >                System.setSecurityManager(null);
1065 >            } catch (SecurityException giveUp) {
1066 >                return;
1067 >            }
1068 >        }
1069  
1070 <    /**
1071 <     * Checks that thread does not terminate within the given millisecond delay.
1072 <     */
1073 <    void assertThreadStaysAlive(Thread thread, long millis) {
1074 <        try {
1075 <            // No need to optimize the failing case via Thread.join.
1076 <            delay(millis);
1077 <            assertTrue(thread.isAlive());
1078 <        } catch (InterruptedException fail) {
1079 <            fail("Unexpected InterruptedException");
1070 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1071 >        System.err.println("------ stacktrace dump start ------");
1072 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1073 >            final String name = info.getThreadName();
1074 >            String lockName;
1075 >            if ("Signal Dispatcher".equals(name))
1076 >                continue;
1077 >            if ("Reference Handler".equals(name)
1078 >                && (lockName = info.getLockName()) != null
1079 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1080 >                continue;
1081 >            if ("Finalizer".equals(name)
1082 >                && (lockName = info.getLockName()) != null
1083 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1084 >                continue;
1085 >            if ("checkForWedgedTest".equals(name))
1086 >                continue;
1087 >            System.err.print(info);
1088          }
1089 <    }
1089 >        System.err.println("------ stacktrace dump end ------");
1090  
1091 <    /**
805 <     * Checks that the threads do not terminate within the default
806 <     * millisecond delay of {@code timeoutMillis()}.
807 <     */
808 <    void assertThreadsStayAlive(Thread... threads) {
809 <        assertThreadsStayAlive(timeoutMillis(), threads);
1091 >        if (sm != null) System.setSecurityManager(sm);
1092      }
1093  
1094      /**
1095 <     * Checks that the threads do not terminate within the given millisecond delay.
1095 >     * Checks that thread eventually enters the expected blocked thread state.
1096       */
1097 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1098 <        try {
1099 <            // No need to optimize the failing case via Thread.join.
1100 <            delay(millis);
1101 <            for (Thread thread : threads)
1102 <                assertTrue(thread.isAlive());
1103 <        } catch (InterruptedException fail) {
1104 <            fail("Unexpected InterruptedException");
1097 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1098 >        // always sleep at least 1 ms, with high probability avoiding
1099 >        // transitory states
1100 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1101 >            try { delay(1); }
1102 >            catch (InterruptedException fail) {
1103 >                throw new AssertionError("Unexpected InterruptedException", fail);
1104 >            }
1105 >            Thread.State s = thread.getState();
1106 >            if (s == expected)
1107 >                return;
1108 >            else if (s == Thread.State.TERMINATED)
1109 >                fail("Unexpected thread termination");
1110          }
1111 +        fail("timed out waiting for thread to enter thread state " + expected);
1112      }
1113  
1114      /**
# Line 861 | Line 1149 | public class JSR166TestCase extends Test
1149      }
1150  
1151      /**
1152 +     * The maximum number of consecutive spurious wakeups we should
1153 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1154 +     */
1155 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1156 +
1157 +    /**
1158       * The number of elements to place in collections, arrays, etc.
1159       */
1160      public static final int SIZE = 20;
# Line 964 | Line 1258 | public class JSR166TestCase extends Test
1258          }
1259          public void refresh() {}
1260          public String toString() {
1261 <            List<Permission> ps = new ArrayList<Permission>();
1261 >            List<Permission> ps = new ArrayList<>();
1262              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1263                  ps.add(e.nextElement());
1264              return "AdjustablePolicy with permissions " + ps;
# Line 992 | Line 1286 | public class JSR166TestCase extends Test
1286  
1287      /**
1288       * Sleeps until the given time has elapsed.
1289 <     * Throws AssertionFailedError if interrupted.
1289 >     * Throws AssertionError if interrupted.
1290       */
1291 <    void sleep(long millis) {
1291 >    static void sleep(long millis) {
1292          try {
1293              delay(millis);
1294          } catch (InterruptedException fail) {
1295 <            AssertionFailedError afe =
1002 <                new AssertionFailedError("Unexpected InterruptedException");
1003 <            afe.initCause(fail);
1004 <            throw afe;
1295 >            throw new AssertionError("Unexpected InterruptedException", fail);
1296          }
1297      }
1298  
1299      /**
1300       * Spin-waits up to the specified number of milliseconds for the given
1301       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1302 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1303       */
1304 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1305 <        long startTime = System.nanoTime();
1306 <        for (;;) {
1307 <            Thread.State s = thread.getState();
1308 <            if (s == Thread.State.BLOCKED ||
1309 <                s == Thread.State.WAITING ||
1310 <                s == Thread.State.TIMED_WAITING)
1311 <                return;
1312 <            else if (s == Thread.State.TERMINATED)
1304 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1305 >                                       Callable<Boolean> waitingForGodot) {
1306 >        for (long startTime = 0L;;) {
1307 >            switch (thread.getState()) {
1308 >            default: break;
1309 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1310 >                try {
1311 >                    if (waitingForGodot == null || waitingForGodot.call())
1312 >                        return;
1313 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1314 >                break;
1315 >            case TERMINATED:
1316                  fail("Unexpected thread termination");
1317 +            }
1318 +
1319 +            if (startTime == 0L)
1320 +                startTime = System.nanoTime();
1321              else if (millisElapsedSince(startTime) > timeoutMillis) {
1322 <                threadAssertTrue(thread.isAlive());
1323 <                return;
1322 >                assertTrue(thread.isAlive());
1323 >                if (waitingForGodot == null
1324 >                    || thread.getState() == Thread.State.RUNNABLE)
1325 >                    fail("timed out waiting for thread to enter wait state");
1326 >                else
1327 >                    fail("timed out waiting for condition, thread state="
1328 >                         + thread.getState());
1329              }
1330              Thread.yield();
1331          }
1332      }
1333  
1334      /**
1335 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1336 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1335 >     * Spin-waits up to the specified number of milliseconds for the given
1336 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1337 >     */
1338 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1339 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1340 >    }
1341 >
1342 >    /**
1343 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1344 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1345       */
1346      void waitForThreadToEnterWaitState(Thread thread) {
1347 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1347 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1348 >    }
1349 >
1350 >    /**
1351 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1352 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1353 >     * and additionally satisfy the given condition.
1354 >     */
1355 >    void waitForThreadToEnterWaitState(Thread thread,
1356 >                                       Callable<Boolean> waitingForGodot) {
1357 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1358      }
1359  
1360      /**
# Line 1050 | Line 1372 | public class JSR166TestCase extends Test
1372   //             r.run();
1373   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1374   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1375 < //             throw new AssertionFailedError("did not return promptly");
1375 > //             throw new AssertionError("did not return promptly");
1376   //     }
1377  
1378   //     void assertTerminatesPromptly(Runnable r) {
# Line 1063 | Line 1385 | public class JSR166TestCase extends Test
1385       */
1386      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1387          long startTime = System.nanoTime();
1388 +        T actual = null;
1389          try {
1390 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1390 >            actual = f.get(timeoutMillis, MILLISECONDS);
1391          } catch (Throwable fail) { threadUnexpectedException(fail); }
1392 +        assertEquals(expectedValue, actual);
1393          if (millisElapsedSince(startTime) > timeoutMillis/2)
1394 <            throw new AssertionFailedError("timed get did not return promptly");
1394 >            throw new AssertionError("timed get did not return promptly");
1395      }
1396  
1397      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1097 | Line 1421 | public class JSR166TestCase extends Test
1421          } finally {
1422              if (t.getState() != Thread.State.TERMINATED) {
1423                  t.interrupt();
1424 <                fail("Test timed out");
1424 >                threadFail("timed out waiting for thread to terminate");
1425              }
1426          }
1427      }
# Line 1125 | Line 1449 | public class JSR166TestCase extends Test
1449          }
1450      }
1451  
1128    public abstract class RunnableShouldThrow implements Runnable {
1129        protected abstract void realRun() throws Throwable;
1130
1131        final Class<?> exceptionClass;
1132
1133        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1134            this.exceptionClass = exceptionClass;
1135        }
1136
1137        public final void run() {
1138            try {
1139                realRun();
1140                threadShouldThrow(exceptionClass.getSimpleName());
1141            } catch (Throwable t) {
1142                if (! exceptionClass.isInstance(t))
1143                    threadUnexpectedException(t);
1144            }
1145        }
1146    }
1147
1452      public abstract class ThreadShouldThrow extends Thread {
1453          protected abstract void realRun() throws Throwable;
1454  
# Line 1157 | Line 1461 | public class JSR166TestCase extends Test
1461          public final void run() {
1462              try {
1463                  realRun();
1160                threadShouldThrow(exceptionClass.getSimpleName());
1464              } catch (Throwable t) {
1465                  if (! exceptionClass.isInstance(t))
1466                      threadUnexpectedException(t);
1467 +                return;
1468              }
1469 +            threadShouldThrow(exceptionClass.getSimpleName());
1470          }
1471      }
1472  
# Line 1171 | Line 1476 | public class JSR166TestCase extends Test
1476          public final void run() {
1477              try {
1478                  realRun();
1174                threadShouldThrow("InterruptedException");
1479              } catch (InterruptedException success) {
1480                  threadAssertFalse(Thread.interrupted());
1481 +                return;
1482              } catch (Throwable fail) {
1483                  threadUnexpectedException(fail);
1484              }
1485 +            threadShouldThrow("InterruptedException");
1486          }
1487      }
1488  
# Line 1188 | Line 1494 | public class JSR166TestCase extends Test
1494                  return realCall();
1495              } catch (Throwable fail) {
1496                  threadUnexpectedException(fail);
1191                return null;
1192            }
1193        }
1194    }
1195
1196    public abstract class CheckedInterruptedCallable<T>
1197        implements Callable<T> {
1198        protected abstract T realCall() throws Throwable;
1199
1200        public final T call() {
1201            try {
1202                T result = realCall();
1203                threadShouldThrow("InterruptedException");
1204                return result;
1205            } catch (InterruptedException success) {
1206                threadAssertFalse(Thread.interrupted());
1207            } catch (Throwable fail) {
1208                threadUnexpectedException(fail);
1497              }
1498 <            return null;
1498 >            throw new AssertionError("unreached");
1499          }
1500      }
1501  
# Line 1222 | Line 1510 | public class JSR166TestCase extends Test
1510      public static final String TEST_STRING = "a test string";
1511  
1512      public static class StringTask implements Callable<String> {
1513 <        public String call() { return TEST_STRING; }
1513 >        final String value;
1514 >        public StringTask() { this(TEST_STRING); }
1515 >        public StringTask(String value) { this.value = value; }
1516 >        public String call() { return value; }
1517      }
1518  
1519      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 1235 | Line 1526 | public class JSR166TestCase extends Test
1526              }};
1527      }
1528  
1529 <    public Runnable awaiter(final CountDownLatch latch) {
1529 >    public Runnable countDowner(final CountDownLatch latch) {
1530          return new CheckedRunnable() {
1531              public void realRun() throws InterruptedException {
1532 <                await(latch);
1532 >                latch.countDown();
1533              }};
1534      }
1535  
1536 <    public void await(CountDownLatch latch) {
1536 >    class LatchAwaiter extends CheckedRunnable {
1537 >        static final int NEW = 0;
1538 >        static final int RUNNING = 1;
1539 >        static final int DONE = 2;
1540 >        final CountDownLatch latch;
1541 >        int state = NEW;
1542 >        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1543 >        public void realRun() throws InterruptedException {
1544 >            state = 1;
1545 >            await(latch);
1546 >            state = 2;
1547 >        }
1548 >    }
1549 >
1550 >    public LatchAwaiter awaiter(CountDownLatch latch) {
1551 >        return new LatchAwaiter(latch);
1552 >    }
1553 >
1554 >    public void await(CountDownLatch latch, long timeoutMillis) {
1555 >        boolean timedOut = false;
1556          try {
1557 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1557 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1558          } catch (Throwable fail) {
1559              threadUnexpectedException(fail);
1560          }
1561 +        if (timedOut)
1562 +            fail("timed out waiting for CountDownLatch for "
1563 +                 + (timeoutMillis/1000) + " sec");
1564 +    }
1565 +
1566 +    public void await(CountDownLatch latch) {
1567 +        await(latch, LONG_DELAY_MS);
1568      }
1569  
1570      public void await(Semaphore semaphore) {
1571 +        boolean timedOut = false;
1572          try {
1573 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1573 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1574 >        } catch (Throwable fail) {
1575 >            threadUnexpectedException(fail);
1576 >        }
1577 >        if (timedOut)
1578 >            fail("timed out waiting for Semaphore for "
1579 >                 + (LONG_DELAY_MS/1000) + " sec");
1580 >    }
1581 >
1582 >    public void await(CyclicBarrier barrier) {
1583 >        try {
1584 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1585          } catch (Throwable fail) {
1586              threadUnexpectedException(fail);
1587          }
# Line 1272 | Line 1601 | public class JSR166TestCase extends Test
1601   //         long startTime = System.nanoTime();
1602   //         while (!flag.get()) {
1603   //             if (millisElapsedSince(startTime) > timeoutMillis)
1604 < //                 throw new AssertionFailedError("timed out");
1604 > //                 throw new AssertionError("timed out");
1605   //             Thread.yield();
1606   //         }
1607   //     }
# Line 1281 | Line 1610 | public class JSR166TestCase extends Test
1610          public String call() { throw new NullPointerException(); }
1611      }
1612  
1284    public static class CallableOne implements Callable<Integer> {
1285        public Integer call() { return one; }
1286    }
1287
1288    public class ShortRunnable extends CheckedRunnable {
1289        protected void realRun() throws Throwable {
1290            delay(SHORT_DELAY_MS);
1291        }
1292    }
1293
1294    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1295        protected void realRun() throws InterruptedException {
1296            delay(SHORT_DELAY_MS);
1297        }
1298    }
1299
1300    public class SmallRunnable extends CheckedRunnable {
1301        protected void realRun() throws Throwable {
1302            delay(SMALL_DELAY_MS);
1303        }
1304    }
1305
1306    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1307        protected void realRun() {
1308            try {
1309                delay(SMALL_DELAY_MS);
1310            } catch (InterruptedException ok) {}
1311        }
1312    }
1313
1314    public class SmallCallable extends CheckedCallable {
1315        protected Object realCall() throws InterruptedException {
1316            delay(SMALL_DELAY_MS);
1317            return Boolean.TRUE;
1318        }
1319    }
1320
1321    public class MediumRunnable extends CheckedRunnable {
1322        protected void realRun() throws Throwable {
1323            delay(MEDIUM_DELAY_MS);
1324        }
1325    }
1326
1327    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1328        protected void realRun() throws InterruptedException {
1329            delay(MEDIUM_DELAY_MS);
1330        }
1331    }
1332
1613      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1614          return new CheckedRunnable() {
1615              protected void realRun() {
# Line 1339 | Line 1619 | public class JSR166TestCase extends Test
1619              }};
1620      }
1621  
1342    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1343        protected void realRun() {
1344            try {
1345                delay(MEDIUM_DELAY_MS);
1346            } catch (InterruptedException ok) {}
1347        }
1348    }
1349
1350    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1351        protected void realRun() {
1352            try {
1353                delay(LONG_DELAY_MS);
1354            } catch (InterruptedException ok) {}
1355        }
1356    }
1357
1622      /**
1623       * For use as ThreadFactory in constructors
1624       */
# Line 1368 | Line 1632 | public class JSR166TestCase extends Test
1632          boolean isDone();
1633      }
1634  
1371    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1372        return new TrackedRunnable() {
1373                private volatile boolean done = false;
1374                public boolean isDone() { return done; }
1375                public void run() {
1376                    try {
1377                        delay(timeoutMillis);
1378                        done = true;
1379                    } catch (InterruptedException ok) {}
1380                }
1381            };
1382    }
1383
1384    public static class TrackedShortRunnable implements Runnable {
1385        public volatile boolean done = false;
1386        public void run() {
1387            try {
1388                delay(SHORT_DELAY_MS);
1389                done = true;
1390            } catch (InterruptedException ok) {}
1391        }
1392    }
1393
1394    public static class TrackedSmallRunnable implements Runnable {
1395        public volatile boolean done = false;
1396        public void run() {
1397            try {
1398                delay(SMALL_DELAY_MS);
1399                done = true;
1400            } catch (InterruptedException ok) {}
1401        }
1402    }
1403
1404    public static class TrackedMediumRunnable implements Runnable {
1405        public volatile boolean done = false;
1406        public void run() {
1407            try {
1408                delay(MEDIUM_DELAY_MS);
1409                done = true;
1410            } catch (InterruptedException ok) {}
1411        }
1412    }
1413
1414    public static class TrackedLongRunnable implements Runnable {
1415        public volatile boolean done = false;
1416        public void run() {
1417            try {
1418                delay(LONG_DELAY_MS);
1419                done = true;
1420            } catch (InterruptedException ok) {}
1421        }
1422    }
1423
1635      public static class TrackedNoOpRunnable implements Runnable {
1636          public volatile boolean done = false;
1637          public void run() {
# Line 1428 | Line 1639 | public class JSR166TestCase extends Test
1639          }
1640      }
1641  
1431    public static class TrackedCallable implements Callable {
1432        public volatile boolean done = false;
1433        public Object call() {
1434            try {
1435                delay(SMALL_DELAY_MS);
1436                done = true;
1437            } catch (InterruptedException ok) {}
1438            return Boolean.TRUE;
1439        }
1440    }
1441
1642      /**
1643       * Analog of CheckedRunnable for RecursiveAction
1644       */
# Line 1465 | Line 1665 | public class JSR166TestCase extends Test
1665                  return realCompute();
1666              } catch (Throwable fail) {
1667                  threadUnexpectedException(fail);
1468                return null;
1668              }
1669 +            throw new AssertionError("unreached");
1670          }
1671      }
1672  
# Line 1480 | Line 1680 | public class JSR166TestCase extends Test
1680  
1681      /**
1682       * A CyclicBarrier that uses timed await and fails with
1683 <     * AssertionFailedErrors instead of throwing checked exceptions.
1683 >     * AssertionErrors instead of throwing checked exceptions.
1684       */
1685 <    public class CheckedBarrier extends CyclicBarrier {
1685 >    public static class CheckedBarrier extends CyclicBarrier {
1686          public CheckedBarrier(int parties) { super(parties); }
1687  
1688          public int await() {
1689              try {
1690                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1691              } catch (TimeoutException timedOut) {
1692 <                throw new AssertionFailedError("timed out");
1692 >                throw new AssertionError("timed out");
1693              } catch (Exception fail) {
1694 <                AssertionFailedError afe =
1495 <                    new AssertionFailedError("Unexpected exception: " + fail);
1496 <                afe.initCause(fail);
1497 <                throw afe;
1694 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1695              }
1696          }
1697      }
# Line 1505 | Line 1702 | public class JSR166TestCase extends Test
1702              assertEquals(0, q.size());
1703              assertNull(q.peek());
1704              assertNull(q.poll());
1705 <            assertNull(q.poll(0, MILLISECONDS));
1705 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1706              assertEquals(q.toString(), "[]");
1707              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1708              assertFalse(q.iterator().hasNext());
# Line 1546 | Line 1743 | public class JSR166TestCase extends Test
1743          }
1744      }
1745  
1746 +    void assertImmutable(final Object o) {
1747 +        if (o instanceof Collection) {
1748 +            assertThrows(
1749 +                UnsupportedOperationException.class,
1750 +                new Runnable() { public void run() {
1751 +                        ((Collection) o).add(null);}});
1752 +        }
1753 +    }
1754 +
1755      @SuppressWarnings("unchecked")
1756      <T> T serialClone(T o) {
1757 +        T clone = null;
1758          try {
1759              ObjectInputStream ois = new ObjectInputStream
1760                  (new ByteArrayInputStream(serialBytes(o)));
1761 <            T clone = (T) ois.readObject();
1555 <            assertSame(o.getClass(), clone.getClass());
1556 <            return clone;
1761 >            clone = (T) ois.readObject();
1762          } catch (Throwable fail) {
1763              threadUnexpectedException(fail);
1764 +        }
1765 +        if (o == clone) assertImmutable(o);
1766 +        else assertSame(o.getClass(), clone.getClass());
1767 +        return clone;
1768 +    }
1769 +
1770 +    /**
1771 +     * A version of serialClone that leaves error handling (for
1772 +     * e.g. NotSerializableException) up to the caller.
1773 +     */
1774 +    @SuppressWarnings("unchecked")
1775 +    <T> T serialClonePossiblyFailing(T o)
1776 +        throws ReflectiveOperationException, java.io.IOException {
1777 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1778 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1779 +        oos.writeObject(o);
1780 +        oos.flush();
1781 +        oos.close();
1782 +        ObjectInputStream ois = new ObjectInputStream
1783 +            (new ByteArrayInputStream(bos.toByteArray()));
1784 +        T clone = (T) ois.readObject();
1785 +        if (o == clone) assertImmutable(o);
1786 +        else assertSame(o.getClass(), clone.getClass());
1787 +        return clone;
1788 +    }
1789 +
1790 +    /**
1791 +     * If o implements Cloneable and has a public clone method,
1792 +     * returns a clone of o, else null.
1793 +     */
1794 +    @SuppressWarnings("unchecked")
1795 +    <T> T cloneableClone(T o) {
1796 +        if (!(o instanceof Cloneable)) return null;
1797 +        final T clone;
1798 +        try {
1799 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1800 +        } catch (NoSuchMethodException ok) {
1801              return null;
1802 +        } catch (ReflectiveOperationException unexpected) {
1803 +            throw new Error(unexpected);
1804          }
1805 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1806 +        assertSame(o.getClass(), clone.getClass());
1807 +        return clone;
1808      }
1809  
1810      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
# Line 1567 | Line 1814 | public class JSR166TestCase extends Test
1814              try { throwingAction.run(); }
1815              catch (Throwable t) {
1816                  threw = true;
1817 <                if (!expectedExceptionClass.isInstance(t)) {
1818 <                    AssertionFailedError afe =
1819 <                        new AssertionFailedError
1820 <                        ("Expected " + expectedExceptionClass.getName() +
1821 <                         ", got " + t.getClass().getName());
1575 <                    afe.initCause(t);
1576 <                    threadUnexpectedException(afe);
1577 <                }
1817 >                if (!expectedExceptionClass.isInstance(t))
1818 >                    throw new AssertionError(
1819 >                            "Expected " + expectedExceptionClass.getName() +
1820 >                            ", got " + t.getClass().getName(),
1821 >                            t);
1822              }
1823              if (!threw)
1824                  shouldThrow(expectedExceptionClass.getName());
# Line 1588 | Line 1832 | public class JSR166TestCase extends Test
1832          } catch (NoSuchElementException success) {}
1833          assertFalse(it.hasNext());
1834      }
1835 +
1836 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1837 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1838 +    }
1839 +
1840 +    public Runnable runnableThrowing(final RuntimeException ex) {
1841 +        return new Runnable() { public void run() { throw ex; }};
1842 +    }
1843 +
1844 +    /** A reusable thread pool to be shared by tests. */
1845 +    static final ExecutorService cachedThreadPool =
1846 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1847 +                               1000L, MILLISECONDS,
1848 +                               new SynchronousQueue<Runnable>());
1849 +
1850 +    static <T> void shuffle(T[] array) {
1851 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1852 +    }
1853 +
1854 +    /**
1855 +     * Returns the same String as would be returned by {@link
1856 +     * Object#toString}, whether or not the given object's class
1857 +     * overrides toString().
1858 +     *
1859 +     * @see System#identityHashCode
1860 +     */
1861 +    static String identityString(Object x) {
1862 +        return x.getClass().getName()
1863 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1864 +    }
1865 +
1866 +    // --- Shared assertions for Executor tests ---
1867 +
1868 +    /**
1869 +     * Returns maximum number of tasks that can be submitted to given
1870 +     * pool (with bounded queue) before saturation (when submission
1871 +     * throws RejectedExecutionException).
1872 +     */
1873 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1874 +        BlockingQueue<Runnable> q = pool.getQueue();
1875 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1876 +    }
1877 +
1878 +    @SuppressWarnings("FutureReturnValueIgnored")
1879 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1880 +        try {
1881 +            e.execute((Runnable) null);
1882 +            shouldThrow();
1883 +        } catch (NullPointerException success) {}
1884 +
1885 +        if (! (e instanceof ExecutorService)) return;
1886 +        ExecutorService es = (ExecutorService) e;
1887 +        try {
1888 +            es.submit((Runnable) null);
1889 +            shouldThrow();
1890 +        } catch (NullPointerException success) {}
1891 +        try {
1892 +            es.submit((Runnable) null, Boolean.TRUE);
1893 +            shouldThrow();
1894 +        } catch (NullPointerException success) {}
1895 +        try {
1896 +            es.submit((Callable) null);
1897 +            shouldThrow();
1898 +        } catch (NullPointerException success) {}
1899 +
1900 +        if (! (e instanceof ScheduledExecutorService)) return;
1901 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1902 +        try {
1903 +            ses.schedule((Runnable) null,
1904 +                         randomTimeout(), randomTimeUnit());
1905 +            shouldThrow();
1906 +        } catch (NullPointerException success) {}
1907 +        try {
1908 +            ses.schedule((Callable) null,
1909 +                         randomTimeout(), randomTimeUnit());
1910 +            shouldThrow();
1911 +        } catch (NullPointerException success) {}
1912 +        try {
1913 +            ses.scheduleAtFixedRate((Runnable) null,
1914 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1915 +            shouldThrow();
1916 +        } catch (NullPointerException success) {}
1917 +        try {
1918 +            ses.scheduleWithFixedDelay((Runnable) null,
1919 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1920 +            shouldThrow();
1921 +        } catch (NullPointerException success) {}
1922 +    }
1923 +
1924 +    void setRejectedExecutionHandler(
1925 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1926 +        p.setRejectedExecutionHandler(handler);
1927 +        assertSame(handler, p.getRejectedExecutionHandler());
1928 +    }
1929 +
1930 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1931 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1932 +        final long savedTaskCount = p.getTaskCount();
1933 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1934 +        final int savedQueueSize = p.getQueue().size();
1935 +        final boolean stock = (p.getClass().getClassLoader() == null);
1936 +
1937 +        Runnable r = () -> {};
1938 +        Callable<Boolean> c = () -> Boolean.TRUE;
1939 +
1940 +        class Recorder implements RejectedExecutionHandler {
1941 +            public volatile Runnable r = null;
1942 +            public volatile ThreadPoolExecutor p = null;
1943 +            public void reset() { r = null; p = null; }
1944 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1945 +                assertNull(this.r);
1946 +                assertNull(this.p);
1947 +                this.r = r;
1948 +                this.p = p;
1949 +            }
1950 +        }
1951 +
1952 +        // check custom handler is invoked exactly once per task
1953 +        Recorder recorder = new Recorder();
1954 +        setRejectedExecutionHandler(p, recorder);
1955 +        for (int i = 2; i--> 0; ) {
1956 +            recorder.reset();
1957 +            p.execute(r);
1958 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1959 +                assertSame(r, recorder.r);
1960 +            assertSame(p, recorder.p);
1961 +
1962 +            recorder.reset();
1963 +            assertFalse(p.submit(r).isDone());
1964 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1965 +            assertSame(p, recorder.p);
1966 +
1967 +            recorder.reset();
1968 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
1969 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1970 +            assertSame(p, recorder.p);
1971 +
1972 +            recorder.reset();
1973 +            assertFalse(p.submit(c).isDone());
1974 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1975 +            assertSame(p, recorder.p);
1976 +
1977 +            if (p instanceof ScheduledExecutorService) {
1978 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
1979 +                ScheduledFuture<?> future;
1980 +
1981 +                recorder.reset();
1982 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
1983 +                assertFalse(future.isDone());
1984 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1985 +                assertSame(p, recorder.p);
1986 +
1987 +                recorder.reset();
1988 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
1989 +                assertFalse(future.isDone());
1990 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1991 +                assertSame(p, recorder.p);
1992 +
1993 +                recorder.reset();
1994 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1995 +                assertFalse(future.isDone());
1996 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1997 +                assertSame(p, recorder.p);
1998 +
1999 +                recorder.reset();
2000 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2001 +                assertFalse(future.isDone());
2002 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2003 +                assertSame(p, recorder.p);
2004 +            }
2005 +        }
2006 +
2007 +        // Checking our custom handler above should be sufficient, but
2008 +        // we add some integration tests of standard handlers.
2009 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2010 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2011 +
2012 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2013 +        try {
2014 +            p.execute(setThread);
2015 +            shouldThrow();
2016 +        } catch (RejectedExecutionException success) {}
2017 +        assertNull(thread.get());
2018 +
2019 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2020 +        p.execute(setThread);
2021 +        assertNull(thread.get());
2022 +
2023 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2024 +        p.execute(setThread);
2025 +        if (p.isShutdown())
2026 +            assertNull(thread.get());
2027 +        else
2028 +            assertSame(Thread.currentThread(), thread.get());
2029 +
2030 +        setRejectedExecutionHandler(p, savedHandler);
2031 +
2032 +        // check that pool was not perturbed by handlers
2033 +        assertEquals(savedTaskCount, p.getTaskCount());
2034 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2035 +        assertEquals(savedQueueSize, p.getQueue().size());
2036 +    }
2037 +
2038 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2039 +        assertEquals(x, y);
2040 +        assertEquals(y, x);
2041 +        assertEquals(x.isEmpty(), y.isEmpty());
2042 +        assertEquals(x.size(), y.size());
2043 +        if (x instanceof List) {
2044 +            assertEquals(x.toString(), y.toString());
2045 +        }
2046 +        if (x instanceof List || x instanceof Set) {
2047 +            assertEquals(x.hashCode(), y.hashCode());
2048 +        }
2049 +        if (x instanceof List || x instanceof Deque) {
2050 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2051 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2052 +                                     y.toArray(new Object[0])));
2053 +        }
2054 +    }
2055 +
2056 +    /**
2057 +     * A weaker form of assertCollectionsEquals which does not insist
2058 +     * that the two collections satisfy Object#equals(Object), since
2059 +     * they may use identity semantics as Deques do.
2060 +     */
2061 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2062 +        if (x instanceof List || x instanceof Set)
2063 +            assertCollectionsEquals(x, y);
2064 +        else {
2065 +            assertEquals(x.isEmpty(), y.isEmpty());
2066 +            assertEquals(x.size(), y.size());
2067 +            assertEquals(new HashSet(x), new HashSet(y));
2068 +            if (x instanceof Deque) {
2069 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2070 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2071 +                                         y.toArray(new Object[0])));
2072 +            }
2073 +        }
2074 +    }
2075   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines