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.256 by jsr166, Sun Aug 11 22:29:26 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 the shortest timed delay. This could
696 <     * be reimplemented to use for example a Property.
695 >     * Returns the shortest timed delay. This can be scaled up for
696 >     * slow machines using the jsr166.delay.factor system property,
697 >     * or via jtreg's -timeoutFactor: flag.
698 >     * http://openjdk.java.net/jtreg/command-help.html
699       */
700      protected long getShortDelay() {
701 <        return 50;
701 >        return (long) (50 * delayFactor);
702      }
703  
704      /**
# Line 488 | Line 711 | public class JSR166TestCase extends Test
711          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
712      }
713  
714 +    private static final long TIMEOUT_DELAY_MS
715 +        = (long) (12.0 * Math.cbrt(delayFactor));
716 +
717      /**
718 <     * Returns a timeout in milliseconds to be used in tests that
719 <     * verify that operations block or time out.
718 >     * Returns a timeout in milliseconds to be used in tests that verify
719 >     * that operations block or time out.  We want this to be longer
720 >     * than the OS scheduling quantum, but not too long, so don't scale
721 >     * linearly with delayFactor; we use "crazy" cube root instead.
722       */
723 <    long timeoutMillis() {
724 <        return SHORT_DELAY_MS / 4;
723 >    static long timeoutMillis() {
724 >        return TIMEOUT_DELAY_MS;
725      }
726  
727      /**
# Line 509 | Line 737 | public class JSR166TestCase extends Test
737       * The first exception encountered if any threadAssertXXX method fails.
738       */
739      private final AtomicReference<Throwable> threadFailure
740 <        = new AtomicReference<Throwable>(null);
740 >        = new AtomicReference<>(null);
741  
742      /**
743       * Records an exception so that it can be rethrown later in the test
# Line 518 | Line 746 | public class JSR166TestCase extends Test
746       * the same test have no effect.
747       */
748      public void threadRecordFailure(Throwable t) {
749 <        threadDump();
749 >        System.err.println(t);
750 >        dumpTestThreads();
751          threadFailure.compareAndSet(null, t);
752      }
753  
# Line 529 | Line 758 | public class JSR166TestCase extends Test
758      void tearDownFail(String format, Object... args) {
759          String msg = toString() + ": " + String.format(format, args);
760          System.err.println(msg);
761 <        threadDump();
762 <        throw new AssertionFailedError(msg);
761 >        dumpTestThreads();
762 >        throw new AssertionError(msg);
763      }
764  
765      /**
# Line 551 | Line 780 | public class JSR166TestCase extends Test
780                  throw (RuntimeException) t;
781              else if (t instanceof Exception)
782                  throw (Exception) t;
783 <            else {
784 <                AssertionFailedError afe =
556 <                    new AssertionFailedError(t.toString());
557 <                afe.initCause(t);
558 <                throw afe;
559 <            }
783 >            else
784 >                throw new AssertionError(t.toString(), t);
785          }
786  
787          if (Thread.interrupted())
# Line 566 | Line 791 | public class JSR166TestCase extends Test
791      }
792  
793      /**
794 <     * Finds missing try { ... } finally { joinPool(e); }
794 >     * Finds missing PoolCleaners
795       */
796      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
797          Thread[] survivors = new Thread[7];
# Line 590 | Line 815 | public class JSR166TestCase extends Test
815  
816      /**
817       * Just like fail(reason), but additionally recording (using
818 <     * threadRecordFailure) any AssertionFailedError thrown, so that
819 <     * the current testcase will fail.
818 >     * threadRecordFailure) any AssertionError thrown, so that the
819 >     * current testcase will fail.
820       */
821      public void threadFail(String reason) {
822          try {
823              fail(reason);
824 <        } catch (AssertionFailedError t) {
825 <            threadRecordFailure(t);
826 <            throw t;
824 >        } catch (AssertionError fail) {
825 >            threadRecordFailure(fail);
826 >            throw fail;
827          }
828      }
829  
830      /**
831       * Just like assertTrue(b), but additionally recording (using
832 <     * threadRecordFailure) any AssertionFailedError thrown, so that
833 <     * the current testcase will fail.
832 >     * threadRecordFailure) any AssertionError thrown, so that the
833 >     * current testcase will fail.
834       */
835      public void threadAssertTrue(boolean b) {
836          try {
837              assertTrue(b);
838 <        } catch (AssertionFailedError t) {
839 <            threadRecordFailure(t);
840 <            throw t;
838 >        } catch (AssertionError fail) {
839 >            threadRecordFailure(fail);
840 >            throw fail;
841          }
842      }
843  
844      /**
845       * Just like assertFalse(b), but additionally recording (using
846 <     * threadRecordFailure) any AssertionFailedError thrown, so that
847 <     * the current testcase will fail.
846 >     * threadRecordFailure) any AssertionError thrown, so that the
847 >     * current testcase will fail.
848       */
849      public void threadAssertFalse(boolean b) {
850          try {
851              assertFalse(b);
852 <        } catch (AssertionFailedError t) {
853 <            threadRecordFailure(t);
854 <            throw t;
852 >        } catch (AssertionError fail) {
853 >            threadRecordFailure(fail);
854 >            throw fail;
855          }
856      }
857  
858      /**
859       * Just like assertNull(x), but additionally recording (using
860 <     * threadRecordFailure) any AssertionFailedError thrown, so that
861 <     * the current testcase will fail.
860 >     * threadRecordFailure) any AssertionError thrown, so that the
861 >     * current testcase will fail.
862       */
863      public void threadAssertNull(Object x) {
864          try {
865              assertNull(x);
866 <        } catch (AssertionFailedError t) {
867 <            threadRecordFailure(t);
868 <            throw t;
866 >        } catch (AssertionError fail) {
867 >            threadRecordFailure(fail);
868 >            throw fail;
869          }
870      }
871  
872      /**
873       * Just like assertEquals(x, y), but additionally recording (using
874 <     * threadRecordFailure) any AssertionFailedError thrown, so that
875 <     * the current testcase will fail.
874 >     * threadRecordFailure) any AssertionError thrown, so that the
875 >     * current testcase will fail.
876       */
877      public void threadAssertEquals(long x, long y) {
878          try {
879              assertEquals(x, y);
880 <        } catch (AssertionFailedError t) {
881 <            threadRecordFailure(t);
882 <            throw t;
880 >        } catch (AssertionError fail) {
881 >            threadRecordFailure(fail);
882 >            throw fail;
883          }
884      }
885  
886      /**
887       * Just like assertEquals(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 threadAssertEquals(Object x, Object y) {
892          try {
893              assertEquals(x, y);
894 <        } catch (AssertionFailedError fail) {
894 >        } catch (AssertionError fail) {
895              threadRecordFailure(fail);
896              throw fail;
897          } catch (Throwable fail) {
# Line 676 | Line 901 | public class JSR166TestCase extends Test
901  
902      /**
903       * Just like assertSame(x, y), but additionally recording (using
904 <     * threadRecordFailure) any AssertionFailedError thrown, so that
905 <     * the current testcase will fail.
904 >     * threadRecordFailure) any AssertionError thrown, so that the
905 >     * current testcase will fail.
906       */
907      public void threadAssertSame(Object x, Object y) {
908          try {
909              assertSame(x, y);
910 <        } catch (AssertionFailedError fail) {
910 >        } catch (AssertionError fail) {
911              threadRecordFailure(fail);
912              throw fail;
913          }
# Line 704 | Line 929 | public class JSR166TestCase extends Test
929  
930      /**
931       * Records the given exception using {@link #threadRecordFailure},
932 <     * then rethrows the exception, wrapping it in an
933 <     * AssertionFailedError if necessary.
932 >     * then rethrows the exception, wrapping it in an AssertionError
933 >     * if necessary.
934       */
935      public void threadUnexpectedException(Throwable t) {
936          threadRecordFailure(t);
# Line 714 | Line 939 | public class JSR166TestCase extends Test
939              throw (RuntimeException) t;
940          else if (t instanceof Error)
941              throw (Error) t;
942 <        else {
943 <            AssertionFailedError afe =
719 <                new AssertionFailedError("unexpected exception: " + t);
720 <            afe.initCause(t);
721 <            throw afe;
722 <        }
942 >        else
943 >            throw new AssertionError("unexpected exception: " + t, t);
944      }
945  
946      /**
947       * Delays, via Thread.sleep, for the given millisecond delay, but
948       * if the sleep is shorter than specified, may re-sleep or yield
949 <     * until time elapses.
949 >     * until time elapses.  Ensures that the given time, as measured
950 >     * by System.nanoTime(), has elapsed.
951       */
952      static void delay(long millis) throws InterruptedException {
953 <        long startTime = System.nanoTime();
954 <        long ns = millis * 1000 * 1000;
955 <        for (;;) {
953 >        long nanos = millis * (1000 * 1000);
954 >        final long wakeupTime = System.nanoTime() + nanos;
955 >        do {
956              if (millis > 0L)
957                  Thread.sleep(millis);
958              else // too short to sleep
959                  Thread.yield();
960 <            long d = ns - (System.nanoTime() - startTime);
961 <            if (d > 0L)
962 <                millis = d / (1000 * 1000);
741 <            else
742 <                break;
743 <        }
960 >            nanos = wakeupTime - System.nanoTime();
961 >            millis = nanos / (1000 * 1000);
962 >        } while (nanos >= 0L);
963      }
964  
965      /**
966       * Allows use of try-with-resources with per-test thread pools.
967       */
968 <    static class PoolCloser<T extends ExecutorService>
969 <            implements AutoCloseable {
970 <        public final T pool;
752 <        public PoolCloser(T pool) { this.pool = pool; }
968 >    class PoolCleaner implements AutoCloseable {
969 >        private final ExecutorService pool;
970 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
971          public void close() { joinPool(pool); }
972      }
973  
974      /**
975 +     * An extension of PoolCleaner that has an action to release the pool.
976 +     */
977 +    class PoolCleanerWithReleaser extends PoolCleaner {
978 +        private final Runnable releaser;
979 +        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
980 +            super(pool);
981 +            this.releaser = releaser;
982 +        }
983 +        public void close() {
984 +            try {
985 +                releaser.run();
986 +            } finally {
987 +                super.close();
988 +            }
989 +        }
990 +    }
991 +
992 +    PoolCleaner cleaner(ExecutorService pool) {
993 +        return new PoolCleaner(pool);
994 +    }
995 +
996 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
997 +        return new PoolCleanerWithReleaser(pool, releaser);
998 +    }
999 +
1000 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
1001 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
1002 +    }
1003 +
1004 +    Runnable releaser(final CountDownLatch latch) {
1005 +        return new Runnable() { public void run() {
1006 +            do { latch.countDown(); }
1007 +            while (latch.getCount() > 0);
1008 +        }};
1009 +    }
1010 +
1011 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
1012 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
1013 +    }
1014 +
1015 +    Runnable releaser(final AtomicBoolean flag) {
1016 +        return new Runnable() { public void run() { flag.set(true); }};
1017 +    }
1018 +
1019 +    /**
1020       * Waits out termination of a thread pool or fails doing so.
1021       */
1022 <    static void joinPool(ExecutorService pool) {
1022 >    void joinPool(ExecutorService pool) {
1023          try {
1024              pool.shutdown();
1025 <            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
1026 <                fail("ExecutorService " + pool +
1027 <                     " did not terminate in a timely manner");
1025 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
1026 >                try {
1027 >                    threadFail("ExecutorService " + pool +
1028 >                               " did not terminate in a timely manner");
1029 >                } finally {
1030 >                    // last resort, for the benefit of subsequent tests
1031 >                    pool.shutdownNow();
1032 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
1033 >                }
1034 >            }
1035          } catch (SecurityException ok) {
1036              // Allowed in case test doesn't have privs
1037          } catch (InterruptedException fail) {
1038 <            fail("Unexpected InterruptedException");
1038 >            threadFail("Unexpected InterruptedException");
1039          }
1040      }
1041  
1042 <    /** Like Runnable, but with the freedom to throw anything */
1042 >    /**
1043 >     * Like Runnable, but with the freedom to throw anything.
1044 >     * junit folks had the same idea:
1045 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1046 >     */
1047      interface Action { public void run() throws Throwable; }
1048  
1049      /**
# Line 778 | Line 1052 | public class JSR166TestCase extends Test
1052       * necessarily individually slow because they must block.
1053       */
1054      void testInParallel(Action ... actions) {
1055 <        try (PoolCloser<ExecutorService> poolCloser
1056 <             = new PoolCloser<>(Executors.newCachedThreadPool())) {
783 <            ExecutorService pool = poolCloser.pool;
1055 >        ExecutorService pool = Executors.newCachedThreadPool();
1056 >        try (PoolCleaner cleaner = cleaner(pool)) {
1057              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1058              for (final Action action : actions)
1059                  futures.add(pool.submit(new CheckedRunnable() {
# Line 797 | Line 1070 | public class JSR166TestCase extends Test
1070      }
1071  
1072      /**
1073 <     * A debugging tool to print all stack traces, as jstack does.
1073 >     * A debugging tool to print stack traces of most threads, as jstack does.
1074       * Uninteresting threads are filtered out.
1075       */
1076 <    static void threadDump() {
1076 >    static void dumpTestThreads() {
1077 >        SecurityManager sm = System.getSecurityManager();
1078 >        if (sm != null) {
1079 >            try {
1080 >                System.setSecurityManager(null);
1081 >            } catch (SecurityException giveUp) {
1082 >                return;
1083 >            }
1084 >        }
1085 >
1086          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1087          System.err.println("------ stacktrace dump start ------");
1088          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1089 <            String name = info.getThreadName();
1089 >            final String name = info.getThreadName();
1090 >            String lockName;
1091              if ("Signal Dispatcher".equals(name))
1092                  continue;
1093              if ("Reference Handler".equals(name)
1094 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1094 >                && (lockName = info.getLockName()) != null
1095 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1096                  continue;
1097              if ("Finalizer".equals(name)
1098 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1098 >                && (lockName = info.getLockName()) != null
1099 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1100 >                continue;
1101 >            if ("checkForWedgedTest".equals(name))
1102                  continue;
1103              System.err.print(info);
1104          }
1105          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    }
1106  
1107 <    /**
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);
1107 >        if (sm != null) System.setSecurityManager(sm);
1108      }
1109  
1110      /**
1111 <     * Checks that the threads do not terminate within the given millisecond delay.
1111 >     * Checks that thread eventually enters the expected blocked thread state.
1112       */
1113 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1114 <        try {
1115 <            // No need to optimize the failing case via Thread.join.
1116 <            delay(millis);
1117 <            for (Thread thread : threads)
1118 <                assertTrue(thread.isAlive());
1119 <        } catch (InterruptedException fail) {
1120 <            fail("Unexpected InterruptedException");
1113 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1114 >        // always sleep at least 1 ms, with high probability avoiding
1115 >        // transitory states
1116 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1117 >            try { delay(1); }
1118 >            catch (InterruptedException fail) {
1119 >                throw new AssertionError("Unexpected InterruptedException", fail);
1120 >            }
1121 >            Thread.State s = thread.getState();
1122 >            if (s == expected)
1123 >                return;
1124 >            else if (s == Thread.State.TERMINATED)
1125 >                fail("Unexpected thread termination");
1126          }
1127 +        fail("timed out waiting for thread to enter thread state " + expected);
1128      }
1129  
1130      /**
# Line 899 | Line 1165 | public class JSR166TestCase extends Test
1165      }
1166  
1167      /**
1168 +     * The maximum number of consecutive spurious wakeups we should
1169 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1170 +     */
1171 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1172 +
1173 +    /**
1174       * The number of elements to place in collections, arrays, etc.
1175       */
1176      public static final int SIZE = 20;
# Line 1002 | Line 1274 | public class JSR166TestCase extends Test
1274          }
1275          public void refresh() {}
1276          public String toString() {
1277 <            List<Permission> ps = new ArrayList<Permission>();
1277 >            List<Permission> ps = new ArrayList<>();
1278              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1279                  ps.add(e.nextElement());
1280              return "AdjustablePolicy with permissions " + ps;
# Line 1030 | Line 1302 | public class JSR166TestCase extends Test
1302  
1303      /**
1304       * Sleeps until the given time has elapsed.
1305 <     * Throws AssertionFailedError if interrupted.
1305 >     * Throws AssertionError if interrupted.
1306       */
1307 <    void sleep(long millis) {
1307 >    static void sleep(long millis) {
1308          try {
1309              delay(millis);
1310          } catch (InterruptedException fail) {
1311 <            AssertionFailedError afe =
1040 <                new AssertionFailedError("Unexpected InterruptedException");
1041 <            afe.initCause(fail);
1042 <            throw afe;
1311 >            throw new AssertionError("Unexpected InterruptedException", fail);
1312          }
1313      }
1314  
1315      /**
1316       * Spin-waits up to the specified number of milliseconds for the given
1317       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1318 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1319       */
1320 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1321 <        long startTime = System.nanoTime();
1322 <        for (;;) {
1323 <            Thread.State s = thread.getState();
1324 <            if (s == Thread.State.BLOCKED ||
1325 <                s == Thread.State.WAITING ||
1326 <                s == Thread.State.TIMED_WAITING)
1327 <                return;
1328 <            else if (s == Thread.State.TERMINATED)
1320 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1321 >                                       Callable<Boolean> waitingForGodot) {
1322 >        for (long startTime = 0L;;) {
1323 >            switch (thread.getState()) {
1324 >            default: break;
1325 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1326 >                try {
1327 >                    if (waitingForGodot == null || waitingForGodot.call())
1328 >                        return;
1329 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1330 >                break;
1331 >            case TERMINATED:
1332                  fail("Unexpected thread termination");
1333 +            }
1334 +
1335 +            if (startTime == 0L)
1336 +                startTime = System.nanoTime();
1337              else if (millisElapsedSince(startTime) > timeoutMillis) {
1338 <                threadAssertTrue(thread.isAlive());
1339 <                return;
1338 >                assertTrue(thread.isAlive());
1339 >                if (waitingForGodot == null
1340 >                    || thread.getState() == Thread.State.RUNNABLE)
1341 >                    fail("timed out waiting for thread to enter wait state");
1342 >                else
1343 >                    fail("timed out waiting for condition, thread state="
1344 >                         + thread.getState());
1345              }
1346              Thread.yield();
1347          }
1348      }
1349  
1350      /**
1351 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1352 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1351 >     * Spin-waits up to the specified number of milliseconds for the given
1352 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1353 >     */
1354 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1355 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1356 >    }
1357 >
1358 >    /**
1359 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1360 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1361       */
1362      void waitForThreadToEnterWaitState(Thread thread) {
1363 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1363 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1364 >    }
1365 >
1366 >    /**
1367 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1368 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1369 >     * and additionally satisfy the given condition.
1370 >     */
1371 >    void waitForThreadToEnterWaitState(Thread thread,
1372 >                                       Callable<Boolean> waitingForGodot) {
1373 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1374      }
1375  
1376      /**
# Line 1088 | Line 1388 | public class JSR166TestCase extends Test
1388   //             r.run();
1389   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1390   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1391 < //             throw new AssertionFailedError("did not return promptly");
1391 > //             throw new AssertionError("did not return promptly");
1392   //     }
1393  
1394   //     void assertTerminatesPromptly(Runnable r) {
# Line 1101 | Line 1401 | public class JSR166TestCase extends Test
1401       */
1402      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1403          long startTime = System.nanoTime();
1404 +        T actual = null;
1405          try {
1406 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1406 >            actual = f.get(timeoutMillis, MILLISECONDS);
1407          } catch (Throwable fail) { threadUnexpectedException(fail); }
1408 +        assertEquals(expectedValue, actual);
1409          if (millisElapsedSince(startTime) > timeoutMillis/2)
1410 <            throw new AssertionFailedError("timed get did not return promptly");
1410 >            throw new AssertionError("timed get did not return promptly");
1411      }
1412  
1413      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1135 | Line 1437 | public class JSR166TestCase extends Test
1437          } finally {
1438              if (t.getState() != Thread.State.TERMINATED) {
1439                  t.interrupt();
1440 <                fail("Test timed out");
1440 >                threadFail("timed out waiting for thread to terminate");
1441              }
1442          }
1443      }
# Line 1163 | Line 1465 | public class JSR166TestCase extends Test
1465          }
1466      }
1467  
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
1468      public abstract class ThreadShouldThrow extends Thread {
1469          protected abstract void realRun() throws Throwable;
1470  
# Line 1195 | Line 1477 | public class JSR166TestCase extends Test
1477          public final void run() {
1478              try {
1479                  realRun();
1198                threadShouldThrow(exceptionClass.getSimpleName());
1480              } catch (Throwable t) {
1481                  if (! exceptionClass.isInstance(t))
1482                      threadUnexpectedException(t);
1483 +                return;
1484              }
1485 +            threadShouldThrow(exceptionClass.getSimpleName());
1486          }
1487      }
1488  
# Line 1209 | Line 1492 | public class JSR166TestCase extends Test
1492          public final void run() {
1493              try {
1494                  realRun();
1212                threadShouldThrow("InterruptedException");
1495              } catch (InterruptedException success) {
1496                  threadAssertFalse(Thread.interrupted());
1497 +                return;
1498              } catch (Throwable fail) {
1499                  threadUnexpectedException(fail);
1500              }
1501 +            threadShouldThrow("InterruptedException");
1502          }
1503      }
1504  
# Line 1226 | Line 1510 | public class JSR166TestCase extends Test
1510                  return realCall();
1511              } catch (Throwable fail) {
1512                  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);
1513              }
1514 <            return null;
1514 >            throw new AssertionError("unreached");
1515          }
1516      }
1517  
# Line 1283 | Line 1549 | public class JSR166TestCase extends Test
1549              }};
1550      }
1551  
1552 <    public Runnable awaiter(final CountDownLatch latch) {
1553 <        return new CheckedRunnable() {
1554 <            public void realRun() throws InterruptedException {
1555 <                await(latch);
1556 <            }};
1552 >    class LatchAwaiter extends CheckedRunnable {
1553 >        static final int NEW = 0;
1554 >        static final int RUNNING = 1;
1555 >        static final int DONE = 2;
1556 >        final CountDownLatch latch;
1557 >        int state = NEW;
1558 >        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1559 >        public void realRun() throws InterruptedException {
1560 >            state = 1;
1561 >            await(latch);
1562 >            state = 2;
1563 >        }
1564      }
1565  
1566 <    public void await(CountDownLatch latch) {
1566 >    public LatchAwaiter awaiter(CountDownLatch latch) {
1567 >        return new LatchAwaiter(latch);
1568 >    }
1569 >
1570 >    public void await(CountDownLatch latch, long timeoutMillis) {
1571 >        boolean timedOut = false;
1572          try {
1573 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1573 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1574          } catch (Throwable fail) {
1575              threadUnexpectedException(fail);
1576          }
1577 +        if (timedOut)
1578 +            fail("timed out waiting for CountDownLatch for "
1579 +                 + (timeoutMillis/1000) + " sec");
1580 +    }
1581 +
1582 +    public void await(CountDownLatch latch) {
1583 +        await(latch, LONG_DELAY_MS);
1584      }
1585  
1586      public void await(Semaphore semaphore) {
1587 +        boolean timedOut = false;
1588          try {
1589 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1589 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1590 >        } catch (Throwable fail) {
1591 >            threadUnexpectedException(fail);
1592 >        }
1593 >        if (timedOut)
1594 >            fail("timed out waiting for Semaphore for "
1595 >                 + (LONG_DELAY_MS/1000) + " sec");
1596 >    }
1597 >
1598 >    public void await(CyclicBarrier barrier) {
1599 >        try {
1600 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1601          } catch (Throwable fail) {
1602              threadUnexpectedException(fail);
1603          }
# Line 1320 | Line 1617 | public class JSR166TestCase extends Test
1617   //         long startTime = System.nanoTime();
1618   //         while (!flag.get()) {
1619   //             if (millisElapsedSince(startTime) > timeoutMillis)
1620 < //                 throw new AssertionFailedError("timed out");
1620 > //                 throw new AssertionError("timed out");
1621   //             Thread.yield();
1622   //         }
1623   //     }
# Line 1329 | Line 1626 | public class JSR166TestCase extends Test
1626          public String call() { throw new NullPointerException(); }
1627      }
1628  
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
1629      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1630          return new CheckedRunnable() {
1631              protected void realRun() {
# Line 1387 | Line 1635 | public class JSR166TestCase extends Test
1635              }};
1636      }
1637  
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
1638      /**
1639       * For use as ThreadFactory in constructors
1640       */
# Line 1416 | Line 1648 | public class JSR166TestCase extends Test
1648          boolean isDone();
1649      }
1650  
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
1651      public static class TrackedNoOpRunnable implements Runnable {
1652          public volatile boolean done = false;
1653          public void run() {
# Line 1476 | Line 1655 | public class JSR166TestCase extends Test
1655          }
1656      }
1657  
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
1658      /**
1659       * Analog of CheckedRunnable for RecursiveAction
1660       */
# Line 1513 | Line 1681 | public class JSR166TestCase extends Test
1681                  return realCompute();
1682              } catch (Throwable fail) {
1683                  threadUnexpectedException(fail);
1516                return null;
1684              }
1685 +            throw new AssertionError("unreached");
1686          }
1687      }
1688  
# Line 1528 | Line 1696 | public class JSR166TestCase extends Test
1696  
1697      /**
1698       * A CyclicBarrier that uses timed await and fails with
1699 <     * AssertionFailedErrors instead of throwing checked exceptions.
1699 >     * AssertionErrors instead of throwing checked exceptions.
1700       */
1701 <    public class CheckedBarrier extends CyclicBarrier {
1701 >    public static class CheckedBarrier extends CyclicBarrier {
1702          public CheckedBarrier(int parties) { super(parties); }
1703  
1704          public int await() {
1705              try {
1706                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1707              } catch (TimeoutException timedOut) {
1708 <                throw new AssertionFailedError("timed out");
1708 >                throw new AssertionError("timed out");
1709              } catch (Exception fail) {
1710 <                AssertionFailedError afe =
1543 <                    new AssertionFailedError("Unexpected exception: " + fail);
1544 <                afe.initCause(fail);
1545 <                throw afe;
1710 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1711              }
1712          }
1713      }
# Line 1553 | Line 1718 | public class JSR166TestCase extends Test
1718              assertEquals(0, q.size());
1719              assertNull(q.peek());
1720              assertNull(q.poll());
1721 <            assertNull(q.poll(0, MILLISECONDS));
1721 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1722              assertEquals(q.toString(), "[]");
1723              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1724              assertFalse(q.iterator().hasNext());
# Line 1594 | Line 1759 | public class JSR166TestCase extends Test
1759          }
1760      }
1761  
1762 +    void assertImmutable(Object o) {
1763 +        if (o instanceof Collection) {
1764 +            assertThrows(
1765 +                UnsupportedOperationException.class,
1766 +                () -> ((Collection) o).add(null));
1767 +        }
1768 +    }
1769 +
1770      @SuppressWarnings("unchecked")
1771      <T> T serialClone(T o) {
1772 +        T clone = null;
1773          try {
1774              ObjectInputStream ois = new ObjectInputStream
1775                  (new ByteArrayInputStream(serialBytes(o)));
1776 <            T clone = (T) ois.readObject();
1603 <            assertSame(o.getClass(), clone.getClass());
1604 <            return clone;
1776 >            clone = (T) ois.readObject();
1777          } catch (Throwable fail) {
1778              threadUnexpectedException(fail);
1779 +        }
1780 +        if (o == clone) assertImmutable(o);
1781 +        else assertSame(o.getClass(), clone.getClass());
1782 +        return clone;
1783 +    }
1784 +
1785 +    /**
1786 +     * A version of serialClone that leaves error handling (for
1787 +     * e.g. NotSerializableException) up to the caller.
1788 +     */
1789 +    @SuppressWarnings("unchecked")
1790 +    <T> T serialClonePossiblyFailing(T o)
1791 +        throws ReflectiveOperationException, java.io.IOException {
1792 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1793 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1794 +        oos.writeObject(o);
1795 +        oos.flush();
1796 +        oos.close();
1797 +        ObjectInputStream ois = new ObjectInputStream
1798 +            (new ByteArrayInputStream(bos.toByteArray()));
1799 +        T clone = (T) ois.readObject();
1800 +        if (o == clone) assertImmutable(o);
1801 +        else assertSame(o.getClass(), clone.getClass());
1802 +        return clone;
1803 +    }
1804 +
1805 +    /**
1806 +     * If o implements Cloneable and has a public clone method,
1807 +     * returns a clone of o, else null.
1808 +     */
1809 +    @SuppressWarnings("unchecked")
1810 +    <T> T cloneableClone(T o) {
1811 +        if (!(o instanceof Cloneable)) return null;
1812 +        final T clone;
1813 +        try {
1814 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1815 +        } catch (NoSuchMethodException ok) {
1816              return null;
1817 +        } catch (ReflectiveOperationException unexpected) {
1818 +            throw new Error(unexpected);
1819          }
1820 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1821 +        assertSame(o.getClass(), clone.getClass());
1822 +        return clone;
1823      }
1824  
1825      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1826 <                             Runnable... throwingActions) {
1827 <        for (Runnable throwingAction : throwingActions) {
1826 >                             Action... throwingActions) {
1827 >        for (Action throwingAction : throwingActions) {
1828              boolean threw = false;
1829              try { throwingAction.run(); }
1830              catch (Throwable t) {
1831                  threw = true;
1832 <                if (!expectedExceptionClass.isInstance(t)) {
1833 <                    AssertionFailedError afe =
1834 <                        new AssertionFailedError
1835 <                        ("Expected " + expectedExceptionClass.getName() +
1836 <                         ", got " + t.getClass().getName());
1623 <                    afe.initCause(t);
1624 <                    threadUnexpectedException(afe);
1625 <                }
1832 >                if (!expectedExceptionClass.isInstance(t))
1833 >                    throw new AssertionError(
1834 >                            "Expected " + expectedExceptionClass.getName() +
1835 >                            ", got " + t.getClass().getName(),
1836 >                            t);
1837              }
1838              if (!threw)
1839                  shouldThrow(expectedExceptionClass.getName());
# Line 1636 | Line 1847 | public class JSR166TestCase extends Test
1847          } catch (NoSuchElementException success) {}
1848          assertFalse(it.hasNext());
1849      }
1850 +
1851 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1852 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1853 +    }
1854 +
1855 +    public Runnable runnableThrowing(final RuntimeException ex) {
1856 +        return new Runnable() { public void run() { throw ex; }};
1857 +    }
1858 +
1859 +    /** A reusable thread pool to be shared by tests. */
1860 +    static final ExecutorService cachedThreadPool =
1861 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1862 +                               1000L, MILLISECONDS,
1863 +                               new SynchronousQueue<Runnable>());
1864 +
1865 +    static <T> void shuffle(T[] array) {
1866 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1867 +    }
1868 +
1869 +    /**
1870 +     * Returns the same String as would be returned by {@link
1871 +     * Object#toString}, whether or not the given object's class
1872 +     * overrides toString().
1873 +     *
1874 +     * @see System#identityHashCode
1875 +     */
1876 +    static String identityString(Object x) {
1877 +        return x.getClass().getName()
1878 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1879 +    }
1880 +
1881 +    // --- Shared assertions for Executor tests ---
1882 +
1883 +    /**
1884 +     * Returns maximum number of tasks that can be submitted to given
1885 +     * pool (with bounded queue) before saturation (when submission
1886 +     * throws RejectedExecutionException).
1887 +     */
1888 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1889 +        BlockingQueue<Runnable> q = pool.getQueue();
1890 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1891 +    }
1892 +
1893 +    @SuppressWarnings("FutureReturnValueIgnored")
1894 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1895 +        try {
1896 +            e.execute((Runnable) null);
1897 +            shouldThrow();
1898 +        } catch (NullPointerException success) {}
1899 +
1900 +        if (! (e instanceof ExecutorService)) return;
1901 +        ExecutorService es = (ExecutorService) e;
1902 +        try {
1903 +            es.submit((Runnable) null);
1904 +            shouldThrow();
1905 +        } catch (NullPointerException success) {}
1906 +        try {
1907 +            es.submit((Runnable) null, Boolean.TRUE);
1908 +            shouldThrow();
1909 +        } catch (NullPointerException success) {}
1910 +        try {
1911 +            es.submit((Callable) null);
1912 +            shouldThrow();
1913 +        } catch (NullPointerException success) {}
1914 +
1915 +        if (! (e instanceof ScheduledExecutorService)) return;
1916 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1917 +        try {
1918 +            ses.schedule((Runnable) null,
1919 +                         randomTimeout(), randomTimeUnit());
1920 +            shouldThrow();
1921 +        } catch (NullPointerException success) {}
1922 +        try {
1923 +            ses.schedule((Callable) null,
1924 +                         randomTimeout(), randomTimeUnit());
1925 +            shouldThrow();
1926 +        } catch (NullPointerException success) {}
1927 +        try {
1928 +            ses.scheduleAtFixedRate((Runnable) null,
1929 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1930 +            shouldThrow();
1931 +        } catch (NullPointerException success) {}
1932 +        try {
1933 +            ses.scheduleWithFixedDelay((Runnable) null,
1934 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1935 +            shouldThrow();
1936 +        } catch (NullPointerException success) {}
1937 +    }
1938 +
1939 +    void setRejectedExecutionHandler(
1940 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1941 +        p.setRejectedExecutionHandler(handler);
1942 +        assertSame(handler, p.getRejectedExecutionHandler());
1943 +    }
1944 +
1945 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1946 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1947 +        final long savedTaskCount = p.getTaskCount();
1948 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1949 +        final int savedQueueSize = p.getQueue().size();
1950 +        final boolean stock = (p.getClass().getClassLoader() == null);
1951 +
1952 +        Runnable r = () -> {};
1953 +        Callable<Boolean> c = () -> Boolean.TRUE;
1954 +
1955 +        class Recorder implements RejectedExecutionHandler {
1956 +            public volatile Runnable r = null;
1957 +            public volatile ThreadPoolExecutor p = null;
1958 +            public void reset() { r = null; p = null; }
1959 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1960 +                assertNull(this.r);
1961 +                assertNull(this.p);
1962 +                this.r = r;
1963 +                this.p = p;
1964 +            }
1965 +        }
1966 +
1967 +        // check custom handler is invoked exactly once per task
1968 +        Recorder recorder = new Recorder();
1969 +        setRejectedExecutionHandler(p, recorder);
1970 +        for (int i = 2; i--> 0; ) {
1971 +            recorder.reset();
1972 +            p.execute(r);
1973 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1974 +                assertSame(r, recorder.r);
1975 +            assertSame(p, recorder.p);
1976 +
1977 +            recorder.reset();
1978 +            assertFalse(p.submit(r).isDone());
1979 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1980 +            assertSame(p, recorder.p);
1981 +
1982 +            recorder.reset();
1983 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
1984 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1985 +            assertSame(p, recorder.p);
1986 +
1987 +            recorder.reset();
1988 +            assertFalse(p.submit(c).isDone());
1989 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1990 +            assertSame(p, recorder.p);
1991 +
1992 +            if (p instanceof ScheduledExecutorService) {
1993 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
1994 +                ScheduledFuture<?> future;
1995 +
1996 +                recorder.reset();
1997 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
1998 +                assertFalse(future.isDone());
1999 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2000 +                assertSame(p, recorder.p);
2001 +
2002 +                recorder.reset();
2003 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2004 +                assertFalse(future.isDone());
2005 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2006 +                assertSame(p, recorder.p);
2007 +
2008 +                recorder.reset();
2009 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2010 +                assertFalse(future.isDone());
2011 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2012 +                assertSame(p, recorder.p);
2013 +
2014 +                recorder.reset();
2015 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2016 +                assertFalse(future.isDone());
2017 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2018 +                assertSame(p, recorder.p);
2019 +            }
2020 +        }
2021 +
2022 +        // Checking our custom handler above should be sufficient, but
2023 +        // we add some integration tests of standard handlers.
2024 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2025 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2026 +
2027 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2028 +        try {
2029 +            p.execute(setThread);
2030 +            shouldThrow();
2031 +        } catch (RejectedExecutionException success) {}
2032 +        assertNull(thread.get());
2033 +
2034 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2035 +        p.execute(setThread);
2036 +        assertNull(thread.get());
2037 +
2038 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2039 +        p.execute(setThread);
2040 +        if (p.isShutdown())
2041 +            assertNull(thread.get());
2042 +        else
2043 +            assertSame(Thread.currentThread(), thread.get());
2044 +
2045 +        setRejectedExecutionHandler(p, savedHandler);
2046 +
2047 +        // check that pool was not perturbed by handlers
2048 +        assertEquals(savedTaskCount, p.getTaskCount());
2049 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2050 +        assertEquals(savedQueueSize, p.getQueue().size());
2051 +    }
2052 +
2053 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2054 +        assertEquals(x, y);
2055 +        assertEquals(y, x);
2056 +        assertEquals(x.isEmpty(), y.isEmpty());
2057 +        assertEquals(x.size(), y.size());
2058 +        if (x instanceof List) {
2059 +            assertEquals(x.toString(), y.toString());
2060 +        }
2061 +        if (x instanceof List || x instanceof Set) {
2062 +            assertEquals(x.hashCode(), y.hashCode());
2063 +        }
2064 +        if (x instanceof List || x instanceof Deque) {
2065 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2066 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2067 +                                     y.toArray(new Object[0])));
2068 +        }
2069 +    }
2070 +
2071 +    /**
2072 +     * A weaker form of assertCollectionsEquals which does not insist
2073 +     * that the two collections satisfy Object#equals(Object), since
2074 +     * they may use identity semantics as Deques do.
2075 +     */
2076 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2077 +        if (x instanceof List || x instanceof Set)
2078 +            assertCollectionsEquals(x, y);
2079 +        else {
2080 +            assertEquals(x.isEmpty(), y.isEmpty());
2081 +            assertEquals(x.size(), y.size());
2082 +            assertEquals(new HashSet(x), new HashSet(y));
2083 +            if (x instanceof Deque) {
2084 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2085 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2086 +                                         y.toArray(new Object[0])));
2087 +            }
2088 +        }
2089 +    }
2090   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines