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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines