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.126 by jsr166, Sat Jan 17 22:55:06 2015 UTC vs.
Revision 1.249 by jsr166, Sat Nov 24 21:41:20 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  
50 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 62 | 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 84 | 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
105 < * 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 160 | 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 171 | 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();
189 <        long t0 = System.nanoTime();
190 <        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.
201     * Optional command line arg provides the number of iterations to
202     * 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) {
214 <            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          }
218        System.exit(0);
412      }
413  
414      public static TestSuite newTestSuite(Object... suiteOrClasses) {
# Line 236 | 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",
240 <                                                       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 262 | 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");
271 <    }
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 289 | 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 311 | 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 339 | Line 532 | public class JSR166TestCase extends Test
532              TreeMapTest.suite(),
533              TreeSetTest.suite(),
534              TreeSubMapTest.suite(),
535 <            TreeSubSetTest.suite());
535 >            TreeSubSetTest.suite(),
536 >            VectorTest.suite());
537  
538          // Java8+ test classes
539          if (atLeastJava8()) {
540              String[] java8TestClassNames = {
541 +                "ArrayDeque8Test",
542                  "Atomic8Test",
543                  "CompletableFutureTest",
544                  "ConcurrentHashMap8Test",
545 <                "CountedCompleterTest",
545 >                "CountedCompleter8Test",
546                  "DoubleAccumulatorTest",
547                  "DoubleAdderTest",
548                  "ForkJoinPool8Test",
549                  "ForkJoinTask8Test",
550 +                "HashMapTest",
551 +                "LinkedBlockingDeque8Test",
552 +                "LinkedBlockingQueue8Test",
553                  "LongAccumulatorTest",
554                  "LongAdderTest",
555                  "SplittableRandomTest",
556                  "StampedLockTest",
557 +                "SubmissionPublisherTest",
558                  "ThreadLocalRandom8Test",
559 +                "TimeUnit8Test",
560              };
561              addNamedTestClasses(suite, java8TestClassNames);
562          }
# Line 364 | Line 564 | public class JSR166TestCase extends Test
564          // Java9+ test classes
565          if (atLeastJava9()) {
566              String[] java9TestClassNames = {
567 <                "ThreadPoolExecutor9Test",
567 >                "AtomicBoolean9Test",
568 >                "AtomicInteger9Test",
569 >                "AtomicIntegerArray9Test",
570 >                "AtomicLong9Test",
571 >                "AtomicLongArray9Test",
572 >                "AtomicReference9Test",
573 >                "AtomicReferenceArray9Test",
574 >                "ExecutorCompletionService9Test",
575 >                "ForkJoinPool9Test",
576              };
577              addNamedTestClasses(suite, java9TestClassNames);
578          }
# Line 372 | Line 580 | public class JSR166TestCase extends Test
580          return suite;
581      }
582  
583 +    /** Returns list of junit-style test method names in given class. */
584 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
585 +        Method[] methods = testClass.getDeclaredMethods();
586 +        ArrayList<String> names = new ArrayList<>(methods.length);
587 +        for (Method method : methods) {
588 +            if (method.getName().startsWith("test")
589 +                && Modifier.isPublic(method.getModifiers())
590 +                // method.getParameterCount() requires jdk8+
591 +                && method.getParameterTypes().length == 0) {
592 +                names.add(method.getName());
593 +            }
594 +        }
595 +        return names;
596 +    }
597 +
598 +    /**
599 +     * Returns junit-style testSuite for the given test class, but
600 +     * parameterized by passing extra data to each test.
601 +     */
602 +    public static <ExtraData> Test parameterizedTestSuite
603 +        (Class<? extends JSR166TestCase> testClass,
604 +         Class<ExtraData> dataClass,
605 +         ExtraData data) {
606 +        try {
607 +            TestSuite suite = new TestSuite();
608 +            Constructor c =
609 +                testClass.getDeclaredConstructor(dataClass, String.class);
610 +            for (String methodName : testMethodNames(testClass))
611 +                suite.addTest((Test) c.newInstance(data, methodName));
612 +            return suite;
613 +        } catch (ReflectiveOperationException e) {
614 +            throw new AssertionError(e);
615 +        }
616 +    }
617 +
618 +    /**
619 +     * Returns junit-style testSuite for the jdk8 extension of the
620 +     * given test class, but parameterized by passing extra data to
621 +     * each test.  Uses reflection to allow compilation in jdk7.
622 +     */
623 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
624 +        (Class<? extends JSR166TestCase> testClass,
625 +         Class<ExtraData> dataClass,
626 +         ExtraData data) {
627 +        if (atLeastJava8()) {
628 +            String name = testClass.getName();
629 +            String name8 = name.replaceAll("Test$", "8Test");
630 +            if (name.equals(name8)) throw new AssertionError(name);
631 +            try {
632 +                return (Test)
633 +                    Class.forName(name8)
634 +                    .getMethod("testSuite", dataClass)
635 +                    .invoke(null, data);
636 +            } catch (ReflectiveOperationException e) {
637 +                throw new AssertionError(e);
638 +            }
639 +        } else {
640 +            return new TestSuite();
641 +        }
642 +    }
643 +
644      // Delays for timing-dependent tests, in milliseconds.
645  
646      public static long SHORT_DELAY_MS;
# Line 379 | Line 648 | public class JSR166TestCase extends Test
648      public static long MEDIUM_DELAY_MS;
649      public static long LONG_DELAY_MS;
650  
651 +    private static final long RANDOM_TIMEOUT;
652 +    private static final long RANDOM_EXPIRED_TIMEOUT;
653 +    private static final TimeUnit RANDOM_TIMEUNIT;
654 +    static {
655 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
656 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
657 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
658 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
659 +        TimeUnit[] timeUnits = TimeUnit.values();
660 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
661 +    }
662 +
663 +    /**
664 +     * Returns a timeout for use when any value at all will do.
665 +     */
666 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
667 +
668 +    /**
669 +     * Returns a timeout that means "no waiting", i.e. not positive.
670 +     */
671 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
672 +
673 +    /**
674 +     * Returns a random non-null TimeUnit.
675 +     */
676 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
677 +
678      /**
679 <     * Returns the shortest timed delay. This could
680 <     * be reimplemented to use for example a Property.
679 >     * Returns the shortest timed delay. This can be scaled up for
680 >     * slow machines using the jsr166.delay.factor system property,
681 >     * or via jtreg's -timeoutFactor: flag.
682 >     * http://openjdk.java.net/jtreg/command-help.html
683       */
684      protected long getShortDelay() {
685 <        return 50;
685 >        return (long) (50 * delayFactor);
686      }
687  
688      /**
# Line 397 | Line 695 | public class JSR166TestCase extends Test
695          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
696      }
697  
698 +    private static final long TIMEOUT_DELAY_MS
699 +        = (long) (12.0 * Math.cbrt(delayFactor));
700 +
701      /**
702 <     * Returns a timeout in milliseconds to be used in tests that
703 <     * verify that operations block or time out.
702 >     * Returns a timeout in milliseconds to be used in tests that verify
703 >     * that operations block or time out.  We want this to be longer
704 >     * than the OS scheduling quantum, but not too long, so don't scale
705 >     * linearly with delayFactor; we use "crazy" cube root instead.
706       */
707 <    long timeoutMillis() {
708 <        return SHORT_DELAY_MS / 4;
707 >    static long timeoutMillis() {
708 >        return TIMEOUT_DELAY_MS;
709      }
710  
711      /**
712 <     * Returns a new Date instance representing a time delayMillis
713 <     * milliseconds in the future.
712 >     * Returns a new Date instance representing a time at least
713 >     * delayMillis milliseconds in the future.
714       */
715      Date delayedDate(long delayMillis) {
716 <        return new Date(System.currentTimeMillis() + delayMillis);
716 >        // Add 1 because currentTimeMillis is known to round into the past.
717 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
718      }
719  
720      /**
721       * The first exception encountered if any threadAssertXXX method fails.
722       */
723      private final AtomicReference<Throwable> threadFailure
724 <        = new AtomicReference<Throwable>(null);
724 >        = new AtomicReference<>(null);
725  
726      /**
727       * Records an exception so that it can be rethrown later in the test
# Line 426 | Line 730 | public class JSR166TestCase extends Test
730       * the same test have no effect.
731       */
732      public void threadRecordFailure(Throwable t) {
733 +        System.err.println(t);
734 +        dumpTestThreads();
735          threadFailure.compareAndSet(null, t);
736      }
737  
# Line 433 | Line 739 | public class JSR166TestCase extends Test
739          setDelays();
740      }
741  
742 +    void tearDownFail(String format, Object... args) {
743 +        String msg = toString() + ": " + String.format(format, args);
744 +        System.err.println(msg);
745 +        dumpTestThreads();
746 +        throw new AssertionError(msg);
747 +    }
748 +
749      /**
750       * Extra checks that get done for all test cases.
751       *
# Line 451 | Line 764 | public class JSR166TestCase extends Test
764                  throw (RuntimeException) t;
765              else if (t instanceof Exception)
766                  throw (Exception) t;
767 <            else {
768 <                AssertionFailedError afe =
456 <                    new AssertionFailedError(t.toString());
457 <                afe.initCause(t);
458 <                throw afe;
459 <            }
767 >            else
768 >                throw new AssertionError(t.toString(), t);
769          }
770  
771          if (Thread.interrupted())
772 <            throw new AssertionFailedError("interrupt status set in main thread");
772 >            tearDownFail("interrupt status set in main thread");
773  
774          checkForkJoinPoolThreadLeaks();
775      }
776  
777      /**
778 <     * Finds missing try { ... } finally { joinPool(e); }
778 >     * Finds missing PoolCleaners
779       */
780      void checkForkJoinPoolThreadLeaks() throws InterruptedException {
781 <        Thread[] survivors = new Thread[5];
781 >        Thread[] survivors = new Thread[7];
782          int count = Thread.enumerate(survivors);
783          for (int i = 0; i < count; i++) {
784              Thread thread = survivors[i];
# Line 477 | Line 786 | public class JSR166TestCase extends Test
786              if (name.startsWith("ForkJoinPool-")) {
787                  // give thread some time to terminate
788                  thread.join(LONG_DELAY_MS);
789 <                if (!thread.isAlive()) continue;
790 <                thread.stop();
791 <                throw new AssertionFailedError
483 <                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
484 <                                   toString(), name));
789 >                if (thread.isAlive())
790 >                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
791 >                                 thread);
792              }
793          }
794 +
795 +        if (!ForkJoinPool.commonPool()
796 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
797 +            tearDownFail("ForkJoin common pool thread stuck");
798      }
799  
800      /**
801       * Just like fail(reason), but additionally recording (using
802 <     * threadRecordFailure) any AssertionFailedError thrown, so that
803 <     * the current testcase will fail.
802 >     * threadRecordFailure) any AssertionError thrown, so that the
803 >     * current testcase will fail.
804       */
805      public void threadFail(String reason) {
806          try {
807              fail(reason);
808 <        } catch (AssertionFailedError t) {
809 <            threadRecordFailure(t);
810 <            fail(reason);
808 >        } catch (AssertionError fail) {
809 >            threadRecordFailure(fail);
810 >            throw fail;
811          }
812      }
813  
814      /**
815       * Just like assertTrue(b), but additionally recording (using
816 <     * threadRecordFailure) any AssertionFailedError thrown, so that
817 <     * the current testcase will fail.
816 >     * threadRecordFailure) any AssertionError thrown, so that the
817 >     * current testcase will fail.
818       */
819      public void threadAssertTrue(boolean b) {
820          try {
821              assertTrue(b);
822 <        } catch (AssertionFailedError t) {
823 <            threadRecordFailure(t);
824 <            throw t;
822 >        } catch (AssertionError fail) {
823 >            threadRecordFailure(fail);
824 >            throw fail;
825          }
826      }
827  
828      /**
829       * Just like assertFalse(b), but additionally recording (using
830 <     * threadRecordFailure) any AssertionFailedError thrown, so that
831 <     * the current testcase will fail.
830 >     * threadRecordFailure) any AssertionError thrown, so that the
831 >     * current testcase will fail.
832       */
833      public void threadAssertFalse(boolean b) {
834          try {
835              assertFalse(b);
836 <        } catch (AssertionFailedError t) {
837 <            threadRecordFailure(t);
838 <            throw t;
836 >        } catch (AssertionError fail) {
837 >            threadRecordFailure(fail);
838 >            throw fail;
839          }
840      }
841  
842      /**
843       * Just like assertNull(x), but additionally recording (using
844 <     * threadRecordFailure) any AssertionFailedError thrown, so that
845 <     * the current testcase will fail.
844 >     * threadRecordFailure) any AssertionError thrown, so that the
845 >     * current testcase will fail.
846       */
847      public void threadAssertNull(Object x) {
848          try {
849              assertNull(x);
850 <        } catch (AssertionFailedError t) {
851 <            threadRecordFailure(t);
852 <            throw t;
850 >        } catch (AssertionError fail) {
851 >            threadRecordFailure(fail);
852 >            throw fail;
853          }
854      }
855  
856      /**
857       * Just like assertEquals(x, y), but additionally recording (using
858 <     * threadRecordFailure) any AssertionFailedError thrown, so that
859 <     * the current testcase will fail.
858 >     * threadRecordFailure) any AssertionError thrown, so that the
859 >     * current testcase will fail.
860       */
861      public void threadAssertEquals(long x, long y) {
862          try {
863              assertEquals(x, y);
864 <        } catch (AssertionFailedError t) {
865 <            threadRecordFailure(t);
866 <            throw t;
864 >        } catch (AssertionError fail) {
865 >            threadRecordFailure(fail);
866 >            throw fail;
867          }
868      }
869  
870      /**
871       * Just like assertEquals(x, y), but additionally recording (using
872 <     * threadRecordFailure) any AssertionFailedError thrown, so that
873 <     * the current testcase will fail.
872 >     * threadRecordFailure) any AssertionError thrown, so that the
873 >     * current testcase will fail.
874       */
875      public void threadAssertEquals(Object x, Object y) {
876          try {
877              assertEquals(x, y);
878 <        } catch (AssertionFailedError t) {
879 <            threadRecordFailure(t);
880 <            throw t;
881 <        } catch (Throwable t) {
882 <            threadUnexpectedException(t);
878 >        } catch (AssertionError fail) {
879 >            threadRecordFailure(fail);
880 >            throw fail;
881 >        } catch (Throwable fail) {
882 >            threadUnexpectedException(fail);
883          }
884      }
885  
886      /**
887       * Just like assertSame(x, y), but additionally recording (using
888 <     * threadRecordFailure) any AssertionFailedError thrown, so that
889 <     * the current testcase will fail.
888 >     * threadRecordFailure) any AssertionError thrown, so that the
889 >     * current testcase will fail.
890       */
891      public void threadAssertSame(Object x, Object y) {
892          try {
893              assertSame(x, y);
894 <        } catch (AssertionFailedError t) {
895 <            threadRecordFailure(t);
896 <            throw t;
894 >        } catch (AssertionError fail) {
895 >            threadRecordFailure(fail);
896 >            throw fail;
897          }
898      }
899  
# Line 602 | Line 913 | public class JSR166TestCase extends Test
913  
914      /**
915       * Records the given exception using {@link #threadRecordFailure},
916 <     * then rethrows the exception, wrapping it in an
917 <     * AssertionFailedError if necessary.
916 >     * then rethrows the exception, wrapping it in an AssertionError
917 >     * if necessary.
918       */
919      public void threadUnexpectedException(Throwable t) {
920          threadRecordFailure(t);
# Line 612 | Line 923 | public class JSR166TestCase extends Test
923              throw (RuntimeException) t;
924          else if (t instanceof Error)
925              throw (Error) t;
926 <        else {
927 <            AssertionFailedError afe =
617 <                new AssertionFailedError("unexpected exception: " + t);
618 <            afe.initCause(t);
619 <            throw afe;
620 <        }
926 >        else
927 >            throw new AssertionError("unexpected exception: " + t, t);
928      }
929  
930      /**
931       * Delays, via Thread.sleep, for the given millisecond delay, but
932       * if the sleep is shorter than specified, may re-sleep or yield
933 <     * until time elapses.
933 >     * until time elapses.  Ensures that the given time, as measured
934 >     * by System.nanoTime(), has elapsed.
935       */
936      static void delay(long millis) throws InterruptedException {
937 <        long startTime = System.nanoTime();
938 <        long ns = millis * 1000 * 1000;
939 <        for (;;) {
937 >        long nanos = millis * (1000 * 1000);
938 >        final long wakeupTime = System.nanoTime() + nanos;
939 >        do {
940              if (millis > 0L)
941                  Thread.sleep(millis);
942              else // too short to sleep
943                  Thread.yield();
944 <            long d = ns - (System.nanoTime() - startTime);
945 <            if (d > 0L)
946 <                millis = d / (1000 * 1000);
947 <            else
948 <                break;
944 >            nanos = wakeupTime - System.nanoTime();
945 >            millis = nanos / (1000 * 1000);
946 >        } while (nanos >= 0L);
947 >    }
948 >
949 >    /**
950 >     * Allows use of try-with-resources with per-test thread pools.
951 >     */
952 >    class PoolCleaner implements AutoCloseable {
953 >        private final ExecutorService pool;
954 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
955 >        public void close() { joinPool(pool); }
956 >    }
957 >
958 >    /**
959 >     * An extension of PoolCleaner that has an action to release the pool.
960 >     */
961 >    class PoolCleanerWithReleaser extends PoolCleaner {
962 >        private final Runnable releaser;
963 >        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
964 >            super(pool);
965 >            this.releaser = releaser;
966 >        }
967 >        public void close() {
968 >            try {
969 >                releaser.run();
970 >            } finally {
971 >                super.close();
972 >            }
973          }
974      }
975  
976 +    PoolCleaner cleaner(ExecutorService pool) {
977 +        return new PoolCleaner(pool);
978 +    }
979 +
980 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
981 +        return new PoolCleanerWithReleaser(pool, releaser);
982 +    }
983 +
984 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
985 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
986 +    }
987 +
988 +    Runnable releaser(final CountDownLatch latch) {
989 +        return new Runnable() { public void run() {
990 +            do { latch.countDown(); }
991 +            while (latch.getCount() > 0);
992 +        }};
993 +    }
994 +
995 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
996 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
997 +    }
998 +
999 +    Runnable releaser(final AtomicBoolean flag) {
1000 +        return new Runnable() { public void run() { flag.set(true); }};
1001 +    }
1002 +
1003      /**
1004       * Waits out termination of a thread pool or fails doing so.
1005       */
1006 <    void joinPool(ExecutorService exec) {
1006 >    void joinPool(ExecutorService pool) {
1007          try {
1008 <            exec.shutdown();
1009 <            if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
1010 <                fail("ExecutorService " + exec +
1011 <                     " did not terminate in a timely manner");
1008 >            pool.shutdown();
1009 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
1010 >                try {
1011 >                    threadFail("ExecutorService " + pool +
1012 >                               " did not terminate in a timely manner");
1013 >                } finally {
1014 >                    // last resort, for the benefit of subsequent tests
1015 >                    pool.shutdownNow();
1016 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
1017 >                }
1018 >            }
1019          } catch (SecurityException ok) {
1020              // Allowed in case test doesn't have privs
1021 <        } catch (InterruptedException ie) {
1022 <            fail("Unexpected InterruptedException");
1021 >        } catch (InterruptedException fail) {
1022 >            threadFail("Unexpected InterruptedException");
1023          }
1024      }
1025  
1026      /**
1027 <     * A debugging tool to print all stack traces, as jstack does.
1027 >     * Like Runnable, but with the freedom to throw anything.
1028 >     * junit folks had the same idea:
1029 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1030       */
1031 <    static void printAllStackTraces() {
664 <        for (ThreadInfo info :
665 <                 ManagementFactory.getThreadMXBean()
666 <                 .dumpAllThreads(true, true))
667 <            System.err.print(info);
668 <    }
1031 >    interface Action { public void run() throws Throwable; }
1032  
1033      /**
1034 <     * Checks that thread does not terminate within the default
1035 <     * millisecond delay of {@code timeoutMillis()}.
1034 >     * Runs all the given actions in parallel, failing if any fail.
1035 >     * Useful for running multiple variants of tests that are
1036 >     * necessarily individually slow because they must block.
1037       */
1038 <    void assertThreadStaysAlive(Thread thread) {
1039 <        assertThreadStaysAlive(thread, timeoutMillis());
1038 >    void testInParallel(Action ... actions) {
1039 >        ExecutorService pool = Executors.newCachedThreadPool();
1040 >        try (PoolCleaner cleaner = cleaner(pool)) {
1041 >            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1042 >            for (final Action action : actions)
1043 >                futures.add(pool.submit(new CheckedRunnable() {
1044 >                    public void realRun() throws Throwable { action.run();}}));
1045 >            for (Future<?> future : futures)
1046 >                try {
1047 >                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
1048 >                } catch (ExecutionException ex) {
1049 >                    threadUnexpectedException(ex.getCause());
1050 >                } catch (Exception ex) {
1051 >                    threadUnexpectedException(ex);
1052 >                }
1053 >        }
1054      }
1055  
1056      /**
1057 <     * Checks that thread does not terminate within the given millisecond delay.
1057 >     * A debugging tool to print stack traces of most threads, as jstack does.
1058 >     * Uninteresting threads are filtered out.
1059       */
1060 <    void assertThreadStaysAlive(Thread thread, long millis) {
1061 <        try {
1062 <            // No need to optimize the failing case via Thread.join.
1063 <            delay(millis);
1064 <            assertTrue(thread.isAlive());
1065 <        } catch (InterruptedException ie) {
1066 <            fail("Unexpected InterruptedException");
1060 >    static void dumpTestThreads() {
1061 >        SecurityManager sm = System.getSecurityManager();
1062 >        if (sm != null) {
1063 >            try {
1064 >                System.setSecurityManager(null);
1065 >            } catch (SecurityException giveUp) {
1066 >                return;
1067 >            }
1068          }
689    }
1069  
1070 <    /**
1071 <     * Checks that the threads do not terminate within the default
1072 <     * millisecond delay of {@code timeoutMillis()}.
1073 <     */
1074 <    void assertThreadsStayAlive(Thread... threads) {
1075 <        assertThreadsStayAlive(timeoutMillis(), threads);
1070 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1071 >        System.err.println("------ stacktrace dump start ------");
1072 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1073 >            final String name = info.getThreadName();
1074 >            String lockName;
1075 >            if ("Signal Dispatcher".equals(name))
1076 >                continue;
1077 >            if ("Reference Handler".equals(name)
1078 >                && (lockName = info.getLockName()) != null
1079 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1080 >                continue;
1081 >            if ("Finalizer".equals(name)
1082 >                && (lockName = info.getLockName()) != null
1083 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1084 >                continue;
1085 >            if ("checkForWedgedTest".equals(name))
1086 >                continue;
1087 >            System.err.print(info);
1088 >        }
1089 >        System.err.println("------ stacktrace dump end ------");
1090 >
1091 >        if (sm != null) System.setSecurityManager(sm);
1092      }
1093  
1094      /**
1095 <     * Checks that the threads do not terminate within the given millisecond delay.
1095 >     * Checks that thread eventually enters the expected blocked thread state.
1096       */
1097 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1098 <        try {
1099 <            // No need to optimize the failing case via Thread.join.
1100 <            delay(millis);
1101 <            for (Thread thread : threads)
1102 <                assertTrue(thread.isAlive());
1103 <        } catch (InterruptedException ie) {
1104 <            fail("Unexpected InterruptedException");
1097 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1098 >        // always sleep at least 1 ms, with high probability avoiding
1099 >        // transitory states
1100 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1101 >            try { delay(1); }
1102 >            catch (InterruptedException fail) {
1103 >                throw new AssertionError("Unexpected InterruptedException", fail);
1104 >            }
1105 >            Thread.State s = thread.getState();
1106 >            if (s == expected)
1107 >                return;
1108 >            else if (s == Thread.State.TERMINATED)
1109 >                fail("Unexpected thread termination");
1110          }
1111 +        fail("timed out waiting for thread to enter thread state " + expected);
1112      }
1113  
1114      /**
# Line 727 | Line 1128 | public class JSR166TestCase extends Test
1128              future.get(timeoutMillis, MILLISECONDS);
1129              shouldThrow();
1130          } catch (TimeoutException success) {
1131 <        } catch (Exception e) {
1132 <            threadUnexpectedException(e);
1131 >        } catch (Exception fail) {
1132 >            threadUnexpectedException(fail);
1133          } finally { future.cancel(true); }
1134          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1135      }
# Line 748 | Line 1149 | public class JSR166TestCase extends Test
1149      }
1150  
1151      /**
1152 +     * The maximum number of consecutive spurious wakeups we should
1153 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1154 +     */
1155 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1156 +
1157 +    /**
1158       * The number of elements to place in collections, arrays, etc.
1159       */
1160      public static final int SIZE = 20;
# Line 851 | Line 1258 | public class JSR166TestCase extends Test
1258          }
1259          public void refresh() {}
1260          public String toString() {
1261 <            List<Permission> ps = new ArrayList<Permission>();
1261 >            List<Permission> ps = new ArrayList<>();
1262              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1263                  ps.add(e.nextElement());
1264              return "AdjustablePolicy with permissions " + ps;
# Line 879 | Line 1286 | public class JSR166TestCase extends Test
1286  
1287      /**
1288       * Sleeps until the given time has elapsed.
1289 <     * Throws AssertionFailedError if interrupted.
1289 >     * Throws AssertionError if interrupted.
1290       */
1291 <    void sleep(long millis) {
1291 >    static void sleep(long millis) {
1292          try {
1293              delay(millis);
1294 <        } catch (InterruptedException ie) {
1295 <            AssertionFailedError afe =
889 <                new AssertionFailedError("Unexpected InterruptedException");
890 <            afe.initCause(ie);
891 <            throw afe;
1294 >        } catch (InterruptedException fail) {
1295 >            throw new AssertionError("Unexpected InterruptedException", fail);
1296          }
1297      }
1298  
1299      /**
1300       * Spin-waits up to the specified number of milliseconds for the given
1301       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1302 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1303       */
1304 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1305 <        long startTime = System.nanoTime();
1306 <        for (;;) {
1307 <            Thread.State s = thread.getState();
1308 <            if (s == Thread.State.BLOCKED ||
1309 <                s == Thread.State.WAITING ||
1310 <                s == Thread.State.TIMED_WAITING)
1311 <                return;
1312 <            else if (s == Thread.State.TERMINATED)
1304 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1305 >                                       Callable<Boolean> waitingForGodot) {
1306 >        for (long startTime = 0L;;) {
1307 >            switch (thread.getState()) {
1308 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1309 >                try {
1310 >                    if (waitingForGodot == null || waitingForGodot.call())
1311 >                        return;
1312 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1313 >                break;
1314 >            case TERMINATED:
1315                  fail("Unexpected thread termination");
1316 +            }
1317 +
1318 +            if (startTime == 0L)
1319 +                startTime = System.nanoTime();
1320              else if (millisElapsedSince(startTime) > timeoutMillis) {
1321 <                threadAssertTrue(thread.isAlive());
1322 <                return;
1321 >                assertTrue(thread.isAlive());
1322 >                if (waitingForGodot == null
1323 >                    || thread.getState() == Thread.State.RUNNABLE)
1324 >                    fail("timed out waiting for thread to enter wait state");
1325 >                else
1326 >                    fail("timed out waiting for condition, thread state="
1327 >                         + thread.getState());
1328              }
1329              Thread.yield();
1330          }
1331      }
1332  
1333      /**
1334 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1335 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1334 >     * Spin-waits up to the specified number of milliseconds for the given
1335 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1336 >     */
1337 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1338 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1339 >    }
1340 >
1341 >    /**
1342 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1343 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1344       */
1345      void waitForThreadToEnterWaitState(Thread thread) {
1346 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1346 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1347 >    }
1348 >
1349 >    /**
1350 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1351 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1352 >     * and additionally satisfy the given condition.
1353 >     */
1354 >    void waitForThreadToEnterWaitState(Thread thread,
1355 >                                       Callable<Boolean> waitingForGodot) {
1356 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1357      }
1358  
1359      /**
# Line 937 | Line 1371 | public class JSR166TestCase extends Test
1371   //             r.run();
1372   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1373   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1374 < //             throw new AssertionFailedError("did not return promptly");
1374 > //             throw new AssertionError("did not return promptly");
1375   //     }
1376  
1377   //     void assertTerminatesPromptly(Runnable r) {
# Line 950 | Line 1384 | public class JSR166TestCase extends Test
1384       */
1385      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1386          long startTime = System.nanoTime();
1387 +        T actual = null;
1388          try {
1389 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1389 >            actual = f.get(timeoutMillis, MILLISECONDS);
1390          } catch (Throwable fail) { threadUnexpectedException(fail); }
1391 +        assertEquals(expectedValue, actual);
1392          if (millisElapsedSince(startTime) > timeoutMillis/2)
1393 <            throw new AssertionFailedError("timed get did not return promptly");
1393 >            throw new AssertionError("timed get did not return promptly");
1394      }
1395  
1396      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 979 | Line 1415 | public class JSR166TestCase extends Test
1415      void awaitTermination(Thread t, long timeoutMillis) {
1416          try {
1417              t.join(timeoutMillis);
1418 <        } catch (InterruptedException ie) {
1419 <            threadUnexpectedException(ie);
1418 >        } catch (InterruptedException fail) {
1419 >            threadUnexpectedException(fail);
1420          } finally {
1421              if (t.getState() != Thread.State.TERMINATED) {
1422                  t.interrupt();
1423 <                fail("Test timed out");
1423 >                threadFail("timed out waiting for thread to terminate");
1424              }
1425          }
1426      }
# Line 1006 | Line 1442 | public class JSR166TestCase extends Test
1442          public final void run() {
1443              try {
1444                  realRun();
1445 <            } catch (Throwable t) {
1446 <                threadUnexpectedException(t);
1011 <            }
1012 <        }
1013 <    }
1014 <
1015 <    public abstract class RunnableShouldThrow implements Runnable {
1016 <        protected abstract void realRun() throws Throwable;
1017 <
1018 <        final Class<?> exceptionClass;
1019 <
1020 <        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1021 <            this.exceptionClass = exceptionClass;
1022 <        }
1023 <
1024 <        public final void run() {
1025 <            try {
1026 <                realRun();
1027 <                threadShouldThrow(exceptionClass.getSimpleName());
1028 <            } catch (Throwable t) {
1029 <                if (! exceptionClass.isInstance(t))
1030 <                    threadUnexpectedException(t);
1445 >            } catch (Throwable fail) {
1446 >                threadUnexpectedException(fail);
1447              }
1448          }
1449      }
# Line 1044 | Line 1460 | public class JSR166TestCase extends Test
1460          public final void run() {
1461              try {
1462                  realRun();
1047                threadShouldThrow(exceptionClass.getSimpleName());
1463              } catch (Throwable t) {
1464                  if (! exceptionClass.isInstance(t))
1465                      threadUnexpectedException(t);
1466 +                return;
1467              }
1468 +            threadShouldThrow(exceptionClass.getSimpleName());
1469          }
1470      }
1471  
# Line 1058 | Line 1475 | public class JSR166TestCase extends Test
1475          public final void run() {
1476              try {
1477                  realRun();
1061                threadShouldThrow("InterruptedException");
1478              } catch (InterruptedException success) {
1479                  threadAssertFalse(Thread.interrupted());
1480 <            } catch (Throwable t) {
1481 <                threadUnexpectedException(t);
1480 >                return;
1481 >            } catch (Throwable fail) {
1482 >                threadUnexpectedException(fail);
1483              }
1484 +            threadShouldThrow("InterruptedException");
1485          }
1486      }
1487  
# Line 1073 | Line 1491 | public class JSR166TestCase extends Test
1491          public final T call() {
1492              try {
1493                  return realCall();
1494 <            } catch (Throwable t) {
1495 <                threadUnexpectedException(t);
1078 <                return null;
1494 >            } catch (Throwable fail) {
1495 >                threadUnexpectedException(fail);
1496              }
1497 <        }
1081 <    }
1082 <
1083 <    public abstract class CheckedInterruptedCallable<T>
1084 <        implements Callable<T> {
1085 <        protected abstract T realCall() throws Throwable;
1086 <
1087 <        public final T call() {
1088 <            try {
1089 <                T result = realCall();
1090 <                threadShouldThrow("InterruptedException");
1091 <                return result;
1092 <            } catch (InterruptedException success) {
1093 <                threadAssertFalse(Thread.interrupted());
1094 <            } catch (Throwable t) {
1095 <                threadUnexpectedException(t);
1096 <            }
1097 <            return null;
1497 >            throw new AssertionError("unreached");
1498          }
1499      }
1500  
# Line 1109 | Line 1509 | public class JSR166TestCase extends Test
1509      public static final String TEST_STRING = "a test string";
1510  
1511      public static class StringTask implements Callable<String> {
1512 <        public String call() { return TEST_STRING; }
1512 >        final String value;
1513 >        public StringTask() { this(TEST_STRING); }
1514 >        public StringTask(String value) { this.value = value; }
1515 >        public String call() { return value; }
1516      }
1517  
1518      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 1122 | Line 1525 | public class JSR166TestCase extends Test
1525              }};
1526      }
1527  
1528 <    public Runnable awaiter(final CountDownLatch latch) {
1528 >    public Runnable countDowner(final CountDownLatch latch) {
1529          return new CheckedRunnable() {
1530              public void realRun() throws InterruptedException {
1531 <                await(latch);
1531 >                latch.countDown();
1532              }};
1533      }
1534  
1535 +    class LatchAwaiter extends CheckedRunnable {
1536 +        static final int NEW = 0;
1537 +        static final int RUNNING = 1;
1538 +        static final int DONE = 2;
1539 +        final CountDownLatch latch;
1540 +        int state = NEW;
1541 +        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1542 +        public void realRun() throws InterruptedException {
1543 +            state = 1;
1544 +            await(latch);
1545 +            state = 2;
1546 +        }
1547 +    }
1548 +
1549 +    public LatchAwaiter awaiter(CountDownLatch latch) {
1550 +        return new LatchAwaiter(latch);
1551 +    }
1552 +
1553 +    public void await(CountDownLatch latch, long timeoutMillis) {
1554 +        boolean timedOut = false;
1555 +        try {
1556 +            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1557 +        } catch (Throwable fail) {
1558 +            threadUnexpectedException(fail);
1559 +        }
1560 +        if (timedOut)
1561 +            fail("timed out waiting for CountDownLatch for "
1562 +                 + (timeoutMillis/1000) + " sec");
1563 +    }
1564 +
1565      public void await(CountDownLatch latch) {
1566 +        await(latch, LONG_DELAY_MS);
1567 +    }
1568 +
1569 +    public void await(Semaphore semaphore) {
1570 +        boolean timedOut = false;
1571          try {
1572 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1573 <        } catch (Throwable t) {
1574 <            threadUnexpectedException(t);
1572 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1573 >        } catch (Throwable fail) {
1574 >            threadUnexpectedException(fail);
1575          }
1576 +        if (timedOut)
1577 +            fail("timed out waiting for Semaphore for "
1578 +                 + (LONG_DELAY_MS/1000) + " sec");
1579      }
1580  
1581 <    public void await(Semaphore semaphore) {
1581 >    public void await(CyclicBarrier barrier) {
1582          try {
1583 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1584 <        } catch (Throwable t) {
1585 <            threadUnexpectedException(t);
1583 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1584 >        } catch (Throwable fail) {
1585 >            threadUnexpectedException(fail);
1586          }
1587      }
1588  
# Line 1159 | Line 1600 | public class JSR166TestCase extends Test
1600   //         long startTime = System.nanoTime();
1601   //         while (!flag.get()) {
1602   //             if (millisElapsedSince(startTime) > timeoutMillis)
1603 < //                 throw new AssertionFailedError("timed out");
1603 > //                 throw new AssertionError("timed out");
1604   //             Thread.yield();
1605   //         }
1606   //     }
# Line 1168 | Line 1609 | public class JSR166TestCase extends Test
1609          public String call() { throw new NullPointerException(); }
1610      }
1611  
1171    public static class CallableOne implements Callable<Integer> {
1172        public Integer call() { return one; }
1173    }
1174
1175    public class ShortRunnable extends CheckedRunnable {
1176        protected void realRun() throws Throwable {
1177            delay(SHORT_DELAY_MS);
1178        }
1179    }
1180
1181    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1182        protected void realRun() throws InterruptedException {
1183            delay(SHORT_DELAY_MS);
1184        }
1185    }
1186
1187    public class SmallRunnable extends CheckedRunnable {
1188        protected void realRun() throws Throwable {
1189            delay(SMALL_DELAY_MS);
1190        }
1191    }
1192
1193    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1194        protected void realRun() {
1195            try {
1196                delay(SMALL_DELAY_MS);
1197            } catch (InterruptedException ok) {}
1198        }
1199    }
1200
1201    public class SmallCallable extends CheckedCallable {
1202        protected Object realCall() throws InterruptedException {
1203            delay(SMALL_DELAY_MS);
1204            return Boolean.TRUE;
1205        }
1206    }
1207
1208    public class MediumRunnable extends CheckedRunnable {
1209        protected void realRun() throws Throwable {
1210            delay(MEDIUM_DELAY_MS);
1211        }
1212    }
1213
1214    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1215        protected void realRun() throws InterruptedException {
1216            delay(MEDIUM_DELAY_MS);
1217        }
1218    }
1219
1612      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1613          return new CheckedRunnable() {
1614              protected void realRun() {
# Line 1226 | Line 1618 | public class JSR166TestCase extends Test
1618              }};
1619      }
1620  
1229    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1230        protected void realRun() {
1231            try {
1232                delay(MEDIUM_DELAY_MS);
1233            } catch (InterruptedException ok) {}
1234        }
1235    }
1236
1237    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1238        protected void realRun() {
1239            try {
1240                delay(LONG_DELAY_MS);
1241            } catch (InterruptedException ok) {}
1242        }
1243    }
1244
1621      /**
1622       * For use as ThreadFactory in constructors
1623       */
# Line 1255 | Line 1631 | public class JSR166TestCase extends Test
1631          boolean isDone();
1632      }
1633  
1258    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1259        return new TrackedRunnable() {
1260                private volatile boolean done = false;
1261                public boolean isDone() { return done; }
1262                public void run() {
1263                    try {
1264                        delay(timeoutMillis);
1265                        done = true;
1266                    } catch (InterruptedException ok) {}
1267                }
1268            };
1269    }
1270
1271    public static class TrackedShortRunnable implements Runnable {
1272        public volatile boolean done = false;
1273        public void run() {
1274            try {
1275                delay(SHORT_DELAY_MS);
1276                done = true;
1277            } catch (InterruptedException ok) {}
1278        }
1279    }
1280
1281    public static class TrackedSmallRunnable implements Runnable {
1282        public volatile boolean done = false;
1283        public void run() {
1284            try {
1285                delay(SMALL_DELAY_MS);
1286                done = true;
1287            } catch (InterruptedException ok) {}
1288        }
1289    }
1290
1291    public static class TrackedMediumRunnable implements Runnable {
1292        public volatile boolean done = false;
1293        public void run() {
1294            try {
1295                delay(MEDIUM_DELAY_MS);
1296                done = true;
1297            } catch (InterruptedException ok) {}
1298        }
1299    }
1300
1301    public static class TrackedLongRunnable implements Runnable {
1302        public volatile boolean done = false;
1303        public void run() {
1304            try {
1305                delay(LONG_DELAY_MS);
1306                done = true;
1307            } catch (InterruptedException ok) {}
1308        }
1309    }
1310
1634      public static class TrackedNoOpRunnable implements Runnable {
1635          public volatile boolean done = false;
1636          public void run() {
# Line 1315 | Line 1638 | public class JSR166TestCase extends Test
1638          }
1639      }
1640  
1318    public static class TrackedCallable implements Callable {
1319        public volatile boolean done = false;
1320        public Object call() {
1321            try {
1322                delay(SMALL_DELAY_MS);
1323                done = true;
1324            } catch (InterruptedException ok) {}
1325            return Boolean.TRUE;
1326        }
1327    }
1328
1641      /**
1642       * Analog of CheckedRunnable for RecursiveAction
1643       */
# Line 1335 | Line 1647 | public class JSR166TestCase extends Test
1647          @Override protected final void compute() {
1648              try {
1649                  realCompute();
1650 <            } catch (Throwable t) {
1651 <                threadUnexpectedException(t);
1650 >            } catch (Throwable fail) {
1651 >                threadUnexpectedException(fail);
1652              }
1653          }
1654      }
# Line 1350 | Line 1662 | public class JSR166TestCase extends Test
1662          @Override protected final T compute() {
1663              try {
1664                  return realCompute();
1665 <            } catch (Throwable t) {
1666 <                threadUnexpectedException(t);
1355 <                return null;
1665 >            } catch (Throwable fail) {
1666 >                threadUnexpectedException(fail);
1667              }
1668 +            throw new AssertionError("unreached");
1669          }
1670      }
1671  
# Line 1367 | Line 1679 | public class JSR166TestCase extends Test
1679  
1680      /**
1681       * A CyclicBarrier that uses timed await and fails with
1682 <     * AssertionFailedErrors instead of throwing checked exceptions.
1682 >     * AssertionErrors instead of throwing checked exceptions.
1683       */
1684 <    public class CheckedBarrier extends CyclicBarrier {
1684 >    public static class CheckedBarrier extends CyclicBarrier {
1685          public CheckedBarrier(int parties) { super(parties); }
1686  
1687          public int await() {
1688              try {
1689                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1690 <            } catch (TimeoutException e) {
1691 <                throw new AssertionFailedError("timed out");
1692 <            } catch (Exception e) {
1693 <                AssertionFailedError afe =
1382 <                    new AssertionFailedError("Unexpected exception: " + e);
1383 <                afe.initCause(e);
1384 <                throw afe;
1690 >            } catch (TimeoutException timedOut) {
1691 >                throw new AssertionError("timed out");
1692 >            } catch (Exception fail) {
1693 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1694              }
1695          }
1696      }
# Line 1392 | Line 1701 | public class JSR166TestCase extends Test
1701              assertEquals(0, q.size());
1702              assertNull(q.peek());
1703              assertNull(q.poll());
1704 <            assertNull(q.poll(0, MILLISECONDS));
1704 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1705              assertEquals(q.toString(), "[]");
1706              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1707              assertFalse(q.iterator().hasNext());
# Line 1408 | Line 1717 | public class JSR166TestCase extends Test
1717                  q.remove();
1718                  shouldThrow();
1719              } catch (NoSuchElementException success) {}
1720 <        } catch (InterruptedException ie) {
1412 <            threadUnexpectedException(ie);
1413 <        }
1720 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1721      }
1722  
1723      void assertSerialEquals(Object x, Object y) {
# Line 1429 | Line 1736 | public class JSR166TestCase extends Test
1736              oos.flush();
1737              oos.close();
1738              return bos.toByteArray();
1739 <        } catch (Throwable t) {
1740 <            threadUnexpectedException(t);
1739 >        } catch (Throwable fail) {
1740 >            threadUnexpectedException(fail);
1741              return new byte[0];
1742          }
1743      }
1744  
1745 +    void assertImmutable(final Object o) {
1746 +        if (o instanceof Collection) {
1747 +            assertThrows(
1748 +                UnsupportedOperationException.class,
1749 +                new Runnable() { public void run() {
1750 +                        ((Collection) o).add(null);}});
1751 +        }
1752 +    }
1753 +
1754      @SuppressWarnings("unchecked")
1755      <T> T serialClone(T o) {
1756 +        T clone = null;
1757          try {
1758              ObjectInputStream ois = new ObjectInputStream
1759                  (new ByteArrayInputStream(serialBytes(o)));
1760 <            T clone = (T) ois.readObject();
1761 <            assertSame(o.getClass(), clone.getClass());
1762 <            return clone;
1763 <        } catch (Throwable t) {
1764 <            threadUnexpectedException(t);
1760 >            clone = (T) ois.readObject();
1761 >        } catch (Throwable fail) {
1762 >            threadUnexpectedException(fail);
1763 >        }
1764 >        if (o == clone) assertImmutable(o);
1765 >        else assertSame(o.getClass(), clone.getClass());
1766 >        return clone;
1767 >    }
1768 >
1769 >    /**
1770 >     * A version of serialClone that leaves error handling (for
1771 >     * e.g. NotSerializableException) up to the caller.
1772 >     */
1773 >    @SuppressWarnings("unchecked")
1774 >    <T> T serialClonePossiblyFailing(T o)
1775 >        throws ReflectiveOperationException, java.io.IOException {
1776 >        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1777 >        ObjectOutputStream oos = new ObjectOutputStream(bos);
1778 >        oos.writeObject(o);
1779 >        oos.flush();
1780 >        oos.close();
1781 >        ObjectInputStream ois = new ObjectInputStream
1782 >            (new ByteArrayInputStream(bos.toByteArray()));
1783 >        T clone = (T) ois.readObject();
1784 >        if (o == clone) assertImmutable(o);
1785 >        else assertSame(o.getClass(), clone.getClass());
1786 >        return clone;
1787 >    }
1788 >
1789 >    /**
1790 >     * If o implements Cloneable and has a public clone method,
1791 >     * returns a clone of o, else null.
1792 >     */
1793 >    @SuppressWarnings("unchecked")
1794 >    <T> T cloneableClone(T o) {
1795 >        if (!(o instanceof Cloneable)) return null;
1796 >        final T clone;
1797 >        try {
1798 >            clone = (T) o.getClass().getMethod("clone").invoke(o);
1799 >        } catch (NoSuchMethodException ok) {
1800              return null;
1801 +        } catch (ReflectiveOperationException unexpected) {
1802 +            throw new Error(unexpected);
1803          }
1804 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1805 +        assertSame(o.getClass(), clone.getClass());
1806 +        return clone;
1807      }
1808  
1809      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
# Line 1456 | Line 1813 | public class JSR166TestCase extends Test
1813              try { throwingAction.run(); }
1814              catch (Throwable t) {
1815                  threw = true;
1816 <                if (!expectedExceptionClass.isInstance(t)) {
1817 <                    AssertionFailedError afe =
1818 <                        new AssertionFailedError
1819 <                        ("Expected " + expectedExceptionClass.getName() +
1820 <                         ", got " + t.getClass().getName());
1464 <                    afe.initCause(t);
1465 <                    threadUnexpectedException(afe);
1466 <                }
1816 >                if (!expectedExceptionClass.isInstance(t))
1817 >                    throw new AssertionError(
1818 >                            "Expected " + expectedExceptionClass.getName() +
1819 >                            ", got " + t.getClass().getName(),
1820 >                            t);
1821              }
1822              if (!threw)
1823                  shouldThrow(expectedExceptionClass.getName());
# Line 1476 | Line 1830 | public class JSR166TestCase extends Test
1830              shouldThrow();
1831          } catch (NoSuchElementException success) {}
1832          assertFalse(it.hasNext());
1833 <    }        
1833 >    }
1834 >
1835 >    public <T> Callable<T> callableThrowing(final Exception ex) {
1836 >        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1837 >    }
1838 >
1839 >    public Runnable runnableThrowing(final RuntimeException ex) {
1840 >        return new Runnable() { public void run() { throw ex; }};
1841 >    }
1842 >
1843 >    /** A reusable thread pool to be shared by tests. */
1844 >    static final ExecutorService cachedThreadPool =
1845 >        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1846 >                               1000L, MILLISECONDS,
1847 >                               new SynchronousQueue<Runnable>());
1848 >
1849 >    static <T> void shuffle(T[] array) {
1850 >        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1851 >    }
1852 >
1853 >    /**
1854 >     * Returns the same String as would be returned by {@link
1855 >     * Object#toString}, whether or not the given object's class
1856 >     * overrides toString().
1857 >     *
1858 >     * @see System#identityHashCode
1859 >     */
1860 >    static String identityString(Object x) {
1861 >        return x.getClass().getName()
1862 >            + "@" + Integer.toHexString(System.identityHashCode(x));
1863 >    }
1864 >
1865 >    // --- Shared assertions for Executor tests ---
1866 >
1867 >    /**
1868 >     * Returns maximum number of tasks that can be submitted to given
1869 >     * pool (with bounded queue) before saturation (when submission
1870 >     * throws RejectedExecutionException).
1871 >     */
1872 >    static final int saturatedSize(ThreadPoolExecutor pool) {
1873 >        BlockingQueue<Runnable> q = pool.getQueue();
1874 >        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1875 >    }
1876 >
1877 >    @SuppressWarnings("FutureReturnValueIgnored")
1878 >    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1879 >        try {
1880 >            e.execute((Runnable) null);
1881 >            shouldThrow();
1882 >        } catch (NullPointerException success) {}
1883 >
1884 >        if (! (e instanceof ExecutorService)) return;
1885 >        ExecutorService es = (ExecutorService) e;
1886 >        try {
1887 >            es.submit((Runnable) null);
1888 >            shouldThrow();
1889 >        } catch (NullPointerException success) {}
1890 >        try {
1891 >            es.submit((Runnable) null, Boolean.TRUE);
1892 >            shouldThrow();
1893 >        } catch (NullPointerException success) {}
1894 >        try {
1895 >            es.submit((Callable) null);
1896 >            shouldThrow();
1897 >        } catch (NullPointerException success) {}
1898 >
1899 >        if (! (e instanceof ScheduledExecutorService)) return;
1900 >        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1901 >        try {
1902 >            ses.schedule((Runnable) null,
1903 >                         randomTimeout(), randomTimeUnit());
1904 >            shouldThrow();
1905 >        } catch (NullPointerException success) {}
1906 >        try {
1907 >            ses.schedule((Callable) null,
1908 >                         randomTimeout(), randomTimeUnit());
1909 >            shouldThrow();
1910 >        } catch (NullPointerException success) {}
1911 >        try {
1912 >            ses.scheduleAtFixedRate((Runnable) null,
1913 >                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1914 >            shouldThrow();
1915 >        } catch (NullPointerException success) {}
1916 >        try {
1917 >            ses.scheduleWithFixedDelay((Runnable) null,
1918 >                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1919 >            shouldThrow();
1920 >        } catch (NullPointerException success) {}
1921 >    }
1922 >
1923 >    void setRejectedExecutionHandler(
1924 >        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1925 >        p.setRejectedExecutionHandler(handler);
1926 >        assertSame(handler, p.getRejectedExecutionHandler());
1927 >    }
1928 >
1929 >    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1930 >        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1931 >        final long savedTaskCount = p.getTaskCount();
1932 >        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1933 >        final int savedQueueSize = p.getQueue().size();
1934 >        final boolean stock = (p.getClass().getClassLoader() == null);
1935 >
1936 >        Runnable r = () -> {};
1937 >        Callable<Boolean> c = () -> Boolean.TRUE;
1938 >
1939 >        class Recorder implements RejectedExecutionHandler {
1940 >            public volatile Runnable r = null;
1941 >            public volatile ThreadPoolExecutor p = null;
1942 >            public void reset() { r = null; p = null; }
1943 >            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1944 >                assertNull(this.r);
1945 >                assertNull(this.p);
1946 >                this.r = r;
1947 >                this.p = p;
1948 >            }
1949 >        }
1950 >
1951 >        // check custom handler is invoked exactly once per task
1952 >        Recorder recorder = new Recorder();
1953 >        setRejectedExecutionHandler(p, recorder);
1954 >        for (int i = 2; i--> 0; ) {
1955 >            recorder.reset();
1956 >            p.execute(r);
1957 >            if (stock && p.getClass() == ThreadPoolExecutor.class)
1958 >                assertSame(r, recorder.r);
1959 >            assertSame(p, recorder.p);
1960 >
1961 >            recorder.reset();
1962 >            assertFalse(p.submit(r).isDone());
1963 >            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1964 >            assertSame(p, recorder.p);
1965 >
1966 >            recorder.reset();
1967 >            assertFalse(p.submit(r, Boolean.TRUE).isDone());
1968 >            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1969 >            assertSame(p, recorder.p);
1970 >
1971 >            recorder.reset();
1972 >            assertFalse(p.submit(c).isDone());
1973 >            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1974 >            assertSame(p, recorder.p);
1975 >
1976 >            if (p instanceof ScheduledExecutorService) {
1977 >                ScheduledExecutorService s = (ScheduledExecutorService) p;
1978 >                ScheduledFuture<?> future;
1979 >
1980 >                recorder.reset();
1981 >                future = s.schedule(r, randomTimeout(), randomTimeUnit());
1982 >                assertFalse(future.isDone());
1983 >                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1984 >                assertSame(p, recorder.p);
1985 >
1986 >                recorder.reset();
1987 >                future = s.schedule(c, randomTimeout(), randomTimeUnit());
1988 >                assertFalse(future.isDone());
1989 >                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1990 >                assertSame(p, recorder.p);
1991 >
1992 >                recorder.reset();
1993 >                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1994 >                assertFalse(future.isDone());
1995 >                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1996 >                assertSame(p, recorder.p);
1997 >
1998 >                recorder.reset();
1999 >                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2000 >                assertFalse(future.isDone());
2001 >                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2002 >                assertSame(p, recorder.p);
2003 >            }
2004 >        }
2005 >
2006 >        // Checking our custom handler above should be sufficient, but
2007 >        // we add some integration tests of standard handlers.
2008 >        final AtomicReference<Thread> thread = new AtomicReference<>();
2009 >        final Runnable setThread = () -> thread.set(Thread.currentThread());
2010 >
2011 >        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2012 >        try {
2013 >            p.execute(setThread);
2014 >            shouldThrow();
2015 >        } catch (RejectedExecutionException success) {}
2016 >        assertNull(thread.get());
2017 >
2018 >        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2019 >        p.execute(setThread);
2020 >        assertNull(thread.get());
2021 >
2022 >        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2023 >        p.execute(setThread);
2024 >        if (p.isShutdown())
2025 >            assertNull(thread.get());
2026 >        else
2027 >            assertSame(Thread.currentThread(), thread.get());
2028 >
2029 >        setRejectedExecutionHandler(p, savedHandler);
2030 >
2031 >        // check that pool was not perturbed by handlers
2032 >        assertEquals(savedTaskCount, p.getTaskCount());
2033 >        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2034 >        assertEquals(savedQueueSize, p.getQueue().size());
2035 >    }
2036 >
2037 >    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2038 >        assertEquals(x, y);
2039 >        assertEquals(y, x);
2040 >        assertEquals(x.isEmpty(), y.isEmpty());
2041 >        assertEquals(x.size(), y.size());
2042 >        if (x instanceof List) {
2043 >            assertEquals(x.toString(), y.toString());
2044 >        }
2045 >        if (x instanceof List || x instanceof Set) {
2046 >            assertEquals(x.hashCode(), y.hashCode());
2047 >        }
2048 >        if (x instanceof List || x instanceof Deque) {
2049 >            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2050 >            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2051 >                                     y.toArray(new Object[0])));
2052 >        }
2053 >    }
2054 >
2055 >    /**
2056 >     * A weaker form of assertCollectionsEquals which does not insist
2057 >     * that the two collections satisfy Object#equals(Object), since
2058 >     * they may use identity semantics as Deques do.
2059 >     */
2060 >    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2061 >        if (x instanceof List || x instanceof Set)
2062 >            assertCollectionsEquals(x, y);
2063 >        else {
2064 >            assertEquals(x.isEmpty(), y.isEmpty());
2065 >            assertEquals(x.size(), y.size());
2066 >            assertEquals(new HashSet(x), new HashSet(y));
2067 >            if (x instanceof Deque) {
2068 >                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2069 >                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2070 >                                         y.toArray(new Object[0])));
2071 >            }
2072 >        }
2073 >    }
2074   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines