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.155 by jsr166, Sat Oct 3 19:59:49 2015 UTC vs.
Revision 1.258 by jsr166, Tue Aug 20 23:06:11 2019 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 28 | 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  
56 import junit.framework.AssertionFailedError;
105   import junit.framework.Test;
106   import junit.framework.TestCase;
107   import junit.framework.TestResult;
# Line 69 | 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.
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
137   * to invoke {@code super.setUp} and {@code super.tearDown} within
# Line 108 | Line 164 | import junit.framework.TestSuite;
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
112 < * isolation.
167 > * cover multiple methods when they cannot be tested in isolation.
168   *
169   * <li>The documentation style for testcases is to provide as javadoc
170   * a simple sentence or two describing the property that the testcase
# Line 172 | 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 187 | Line 280 | public class JSR166TestCase extends Test
280          return (regex == null) ? null : Pattern.compile(regex);
281      }
282  
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 timeoutMinutesMin = Math.max(runsPerTest / 60, 1)
292 +                * Math.max((int) delayFactor, 1);
293 +            final int timeoutMinutes = Math.min(15, timeoutMinutesMin);
294 +            for (TestCase lastTestCase = currentTestCase;;) {
295 +                try { MINUTES.sleep(timeoutMinutes); }
296 +                catch (InterruptedException unexpected) { break; }
297 +                if (lastTestCase == currentTestCase) {
298 +                    System.err.printf(
299 +                        "Looks like we're stuck running test: %s%n",
300 +                        lastTestCase);
301 + //                     System.err.printf(
302 + //                         "Looks like we're stuck running test: %s (%d/%d)%n",
303 + //                         lastTestCase, currentRun, runsPerTest);
304 + //                     System.err.println("availableProcessors=" +
305 + //                         Runtime.getRuntime().availableProcessors());
306 + //                     System.err.printf("cpu model = %s%n", cpuModel());
307 +                    dumpTestThreads();
308 +                    // one stack dump is probably enough; more would be spam
309 +                    break;
310 +                }
311 +                lastTestCase = currentTestCase;
312 +            }}};
313 +        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
314 +        thread.setDaemon(true);
315 +        thread.start();
316 +    }
317 +
318 + //     public static String cpuModel() {
319 + //         try {
320 + //             java.util.regex.Matcher matcher
321 + //               = Pattern.compile("model name\\s*: (.*)")
322 + //                 .matcher(new String(
323 + //                     java.nio.file.Files.readAllBytes(
324 + //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
325 + //             matcher.find();
326 + //             return matcher.group(1);
327 + //         } catch (Exception ex) { return null; }
328 + //     }
329 +
330      public void runBare() throws Throwable {
331 +        currentTestCase = this;
332          if (methodFilter == null
333              || methodFilter.matcher(toString()).find())
334              super.runBare();
# Line 195 | Line 336 | public class JSR166TestCase extends Test
336  
337      protected void runTest() throws Throwable {
338          for (int i = 0; i < runsPerTest; i++) {
339 +            // currentRun = i;
340              if (profileTests)
341                  runTestProfiled();
342              else
# Line 223 | Line 365 | public class JSR166TestCase extends Test
365          main(suite(), args);
366      }
367  
368 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
369 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
370 +        long runTime;
371 +        public void startTest(Test test) {}
372 +        protected void printHeader(long runTime) {
373 +            this.runTime = runTime; // defer printing for later
374 +        }
375 +        protected void printFooter(TestResult result) {
376 +            if (result.wasSuccessful()) {
377 +                getWriter().println("OK (" + result.runCount() + " tests)"
378 +                    + "  Time: " + elapsedTimeAsString(runTime));
379 +            } else {
380 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
381 +                super.printFooter(result);
382 +            }
383 +        }
384 +    }
385 +
386 +    /**
387 +     * Returns a TestRunner that doesn't bother with unnecessary
388 +     * fluff, like printing a "." for each test case.
389 +     */
390 +    static junit.textui.TestRunner newPithyTestRunner() {
391 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
392 +        runner.setPrinter(new PithyResultPrinter(System.out));
393 +        return runner;
394 +    }
395 +
396      /**
397       * Runs all unit tests in the given test suite.
398       * Actual behavior influenced by jsr166.* system properties.
# Line 234 | Line 404 | public class JSR166TestCase extends Test
404              System.setSecurityManager(new SecurityManager());
405          }
406          for (int i = 0; i < suiteRuns; i++) {
407 <            TestResult result = junit.textui.TestRunner.run(suite);
407 >            TestResult result = newPithyTestRunner().doRun(suite);
408              if (!result.wasSuccessful())
409                  System.exit(1);
410              System.gc();
# Line 260 | Line 430 | public class JSR166TestCase extends Test
430          for (String testClassName : testClassNames) {
431              try {
432                  Class<?> testClass = Class.forName(testClassName);
433 <                Method m = testClass.getDeclaredMethod("suite",
264 <                                                       new Class<?>[0]);
433 >                Method m = testClass.getDeclaredMethod("suite");
434                  suite.addTest(newTestSuite((Test)m.invoke(null)));
435 <            } catch (Exception e) {
436 <                throw new Error("Missing test class", e);
435 >            } catch (ReflectiveOperationException e) {
436 >                throw new AssertionError("Missing test class", e);
437              }
438          }
439      }
# Line 286 | Line 455 | public class JSR166TestCase extends Test
455          }
456      }
457  
458 <    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
459 <    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
460 <    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
461 <    public static boolean atLeastJava9() {
462 <        return JAVA_CLASS_VERSION >= 53.0
463 <            // As of 2015-09, java9 still uses 52.0 class file version
464 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
465 <    }
466 <    public static boolean atLeastJava10() {
467 <        return JAVA_CLASS_VERSION >= 54.0
468 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
469 <    }
458 >    public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
459 >    public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
460 >    public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
461 >    public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
462 >    public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
463 >    public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
464 >    public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
465 >    public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
466 >    public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
467 >    public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
468 >    public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
469 >    public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
470  
471      /**
472       * Collects all JSR166 unit tests as one suite.
# Line 318 | Line 487 | public class JSR166TestCase extends Test
487              AbstractQueuedLongSynchronizerTest.suite(),
488              ArrayBlockingQueueTest.suite(),
489              ArrayDequeTest.suite(),
490 +            ArrayListTest.suite(),
491              AtomicBooleanTest.suite(),
492              AtomicIntegerArrayTest.suite(),
493              AtomicIntegerFieldUpdaterTest.suite(),
# Line 340 | Line 510 | public class JSR166TestCase extends Test
510              CopyOnWriteArrayListTest.suite(),
511              CopyOnWriteArraySetTest.suite(),
512              CountDownLatchTest.suite(),
513 +            CountedCompleterTest.suite(),
514              CyclicBarrierTest.suite(),
515              DelayQueueTest.suite(),
516              EntryTest.suite(),
# Line 347 | Line 518 | public class JSR166TestCase extends Test
518              ExecutorsTest.suite(),
519              ExecutorCompletionServiceTest.suite(),
520              FutureTaskTest.suite(),
521 +            HashtableTest.suite(),
522              LinkedBlockingDequeTest.suite(),
523              LinkedBlockingQueueTest.suite(),
524              LinkedListTest.suite(),
# Line 368 | Line 540 | public class JSR166TestCase extends Test
540              TreeMapTest.suite(),
541              TreeSetTest.suite(),
542              TreeSubMapTest.suite(),
543 <            TreeSubSetTest.suite());
543 >            TreeSubSetTest.suite(),
544 >            VectorTest.suite());
545  
546          // Java8+ test classes
547          if (atLeastJava8()) {
548              String[] java8TestClassNames = {
549 +                "ArrayDeque8Test",
550                  "Atomic8Test",
551                  "CompletableFutureTest",
552                  "ConcurrentHashMap8Test",
553 <                "CountedCompleterTest",
553 >                "CountedCompleter8Test",
554                  "DoubleAccumulatorTest",
555                  "DoubleAdderTest",
556                  "ForkJoinPool8Test",
557                  "ForkJoinTask8Test",
558 +                "HashMapTest",
559 +                "LinkedBlockingDeque8Test",
560 +                "LinkedBlockingQueue8Test",
561 +                "LinkedHashMapTest",
562                  "LongAccumulatorTest",
563                  "LongAdderTest",
564                  "SplittableRandomTest",
565                  "StampedLockTest",
566                  "SubmissionPublisherTest",
567                  "ThreadLocalRandom8Test",
568 +                "TimeUnit8Test",
569              };
570              addNamedTestClasses(suite, java8TestClassNames);
571          }
# Line 394 | Line 573 | public class JSR166TestCase extends Test
573          // Java9+ test classes
574          if (atLeastJava9()) {
575              String[] java9TestClassNames = {
576 <                // Currently empty, but expecting varhandle tests
576 >                "AtomicBoolean9Test",
577 >                "AtomicInteger9Test",
578 >                "AtomicIntegerArray9Test",
579 >                "AtomicLong9Test",
580 >                "AtomicLongArray9Test",
581 >                "AtomicReference9Test",
582 >                "AtomicReferenceArray9Test",
583 >                "ExecutorCompletionService9Test",
584 >                "ForkJoinPool9Test",
585              };
586              addNamedTestClasses(suite, java9TestClassNames);
587          }
# Line 405 | Line 592 | public class JSR166TestCase extends Test
592      /** Returns list of junit-style test method names in given class. */
593      public static ArrayList<String> testMethodNames(Class<?> testClass) {
594          Method[] methods = testClass.getDeclaredMethods();
595 <        ArrayList<String> names = new ArrayList<String>(methods.length);
595 >        ArrayList<String> names = new ArrayList<>(methods.length);
596          for (Method method : methods) {
597              if (method.getName().startsWith("test")
598                  && Modifier.isPublic(method.getModifiers())
# Line 432 | Line 619 | public class JSR166TestCase extends Test
619              for (String methodName : testMethodNames(testClass))
620                  suite.addTest((Test) c.newInstance(data, methodName));
621              return suite;
622 <        } catch (Exception e) {
623 <            throw new Error(e);
622 >        } catch (ReflectiveOperationException e) {
623 >            throw new AssertionError(e);
624          }
625      }
626  
# Line 449 | Line 636 | public class JSR166TestCase extends Test
636          if (atLeastJava8()) {
637              String name = testClass.getName();
638              String name8 = name.replaceAll("Test$", "8Test");
639 <            if (name.equals(name8)) throw new Error(name);
639 >            if (name.equals(name8)) throw new AssertionError(name);
640              try {
641                  return (Test)
642                      Class.forName(name8)
643 <                    .getMethod("testSuite", new Class[] { dataClass })
643 >                    .getMethod("testSuite", dataClass)
644                      .invoke(null, data);
645 <            } catch (Exception e) {
646 <                throw new Error(e);
645 >            } catch (ReflectiveOperationException e) {
646 >                throw new AssertionError(e);
647              }
648          } else {
649              return new TestSuite();
# Line 470 | Line 657 | public class JSR166TestCase extends Test
657      public static long MEDIUM_DELAY_MS;
658      public static long LONG_DELAY_MS;
659  
660 +    private static final long RANDOM_TIMEOUT;
661 +    private static final long RANDOM_EXPIRED_TIMEOUT;
662 +    private static final TimeUnit RANDOM_TIMEUNIT;
663 +    static {
664 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
665 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
666 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
667 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
668 +        TimeUnit[] timeUnits = TimeUnit.values();
669 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
670 +    }
671 +
672 +    /**
673 +     * Returns a timeout for use when any value at all will do.
674 +     */
675 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
676 +
677 +    /**
678 +     * Returns a timeout that means "no waiting", i.e. not positive.
679 +     */
680 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
681 +
682 +    /**
683 +     * Returns a random non-null TimeUnit.
684 +     */
685 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
686 +
687 +    /**
688 +     * Returns a random boolean; a "coin flip".
689 +     */
690 +    static boolean randomBoolean() {
691 +        return ThreadLocalRandom.current().nextBoolean();
692 +    }
693 +
694 +    /**
695 +     * Returns a random element from given choices.
696 +     */
697 +    <T> T chooseRandomly(T... choices) {
698 +        return choices[ThreadLocalRandom.current().nextInt(choices.length)];
699 +    }
700 +
701      /**
702 <     * Returns the shortest timed delay. This could
703 <     * be reimplemented to use for example a Property.
702 >     * Returns the shortest timed delay. This can be scaled up for
703 >     * slow machines using the jsr166.delay.factor system property,
704 >     * or via jtreg's -timeoutFactor: flag.
705 >     * http://openjdk.java.net/jtreg/command-help.html
706       */
707      protected long getShortDelay() {
708 <        return 50;
708 >        return (long) (50 * delayFactor);
709      }
710  
711      /**
# Line 488 | Line 718 | public class JSR166TestCase extends Test
718          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
719      }
720  
721 +    private static final long TIMEOUT_DELAY_MS
722 +        = (long) (12.0 * Math.cbrt(delayFactor));
723 +
724      /**
725 <     * Returns a timeout in milliseconds to be used in tests that
726 <     * verify that operations block or time out.
725 >     * Returns a timeout in milliseconds to be used in tests that verify
726 >     * that operations block or time out.  We want this to be longer
727 >     * than the OS scheduling quantum, but not too long, so don't scale
728 >     * linearly with delayFactor; we use "crazy" cube root instead.
729       */
730 <    long timeoutMillis() {
731 <        return SHORT_DELAY_MS / 4;
730 >    static long timeoutMillis() {
731 >        return TIMEOUT_DELAY_MS;
732      }
733  
734      /**
# Line 509 | Line 744 | public class JSR166TestCase extends Test
744       * The first exception encountered if any threadAssertXXX method fails.
745       */
746      private final AtomicReference<Throwable> threadFailure
747 <        = new AtomicReference<Throwable>(null);
747 >        = new AtomicReference<>(null);
748  
749      /**
750       * Records an exception so that it can be rethrown later in the test
# Line 518 | Line 753 | public class JSR166TestCase extends Test
753       * the same test have no effect.
754       */
755      public void threadRecordFailure(Throwable t) {
756 <        threadDump();
756 >        System.err.println(t);
757 >        dumpTestThreads();
758          threadFailure.compareAndSet(null, t);
759      }
760  
# Line 529 | Line 765 | public class JSR166TestCase extends Test
765      void tearDownFail(String format, Object... args) {
766          String msg = toString() + ": " + String.format(format, args);
767          System.err.println(msg);
768 <        threadDump();
769 <        throw new AssertionFailedError(msg);
768 >        dumpTestThreads();
769 >        throw new AssertionError(msg);
770      }
771  
772      /**
# Line 551 | Line 787 | public class JSR166TestCase extends Test
787                  throw (RuntimeException) t;
788              else if (t instanceof Exception)
789                  throw (Exception) t;
790 <            else {
791 <                AssertionFailedError afe =
556 <                    new AssertionFailedError(t.toString());
557 <                afe.initCause(t);
558 <                throw afe;
559 <            }
790 >            else
791 >                throw new AssertionError(t.toString(), t);
792          }
793  
794          if (Thread.interrupted())
# Line 566 | Line 798 | public class JSR166TestCase extends Test
798      }
799  
800      /**
801 <     * Finds missing try { ... } finally { joinPool(e); }
801 >     * Finds missing PoolCleaners
802       */
803      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
804          Thread[] survivors = new Thread[7];
# Line 590 | Line 822 | public class JSR166TestCase extends Test
822  
823      /**
824       * Just like fail(reason), but additionally recording (using
825 <     * threadRecordFailure) any AssertionFailedError thrown, so that
826 <     * the current testcase will fail.
825 >     * threadRecordFailure) any AssertionError thrown, so that the
826 >     * current testcase will fail.
827       */
828      public void threadFail(String reason) {
829          try {
830              fail(reason);
831 <        } catch (AssertionFailedError t) {
832 <            threadRecordFailure(t);
833 <            throw t;
831 >        } catch (AssertionError fail) {
832 >            threadRecordFailure(fail);
833 >            throw fail;
834          }
835      }
836  
837      /**
838       * Just like assertTrue(b), but additionally recording (using
839 <     * threadRecordFailure) any AssertionFailedError thrown, so that
840 <     * the current testcase will fail.
839 >     * threadRecordFailure) any AssertionError thrown, so that the
840 >     * current testcase will fail.
841       */
842      public void threadAssertTrue(boolean b) {
843          try {
844              assertTrue(b);
845 <        } catch (AssertionFailedError t) {
846 <            threadRecordFailure(t);
847 <            throw t;
845 >        } catch (AssertionError fail) {
846 >            threadRecordFailure(fail);
847 >            throw fail;
848          }
849      }
850  
851      /**
852       * Just like assertFalse(b), but additionally recording (using
853 <     * threadRecordFailure) any AssertionFailedError thrown, so that
854 <     * the current testcase will fail.
853 >     * threadRecordFailure) any AssertionError thrown, so that the
854 >     * current testcase will fail.
855       */
856      public void threadAssertFalse(boolean b) {
857          try {
858              assertFalse(b);
859 <        } catch (AssertionFailedError t) {
860 <            threadRecordFailure(t);
861 <            throw t;
859 >        } catch (AssertionError fail) {
860 >            threadRecordFailure(fail);
861 >            throw fail;
862          }
863      }
864  
865      /**
866       * Just like assertNull(x), but additionally recording (using
867 <     * threadRecordFailure) any AssertionFailedError thrown, so that
868 <     * the current testcase will fail.
867 >     * threadRecordFailure) any AssertionError thrown, so that the
868 >     * current testcase will fail.
869       */
870      public void threadAssertNull(Object x) {
871          try {
872              assertNull(x);
873 <        } catch (AssertionFailedError t) {
874 <            threadRecordFailure(t);
875 <            throw t;
873 >        } catch (AssertionError fail) {
874 >            threadRecordFailure(fail);
875 >            throw fail;
876          }
877      }
878  
879      /**
880       * Just like assertEquals(x, y), but additionally recording (using
881 <     * threadRecordFailure) any AssertionFailedError thrown, so that
882 <     * the current testcase will fail.
881 >     * threadRecordFailure) any AssertionError thrown, so that the
882 >     * current testcase will fail.
883       */
884      public void threadAssertEquals(long x, long y) {
885          try {
886              assertEquals(x, y);
887 <        } catch (AssertionFailedError t) {
888 <            threadRecordFailure(t);
889 <            throw t;
887 >        } catch (AssertionError fail) {
888 >            threadRecordFailure(fail);
889 >            throw fail;
890          }
891      }
892  
893      /**
894       * Just like assertEquals(x, y), but additionally recording (using
895 <     * threadRecordFailure) any AssertionFailedError thrown, so that
896 <     * the current testcase will fail.
895 >     * threadRecordFailure) any AssertionError thrown, so that the
896 >     * current testcase will fail.
897       */
898      public void threadAssertEquals(Object x, Object y) {
899          try {
900              assertEquals(x, y);
901 <        } catch (AssertionFailedError fail) {
901 >        } catch (AssertionError fail) {
902              threadRecordFailure(fail);
903              throw fail;
904          } catch (Throwable fail) {
# Line 676 | Line 908 | public class JSR166TestCase extends Test
908  
909      /**
910       * Just like assertSame(x, y), but additionally recording (using
911 <     * threadRecordFailure) any AssertionFailedError thrown, so that
912 <     * the current testcase will fail.
911 >     * threadRecordFailure) any AssertionError thrown, so that the
912 >     * current testcase will fail.
913       */
914      public void threadAssertSame(Object x, Object y) {
915          try {
916              assertSame(x, y);
917 <        } catch (AssertionFailedError fail) {
917 >        } catch (AssertionError fail) {
918              threadRecordFailure(fail);
919              throw fail;
920          }
# Line 704 | Line 936 | public class JSR166TestCase extends Test
936  
937      /**
938       * Records the given exception using {@link #threadRecordFailure},
939 <     * then rethrows the exception, wrapping it in an
940 <     * AssertionFailedError if necessary.
939 >     * then rethrows the exception, wrapping it in an AssertionError
940 >     * if necessary.
941       */
942      public void threadUnexpectedException(Throwable t) {
943          threadRecordFailure(t);
# Line 714 | Line 946 | public class JSR166TestCase extends Test
946              throw (RuntimeException) t;
947          else if (t instanceof Error)
948              throw (Error) t;
949 <        else {
950 <            AssertionFailedError afe =
719 <                new AssertionFailedError("unexpected exception: " + t);
720 <            afe.initCause(t);
721 <            throw afe;
722 <        }
949 >        else
950 >            throw new AssertionError("unexpected exception: " + t, t);
951      }
952  
953      /**
954       * Delays, via Thread.sleep, for the given millisecond delay, but
955       * if the sleep is shorter than specified, may re-sleep or yield
956 <     * until time elapses.
956 >     * until time elapses.  Ensures that the given time, as measured
957 >     * by System.nanoTime(), has elapsed.
958       */
959      static void delay(long millis) throws InterruptedException {
960 <        long startTime = System.nanoTime();
961 <        long ns = millis * 1000 * 1000;
962 <        for (;;) {
960 >        long nanos = millis * (1000 * 1000);
961 >        final long wakeupTime = System.nanoTime() + nanos;
962 >        do {
963              if (millis > 0L)
964                  Thread.sleep(millis);
965              else // too short to sleep
966                  Thread.yield();
967 <            long d = ns - (System.nanoTime() - startTime);
968 <            if (d > 0L)
969 <                millis = d / (1000 * 1000);
741 <            else
742 <                break;
743 <        }
967 >            nanos = wakeupTime - System.nanoTime();
968 >            millis = nanos / (1000 * 1000);
969 >        } while (nanos >= 0L);
970      }
971  
972      /**
973       * Allows use of try-with-resources with per-test thread pools.
974       */
975 <    static class PoolCloser<T extends ExecutorService>
976 <            implements AutoCloseable {
977 <        public final T pool;
752 <        public PoolCloser(T pool) { this.pool = pool; }
975 >    class PoolCleaner implements AutoCloseable {
976 >        private final ExecutorService pool;
977 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
978          public void close() { joinPool(pool); }
979      }
980  
981      /**
982 +     * An extension of PoolCleaner that has an action to release the pool.
983 +     */
984 +    class PoolCleanerWithReleaser extends PoolCleaner {
985 +        private final Runnable releaser;
986 +        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
987 +            super(pool);
988 +            this.releaser = releaser;
989 +        }
990 +        public void close() {
991 +            try {
992 +                releaser.run();
993 +            } finally {
994 +                super.close();
995 +            }
996 +        }
997 +    }
998 +
999 +    PoolCleaner cleaner(ExecutorService pool) {
1000 +        return new PoolCleaner(pool);
1001 +    }
1002 +
1003 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
1004 +        return new PoolCleanerWithReleaser(pool, releaser);
1005 +    }
1006 +
1007 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
1008 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
1009 +    }
1010 +
1011 +    Runnable releaser(final CountDownLatch latch) {
1012 +        return new Runnable() { public void run() {
1013 +            do { latch.countDown(); }
1014 +            while (latch.getCount() > 0);
1015 +        }};
1016 +    }
1017 +
1018 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
1019 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
1020 +    }
1021 +
1022 +    Runnable releaser(final AtomicBoolean flag) {
1023 +        return new Runnable() { public void run() { flag.set(true); }};
1024 +    }
1025 +
1026 +    /**
1027       * Waits out termination of a thread pool or fails doing so.
1028       */
1029 <    static void joinPool(ExecutorService pool) {
1029 >    void joinPool(ExecutorService pool) {
1030          try {
1031              pool.shutdown();
1032 <            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
1033 <                fail("ExecutorService " + pool +
1034 <                     " did not terminate in a timely manner");
1032 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
1033 >                try {
1034 >                    threadFail("ExecutorService " + pool +
1035 >                               " did not terminate in a timely manner");
1036 >                } finally {
1037 >                    // last resort, for the benefit of subsequent tests
1038 >                    pool.shutdownNow();
1039 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
1040 >                }
1041 >            }
1042          } catch (SecurityException ok) {
1043              // Allowed in case test doesn't have privs
1044          } catch (InterruptedException fail) {
1045 <            fail("Unexpected InterruptedException");
1045 >            threadFail("Unexpected InterruptedException");
1046          }
1047      }
1048  
1049 <    /** Like Runnable, but with the freedom to throw anything */
1049 >    /**
1050 >     * Like Runnable, but with the freedom to throw anything.
1051 >     * junit folks had the same idea:
1052 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1053 >     */
1054      interface Action { public void run() throws Throwable; }
1055  
1056      /**
# Line 778 | Line 1059 | public class JSR166TestCase extends Test
1059       * necessarily individually slow because they must block.
1060       */
1061      void testInParallel(Action ... actions) {
1062 <        try (PoolCloser<ExecutorService> poolCloser
1063 <             = new PoolCloser<>(Executors.newCachedThreadPool())) {
783 <            ExecutorService pool = poolCloser.pool;
1062 >        ExecutorService pool = Executors.newCachedThreadPool();
1063 >        try (PoolCleaner cleaner = cleaner(pool)) {
1064              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1065              for (final Action action : actions)
1066                  futures.add(pool.submit(new CheckedRunnable() {
# Line 797 | Line 1077 | public class JSR166TestCase extends Test
1077      }
1078  
1079      /**
1080 <     * A debugging tool to print all stack traces, as jstack does.
1080 >     * A debugging tool to print stack traces of most threads, as jstack does.
1081       * Uninteresting threads are filtered out.
1082       */
1083 <    static void threadDump() {
1083 >    static void dumpTestThreads() {
1084 >        SecurityManager sm = System.getSecurityManager();
1085 >        if (sm != null) {
1086 >            try {
1087 >                System.setSecurityManager(null);
1088 >            } catch (SecurityException giveUp) {
1089 >                return;
1090 >            }
1091 >        }
1092 >
1093          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1094          System.err.println("------ stacktrace dump start ------");
1095          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1096 <            String name = info.getThreadName();
1096 >            final String name = info.getThreadName();
1097 >            String lockName;
1098              if ("Signal Dispatcher".equals(name))
1099                  continue;
1100              if ("Reference Handler".equals(name)
1101 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1101 >                && (lockName = info.getLockName()) != null
1102 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1103                  continue;
1104              if ("Finalizer".equals(name)
1105 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1105 >                && (lockName = info.getLockName()) != null
1106 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1107 >                continue;
1108 >            if ("checkForWedgedTest".equals(name))
1109                  continue;
1110              System.err.print(info);
1111          }
1112          System.err.println("------ stacktrace dump end ------");
819    }
820
821    /**
822     * Checks that thread does not terminate within the default
823     * millisecond delay of {@code timeoutMillis()}.
824     */
825    void assertThreadStaysAlive(Thread thread) {
826        assertThreadStaysAlive(thread, timeoutMillis());
827    }
828
829    /**
830     * Checks that thread does not terminate within the given millisecond delay.
831     */
832    void assertThreadStaysAlive(Thread thread, long millis) {
833        try {
834            // No need to optimize the failing case via Thread.join.
835            delay(millis);
836            assertTrue(thread.isAlive());
837        } catch (InterruptedException fail) {
838            fail("Unexpected InterruptedException");
839        }
840    }
1113  
1114 <    /**
843 <     * Checks that the threads do not terminate within the default
844 <     * millisecond delay of {@code timeoutMillis()}.
845 <     */
846 <    void assertThreadsStayAlive(Thread... threads) {
847 <        assertThreadsStayAlive(timeoutMillis(), threads);
1114 >        if (sm != null) System.setSecurityManager(sm);
1115      }
1116  
1117      /**
1118 <     * Checks that the threads do not terminate within the given millisecond delay.
1118 >     * Checks that thread eventually enters the expected blocked thread state.
1119       */
1120 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1121 <        try {
1122 <            // No need to optimize the failing case via Thread.join.
1123 <            delay(millis);
1124 <            for (Thread thread : threads)
1125 <                assertTrue(thread.isAlive());
1126 <        } catch (InterruptedException fail) {
1127 <            fail("Unexpected InterruptedException");
1120 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1121 >        // always sleep at least 1 ms, with high probability avoiding
1122 >        // transitory states
1123 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1124 >            try { delay(1); }
1125 >            catch (InterruptedException fail) {
1126 >                throw new AssertionError("Unexpected InterruptedException", fail);
1127 >            }
1128 >            Thread.State s = thread.getState();
1129 >            if (s == expected)
1130 >                return;
1131 >            else if (s == Thread.State.TERMINATED)
1132 >                fail("Unexpected thread termination");
1133          }
1134 +        fail("timed out waiting for thread to enter thread state " + expected);
1135      }
1136  
1137      /**
# Line 899 | Line 1172 | public class JSR166TestCase extends Test
1172      }
1173  
1174      /**
1175 +     * The maximum number of consecutive spurious wakeups we should
1176 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1177 +     */
1178 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1179 +
1180 +    /**
1181       * The number of elements to place in collections, arrays, etc.
1182       */
1183      public static final int SIZE = 20;
# Line 1002 | Line 1281 | public class JSR166TestCase extends Test
1281          }
1282          public void refresh() {}
1283          public String toString() {
1284 <            List<Permission> ps = new ArrayList<Permission>();
1284 >            List<Permission> ps = new ArrayList<>();
1285              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1286                  ps.add(e.nextElement());
1287              return "AdjustablePolicy with permissions " + ps;
# Line 1030 | Line 1309 | public class JSR166TestCase extends Test
1309  
1310      /**
1311       * Sleeps until the given time has elapsed.
1312 <     * Throws AssertionFailedError if interrupted.
1312 >     * Throws AssertionError if interrupted.
1313       */
1314 <    void sleep(long millis) {
1314 >    static void sleep(long millis) {
1315          try {
1316              delay(millis);
1317          } catch (InterruptedException fail) {
1318 <            AssertionFailedError afe =
1040 <                new AssertionFailedError("Unexpected InterruptedException");
1041 <            afe.initCause(fail);
1042 <            throw afe;
1318 >            throw new AssertionError("Unexpected InterruptedException", fail);
1319          }
1320      }
1321  
1322      /**
1323       * Spin-waits up to the specified number of milliseconds for the given
1324       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1325 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1326       */
1327 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1328 <        long startTime = System.nanoTime();
1329 <        for (;;) {
1330 <            Thread.State s = thread.getState();
1331 <            if (s == Thread.State.BLOCKED ||
1332 <                s == Thread.State.WAITING ||
1333 <                s == Thread.State.TIMED_WAITING)
1334 <                return;
1335 <            else if (s == Thread.State.TERMINATED)
1327 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1328 >                                       Callable<Boolean> waitingForGodot) {
1329 >        for (long startTime = 0L;;) {
1330 >            switch (thread.getState()) {
1331 >            default: break;
1332 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1333 >                try {
1334 >                    if (waitingForGodot == null || waitingForGodot.call())
1335 >                        return;
1336 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1337 >                break;
1338 >            case TERMINATED:
1339                  fail("Unexpected thread termination");
1340 +            }
1341 +
1342 +            if (startTime == 0L)
1343 +                startTime = System.nanoTime();
1344              else if (millisElapsedSince(startTime) > timeoutMillis) {
1345 <                threadAssertTrue(thread.isAlive());
1346 <                return;
1345 >                assertTrue(thread.isAlive());
1346 >                if (waitingForGodot == null
1347 >                    || thread.getState() == Thread.State.RUNNABLE)
1348 >                    fail("timed out waiting for thread to enter wait state");
1349 >                else
1350 >                    fail("timed out waiting for condition, thread state="
1351 >                         + thread.getState());
1352              }
1353              Thread.yield();
1354          }
1355      }
1356  
1357      /**
1358 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1359 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1358 >     * Spin-waits up to the specified number of milliseconds for the given
1359 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1360 >     */
1361 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1362 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1363 >    }
1364 >
1365 >    /**
1366 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1367 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1368       */
1369      void waitForThreadToEnterWaitState(Thread thread) {
1370 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1370 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1371 >    }
1372 >
1373 >    /**
1374 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1375 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1376 >     * and additionally satisfy the given condition.
1377 >     */
1378 >    void waitForThreadToEnterWaitState(Thread thread,
1379 >                                       Callable<Boolean> waitingForGodot) {
1380 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1381 >    }
1382 >
1383 >    /**
1384 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1385 >     * be interrupted.  Clears the interrupt status before returning.
1386 >     */
1387 >    void awaitInterrupted() {
1388 >        for (long startTime = 0L; !Thread.interrupted(); ) {
1389 >            if (startTime == 0L)
1390 >                startTime = System.nanoTime();
1391 >            else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1392 >                fail("timed out waiting for thread interrupt");
1393 >            Thread.yield();
1394 >        }
1395      }
1396  
1397      /**
# Line 1088 | Line 1409 | public class JSR166TestCase extends Test
1409   //             r.run();
1410   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1411   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1412 < //             throw new AssertionFailedError("did not return promptly");
1412 > //             throw new AssertionError("did not return promptly");
1413   //     }
1414  
1415   //     void assertTerminatesPromptly(Runnable r) {
# Line 1101 | Line 1422 | public class JSR166TestCase extends Test
1422       */
1423      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1424          long startTime = System.nanoTime();
1425 +        T actual = null;
1426          try {
1427 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1427 >            actual = f.get(timeoutMillis, MILLISECONDS);
1428          } catch (Throwable fail) { threadUnexpectedException(fail); }
1429 +        assertEquals(expectedValue, actual);
1430          if (millisElapsedSince(startTime) > timeoutMillis/2)
1431 <            throw new AssertionFailedError("timed get did not return promptly");
1431 >            throw new AssertionError("timed get did not return promptly");
1432      }
1433  
1434      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1132 | Line 1455 | public class JSR166TestCase extends Test
1455              t.join(timeoutMillis);
1456          } catch (InterruptedException fail) {
1457              threadUnexpectedException(fail);
1458 <        } finally {
1459 <            if (t.getState() != Thread.State.TERMINATED) {
1460 <                t.interrupt();
1461 <                fail("Test timed out");
1462 <            }
1458 >        }
1459 >        Thread.State state;
1460 >        if ((state = t.getState()) != Thread.State.TERMINATED) {
1461 >            t.interrupt();
1462 >            threadFail("timed out waiting for thread to terminate; "
1463 >                       + "state=" + state);
1464          }
1465      }
1466  
# Line 1163 | Line 1487 | public class JSR166TestCase extends Test
1487          }
1488      }
1489  
1166    public abstract class RunnableShouldThrow implements Runnable {
1167        protected abstract void realRun() throws Throwable;
1168
1169        final Class<?> exceptionClass;
1170
1171        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1172            this.exceptionClass = exceptionClass;
1173        }
1174
1175        public final void run() {
1176            try {
1177                realRun();
1178                threadShouldThrow(exceptionClass.getSimpleName());
1179            } catch (Throwable t) {
1180                if (! exceptionClass.isInstance(t))
1181                    threadUnexpectedException(t);
1182            }
1183        }
1184    }
1185
1490      public abstract class ThreadShouldThrow extends Thread {
1491          protected abstract void realRun() throws Throwable;
1492  
# Line 1195 | Line 1499 | public class JSR166TestCase extends Test
1499          public final void run() {
1500              try {
1501                  realRun();
1198                threadShouldThrow(exceptionClass.getSimpleName());
1502              } catch (Throwable t) {
1503                  if (! exceptionClass.isInstance(t))
1504                      threadUnexpectedException(t);
1505 +                return;
1506              }
1507 +            threadShouldThrow(exceptionClass.getSimpleName());
1508          }
1509      }
1510  
# Line 1209 | Line 1514 | public class JSR166TestCase extends Test
1514          public final void run() {
1515              try {
1516                  realRun();
1212                threadShouldThrow("InterruptedException");
1517              } catch (InterruptedException success) {
1518                  threadAssertFalse(Thread.interrupted());
1519 +                return;
1520              } catch (Throwable fail) {
1521                  threadUnexpectedException(fail);
1522              }
1523 +            threadShouldThrow("InterruptedException");
1524          }
1525      }
1526  
# Line 1226 | Line 1532 | public class JSR166TestCase extends Test
1532                  return realCall();
1533              } catch (Throwable fail) {
1534                  threadUnexpectedException(fail);
1229                return null;
1230            }
1231        }
1232    }
1233
1234    public abstract class CheckedInterruptedCallable<T>
1235        implements Callable<T> {
1236        protected abstract T realCall() throws Throwable;
1237
1238        public final T call() {
1239            try {
1240                T result = realCall();
1241                threadShouldThrow("InterruptedException");
1242                return result;
1243            } catch (InterruptedException success) {
1244                threadAssertFalse(Thread.interrupted());
1245            } catch (Throwable fail) {
1246                threadUnexpectedException(fail);
1535              }
1536 <            return null;
1536 >            throw new AssertionError("unreached");
1537          }
1538      }
1539  
# Line 1283 | Line 1571 | public class JSR166TestCase extends Test
1571              }};
1572      }
1573  
1574 <    public Runnable awaiter(final CountDownLatch latch) {
1575 <        return new CheckedRunnable() {
1576 <            public void realRun() throws InterruptedException {
1577 <                await(latch);
1578 <            }};
1574 >    class LatchAwaiter extends CheckedRunnable {
1575 >        static final int NEW = 0;
1576 >        static final int RUNNING = 1;
1577 >        static final int DONE = 2;
1578 >        final CountDownLatch latch;
1579 >        int state = NEW;
1580 >        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1581 >        public void realRun() throws InterruptedException {
1582 >            state = 1;
1583 >            await(latch);
1584 >            state = 2;
1585 >        }
1586      }
1587  
1588 <    public void await(CountDownLatch latch) {
1588 >    public LatchAwaiter awaiter(CountDownLatch latch) {
1589 >        return new LatchAwaiter(latch);
1590 >    }
1591 >
1592 >    public void await(CountDownLatch latch, long timeoutMillis) {
1593 >        boolean timedOut = false;
1594          try {
1595 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1595 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1596          } catch (Throwable fail) {
1597              threadUnexpectedException(fail);
1598          }
1599 +        if (timedOut)
1600 +            fail("timed out waiting for CountDownLatch for "
1601 +                 + (timeoutMillis/1000) + " sec");
1602 +    }
1603 +
1604 +    public void await(CountDownLatch latch) {
1605 +        await(latch, LONG_DELAY_MS);
1606      }
1607  
1608      public void await(Semaphore semaphore) {
1609 +        boolean timedOut = false;
1610          try {
1611 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1611 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1612 >        } catch (Throwable fail) {
1613 >            threadUnexpectedException(fail);
1614 >        }
1615 >        if (timedOut)
1616 >            fail("timed out waiting for Semaphore for "
1617 >                 + (LONG_DELAY_MS/1000) + " sec");
1618 >    }
1619 >
1620 >    public void await(CyclicBarrier barrier) {
1621 >        try {
1622 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1623          } catch (Throwable fail) {
1624              threadUnexpectedException(fail);
1625          }
# Line 1320 | Line 1639 | public class JSR166TestCase extends Test
1639   //         long startTime = System.nanoTime();
1640   //         while (!flag.get()) {
1641   //             if (millisElapsedSince(startTime) > timeoutMillis)
1642 < //                 throw new AssertionFailedError("timed out");
1642 > //                 throw new AssertionError("timed out");
1643   //             Thread.yield();
1644   //         }
1645   //     }
# Line 1329 | Line 1648 | public class JSR166TestCase extends Test
1648          public String call() { throw new NullPointerException(); }
1649      }
1650  
1332    public static class CallableOne implements Callable<Integer> {
1333        public Integer call() { return one; }
1334    }
1335
1336    public class ShortRunnable extends CheckedRunnable {
1337        protected void realRun() throws Throwable {
1338            delay(SHORT_DELAY_MS);
1339        }
1340    }
1341
1342    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1343        protected void realRun() throws InterruptedException {
1344            delay(SHORT_DELAY_MS);
1345        }
1346    }
1347
1348    public class SmallRunnable extends CheckedRunnable {
1349        protected void realRun() throws Throwable {
1350            delay(SMALL_DELAY_MS);
1351        }
1352    }
1353
1354    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1355        protected void realRun() {
1356            try {
1357                delay(SMALL_DELAY_MS);
1358            } catch (InterruptedException ok) {}
1359        }
1360    }
1361
1362    public class SmallCallable extends CheckedCallable {
1363        protected Object realCall() throws InterruptedException {
1364            delay(SMALL_DELAY_MS);
1365            return Boolean.TRUE;
1366        }
1367    }
1368
1369    public class MediumRunnable extends CheckedRunnable {
1370        protected void realRun() throws Throwable {
1371            delay(MEDIUM_DELAY_MS);
1372        }
1373    }
1374
1375    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1376        protected void realRun() throws InterruptedException {
1377            delay(MEDIUM_DELAY_MS);
1378        }
1379    }
1380
1651      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1652          return new CheckedRunnable() {
1653              protected void realRun() {
# Line 1387 | Line 1657 | public class JSR166TestCase extends Test
1657              }};
1658      }
1659  
1390    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1391        protected void realRun() {
1392            try {
1393                delay(MEDIUM_DELAY_MS);
1394            } catch (InterruptedException ok) {}
1395        }
1396    }
1397
1398    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1399        protected void realRun() {
1400            try {
1401                delay(LONG_DELAY_MS);
1402            } catch (InterruptedException ok) {}
1403        }
1404    }
1405
1660      /**
1661       * For use as ThreadFactory in constructors
1662       */
# Line 1416 | Line 1670 | public class JSR166TestCase extends Test
1670          boolean isDone();
1671      }
1672  
1419    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1420        return new TrackedRunnable() {
1421                private volatile boolean done = false;
1422                public boolean isDone() { return done; }
1423                public void run() {
1424                    try {
1425                        delay(timeoutMillis);
1426                        done = true;
1427                    } catch (InterruptedException ok) {}
1428                }
1429            };
1430    }
1431
1432    public static class TrackedShortRunnable implements Runnable {
1433        public volatile boolean done = false;
1434        public void run() {
1435            try {
1436                delay(SHORT_DELAY_MS);
1437                done = true;
1438            } catch (InterruptedException ok) {}
1439        }
1440    }
1441
1442    public static class TrackedSmallRunnable implements Runnable {
1443        public volatile boolean done = false;
1444        public void run() {
1445            try {
1446                delay(SMALL_DELAY_MS);
1447                done = true;
1448            } catch (InterruptedException ok) {}
1449        }
1450    }
1451
1452    public static class TrackedMediumRunnable implements Runnable {
1453        public volatile boolean done = false;
1454        public void run() {
1455            try {
1456                delay(MEDIUM_DELAY_MS);
1457                done = true;
1458            } catch (InterruptedException ok) {}
1459        }
1460    }
1461
1462    public static class TrackedLongRunnable implements Runnable {
1463        public volatile boolean done = false;
1464        public void run() {
1465            try {
1466                delay(LONG_DELAY_MS);
1467                done = true;
1468            } catch (InterruptedException ok) {}
1469        }
1470    }
1471
1673      public static class TrackedNoOpRunnable implements Runnable {
1674          public volatile boolean done = false;
1675          public void run() {
# Line 1476 | Line 1677 | public class JSR166TestCase extends Test
1677          }
1678      }
1679  
1479    public static class TrackedCallable implements Callable {
1480        public volatile boolean done = false;
1481        public Object call() {
1482            try {
1483                delay(SMALL_DELAY_MS);
1484                done = true;
1485            } catch (InterruptedException ok) {}
1486            return Boolean.TRUE;
1487        }
1488    }
1489
1680      /**
1681       * Analog of CheckedRunnable for RecursiveAction
1682       */
# Line 1513 | Line 1703 | public class JSR166TestCase extends Test
1703                  return realCompute();
1704              } catch (Throwable fail) {
1705                  threadUnexpectedException(fail);
1516                return null;
1706              }
1707 +            throw new AssertionError("unreached");
1708          }
1709      }
1710  
# Line 1528 | Line 1718 | public class JSR166TestCase extends Test
1718  
1719      /**
1720       * A CyclicBarrier that uses timed await and fails with
1721 <     * AssertionFailedErrors instead of throwing checked exceptions.
1721 >     * AssertionErrors instead of throwing checked exceptions.
1722       */
1723 <    public class CheckedBarrier extends CyclicBarrier {
1723 >    public static class CheckedBarrier extends CyclicBarrier {
1724          public CheckedBarrier(int parties) { super(parties); }
1725  
1726          public int await() {
1727              try {
1728                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1729              } catch (TimeoutException timedOut) {
1730 <                throw new AssertionFailedError("timed out");
1730 >                throw new AssertionError("timed out");
1731              } catch (Exception fail) {
1732 <                AssertionFailedError afe =
1543 <                    new AssertionFailedError("Unexpected exception: " + fail);
1544 <                afe.initCause(fail);
1545 <                throw afe;
1732 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1733              }
1734          }
1735      }
# Line 1553 | Line 1740 | public class JSR166TestCase extends Test
1740              assertEquals(0, q.size());
1741              assertNull(q.peek());
1742              assertNull(q.poll());
1743 <            assertNull(q.poll(0, MILLISECONDS));
1743 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1744              assertEquals(q.toString(), "[]");
1745              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1746              assertFalse(q.iterator().hasNext());
# Line 1594 | Line 1781 | public class JSR166TestCase extends Test
1781          }
1782      }
1783  
1784 +    void assertImmutable(Object o) {
1785 +        if (o instanceof Collection) {
1786 +            assertThrows(
1787 +                UnsupportedOperationException.class,
1788 +                () -> ((Collection) o).add(null));
1789 +        }
1790 +    }
1791 +
1792      @SuppressWarnings("unchecked")
1793      <T> T serialClone(T o) {
1794 +        T clone = null;
1795          try {
1796              ObjectInputStream ois = new ObjectInputStream
1797                  (new ByteArrayInputStream(serialBytes(o)));
1798 <            T clone = (T) ois.readObject();
1603 <            assertSame(o.getClass(), clone.getClass());
1604 <            return clone;
1798 >            clone = (T) ois.readObject();
1799          } catch (Throwable fail) {
1800              threadUnexpectedException(fail);
1801 +        }
1802 +        if (o == clone) assertImmutable(o);
1803 +        else assertSame(o.getClass(), clone.getClass());
1804 +        return clone;
1805 +    }
1806 +
1807 +    /**
1808 +     * A version of serialClone that leaves error handling (for
1809 +     * e.g. NotSerializableException) up to the caller.
1810 +     */
1811 +    @SuppressWarnings("unchecked")
1812 +    <T> T serialClonePossiblyFailing(T o)
1813 +        throws ReflectiveOperationException, java.io.IOException {
1814 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1815 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1816 +        oos.writeObject(o);
1817 +        oos.flush();
1818 +        oos.close();
1819 +        ObjectInputStream ois = new ObjectInputStream
1820 +            (new ByteArrayInputStream(bos.toByteArray()));
1821 +        T clone = (T) ois.readObject();
1822 +        if (o == clone) assertImmutable(o);
1823 +        else assertSame(o.getClass(), clone.getClass());
1824 +        return clone;
1825 +    }
1826 +
1827 +    /**
1828 +     * If o implements Cloneable and has a public clone method,
1829 +     * returns a clone of o, else null.
1830 +     */
1831 +    @SuppressWarnings("unchecked")
1832 +    <T> T cloneableClone(T o) {
1833 +        if (!(o instanceof Cloneable)) return null;
1834 +        final T clone;
1835 +        try {
1836 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1837 +        } catch (NoSuchMethodException ok) {
1838              return null;
1839 +        } catch (ReflectiveOperationException unexpected) {
1840 +            throw new Error(unexpected);
1841          }
1842 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1843 +        assertSame(o.getClass(), clone.getClass());
1844 +        return clone;
1845      }
1846  
1847      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1848 <                             Runnable... throwingActions) {
1849 <        for (Runnable throwingAction : throwingActions) {
1848 >                             Action... throwingActions) {
1849 >        for (Action throwingAction : throwingActions) {
1850              boolean threw = false;
1851              try { throwingAction.run(); }
1852              catch (Throwable t) {
1853                  threw = true;
1854 <                if (!expectedExceptionClass.isInstance(t)) {
1855 <                    AssertionFailedError afe =
1856 <                        new AssertionFailedError
1857 <                        ("Expected " + expectedExceptionClass.getName() +
1858 <                         ", got " + t.getClass().getName());
1623 <                    afe.initCause(t);
1624 <                    threadUnexpectedException(afe);
1625 <                }
1854 >                if (!expectedExceptionClass.isInstance(t))
1855 >                    throw new AssertionError(
1856 >                            "Expected " + expectedExceptionClass.getName() +
1857 >                            ", got " + t.getClass().getName(),
1858 >                            t);
1859              }
1860              if (!threw)
1861                  shouldThrow(expectedExceptionClass.getName());
# Line 1636 | Line 1869 | public class JSR166TestCase extends Test
1869          } catch (NoSuchElementException success) {}
1870          assertFalse(it.hasNext());
1871      }
1872 +
1873 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1874 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1875 +    }
1876 +
1877 +    public Runnable runnableThrowing(final RuntimeException ex) {
1878 +        return new Runnable() { public void run() { throw ex; }};
1879 +    }
1880 +
1881 +    /** A reusable thread pool to be shared by tests. */
1882 +    static final ExecutorService cachedThreadPool =
1883 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1884 +                               1000L, MILLISECONDS,
1885 +                               new SynchronousQueue<Runnable>());
1886 +
1887 +    static <T> void shuffle(T[] array) {
1888 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1889 +    }
1890 +
1891 +    /**
1892 +     * Returns the same String as would be returned by {@link
1893 +     * Object#toString}, whether or not the given object's class
1894 +     * overrides toString().
1895 +     *
1896 +     * @see System#identityHashCode
1897 +     */
1898 +    static String identityString(Object x) {
1899 +        return x.getClass().getName()
1900 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1901 +    }
1902 +
1903 +    // --- Shared assertions for Executor tests ---
1904 +
1905 +    /**
1906 +     * Returns maximum number of tasks that can be submitted to given
1907 +     * pool (with bounded queue) before saturation (when submission
1908 +     * throws RejectedExecutionException).
1909 +     */
1910 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1911 +        BlockingQueue<Runnable> q = pool.getQueue();
1912 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1913 +    }
1914 +
1915 +    @SuppressWarnings("FutureReturnValueIgnored")
1916 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1917 +        try {
1918 +            e.execute((Runnable) null);
1919 +            shouldThrow();
1920 +        } catch (NullPointerException success) {}
1921 +
1922 +        if (! (e instanceof ExecutorService)) return;
1923 +        ExecutorService es = (ExecutorService) e;
1924 +        try {
1925 +            es.submit((Runnable) null);
1926 +            shouldThrow();
1927 +        } catch (NullPointerException success) {}
1928 +        try {
1929 +            es.submit((Runnable) null, Boolean.TRUE);
1930 +            shouldThrow();
1931 +        } catch (NullPointerException success) {}
1932 +        try {
1933 +            es.submit((Callable) null);
1934 +            shouldThrow();
1935 +        } catch (NullPointerException success) {}
1936 +
1937 +        if (! (e instanceof ScheduledExecutorService)) return;
1938 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1939 +        try {
1940 +            ses.schedule((Runnable) null,
1941 +                         randomTimeout(), randomTimeUnit());
1942 +            shouldThrow();
1943 +        } catch (NullPointerException success) {}
1944 +        try {
1945 +            ses.schedule((Callable) null,
1946 +                         randomTimeout(), randomTimeUnit());
1947 +            shouldThrow();
1948 +        } catch (NullPointerException success) {}
1949 +        try {
1950 +            ses.scheduleAtFixedRate((Runnable) null,
1951 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1952 +            shouldThrow();
1953 +        } catch (NullPointerException success) {}
1954 +        try {
1955 +            ses.scheduleWithFixedDelay((Runnable) null,
1956 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1957 +            shouldThrow();
1958 +        } catch (NullPointerException success) {}
1959 +    }
1960 +
1961 +    void setRejectedExecutionHandler(
1962 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1963 +        p.setRejectedExecutionHandler(handler);
1964 +        assertSame(handler, p.getRejectedExecutionHandler());
1965 +    }
1966 +
1967 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1968 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1969 +        final long savedTaskCount = p.getTaskCount();
1970 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1971 +        final int savedQueueSize = p.getQueue().size();
1972 +        final boolean stock = (p.getClass().getClassLoader() == null);
1973 +
1974 +        Runnable r = () -> {};
1975 +        Callable<Boolean> c = () -> Boolean.TRUE;
1976 +
1977 +        class Recorder implements RejectedExecutionHandler {
1978 +            public volatile Runnable r = null;
1979 +            public volatile ThreadPoolExecutor p = null;
1980 +            public void reset() { r = null; p = null; }
1981 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1982 +                assertNull(this.r);
1983 +                assertNull(this.p);
1984 +                this.r = r;
1985 +                this.p = p;
1986 +            }
1987 +        }
1988 +
1989 +        // check custom handler is invoked exactly once per task
1990 +        Recorder recorder = new Recorder();
1991 +        setRejectedExecutionHandler(p, recorder);
1992 +        for (int i = 2; i--> 0; ) {
1993 +            recorder.reset();
1994 +            p.execute(r);
1995 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1996 +                assertSame(r, recorder.r);
1997 +            assertSame(p, recorder.p);
1998 +
1999 +            recorder.reset();
2000 +            assertFalse(p.submit(r).isDone());
2001 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2002 +            assertSame(p, recorder.p);
2003 +
2004 +            recorder.reset();
2005 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2006 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2007 +            assertSame(p, recorder.p);
2008 +
2009 +            recorder.reset();
2010 +            assertFalse(p.submit(c).isDone());
2011 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2012 +            assertSame(p, recorder.p);
2013 +
2014 +            if (p instanceof ScheduledExecutorService) {
2015 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2016 +                ScheduledFuture<?> future;
2017 +
2018 +                recorder.reset();
2019 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2020 +                assertFalse(future.isDone());
2021 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2022 +                assertSame(p, recorder.p);
2023 +
2024 +                recorder.reset();
2025 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2026 +                assertFalse(future.isDone());
2027 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2028 +                assertSame(p, recorder.p);
2029 +
2030 +                recorder.reset();
2031 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2032 +                assertFalse(future.isDone());
2033 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2034 +                assertSame(p, recorder.p);
2035 +
2036 +                recorder.reset();
2037 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2038 +                assertFalse(future.isDone());
2039 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2040 +                assertSame(p, recorder.p);
2041 +            }
2042 +        }
2043 +
2044 +        // Checking our custom handler above should be sufficient, but
2045 +        // we add some integration tests of standard handlers.
2046 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2047 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2048 +
2049 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2050 +        try {
2051 +            p.execute(setThread);
2052 +            shouldThrow();
2053 +        } catch (RejectedExecutionException success) {}
2054 +        assertNull(thread.get());
2055 +
2056 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2057 +        p.execute(setThread);
2058 +        assertNull(thread.get());
2059 +
2060 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2061 +        p.execute(setThread);
2062 +        if (p.isShutdown())
2063 +            assertNull(thread.get());
2064 +        else
2065 +            assertSame(Thread.currentThread(), thread.get());
2066 +
2067 +        setRejectedExecutionHandler(p, savedHandler);
2068 +
2069 +        // check that pool was not perturbed by handlers
2070 +        assertEquals(savedTaskCount, p.getTaskCount());
2071 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2072 +        assertEquals(savedQueueSize, p.getQueue().size());
2073 +    }
2074 +
2075 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2076 +        assertEquals(x, y);
2077 +        assertEquals(y, x);
2078 +        assertEquals(x.isEmpty(), y.isEmpty());
2079 +        assertEquals(x.size(), y.size());
2080 +        if (x instanceof List) {
2081 +            assertEquals(x.toString(), y.toString());
2082 +        }
2083 +        if (x instanceof List || x instanceof Set) {
2084 +            assertEquals(x.hashCode(), y.hashCode());
2085 +        }
2086 +        if (x instanceof List || x instanceof Deque) {
2087 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2088 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2089 +                                     y.toArray(new Object[0])));
2090 +        }
2091 +    }
2092 +
2093 +    /**
2094 +     * A weaker form of assertCollectionsEquals which does not insist
2095 +     * that the two collections satisfy Object#equals(Object), since
2096 +     * they may use identity semantics as Deques do.
2097 +     */
2098 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2099 +        if (x instanceof List || x instanceof Set)
2100 +            assertCollectionsEquals(x, y);
2101 +        else {
2102 +            assertEquals(x.isEmpty(), y.isEmpty());
2103 +            assertEquals(x.size(), y.size());
2104 +            assertEquals(new HashSet(x), new HashSet(y));
2105 +            if (x instanceof Deque) {
2106 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2107 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2108 +                                         y.toArray(new Object[0])));
2109 +            }
2110 +        }
2111 +    }
2112   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines