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.141 by jsr166, Tue Sep 8 16:49:16 2015 UTC vs.
Revision 1.243 by jsr166, Thu Apr 5 03:36:54 2018 UTC

# Line 1 | Line 1
1   /*
2 < * Written by Doug Lea with assistance from members of JCP JSR-166
3 < * Expert Group and released to the public domain, as explained at
2 > * Written by Doug Lea and Martin Buchholz with assistance from
3 > * members of JCP JSR-166 Expert Group and released to the public
4 > * domain, as explained at
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   * Other contributors include Andrew Wright, Jeffrey Hayes,
7   * Pat Fisher, Mike Judd.
8   */
9  
10 + /*
11 + * @test
12 + * @summary JSR-166 tck tests, in a number of variations.
13 + *          The first is the conformance testing variant,
14 + *          while others also test implementation details.
15 + * @build *
16 + * @modules java.management
17 + * @run junit/othervm/timeout=1000 JSR166TestCase
18 + * @run junit/othervm/timeout=1000
19 + *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
20 + *      --add-opens java.base/java.lang=ALL-UNNAMED
21 + *      -Djsr166.testImplementationDetails=true
22 + *      JSR166TestCase
23 + * @run junit/othervm/timeout=1000
24 + *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
25 + *      --add-opens java.base/java.lang=ALL-UNNAMED
26 + *      -Djsr166.testImplementationDetails=true
27 + *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
28 + *      JSR166TestCase
29 + * @run junit/othervm/timeout=1000
30 + *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
31 + *      --add-opens java.base/java.lang=ALL-UNNAMED
32 + *      -Djsr166.testImplementationDetails=true
33 + *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
34 + *      -Djava.util.secureRandomSeed=true
35 + *      JSR166TestCase
36 + * @run junit/othervm/timeout=1000/policy=tck.policy
37 + *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
38 + *      --add-opens java.base/java.lang=ALL-UNNAMED
39 + *      -Djsr166.testImplementationDetails=true
40 + *      JSR166TestCase
41 + */
42 +
43   import static java.util.concurrent.TimeUnit.MILLISECONDS;
44 + import static java.util.concurrent.TimeUnit.MINUTES;
45   import static java.util.concurrent.TimeUnit.NANOSECONDS;
46  
47   import java.io.ByteArrayInputStream;
# Line 15 | Line 50 | import java.io.ObjectInputStream;
50   import java.io.ObjectOutputStream;
51   import java.lang.management.ManagementFactory;
52   import java.lang.management.ThreadInfo;
53 + import java.lang.management.ThreadMXBean;
54   import java.lang.reflect.Constructor;
55   import java.lang.reflect.Method;
56   import java.lang.reflect.Modifier;
# Line 27 | Line 63 | import java.security.ProtectionDomain;
63   import java.security.SecurityPermission;
64   import java.util.ArrayList;
65   import java.util.Arrays;
66 + import java.util.Collection;
67 + import java.util.Collections;
68   import java.util.Date;
69 + import java.util.Deque;
70   import java.util.Enumeration;
71 + import java.util.HashSet;
72   import java.util.Iterator;
73   import java.util.List;
74   import java.util.NoSuchElementException;
75   import java.util.PropertyPermission;
76 + import java.util.Set;
77   import java.util.concurrent.BlockingQueue;
78   import java.util.concurrent.Callable;
79   import java.util.concurrent.CountDownLatch;
80   import java.util.concurrent.CyclicBarrier;
81   import java.util.concurrent.ExecutionException;
82 + import java.util.concurrent.Executor;
83   import java.util.concurrent.Executors;
84   import java.util.concurrent.ExecutorService;
85 + import java.util.concurrent.ForkJoinPool;
86   import java.util.concurrent.Future;
87 + import java.util.concurrent.FutureTask;
88   import java.util.concurrent.RecursiveAction;
89   import java.util.concurrent.RecursiveTask;
90 + import java.util.concurrent.RejectedExecutionException;
91   import java.util.concurrent.RejectedExecutionHandler;
92   import java.util.concurrent.Semaphore;
93 + import java.util.concurrent.ScheduledExecutorService;
94 + import java.util.concurrent.ScheduledFuture;
95 + import java.util.concurrent.SynchronousQueue;
96   import java.util.concurrent.ThreadFactory;
97 + import java.util.concurrent.ThreadLocalRandom;
98   import java.util.concurrent.ThreadPoolExecutor;
99 + import java.util.concurrent.TimeUnit;
100   import java.util.concurrent.TimeoutException;
101 + import java.util.concurrent.atomic.AtomicBoolean;
102   import java.util.concurrent.atomic.AtomicReference;
103   import java.util.regex.Pattern;
104  
54 import junit.framework.AssertionFailedError;
105   import junit.framework.Test;
106   import junit.framework.TestCase;
107   import junit.framework.TestResult;
# Line 67 | Line 117 | import junit.framework.TestSuite;
117   *
118   * <ol>
119   *
120 < * <li> All assertions in code running in generated threads must use
120 > * <li>All assertions in code running in generated threads must use
121   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
122   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
123   * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
124   * particularly recommended) for other code to use these forms too.
125   * Only the most typically used JUnit assertion methods are defined
126 < * this way, but enough to live with.</li>
126 > * this way, but enough to live with.
127   *
128 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
128 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
129   * to invoke {@code super.setUp} and {@code super.tearDown} within
130   * them. These methods are used to clear and check for thread
131 < * assertion failures.</li>
131 > * assertion failures.
132   *
133   * <li>All delays and timeouts must use one of the constants {@code
134   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 89 | Line 139 | import junit.framework.TestSuite;
139   * is always discriminable as larger than SHORT and smaller than
140   * MEDIUM.  And so on. These constants are set to conservative values,
141   * but even so, if there is ever any doubt, they can all be increased
142 < * in one spot to rerun tests on slower platforms.</li>
142 > * in one spot to rerun tests on slower platforms.
143   *
144 < * <li> All threads generated must be joined inside each test case
144 > * <li>All threads generated must be joined inside each test case
145   * method (or {@code fail} to do so) before returning from the
146   * method. The {@code joinPool} method can be used to do this when
147 < * using Executors.</li>
147 > * using Executors.
148   *
149   * </ol>
150   *
151   * <p><b>Other notes</b>
152   * <ul>
153   *
154 < * <li> Usually, there is one testcase method per JSR166 method
154 > * <li>Usually, there is one testcase method per JSR166 method
155   * covering "normal" operation, and then as many exception-testing
156   * methods as there are exceptions the method can throw. Sometimes
157   * there are multiple tests per JSR166 method when the different
158   * "normal" behaviors differ significantly. And sometimes testcases
159 < * cover multiple methods when they cannot be tested in
110 < * isolation.</li>
159 > * cover multiple methods when they cannot be tested in isolation.
160   *
161 < * <li> The documentation style for testcases is to provide as javadoc
161 > * <li>The documentation style for testcases is to provide as javadoc
162   * a simple sentence or two describing the property that the testcase
163   * method purports to test. The javadocs do not say anything about how
164 < * the property is tested. To find out, read the code.</li>
164 > * the property is tested. To find out, read the code.
165   *
166 < * <li> These tests are "conformance tests", and do not attempt to
166 > * <li>These tests are "conformance tests", and do not attempt to
167   * test throughput, latency, scalability or other performance factors
168   * (see the separate "jtreg" tests for a set intended to check these
169   * for the most central aspects of functionality.) So, most tests use
170   * the smallest sensible numbers of threads, collection sizes, etc
171 < * needed to check basic conformance.</li>
171 > * needed to check basic conformance.
172   *
173   * <li>The test classes currently do not declare inclusion in
174   * any particular package to simplify things for people integrating
175 < * them in TCK test suites.</li>
175 > * them in TCK test suites.
176   *
177 < * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
178 < * runs all JSR166 unit tests.</li>
177 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
178 > * runs all JSR166 unit tests.
179   *
180   * </ul>
181   */
# Line 170 | Line 219 | public class JSR166TestCase extends Test
219      private static final int suiteRuns =
220          Integer.getInteger("jsr166.suiteRuns", 1);
221  
222 +    /**
223 +     * Returns the value of the system property, or NaN if not defined.
224 +     */
225 +    private static float systemPropertyValue(String name) {
226 +        String floatString = System.getProperty(name);
227 +        if (floatString == null)
228 +            return Float.NaN;
229 +        try {
230 +            return Float.parseFloat(floatString);
231 +        } catch (NumberFormatException ex) {
232 +            throw new IllegalArgumentException(
233 +                String.format("Bad float value in system property %s=%s",
234 +                              name, floatString));
235 +        }
236 +    }
237 +
238 +    /**
239 +     * The scaling factor to apply to standard delays used in tests.
240 +     * May be initialized from any of:
241 +     * - the "jsr166.delay.factor" system property
242 +     * - the "test.timeout.factor" system property (as used by jtreg)
243 +     *   See: http://openjdk.java.net/jtreg/tag-spec.html
244 +     * - hard-coded fuzz factor when using a known slowpoke VM
245 +     */
246 +    private static final float delayFactor = delayFactor();
247 +
248 +    private static float delayFactor() {
249 +        float x;
250 +        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
251 +            return x;
252 +        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
253 +            return x;
254 +        String prop = System.getProperty("java.vm.version");
255 +        if (prop != null && prop.matches(".*debug.*"))
256 +            return 4.0f; // How much slower is fastdebug than product?!
257 +        return 1.0f;
258 +    }
259 +
260      public JSR166TestCase() { super(); }
261      public JSR166TestCase(String name) { super(name); }
262  
# Line 185 | Line 272 | public class JSR166TestCase extends Test
272          return (regex == null) ? null : Pattern.compile(regex);
273      }
274  
275 <    protected void runTest() throws Throwable {
275 >    // Instrumentation to debug very rare, but very annoying hung test runs.
276 >    static volatile TestCase currentTestCase;
277 >    // static volatile int currentRun = 0;
278 >    static {
279 >        Runnable checkForWedgedTest = new Runnable() { public void run() {
280 >            // Avoid spurious reports with enormous runsPerTest.
281 >            // A single test case run should never take more than 1 second.
282 >            // But let's cap it at the high end too ...
283 >            final int timeoutMinutes =
284 >                Math.min(15, Math.max(runsPerTest / 60, 1));
285 >            for (TestCase lastTestCase = currentTestCase;;) {
286 >                try { MINUTES.sleep(timeoutMinutes); }
287 >                catch (InterruptedException unexpected) { break; }
288 >                if (lastTestCase == currentTestCase) {
289 >                    System.err.printf(
290 >                        "Looks like we're stuck running test: %s%n",
291 >                        lastTestCase);
292 > //                     System.err.printf(
293 > //                         "Looks like we're stuck running test: %s (%d/%d)%n",
294 > //                         lastTestCase, currentRun, runsPerTest);
295 > //                     System.err.println("availableProcessors=" +
296 > //                         Runtime.getRuntime().availableProcessors());
297 > //                     System.err.printf("cpu model = %s%n", cpuModel());
298 >                    dumpTestThreads();
299 >                    // one stack dump is probably enough; more would be spam
300 >                    break;
301 >                }
302 >                lastTestCase = currentTestCase;
303 >            }}};
304 >        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
305 >        thread.setDaemon(true);
306 >        thread.start();
307 >    }
308 >
309 > //     public static String cpuModel() {
310 > //         try {
311 > //             java.util.regex.Matcher matcher
312 > //               = Pattern.compile("model name\\s*: (.*)")
313 > //                 .matcher(new String(
314 > //                     java.nio.file.Files.readAllBytes(
315 > //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
316 > //             matcher.find();
317 > //             return matcher.group(1);
318 > //         } catch (Exception ex) { return null; }
319 > //     }
320 >
321 >    public void runBare() throws Throwable {
322 >        currentTestCase = this;
323          if (methodFilter == null
324 <            || methodFilter.matcher(toString()).find()) {
325 <            for (int i = 0; i < runsPerTest; i++) {
326 <                if (profileTests)
327 <                    runTestProfiled();
328 <                else
329 <                    super.runTest();
330 <            }
324 >            || methodFilter.matcher(toString()).find())
325 >            super.runBare();
326 >    }
327 >
328 >    protected void runTest() throws Throwable {
329 >        for (int i = 0; i < runsPerTest; i++) {
330 >            // currentRun = i;
331 >            if (profileTests)
332 >                runTestProfiled();
333 >            else
334 >                super.runTest();
335          }
336      }
337  
338      protected void runTestProfiled() throws Throwable {
339 <        // Warmup run, notably to trigger all needed classloading.
340 <        super.runTest();
203 <        long t0 = System.nanoTime();
204 <        try {
339 >        for (int i = 0; i < 2; i++) {
340 >            long startTime = System.nanoTime();
341              super.runTest();
342 <        } finally {
343 <            long elapsedMillis = millisElapsedSince(t0);
344 <            if (elapsedMillis >= profileThreshold)
342 >            long elapsedMillis = millisElapsedSince(startTime);
343 >            if (elapsedMillis < profileThreshold)
344 >                break;
345 >            // Never report first run of any test; treat it as a
346 >            // warmup run, notably to trigger all needed classloading,
347 >            if (i > 0)
348                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
349          }
350      }
# Line 217 | Line 356 | public class JSR166TestCase extends Test
356          main(suite(), args);
357      }
358  
359 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
360 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
361 +        long runTime;
362 +        public void startTest(Test test) {}
363 +        protected void printHeader(long runTime) {
364 +            this.runTime = runTime; // defer printing for later
365 +        }
366 +        protected void printFooter(TestResult result) {
367 +            if (result.wasSuccessful()) {
368 +                getWriter().println("OK (" + result.runCount() + " tests)"
369 +                    + "  Time: " + elapsedTimeAsString(runTime));
370 +            } else {
371 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
372 +                super.printFooter(result);
373 +            }
374 +        }
375 +    }
376 +
377 +    /**
378 +     * Returns a TestRunner that doesn't bother with unnecessary
379 +     * fluff, like printing a "." for each test case.
380 +     */
381 +    static junit.textui.TestRunner newPithyTestRunner() {
382 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
383 +        runner.setPrinter(new PithyResultPrinter(System.out));
384 +        return runner;
385 +    }
386 +
387      /**
388       * Runs all unit tests in the given test suite.
389       * Actual behavior influenced by jsr166.* system properties.
# Line 228 | Line 395 | public class JSR166TestCase extends Test
395              System.setSecurityManager(new SecurityManager());
396          }
397          for (int i = 0; i < suiteRuns; i++) {
398 <            TestResult result = junit.textui.TestRunner.run(suite);
398 >            TestResult result = newPithyTestRunner().doRun(suite);
399              if (!result.wasSuccessful())
400                  System.exit(1);
401              System.gc();
# Line 254 | Line 421 | public class JSR166TestCase extends Test
421          for (String testClassName : testClassNames) {
422              try {
423                  Class<?> testClass = Class.forName(testClassName);
424 <                Method m = testClass.getDeclaredMethod("suite",
258 <                                                       new Class<?>[0]);
424 >                Method m = testClass.getDeclaredMethod("suite");
425                  suite.addTest(newTestSuite((Test)m.invoke(null)));
426 <            } catch (Exception e) {
427 <                throw new Error("Missing test class", e);
426 >            } catch (ReflectiveOperationException e) {
427 >                throw new AssertionError("Missing test class", e);
428              }
429          }
430      }
# Line 280 | Line 446 | public class JSR166TestCase extends Test
446          }
447      }
448  
449 <    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
450 <    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
451 <    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
452 <    public static boolean atLeastJava9() {
453 <        return JAVA_CLASS_VERSION >= 53.0
288 <            // As of 2015-09, java9 still uses 52.0 class file version
289 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
290 <    }
291 <    public static boolean atLeastJava10() {
292 <        return JAVA_CLASS_VERSION >= 54.0
293 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
294 <    }
449 >    public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
450 >    public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
451 >    public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
452 >    public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
453 >    public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
454  
455      /**
456       * Collects all JSR166 unit tests as one suite.
# Line 312 | Line 471 | public class JSR166TestCase extends Test
471              AbstractQueuedLongSynchronizerTest.suite(),
472              ArrayBlockingQueueTest.suite(),
473              ArrayDequeTest.suite(),
474 +            ArrayListTest.suite(),
475              AtomicBooleanTest.suite(),
476              AtomicIntegerArrayTest.suite(),
477              AtomicIntegerFieldUpdaterTest.suite(),
# Line 334 | Line 494 | public class JSR166TestCase extends Test
494              CopyOnWriteArrayListTest.suite(),
495              CopyOnWriteArraySetTest.suite(),
496              CountDownLatchTest.suite(),
497 +            CountedCompleterTest.suite(),
498              CyclicBarrierTest.suite(),
499              DelayQueueTest.suite(),
500              EntryTest.suite(),
# Line 362 | Line 523 | public class JSR166TestCase extends Test
523              TreeMapTest.suite(),
524              TreeSetTest.suite(),
525              TreeSubMapTest.suite(),
526 <            TreeSubSetTest.suite());
526 >            TreeSubSetTest.suite(),
527 >            VectorTest.suite());
528  
529          // Java8+ test classes
530          if (atLeastJava8()) {
531              String[] java8TestClassNames = {
532 +                "ArrayDeque8Test",
533                  "Atomic8Test",
534                  "CompletableFutureTest",
535                  "ConcurrentHashMap8Test",
536 <                "CountedCompleterTest",
536 >                "CountedCompleter8Test",
537                  "DoubleAccumulatorTest",
538                  "DoubleAdderTest",
539                  "ForkJoinPool8Test",
540                  "ForkJoinTask8Test",
541 +                "HashMapTest",
542 +                "LinkedBlockingDeque8Test",
543 +                "LinkedBlockingQueue8Test",
544                  "LongAccumulatorTest",
545                  "LongAdderTest",
546                  "SplittableRandomTest",
547                  "StampedLockTest",
548                  "SubmissionPublisherTest",
549                  "ThreadLocalRandom8Test",
550 +                "TimeUnit8Test",
551              };
552              addNamedTestClasses(suite, java8TestClassNames);
553          }
# Line 388 | Line 555 | public class JSR166TestCase extends Test
555          // Java9+ test classes
556          if (atLeastJava9()) {
557              String[] java9TestClassNames = {
558 <                // Currently empty
558 >                "AtomicBoolean9Test",
559 >                "AtomicInteger9Test",
560 >                "AtomicIntegerArray9Test",
561 >                "AtomicLong9Test",
562 >                "AtomicLongArray9Test",
563 >                "AtomicReference9Test",
564 >                "AtomicReferenceArray9Test",
565 >                "ExecutorCompletionService9Test",
566 >                "ForkJoinPool9Test",
567              };
568              addNamedTestClasses(suite, java9TestClassNames);
569          }
# Line 399 | Line 574 | public class JSR166TestCase extends Test
574      /** Returns list of junit-style test method names in given class. */
575      public static ArrayList<String> testMethodNames(Class<?> testClass) {
576          Method[] methods = testClass.getDeclaredMethods();
577 <        ArrayList<String> names = new ArrayList<String>(methods.length);
577 >        ArrayList<String> names = new ArrayList<>(methods.length);
578          for (Method method : methods) {
579              if (method.getName().startsWith("test")
580                  && Modifier.isPublic(method.getModifiers())
# Line 426 | Line 601 | public class JSR166TestCase extends Test
601              for (String methodName : testMethodNames(testClass))
602                  suite.addTest((Test) c.newInstance(data, methodName));
603              return suite;
604 <        } catch (Exception e) {
605 <            throw new Error(e);
604 >        } catch (ReflectiveOperationException e) {
605 >            throw new AssertionError(e);
606          }
607      }
608  
# Line 443 | Line 618 | public class JSR166TestCase extends Test
618          if (atLeastJava8()) {
619              String name = testClass.getName();
620              String name8 = name.replaceAll("Test$", "8Test");
621 <            if (name.equals(name8)) throw new Error(name);
621 >            if (name.equals(name8)) throw new AssertionError(name);
622              try {
623                  return (Test)
624                      Class.forName(name8)
625 <                    .getMethod("testSuite", new Class[] { dataClass })
625 >                    .getMethod("testSuite", dataClass)
626                      .invoke(null, data);
627 <            } catch (Exception e) {
628 <                throw new Error(e);
627 >            } catch (ReflectiveOperationException e) {
628 >                throw new AssertionError(e);
629              }
630          } else {
631              return new TestSuite();
632          }
458
633      }
634  
635      // Delays for timing-dependent tests, in milliseconds.
# Line 465 | Line 639 | public class JSR166TestCase extends Test
639      public static long MEDIUM_DELAY_MS;
640      public static long LONG_DELAY_MS;
641  
642 +    private static final long RANDOM_TIMEOUT;
643 +    private static final long RANDOM_EXPIRED_TIMEOUT;
644 +    private static final TimeUnit RANDOM_TIMEUNIT;
645 +    static {
646 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
647 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
648 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
649 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
650 +        TimeUnit[] timeUnits = TimeUnit.values();
651 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
652 +    }
653 +
654 +    /**
655 +     * Returns a timeout for use when any value at all will do.
656 +     */
657 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
658 +
659      /**
660 <     * Returns the shortest timed delay. This could
661 <     * be reimplemented to use for example a Property.
660 >     * Returns a timeout that means "no waiting", i.e. not positive.
661 >     */
662 >    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
663 >
664 >    /**
665 >     * Returns a random non-null TimeUnit.
666 >     */
667 >    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
668 >
669 >    /**
670 >     * Returns the shortest timed delay. This can be scaled up for
671 >     * slow machines using the jsr166.delay.factor system property,
672 >     * or via jtreg's -timeoutFactor: flag.
673 >     * http://openjdk.java.net/jtreg/command-help.html
674       */
675      protected long getShortDelay() {
676 <        return 50;
676 >        return (long) (50 * delayFactor);
677      }
678  
679      /**
# Line 483 | Line 686 | public class JSR166TestCase extends Test
686          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
687      }
688  
689 +    private static final long TIMEOUT_DELAY_MS
690 +        = (long) (12.0 * Math.cbrt(delayFactor));
691 +
692      /**
693 <     * Returns a timeout in milliseconds to be used in tests that
694 <     * verify that operations block or time out.
693 >     * Returns a timeout in milliseconds to be used in tests that verify
694 >     * that operations block or time out.  We want this to be longer
695 >     * than the OS scheduling quantum, but not too long, so don't scale
696 >     * linearly with delayFactor; we use "crazy" cube root instead.
697       */
698 <    long timeoutMillis() {
699 <        return SHORT_DELAY_MS / 4;
698 >    static long timeoutMillis() {
699 >        return TIMEOUT_DELAY_MS;
700      }
701  
702      /**
# Line 504 | Line 712 | public class JSR166TestCase extends Test
712       * The first exception encountered if any threadAssertXXX method fails.
713       */
714      private final AtomicReference<Throwable> threadFailure
715 <        = new AtomicReference<Throwable>(null);
715 >        = new AtomicReference<>(null);
716  
717      /**
718       * Records an exception so that it can be rethrown later in the test
# Line 513 | Line 721 | public class JSR166TestCase extends Test
721       * the same test have no effect.
722       */
723      public void threadRecordFailure(Throwable t) {
724 +        System.err.println(t);
725 +        dumpTestThreads();
726          threadFailure.compareAndSet(null, t);
727      }
728  
# Line 520 | Line 730 | public class JSR166TestCase extends Test
730          setDelays();
731      }
732  
733 +    void tearDownFail(String format, Object... args) {
734 +        String msg = toString() + ": " + String.format(format, args);
735 +        System.err.println(msg);
736 +        dumpTestThreads();
737 +        throw new AssertionError(msg);
738 +    }
739 +
740      /**
741       * Extra checks that get done for all test cases.
742       *
# Line 538 | Line 755 | public class JSR166TestCase extends Test
755                  throw (RuntimeException) t;
756              else if (t instanceof Exception)
757                  throw (Exception) t;
758 <            else {
759 <                AssertionFailedError afe =
543 <                    new AssertionFailedError(t.toString());
544 <                afe.initCause(t);
545 <                throw afe;
546 <            }
758 >            else
759 >                throw new AssertionError(t.toString(), t);
760          }
761  
762          if (Thread.interrupted())
763 <            throw new AssertionFailedError("interrupt status set in main thread");
763 >            tearDownFail("interrupt status set in main thread");
764  
765          checkForkJoinPoolThreadLeaks();
766      }
767  
768      /**
769 <     * Finds missing try { ... } finally { joinPool(e); }
769 >     * Finds missing PoolCleaners
770       */
771      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
772 <        Thread[] survivors = new Thread[5];
772 >        Thread[] survivors = new Thread[7];
773          int count = Thread.enumerate(survivors);
774          for (int i = 0; i < count; i++) {
775              Thread thread = survivors[i];
# Line 564 | Line 777 | public class JSR166TestCase extends Test
777              if (name.startsWith("ForkJoinPool-")) {
778                  // give thread some time to terminate
779                  thread.join(LONG_DELAY_MS);
780 <                if (!thread.isAlive()) continue;
781 <                throw new AssertionFailedError
782 <                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
570 <                                   toString(), name));
780 >                if (thread.isAlive())
781 >                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
782 >                                 thread);
783              }
784          }
785 +
786 +        if (!ForkJoinPool.commonPool()
787 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
788 +            tearDownFail("ForkJoin common pool thread stuck");
789      }
790  
791      /**
792       * Just like fail(reason), but additionally recording (using
793 <     * threadRecordFailure) any AssertionFailedError thrown, so that
794 <     * the current testcase will fail.
793 >     * threadRecordFailure) any AssertionError thrown, so that the
794 >     * current testcase will fail.
795       */
796      public void threadFail(String reason) {
797          try {
798              fail(reason);
799 <        } catch (AssertionFailedError t) {
800 <            threadRecordFailure(t);
801 <            fail(reason);
799 >        } catch (AssertionError fail) {
800 >            threadRecordFailure(fail);
801 >            throw fail;
802          }
803      }
804  
805      /**
806       * Just like assertTrue(b), but additionally recording (using
807 <     * threadRecordFailure) any AssertionFailedError thrown, so that
808 <     * the current testcase will fail.
807 >     * threadRecordFailure) any AssertionError thrown, so that the
808 >     * current testcase will fail.
809       */
810      public void threadAssertTrue(boolean b) {
811          try {
812              assertTrue(b);
813 <        } catch (AssertionFailedError t) {
814 <            threadRecordFailure(t);
815 <            throw t;
813 >        } catch (AssertionError fail) {
814 >            threadRecordFailure(fail);
815 >            throw fail;
816          }
817      }
818  
819      /**
820       * Just like assertFalse(b), but additionally recording (using
821 <     * threadRecordFailure) any AssertionFailedError thrown, so that
822 <     * the current testcase will fail.
821 >     * threadRecordFailure) any AssertionError thrown, so that the
822 >     * current testcase will fail.
823       */
824      public void threadAssertFalse(boolean b) {
825          try {
826              assertFalse(b);
827 <        } catch (AssertionFailedError t) {
828 <            threadRecordFailure(t);
829 <            throw t;
827 >        } catch (AssertionError fail) {
828 >            threadRecordFailure(fail);
829 >            throw fail;
830          }
831      }
832  
833      /**
834       * Just like assertNull(x), but additionally recording (using
835 <     * threadRecordFailure) any AssertionFailedError thrown, so that
836 <     * the current testcase will fail.
835 >     * threadRecordFailure) any AssertionError thrown, so that the
836 >     * current testcase will fail.
837       */
838      public void threadAssertNull(Object x) {
839          try {
840              assertNull(x);
841 <        } catch (AssertionFailedError t) {
842 <            threadRecordFailure(t);
843 <            throw t;
841 >        } catch (AssertionError fail) {
842 >            threadRecordFailure(fail);
843 >            throw fail;
844          }
845      }
846  
847      /**
848       * Just like assertEquals(x, y), but additionally recording (using
849 <     * threadRecordFailure) any AssertionFailedError thrown, so that
850 <     * the current testcase will fail.
849 >     * threadRecordFailure) any AssertionError thrown, so that the
850 >     * current testcase will fail.
851       */
852      public void threadAssertEquals(long x, long y) {
853          try {
854              assertEquals(x, y);
855 <        } catch (AssertionFailedError t) {
856 <            threadRecordFailure(t);
857 <            throw t;
855 >        } catch (AssertionError fail) {
856 >            threadRecordFailure(fail);
857 >            throw fail;
858          }
859      }
860  
861      /**
862       * Just like assertEquals(x, y), but additionally recording (using
863 <     * threadRecordFailure) any AssertionFailedError thrown, so that
864 <     * the current testcase will fail.
863 >     * threadRecordFailure) any AssertionError thrown, so that the
864 >     * current testcase will fail.
865       */
866      public void threadAssertEquals(Object x, Object y) {
867          try {
868              assertEquals(x, y);
869 <        } catch (AssertionFailedError fail) {
869 >        } catch (AssertionError fail) {
870              threadRecordFailure(fail);
871              throw fail;
872          } catch (Throwable fail) {
# Line 660 | Line 876 | public class JSR166TestCase extends Test
876  
877      /**
878       * Just like assertSame(x, y), but additionally recording (using
879 <     * threadRecordFailure) any AssertionFailedError thrown, so that
880 <     * the current testcase will fail.
879 >     * threadRecordFailure) any AssertionError thrown, so that the
880 >     * current testcase will fail.
881       */
882      public void threadAssertSame(Object x, Object y) {
883          try {
884              assertSame(x, y);
885 <        } catch (AssertionFailedError fail) {
885 >        } catch (AssertionError fail) {
886              threadRecordFailure(fail);
887              throw fail;
888          }
# Line 688 | Line 904 | public class JSR166TestCase extends Test
904  
905      /**
906       * Records the given exception using {@link #threadRecordFailure},
907 <     * then rethrows the exception, wrapping it in an
908 <     * AssertionFailedError if necessary.
907 >     * then rethrows the exception, wrapping it in an AssertionError
908 >     * if necessary.
909       */
910      public void threadUnexpectedException(Throwable t) {
911          threadRecordFailure(t);
# Line 698 | Line 914 | public class JSR166TestCase extends Test
914              throw (RuntimeException) t;
915          else if (t instanceof Error)
916              throw (Error) t;
917 <        else {
918 <            AssertionFailedError afe =
703 <                new AssertionFailedError("unexpected exception: " + t);
704 <            afe.initCause(t);
705 <            throw afe;
706 <        }
917 >        else
918 >            throw new AssertionError("unexpected exception: " + t, t);
919      }
920  
921      /**
922       * Delays, via Thread.sleep, for the given millisecond delay, but
923       * if the sleep is shorter than specified, may re-sleep or yield
924 <     * until time elapses.
924 >     * until time elapses.  Ensures that the given time, as measured
925 >     * by System.nanoTime(), has elapsed.
926       */
927      static void delay(long millis) throws InterruptedException {
928 <        long startTime = System.nanoTime();
929 <        long ns = millis * 1000 * 1000;
930 <        for (;;) {
928 >        long nanos = millis * (1000 * 1000);
929 >        final long wakeupTime = System.nanoTime() + nanos;
930 >        do {
931              if (millis > 0L)
932                  Thread.sleep(millis);
933              else // too short to sleep
934                  Thread.yield();
935 <            long d = ns - (System.nanoTime() - startTime);
936 <            if (d > 0L)
937 <                millis = d / (1000 * 1000);
938 <            else
939 <                break;
935 >            nanos = wakeupTime - System.nanoTime();
936 >            millis = nanos / (1000 * 1000);
937 >        } while (nanos >= 0L);
938 >    }
939 >
940 >    /**
941 >     * Allows use of try-with-resources with per-test thread pools.
942 >     */
943 >    class PoolCleaner implements AutoCloseable {
944 >        private final ExecutorService pool;
945 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
946 >        public void close() { joinPool(pool); }
947 >    }
948 >
949 >    /**
950 >     * An extension of PoolCleaner that has an action to release the pool.
951 >     */
952 >    class PoolCleanerWithReleaser extends PoolCleaner {
953 >        private final Runnable releaser;
954 >        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
955 >            super(pool);
956 >            this.releaser = releaser;
957 >        }
958 >        public void close() {
959 >            try {
960 >                releaser.run();
961 >            } finally {
962 >                super.close();
963 >            }
964          }
965      }
966  
967 +    PoolCleaner cleaner(ExecutorService pool) {
968 +        return new PoolCleaner(pool);
969 +    }
970 +
971 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
972 +        return new PoolCleanerWithReleaser(pool, releaser);
973 +    }
974 +
975 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
976 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
977 +    }
978 +
979 +    Runnable releaser(final CountDownLatch latch) {
980 +        return new Runnable() { public void run() {
981 +            do { latch.countDown(); }
982 +            while (latch.getCount() > 0);
983 +        }};
984 +    }
985 +
986 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
987 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
988 +    }
989 +
990 +    Runnable releaser(final AtomicBoolean flag) {
991 +        return new Runnable() { public void run() { flag.set(true); }};
992 +    }
993 +
994      /**
995       * Waits out termination of a thread pool or fails doing so.
996       */
997      void joinPool(ExecutorService pool) {
998          try {
999              pool.shutdown();
1000 <            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
1001 <                fail("ExecutorService " + pool +
1002 <                     " did not terminate in a timely manner");
1000 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
1001 >                try {
1002 >                    threadFail("ExecutorService " + pool +
1003 >                               " did not terminate in a timely manner");
1004 >                } finally {
1005 >                    // last resort, for the benefit of subsequent tests
1006 >                    pool.shutdownNow();
1007 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
1008 >                }
1009 >            }
1010          } catch (SecurityException ok) {
1011              // Allowed in case test doesn't have privs
1012          } catch (InterruptedException fail) {
1013 <            fail("Unexpected InterruptedException");
1013 >            threadFail("Unexpected InterruptedException");
1014          }
1015      }
1016  
1017 <    /** Like Runnable, but with the freedom to throw anything */
1017 >    /**
1018 >     * Like Runnable, but with the freedom to throw anything.
1019 >     * junit folks had the same idea:
1020 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1021 >     */
1022      interface Action { public void run() throws Throwable; }
1023  
1024      /**
# Line 753 | Line 1028 | public class JSR166TestCase extends Test
1028       */
1029      void testInParallel(Action ... actions) {
1030          ExecutorService pool = Executors.newCachedThreadPool();
1031 <        try {
1031 >        try (PoolCleaner cleaner = cleaner(pool)) {
1032              ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1033              for (final Action action : actions)
1034                  futures.add(pool.submit(new CheckedRunnable() {
# Line 766 | Line 1041 | public class JSR166TestCase extends Test
1041                  } catch (Exception ex) {
1042                      threadUnexpectedException(ex);
1043                  }
769        } finally {
770            joinPool(pool);
1044          }
1045      }
1046  
1047      /**
1048 <     * A debugging tool to print all stack traces, as jstack does.
1049 <     */
777 <    static void printAllStackTraces() {
778 <        for (ThreadInfo info :
779 <                 ManagementFactory.getThreadMXBean()
780 <                 .dumpAllThreads(true, true))
781 <            System.err.print(info);
782 <    }
783 <
784 <    /**
785 <     * Checks that thread does not terminate within the default
786 <     * millisecond delay of {@code timeoutMillis()}.
1048 >     * A debugging tool to print stack traces of most threads, as jstack does.
1049 >     * Uninteresting threads are filtered out.
1050       */
1051 <    void assertThreadStaysAlive(Thread thread) {
1052 <        assertThreadStaysAlive(thread, timeoutMillis());
1053 <    }
1051 >    static void dumpTestThreads() {
1052 >        SecurityManager sm = System.getSecurityManager();
1053 >        if (sm != null) {
1054 >            try {
1055 >                System.setSecurityManager(null);
1056 >            } catch (SecurityException giveUp) {
1057 >                return;
1058 >            }
1059 >        }
1060  
1061 <    /**
1062 <     * Checks that thread does not terminate within the given millisecond delay.
1063 <     */
1064 <    void assertThreadStaysAlive(Thread thread, long millis) {
1065 <        try {
1066 <            // No need to optimize the failing case via Thread.join.
1067 <            delay(millis);
1068 <            assertTrue(thread.isAlive());
1069 <        } catch (InterruptedException fail) {
1070 <            fail("Unexpected InterruptedException");
1061 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1062 >        System.err.println("------ stacktrace dump start ------");
1063 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1064 >            final String name = info.getThreadName();
1065 >            String lockName;
1066 >            if ("Signal Dispatcher".equals(name))
1067 >                continue;
1068 >            if ("Reference Handler".equals(name)
1069 >                && (lockName = info.getLockName()) != null
1070 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1071 >                continue;
1072 >            if ("Finalizer".equals(name)
1073 >                && (lockName = info.getLockName()) != null
1074 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1075 >                continue;
1076 >            if ("checkForWedgedTest".equals(name))
1077 >                continue;
1078 >            System.err.print(info);
1079          }
1080 <    }
1080 >        System.err.println("------ stacktrace dump end ------");
1081  
1082 <    /**
806 <     * Checks that the threads do not terminate within the default
807 <     * millisecond delay of {@code timeoutMillis()}.
808 <     */
809 <    void assertThreadsStayAlive(Thread... threads) {
810 <        assertThreadsStayAlive(timeoutMillis(), threads);
1082 >        if (sm != null) System.setSecurityManager(sm);
1083      }
1084  
1085      /**
1086 <     * Checks that the threads do not terminate within the given millisecond delay.
1086 >     * Checks that thread eventually enters the expected blocked thread state.
1087       */
1088 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1089 <        try {
1090 <            // No need to optimize the failing case via Thread.join.
1091 <            delay(millis);
1092 <            for (Thread thread : threads)
1093 <                assertTrue(thread.isAlive());
1094 <        } catch (InterruptedException fail) {
1095 <            fail("Unexpected InterruptedException");
1088 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1089 >        // always sleep at least 1 ms, with high probability avoiding
1090 >        // transitory states
1091 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1092 >            try { delay(1); }
1093 >            catch (InterruptedException fail) {
1094 >                throw new AssertionError("Unexpected InterruptedException", fail);
1095 >            }
1096 >            Thread.State s = thread.getState();
1097 >            if (s == expected)
1098 >                return;
1099 >            else if (s == Thread.State.TERMINATED)
1100 >                fail("Unexpected thread termination");
1101          }
1102 +        fail("timed out waiting for thread to enter thread state " + expected);
1103      }
1104  
1105      /**
# Line 862 | Line 1140 | public class JSR166TestCase extends Test
1140      }
1141  
1142      /**
1143 +     * The maximum number of consecutive spurious wakeups we should
1144 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1145 +     */
1146 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1147 +
1148 +    /**
1149       * The number of elements to place in collections, arrays, etc.
1150       */
1151      public static final int SIZE = 20;
# Line 965 | Line 1249 | public class JSR166TestCase extends Test
1249          }
1250          public void refresh() {}
1251          public String toString() {
1252 <            List<Permission> ps = new ArrayList<Permission>();
1252 >            List<Permission> ps = new ArrayList<>();
1253              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1254                  ps.add(e.nextElement());
1255              return "AdjustablePolicy with permissions " + ps;
# Line 993 | Line 1277 | public class JSR166TestCase extends Test
1277  
1278      /**
1279       * Sleeps until the given time has elapsed.
1280 <     * Throws AssertionFailedError if interrupted.
1280 >     * Throws AssertionError if interrupted.
1281       */
1282 <    void sleep(long millis) {
1282 >    static void sleep(long millis) {
1283          try {
1284              delay(millis);
1285          } catch (InterruptedException fail) {
1286 <            AssertionFailedError afe =
1003 <                new AssertionFailedError("Unexpected InterruptedException");
1004 <            afe.initCause(fail);
1005 <            throw afe;
1286 >            throw new AssertionError("Unexpected InterruptedException", fail);
1287          }
1288      }
1289  
# Line 1011 | Line 1292 | public class JSR166TestCase extends Test
1292       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1293       */
1294      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1295 <        long startTime = System.nanoTime();
1295 >        long startTime = 0L;
1296          for (;;) {
1297              Thread.State s = thread.getState();
1298              if (s == Thread.State.BLOCKED ||
# Line 1020 | Line 1301 | public class JSR166TestCase extends Test
1301                  return;
1302              else if (s == Thread.State.TERMINATED)
1303                  fail("Unexpected thread termination");
1304 +            else if (startTime == 0L)
1305 +                startTime = System.nanoTime();
1306              else if (millisElapsedSince(startTime) > timeoutMillis) {
1307                  threadAssertTrue(thread.isAlive());
1308 <                return;
1308 >                fail("timed out waiting for thread to enter wait state");
1309              }
1310              Thread.yield();
1311          }
1312      }
1313  
1314      /**
1315 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1316 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1315 >     * Spin-waits up to the specified number of milliseconds for the given
1316 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1317 >     * and additionally satisfy the given condition.
1318 >     */
1319 >    void waitForThreadToEnterWaitState(
1320 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1321 >        long startTime = 0L;
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 >                try {
1328 >                    if (waitingForGodot.call())
1329 >                        return;
1330 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1331 >            }
1332 >            else if (s == Thread.State.TERMINATED)
1333 >                fail("Unexpected thread termination");
1334 >            else if (startTime == 0L)
1335 >                startTime = System.nanoTime();
1336 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1337 >                threadAssertTrue(thread.isAlive());
1338 >                fail("timed out waiting for thread to enter wait state");
1339 >            }
1340 >            Thread.yield();
1341 >        }
1342 >    }
1343 >
1344 >    /**
1345 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1346 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1347       */
1348      void waitForThreadToEnterWaitState(Thread thread) {
1349          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1350      }
1351  
1352      /**
1353 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1354 +     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1355 +     * and additionally satisfy the given condition.
1356 +     */
1357 +    void waitForThreadToEnterWaitState(
1358 +        Thread thread, Callable<Boolean> waitingForGodot) {
1359 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1360 +    }
1361 +
1362 +    /**
1363       * Returns the number of milliseconds since time given by
1364       * startNanoTime, which must have been previously returned from a
1365       * call to {@link System#nanoTime()}.
# Line 1051 | Line 1374 | public class JSR166TestCase extends Test
1374   //             r.run();
1375   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1376   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1377 < //             throw new AssertionFailedError("did not return promptly");
1377 > //             throw new AssertionError("did not return promptly");
1378   //     }
1379  
1380   //     void assertTerminatesPromptly(Runnable r) {
# Line 1068 | Line 1391 | public class JSR166TestCase extends Test
1391              assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1392          } catch (Throwable fail) { threadUnexpectedException(fail); }
1393          if (millisElapsedSince(startTime) > timeoutMillis/2)
1394 <            throw new AssertionFailedError("timed get did not return promptly");
1394 >            throw new AssertionError("timed get did not return promptly");
1395      }
1396  
1397      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1098 | Line 1421 | public class JSR166TestCase extends Test
1421          } finally {
1422              if (t.getState() != Thread.State.TERMINATED) {
1423                  t.interrupt();
1424 <                fail("Test timed out");
1424 >                threadFail("timed out waiting for thread to terminate");
1425              }
1426          }
1427      }
# Line 1126 | Line 1449 | public class JSR166TestCase extends Test
1449          }
1450      }
1451  
1129    public abstract class RunnableShouldThrow implements Runnable {
1130        protected abstract void realRun() throws Throwable;
1131
1132        final Class<?> exceptionClass;
1133
1134        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1135            this.exceptionClass = exceptionClass;
1136        }
1137
1138        public final void run() {
1139            try {
1140                realRun();
1141                threadShouldThrow(exceptionClass.getSimpleName());
1142            } catch (Throwable t) {
1143                if (! exceptionClass.isInstance(t))
1144                    threadUnexpectedException(t);
1145            }
1146        }
1147    }
1148
1452      public abstract class ThreadShouldThrow extends Thread {
1453          protected abstract void realRun() throws Throwable;
1454  
# Line 1223 | Line 1526 | public class JSR166TestCase extends Test
1526      public static final String TEST_STRING = "a test string";
1527  
1528      public static class StringTask implements Callable<String> {
1529 <        public String call() { return TEST_STRING; }
1529 >        final String value;
1530 >        public StringTask() { this(TEST_STRING); }
1531 >        public StringTask(String value) { this.value = value; }
1532 >        public String call() { return value; }
1533      }
1534  
1535      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 1236 | Line 1542 | public class JSR166TestCase extends Test
1542              }};
1543      }
1544  
1545 <    public Runnable awaiter(final CountDownLatch latch) {
1545 >    public Runnable countDowner(final CountDownLatch latch) {
1546          return new CheckedRunnable() {
1547              public void realRun() throws InterruptedException {
1548 <                await(latch);
1548 >                latch.countDown();
1549              }};
1550      }
1551  
1552 <    public void await(CountDownLatch latch) {
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 LatchAwaiter awaiter(CountDownLatch latch) {
1567 >        return new LatchAwaiter(latch);
1568 >    }
1569 >
1570 >    public void await(CountDownLatch latch, long timeoutMillis) {
1571          try {
1572 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1572 >            if (!latch.await(timeoutMillis, MILLISECONDS))
1573 >                fail("timed out waiting for CountDownLatch for "
1574 >                     + (timeoutMillis/1000) + " sec");
1575          } catch (Throwable fail) {
1576              threadUnexpectedException(fail);
1577          }
1578      }
1579  
1580 +    public void await(CountDownLatch latch) {
1581 +        await(latch, LONG_DELAY_MS);
1582 +    }
1583 +
1584      public void await(Semaphore semaphore) {
1585          try {
1586 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1586 >            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1587 >                fail("timed out waiting for Semaphore for "
1588 >                     + (LONG_DELAY_MS/1000) + " sec");
1589 >        } catch (Throwable fail) {
1590 >            threadUnexpectedException(fail);
1591 >        }
1592 >    }
1593 >
1594 >    public void await(CyclicBarrier barrier) {
1595 >        try {
1596 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1597          } catch (Throwable fail) {
1598              threadUnexpectedException(fail);
1599          }
# Line 1273 | Line 1613 | public class JSR166TestCase extends Test
1613   //         long startTime = System.nanoTime();
1614   //         while (!flag.get()) {
1615   //             if (millisElapsedSince(startTime) > timeoutMillis)
1616 < //                 throw new AssertionFailedError("timed out");
1616 > //                 throw new AssertionError("timed out");
1617   //             Thread.yield();
1618   //         }
1619   //     }
# Line 1282 | Line 1622 | public class JSR166TestCase extends Test
1622          public String call() { throw new NullPointerException(); }
1623      }
1624  
1285    public static class CallableOne implements Callable<Integer> {
1286        public Integer call() { return one; }
1287    }
1288
1289    public class ShortRunnable extends CheckedRunnable {
1290        protected void realRun() throws Throwable {
1291            delay(SHORT_DELAY_MS);
1292        }
1293    }
1294
1295    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1296        protected void realRun() throws InterruptedException {
1297            delay(SHORT_DELAY_MS);
1298        }
1299    }
1300
1301    public class SmallRunnable extends CheckedRunnable {
1302        protected void realRun() throws Throwable {
1303            delay(SMALL_DELAY_MS);
1304        }
1305    }
1306
1625      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1626          protected void realRun() {
1627              try {
# Line 1312 | Line 1630 | public class JSR166TestCase extends Test
1630          }
1631      }
1632  
1315    public class SmallCallable extends CheckedCallable {
1316        protected Object realCall() throws InterruptedException {
1317            delay(SMALL_DELAY_MS);
1318            return Boolean.TRUE;
1319        }
1320    }
1321
1322    public class MediumRunnable extends CheckedRunnable {
1323        protected void realRun() throws Throwable {
1324            delay(MEDIUM_DELAY_MS);
1325        }
1326    }
1327
1328    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1329        protected void realRun() throws InterruptedException {
1330            delay(MEDIUM_DELAY_MS);
1331        }
1332    }
1333
1633      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1634          return new CheckedRunnable() {
1635              protected void realRun() {
# Line 1340 | Line 1639 | public class JSR166TestCase extends Test
1639              }};
1640      }
1641  
1343    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1344        protected void realRun() {
1345            try {
1346                delay(MEDIUM_DELAY_MS);
1347            } catch (InterruptedException ok) {}
1348        }
1349    }
1350
1351    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1352        protected void realRun() {
1353            try {
1354                delay(LONG_DELAY_MS);
1355            } catch (InterruptedException ok) {}
1356        }
1357    }
1358
1642      /**
1643       * For use as ThreadFactory in constructors
1644       */
# Line 1369 | Line 1652 | public class JSR166TestCase extends Test
1652          boolean isDone();
1653      }
1654  
1372    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1373        return new TrackedRunnable() {
1374                private volatile boolean done = false;
1375                public boolean isDone() { return done; }
1376                public void run() {
1377                    try {
1378                        delay(timeoutMillis);
1379                        done = true;
1380                    } catch (InterruptedException ok) {}
1381                }
1382            };
1383    }
1384
1385    public static class TrackedShortRunnable implements Runnable {
1386        public volatile boolean done = false;
1387        public void run() {
1388            try {
1389                delay(SHORT_DELAY_MS);
1390                done = true;
1391            } catch (InterruptedException ok) {}
1392        }
1393    }
1394
1395    public static class TrackedSmallRunnable implements Runnable {
1396        public volatile boolean done = false;
1397        public void run() {
1398            try {
1399                delay(SMALL_DELAY_MS);
1400                done = true;
1401            } catch (InterruptedException ok) {}
1402        }
1403    }
1404
1405    public static class TrackedMediumRunnable implements Runnable {
1406        public volatile boolean done = false;
1407        public void run() {
1408            try {
1409                delay(MEDIUM_DELAY_MS);
1410                done = true;
1411            } catch (InterruptedException ok) {}
1412        }
1413    }
1414
1415    public static class TrackedLongRunnable implements Runnable {
1416        public volatile boolean done = false;
1417        public void run() {
1418            try {
1419                delay(LONG_DELAY_MS);
1420                done = true;
1421            } catch (InterruptedException ok) {}
1422        }
1423    }
1424
1655      public static class TrackedNoOpRunnable implements Runnable {
1656          public volatile boolean done = false;
1657          public void run() {
# Line 1429 | Line 1659 | public class JSR166TestCase extends Test
1659          }
1660      }
1661  
1432    public static class TrackedCallable implements Callable {
1433        public volatile boolean done = false;
1434        public Object call() {
1435            try {
1436                delay(SMALL_DELAY_MS);
1437                done = true;
1438            } catch (InterruptedException ok) {}
1439            return Boolean.TRUE;
1440        }
1441    }
1442
1662      /**
1663       * Analog of CheckedRunnable for RecursiveAction
1664       */
# Line 1481 | Line 1700 | public class JSR166TestCase extends Test
1700  
1701      /**
1702       * A CyclicBarrier that uses timed await and fails with
1703 <     * AssertionFailedErrors instead of throwing checked exceptions.
1703 >     * AssertionErrors instead of throwing checked exceptions.
1704       */
1705 <    public class CheckedBarrier extends CyclicBarrier {
1705 >    public static class CheckedBarrier extends CyclicBarrier {
1706          public CheckedBarrier(int parties) { super(parties); }
1707  
1708          public int await() {
1709              try {
1710                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1711              } catch (TimeoutException timedOut) {
1712 <                throw new AssertionFailedError("timed out");
1712 >                throw new AssertionError("timed out");
1713              } catch (Exception fail) {
1714 <                AssertionFailedError afe =
1496 <                    new AssertionFailedError("Unexpected exception: " + fail);
1497 <                afe.initCause(fail);
1498 <                throw afe;
1714 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1715              }
1716          }
1717      }
# Line 1506 | Line 1722 | public class JSR166TestCase extends Test
1722              assertEquals(0, q.size());
1723              assertNull(q.peek());
1724              assertNull(q.poll());
1725 <            assertNull(q.poll(0, MILLISECONDS));
1725 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1726              assertEquals(q.toString(), "[]");
1727              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1728              assertFalse(q.iterator().hasNext());
# Line 1547 | Line 1763 | public class JSR166TestCase extends Test
1763          }
1764      }
1765  
1766 +    void assertImmutable(final Object o) {
1767 +        if (o instanceof Collection) {
1768 +            assertThrows(
1769 +                UnsupportedOperationException.class,
1770 +                new Runnable() { public void run() {
1771 +                        ((Collection) o).add(null);}});
1772 +        }
1773 +    }
1774 +
1775      @SuppressWarnings("unchecked")
1776      <T> T serialClone(T o) {
1777          try {
1778              ObjectInputStream ois = new ObjectInputStream
1779                  (new ByteArrayInputStream(serialBytes(o)));
1780              T clone = (T) ois.readObject();
1781 +            if (o == clone) assertImmutable(o);
1782              assertSame(o.getClass(), clone.getClass());
1783              return clone;
1784          } catch (Throwable fail) {
# Line 1561 | Line 1787 | public class JSR166TestCase extends Test
1787          }
1788      }
1789  
1790 +    /**
1791 +     * A version of serialClone that leaves error handling (for
1792 +     * e.g. NotSerializableException) up to the caller.
1793 +     */
1794 +    @SuppressWarnings("unchecked")
1795 +    <T> T serialClonePossiblyFailing(T o)
1796 +        throws ReflectiveOperationException, java.io.IOException {
1797 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1798 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1799 +        oos.writeObject(o);
1800 +        oos.flush();
1801 +        oos.close();
1802 +        ObjectInputStream ois = new ObjectInputStream
1803 +            (new ByteArrayInputStream(bos.toByteArray()));
1804 +        T clone = (T) ois.readObject();
1805 +        if (o == clone) assertImmutable(o);
1806 +        assertSame(o.getClass(), clone.getClass());
1807 +        return clone;
1808 +    }
1809 +
1810 +    /**
1811 +     * If o implements Cloneable and has a public clone method,
1812 +     * returns a clone of o, else null.
1813 +     */
1814 +    @SuppressWarnings("unchecked")
1815 +    <T> T cloneableClone(T o) {
1816 +        if (!(o instanceof Cloneable)) return null;
1817 +        final T clone;
1818 +        try {
1819 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1820 +        } catch (NoSuchMethodException ok) {
1821 +            return null;
1822 +        } catch (ReflectiveOperationException unexpected) {
1823 +            throw new Error(unexpected);
1824 +        }
1825 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1826 +        assertSame(o.getClass(), clone.getClass());
1827 +        return clone;
1828 +    }
1829 +
1830      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1831                               Runnable... throwingActions) {
1832          for (Runnable throwingAction : throwingActions) {
# Line 1568 | Line 1834 | public class JSR166TestCase extends Test
1834              try { throwingAction.run(); }
1835              catch (Throwable t) {
1836                  threw = true;
1837 <                if (!expectedExceptionClass.isInstance(t)) {
1838 <                    AssertionFailedError afe =
1839 <                        new AssertionFailedError
1840 <                        ("Expected " + expectedExceptionClass.getName() +
1841 <                         ", got " + t.getClass().getName());
1576 <                    afe.initCause(t);
1577 <                    threadUnexpectedException(afe);
1578 <                }
1837 >                if (!expectedExceptionClass.isInstance(t))
1838 >                    throw new AssertionError(
1839 >                            "Expected " + expectedExceptionClass.getName() +
1840 >                            ", got " + t.getClass().getName(),
1841 >                            t);
1842              }
1843              if (!threw)
1844                  shouldThrow(expectedExceptionClass.getName());
# Line 1589 | Line 1852 | public class JSR166TestCase extends Test
1852          } catch (NoSuchElementException success) {}
1853          assertFalse(it.hasNext());
1854      }
1855 +
1856 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1857 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1858 +    }
1859 +
1860 +    public Runnable runnableThrowing(final RuntimeException ex) {
1861 +        return new Runnable() { public void run() { throw ex; }};
1862 +    }
1863 +
1864 +    /** A reusable thread pool to be shared by tests. */
1865 +    static final ExecutorService cachedThreadPool =
1866 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1867 +                               1000L, MILLISECONDS,
1868 +                               new SynchronousQueue<Runnable>());
1869 +
1870 +    static <T> void shuffle(T[] array) {
1871 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1872 +    }
1873 +
1874 +    /**
1875 +     * Returns the same String as would be returned by {@link
1876 +     * Object#toString}, whether or not the given object's class
1877 +     * overrides toString().
1878 +     *
1879 +     * @see System#identityHashCode
1880 +     */
1881 +    static String identityString(Object x) {
1882 +        return x.getClass().getName()
1883 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1884 +    }
1885 +
1886 +    // --- Shared assertions for Executor tests ---
1887 +
1888 +    /**
1889 +     * Returns maximum number of tasks that can be submitted to given
1890 +     * pool (with bounded queue) before saturation (when submission
1891 +     * throws RejectedExecutionException).
1892 +     */
1893 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1894 +        BlockingQueue<Runnable> q = pool.getQueue();
1895 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1896 +    }
1897 +
1898 +    @SuppressWarnings("FutureReturnValueIgnored")
1899 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1900 +        try {
1901 +            e.execute((Runnable) null);
1902 +            shouldThrow();
1903 +        } catch (NullPointerException success) {}
1904 +
1905 +        if (! (e instanceof ExecutorService)) return;
1906 +        ExecutorService es = (ExecutorService) e;
1907 +        try {
1908 +            es.submit((Runnable) null);
1909 +            shouldThrow();
1910 +        } catch (NullPointerException success) {}
1911 +        try {
1912 +            es.submit((Runnable) null, Boolean.TRUE);
1913 +            shouldThrow();
1914 +        } catch (NullPointerException success) {}
1915 +        try {
1916 +            es.submit((Callable) null);
1917 +            shouldThrow();
1918 +        } catch (NullPointerException success) {}
1919 +
1920 +        if (! (e instanceof ScheduledExecutorService)) return;
1921 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1922 +        try {
1923 +            ses.schedule((Runnable) null,
1924 +                         randomTimeout(), randomTimeUnit());
1925 +            shouldThrow();
1926 +        } catch (NullPointerException success) {}
1927 +        try {
1928 +            ses.schedule((Callable) null,
1929 +                         randomTimeout(), randomTimeUnit());
1930 +            shouldThrow();
1931 +        } catch (NullPointerException success) {}
1932 +        try {
1933 +            ses.scheduleAtFixedRate((Runnable) null,
1934 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1935 +            shouldThrow();
1936 +        } catch (NullPointerException success) {}
1937 +        try {
1938 +            ses.scheduleWithFixedDelay((Runnable) null,
1939 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1940 +            shouldThrow();
1941 +        } catch (NullPointerException success) {}
1942 +    }
1943 +
1944 +    void setRejectedExecutionHandler(
1945 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1946 +        p.setRejectedExecutionHandler(handler);
1947 +        assertSame(handler, p.getRejectedExecutionHandler());
1948 +    }
1949 +
1950 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1951 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1952 +        final long savedTaskCount = p.getTaskCount();
1953 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1954 +        final int savedQueueSize = p.getQueue().size();
1955 +        final boolean stock = (p.getClass().getClassLoader() == null);
1956 +
1957 +        Runnable r = () -> {};
1958 +        Callable<Boolean> c = () -> Boolean.TRUE;
1959 +
1960 +        class Recorder implements RejectedExecutionHandler {
1961 +            public volatile Runnable r = null;
1962 +            public volatile ThreadPoolExecutor p = null;
1963 +            public void reset() { r = null; p = null; }
1964 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1965 +                assertNull(this.r);
1966 +                assertNull(this.p);
1967 +                this.r = r;
1968 +                this.p = p;
1969 +            }
1970 +        }
1971 +
1972 +        // check custom handler is invoked exactly once per task
1973 +        Recorder recorder = new Recorder();
1974 +        setRejectedExecutionHandler(p, recorder);
1975 +        for (int i = 2; i--> 0; ) {
1976 +            recorder.reset();
1977 +            p.execute(r);
1978 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1979 +                assertSame(r, recorder.r);
1980 +            assertSame(p, recorder.p);
1981 +
1982 +            recorder.reset();
1983 +            assertFalse(p.submit(r).isDone());
1984 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1985 +            assertSame(p, recorder.p);
1986 +
1987 +            recorder.reset();
1988 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
1989 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1990 +            assertSame(p, recorder.p);
1991 +
1992 +            recorder.reset();
1993 +            assertFalse(p.submit(c).isDone());
1994 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1995 +            assertSame(p, recorder.p);
1996 +
1997 +            if (p instanceof ScheduledExecutorService) {
1998 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
1999 +                ScheduledFuture<?> future;
2000 +
2001 +                recorder.reset();
2002 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2003 +                assertFalse(future.isDone());
2004 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2005 +                assertSame(p, recorder.p);
2006 +
2007 +                recorder.reset();
2008 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2009 +                assertFalse(future.isDone());
2010 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2011 +                assertSame(p, recorder.p);
2012 +
2013 +                recorder.reset();
2014 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2015 +                assertFalse(future.isDone());
2016 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2017 +                assertSame(p, recorder.p);
2018 +
2019 +                recorder.reset();
2020 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2021 +                assertFalse(future.isDone());
2022 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2023 +                assertSame(p, recorder.p);
2024 +            }
2025 +        }
2026 +
2027 +        // Checking our custom handler above should be sufficient, but
2028 +        // we add some integration tests of standard handlers.
2029 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2030 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2031 +
2032 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2033 +        try {
2034 +            p.execute(setThread);
2035 +            shouldThrow();
2036 +        } catch (RejectedExecutionException success) {}
2037 +        assertNull(thread.get());
2038 +
2039 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2040 +        p.execute(setThread);
2041 +        assertNull(thread.get());
2042 +
2043 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2044 +        p.execute(setThread);
2045 +        if (p.isShutdown())
2046 +            assertNull(thread.get());
2047 +        else
2048 +            assertSame(Thread.currentThread(), thread.get());
2049 +
2050 +        setRejectedExecutionHandler(p, savedHandler);
2051 +
2052 +        // check that pool was not perturbed by handlers
2053 +        assertEquals(savedTaskCount, p.getTaskCount());
2054 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2055 +        assertEquals(savedQueueSize, p.getQueue().size());
2056 +    }
2057 +
2058 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2059 +        assertEquals(x, y);
2060 +        assertEquals(y, x);
2061 +        assertEquals(x.isEmpty(), y.isEmpty());
2062 +        assertEquals(x.size(), y.size());
2063 +        if (x instanceof List) {
2064 +            assertEquals(x.toString(), y.toString());
2065 +        }
2066 +        if (x instanceof List || x instanceof Set) {
2067 +            assertEquals(x.hashCode(), y.hashCode());
2068 +        }
2069 +        if (x instanceof List || x instanceof Deque) {
2070 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2071 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2072 +                                     y.toArray(new Object[0])));
2073 +        }
2074 +    }
2075 +
2076 +    /**
2077 +     * A weaker form of assertCollectionsEquals which does not insist
2078 +     * that the two collections satisfy Object#equals(Object), since
2079 +     * they may use identity semantics as Deques do.
2080 +     */
2081 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2082 +        if (x instanceof List || x instanceof Set)
2083 +            assertCollectionsEquals(x, y);
2084 +        else {
2085 +            assertEquals(x.isEmpty(), y.isEmpty());
2086 +            assertEquals(x.size(), y.size());
2087 +            assertEquals(new HashSet(x), new HashSet(y));
2088 +            if (x instanceof Deque) {
2089 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2090 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2091 +                                         y.toArray(new Object[0])));
2092 +            }
2093 +        }
2094 +    }
2095   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines