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.125 by jsr166, Thu Jan 15 18:58:07 2015 UTC vs.
Revision 1.237 by jsr166, Wed Aug 23 05:33:00 2017 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.Enumeration;
70 + import java.util.Iterator;
71   import java.util.List;
72   import java.util.NoSuchElementException;
73   import java.util.PropertyPermission;
# Line 34 | Line 75 | import java.util.concurrent.BlockingQueu
75   import java.util.concurrent.Callable;
76   import java.util.concurrent.CountDownLatch;
77   import java.util.concurrent.CyclicBarrier;
78 + import java.util.concurrent.ExecutionException;
79 + import java.util.concurrent.Executor;
80 + import java.util.concurrent.Executors;
81   import java.util.concurrent.ExecutorService;
82 + import java.util.concurrent.ForkJoinPool;
83   import java.util.concurrent.Future;
84 + import java.util.concurrent.FutureTask;
85   import java.util.concurrent.RecursiveAction;
86   import java.util.concurrent.RecursiveTask;
87 + import java.util.concurrent.RejectedExecutionException;
88   import java.util.concurrent.RejectedExecutionHandler;
89   import java.util.concurrent.Semaphore;
90 + import java.util.concurrent.ScheduledExecutorService;
91 + import java.util.concurrent.ScheduledFuture;
92 + import java.util.concurrent.SynchronousQueue;
93   import java.util.concurrent.ThreadFactory;
94 + import java.util.concurrent.ThreadLocalRandom;
95   import java.util.concurrent.ThreadPoolExecutor;
96 + import java.util.concurrent.TimeUnit;
97   import java.util.concurrent.TimeoutException;
98 + import java.util.concurrent.atomic.AtomicBoolean;
99   import java.util.concurrent.atomic.AtomicReference;
100   import java.util.regex.Pattern;
101  
102   import junit.framework.AssertionFailedError;
103   import junit.framework.Test;
104   import junit.framework.TestCase;
105 + import junit.framework.TestResult;
106   import junit.framework.TestSuite;
107  
108   /**
# Line 61 | Line 115 | import junit.framework.TestSuite;
115   *
116   * <ol>
117   *
118 < * <li> All assertions in code running in generated threads must use
118 > * <li>All assertions in code running in generated threads must use
119   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
120   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
121   * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
122   * particularly recommended) for other code to use these forms too.
123   * Only the most typically used JUnit assertion methods are defined
124 < * this way, but enough to live with.</li>
124 > * this way, but enough to live with.
125   *
126 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
126 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
127   * to invoke {@code super.setUp} and {@code super.tearDown} within
128   * them. These methods are used to clear and check for thread
129 < * assertion failures.</li>
129 > * assertion failures.
130   *
131   * <li>All delays and timeouts must use one of the constants {@code
132   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 83 | Line 137 | import junit.framework.TestSuite;
137   * is always discriminable as larger than SHORT and smaller than
138   * MEDIUM.  And so on. These constants are set to conservative values,
139   * but even so, if there is ever any doubt, they can all be increased
140 < * in one spot to rerun tests on slower platforms.</li>
140 > * in one spot to rerun tests on slower platforms.
141   *
142 < * <li> All threads generated must be joined inside each test case
142 > * <li>All threads generated must be joined inside each test case
143   * method (or {@code fail} to do so) before returning from the
144   * method. The {@code joinPool} method can be used to do this when
145 < * using Executors.</li>
145 > * using Executors.
146   *
147   * </ol>
148   *
149   * <p><b>Other notes</b>
150   * <ul>
151   *
152 < * <li> Usually, there is one testcase method per JSR166 method
152 > * <li>Usually, there is one testcase method per JSR166 method
153   * covering "normal" operation, and then as many exception-testing
154   * methods as there are exceptions the method can throw. Sometimes
155   * there are multiple tests per JSR166 method when the different
156   * "normal" behaviors differ significantly. And sometimes testcases
157 < * cover multiple methods when they cannot be tested in
104 < * isolation.</li>
157 > * cover multiple methods when they cannot be tested in isolation.
158   *
159 < * <li> The documentation style for testcases is to provide as javadoc
159 > * <li>The documentation style for testcases is to provide as javadoc
160   * a simple sentence or two describing the property that the testcase
161   * method purports to test. The javadocs do not say anything about how
162 < * the property is tested. To find out, read the code.</li>
162 > * the property is tested. To find out, read the code.
163   *
164 < * <li> These tests are "conformance tests", and do not attempt to
164 > * <li>These tests are "conformance tests", and do not attempt to
165   * test throughput, latency, scalability or other performance factors
166   * (see the separate "jtreg" tests for a set intended to check these
167   * for the most central aspects of functionality.) So, most tests use
168   * the smallest sensible numbers of threads, collection sizes, etc
169 < * needed to check basic conformance.</li>
169 > * needed to check basic conformance.
170   *
171   * <li>The test classes currently do not declare inclusion in
172   * any particular package to simplify things for people integrating
173 < * them in TCK test suites.</li>
173 > * them in TCK test suites.
174   *
175 < * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
176 < * runs all JSR166 unit tests.</li>
175 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
176 > * runs all JSR166 unit tests.
177   *
178   * </ul>
179   */
# Line 159 | Line 212 | public class JSR166TestCase extends Test
212          Integer.getInteger("jsr166.runsPerTest", 1);
213  
214      /**
215 +     * The number of repetitions of the test suite (for finding leaks?).
216 +     */
217 +    private static final int suiteRuns =
218 +        Integer.getInteger("jsr166.suiteRuns", 1);
219 +
220 +    /**
221 +     * Returns the value of the system property, or NaN if not defined.
222 +     */
223 +    private static float systemPropertyValue(String name) {
224 +        String floatString = System.getProperty(name);
225 +        if (floatString == null)
226 +            return Float.NaN;
227 +        try {
228 +            return Float.parseFloat(floatString);
229 +        } catch (NumberFormatException ex) {
230 +            throw new IllegalArgumentException(
231 +                String.format("Bad float value in system property %s=%s",
232 +                              name, floatString));
233 +        }
234 +    }
235 +
236 +    /**
237 +     * The scaling factor to apply to standard delays used in tests.
238 +     * May be initialized from any of:
239 +     * - the "jsr166.delay.factor" system property
240 +     * - the "test.timeout.factor" system property (as used by jtreg)
241 +     *   See: http://openjdk.java.net/jtreg/tag-spec.html
242 +     * - hard-coded fuzz factor when using a known slowpoke VM
243 +     */
244 +    private static final float delayFactor = delayFactor();
245 +
246 +    private static float delayFactor() {
247 +        float x;
248 +        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
249 +            return x;
250 +        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
251 +            return x;
252 +        String prop = System.getProperty("java.vm.version");
253 +        if (prop != null && prop.matches(".*debug.*"))
254 +            return 4.0f; // How much slower is fastdebug than product?!
255 +        return 1.0f;
256 +    }
257 +
258 +    public JSR166TestCase() { super(); }
259 +    public JSR166TestCase(String name) { super(name); }
260 +
261 +    /**
262       * A filter for tests to run, matching strings of the form
263       * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
264       * Usefully combined with jsr166.runsPerTest.
# Line 170 | Line 270 | public class JSR166TestCase extends Test
270          return (regex == null) ? null : Pattern.compile(regex);
271      }
272  
273 <    protected void runTest() throws Throwable {
273 >    // Instrumentation to debug very rare, but very annoying hung test runs.
274 >    static volatile TestCase currentTestCase;
275 >    // static volatile int currentRun = 0;
276 >    static {
277 >        Runnable checkForWedgedTest = new Runnable() { public void run() {
278 >            // Avoid spurious reports with enormous runsPerTest.
279 >            // A single test case run should never take more than 1 second.
280 >            // But let's cap it at the high end too ...
281 >            final int timeoutMinutes =
282 >                Math.min(15, Math.max(runsPerTest / 60, 1));
283 >            for (TestCase lastTestCase = currentTestCase;;) {
284 >                try { MINUTES.sleep(timeoutMinutes); }
285 >                catch (InterruptedException unexpected) { break; }
286 >                if (lastTestCase == currentTestCase) {
287 >                    System.err.printf(
288 >                        "Looks like we're stuck running test: %s%n",
289 >                        lastTestCase);
290 > //                     System.err.printf(
291 > //                         "Looks like we're stuck running test: %s (%d/%d)%n",
292 > //                         lastTestCase, currentRun, runsPerTest);
293 > //                     System.err.println("availableProcessors=" +
294 > //                         Runtime.getRuntime().availableProcessors());
295 > //                     System.err.printf("cpu model = %s%n", cpuModel());
296 >                    dumpTestThreads();
297 >                    // one stack dump is probably enough; more would be spam
298 >                    break;
299 >                }
300 >                lastTestCase = currentTestCase;
301 >            }}};
302 >        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
303 >        thread.setDaemon(true);
304 >        thread.start();
305 >    }
306 >
307 > //     public static String cpuModel() {
308 > //         try {
309 > //             java.util.regex.Matcher matcher
310 > //               = Pattern.compile("model name\\s*: (.*)")
311 > //                 .matcher(new String(
312 > //                     java.nio.file.Files.readAllBytes(
313 > //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
314 > //             matcher.find();
315 > //             return matcher.group(1);
316 > //         } catch (Exception ex) { return null; }
317 > //     }
318 >
319 >    public void runBare() throws Throwable {
320 >        currentTestCase = this;
321          if (methodFilter == null
322 <            || methodFilter.matcher(toString()).find()) {
323 <            for (int i = 0; i < runsPerTest; i++) {
324 <                if (profileTests)
325 <                    runTestProfiled();
326 <                else
327 <                    super.runTest();
328 <            }
322 >            || methodFilter.matcher(toString()).find())
323 >            super.runBare();
324 >    }
325 >
326 >    protected void runTest() throws Throwable {
327 >        for (int i = 0; i < runsPerTest; i++) {
328 >            // currentRun = i;
329 >            if (profileTests)
330 >                runTestProfiled();
331 >            else
332 >                super.runTest();
333          }
334      }
335  
336      protected void runTestProfiled() throws Throwable {
337 <        // Warmup run, notably to trigger all needed classloading.
338 <        super.runTest();
188 <        long t0 = System.nanoTime();
189 <        try {
337 >        for (int i = 0; i < 2; i++) {
338 >            long startTime = System.nanoTime();
339              super.runTest();
340 <        } finally {
341 <            long elapsedMillis = millisElapsedSince(t0);
342 <            if (elapsedMillis >= profileThreshold)
340 >            long elapsedMillis = millisElapsedSince(startTime);
341 >            if (elapsedMillis < profileThreshold)
342 >                break;
343 >            // Never report first run of any test; treat it as a
344 >            // warmup run, notably to trigger all needed classloading,
345 >            if (i > 0)
346                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
347          }
348      }
349  
350      /**
351       * 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.
352       */
353      public static void main(String[] args) {
354 +        main(suite(), args);
355 +    }
356 +
357 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
358 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
359 +        long runTime;
360 +        public void startTest(Test test) {}
361 +        protected void printHeader(long runTime) {
362 +            this.runTime = runTime; // defer printing for later
363 +        }
364 +        protected void printFooter(TestResult result) {
365 +            if (result.wasSuccessful()) {
366 +                getWriter().println("OK (" + result.runCount() + " tests)"
367 +                    + "  Time: " + elapsedTimeAsString(runTime));
368 +            } else {
369 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
370 +                super.printFooter(result);
371 +            }
372 +        }
373 +    }
374 +
375 +    /**
376 +     * Returns a TestRunner that doesn't bother with unnecessary
377 +     * fluff, like printing a "." for each test case.
378 +     */
379 +    static junit.textui.TestRunner newPithyTestRunner() {
380 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
381 +        runner.setPrinter(new PithyResultPrinter(System.out));
382 +        return runner;
383 +    }
384 +
385 +    /**
386 +     * Runs all unit tests in the given test suite.
387 +     * Actual behavior influenced by jsr166.* system properties.
388 +     */
389 +    static void main(Test suite, String[] args) {
390          if (useSecurityManager) {
391              System.err.println("Setting a permissive security manager");
392              Policy.setPolicy(permissivePolicy());
393              System.setSecurityManager(new SecurityManager());
394          }
395 <        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
396 <
397 <        Test s = suite();
398 <        for (int i = 0; i < iters; ++i) {
213 <            junit.textui.TestRunner.run(s);
395 >        for (int i = 0; i < suiteRuns; i++) {
396 >            TestResult result = newPithyTestRunner().doRun(suite);
397 >            if (!result.wasSuccessful())
398 >                System.exit(1);
399              System.gc();
400              System.runFinalization();
401          }
217        System.exit(0);
402      }
403  
404      public static TestSuite newTestSuite(Object... suiteOrClasses) {
# Line 265 | Line 449 | public class JSR166TestCase extends Test
449      public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
450      public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
451      public static boolean atLeastJava9() {
452 <        // As of 2014-05, java9 still uses 52.0 class file version
453 <        return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
452 >        return JAVA_CLASS_VERSION >= 53.0
453 >            // As of 2015-09, java9 still uses 52.0 class file version
454 >            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
455 >    }
456 >    public static boolean atLeastJava10() {
457 >        return JAVA_CLASS_VERSION >= 54.0
458 >            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
459      }
460  
461      /**
# Line 288 | Line 477 | public class JSR166TestCase extends Test
477              AbstractQueuedLongSynchronizerTest.suite(),
478              ArrayBlockingQueueTest.suite(),
479              ArrayDequeTest.suite(),
480 +            ArrayListTest.suite(),
481              AtomicBooleanTest.suite(),
482              AtomicIntegerArrayTest.suite(),
483              AtomicIntegerFieldUpdaterTest.suite(),
# Line 310 | Line 500 | public class JSR166TestCase extends Test
500              CopyOnWriteArrayListTest.suite(),
501              CopyOnWriteArraySetTest.suite(),
502              CountDownLatchTest.suite(),
503 +            CountedCompleterTest.suite(),
504              CyclicBarrierTest.suite(),
505              DelayQueueTest.suite(),
506              EntryTest.suite(),
# Line 338 | Line 529 | public class JSR166TestCase extends Test
529              TreeMapTest.suite(),
530              TreeSetTest.suite(),
531              TreeSubMapTest.suite(),
532 <            TreeSubSetTest.suite());
532 >            TreeSubSetTest.suite(),
533 >            VectorTest.suite());
534  
535          // Java8+ test classes
536          if (atLeastJava8()) {
537              String[] java8TestClassNames = {
538 +                "ArrayDeque8Test",
539                  "Atomic8Test",
540                  "CompletableFutureTest",
541                  "ConcurrentHashMap8Test",
542 <                "CountedCompleterTest",
542 >                "CountedCompleter8Test",
543                  "DoubleAccumulatorTest",
544                  "DoubleAdderTest",
545                  "ForkJoinPool8Test",
546                  "ForkJoinTask8Test",
547 +                "HashMapTest",
548 +                "LinkedBlockingDeque8Test",
549 +                "LinkedBlockingQueue8Test",
550                  "LongAccumulatorTest",
551                  "LongAdderTest",
552                  "SplittableRandomTest",
553                  "StampedLockTest",
554 +                "SubmissionPublisherTest",
555                  "ThreadLocalRandom8Test",
556 +                "TimeUnit8Test",
557              };
558              addNamedTestClasses(suite, java8TestClassNames);
559          }
# Line 363 | Line 561 | public class JSR166TestCase extends Test
561          // Java9+ test classes
562          if (atLeastJava9()) {
563              String[] java9TestClassNames = {
564 <                "ThreadPoolExecutor9Test",
564 >                "AtomicBoolean9Test",
565 >                "AtomicInteger9Test",
566 >                "AtomicIntegerArray9Test",
567 >                "AtomicLong9Test",
568 >                "AtomicLongArray9Test",
569 >                "AtomicReference9Test",
570 >                "AtomicReferenceArray9Test",
571 >                "ExecutorCompletionService9Test",
572 >                "ForkJoinPool9Test",
573              };
574              addNamedTestClasses(suite, java9TestClassNames);
575          }
# Line 371 | Line 577 | public class JSR166TestCase extends Test
577          return suite;
578      }
579  
580 +    /** Returns list of junit-style test method names in given class. */
581 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
582 +        Method[] methods = testClass.getDeclaredMethods();
583 +        ArrayList<String> names = new ArrayList<>(methods.length);
584 +        for (Method method : methods) {
585 +            if (method.getName().startsWith("test")
586 +                && Modifier.isPublic(method.getModifiers())
587 +                // method.getParameterCount() requires jdk8+
588 +                && method.getParameterTypes().length == 0) {
589 +                names.add(method.getName());
590 +            }
591 +        }
592 +        return names;
593 +    }
594 +
595 +    /**
596 +     * Returns junit-style testSuite for the given test class, but
597 +     * parameterized by passing extra data to each test.
598 +     */
599 +    public static <ExtraData> Test parameterizedTestSuite
600 +        (Class<? extends JSR166TestCase> testClass,
601 +         Class<ExtraData> dataClass,
602 +         ExtraData data) {
603 +        try {
604 +            TestSuite suite = new TestSuite();
605 +            Constructor c =
606 +                testClass.getDeclaredConstructor(dataClass, String.class);
607 +            for (String methodName : testMethodNames(testClass))
608 +                suite.addTest((Test) c.newInstance(data, methodName));
609 +            return suite;
610 +        } catch (Exception e) {
611 +            throw new Error(e);
612 +        }
613 +    }
614 +
615 +    /**
616 +     * Returns junit-style testSuite for the jdk8 extension of the
617 +     * given test class, but parameterized by passing extra data to
618 +     * each test.  Uses reflection to allow compilation in jdk7.
619 +     */
620 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
621 +        (Class<? extends JSR166TestCase> testClass,
622 +         Class<ExtraData> dataClass,
623 +         ExtraData data) {
624 +        if (atLeastJava8()) {
625 +            String name = testClass.getName();
626 +            String name8 = name.replaceAll("Test$", "8Test");
627 +            if (name.equals(name8)) throw new Error(name);
628 +            try {
629 +                return (Test)
630 +                    Class.forName(name8)
631 +                    .getMethod("testSuite", new Class[] { dataClass })
632 +                    .invoke(null, data);
633 +            } catch (Exception e) {
634 +                throw new Error(e);
635 +            }
636 +        } else {
637 +            return new TestSuite();
638 +        }
639 +    }
640 +
641      // Delays for timing-dependent tests, in milliseconds.
642  
643      public static long SHORT_DELAY_MS;
# Line 378 | Line 645 | public class JSR166TestCase extends Test
645      public static long MEDIUM_DELAY_MS;
646      public static long LONG_DELAY_MS;
647  
648 +    private static final long RANDOM_TIMEOUT;
649 +    private static final long RANDOM_EXPIRED_TIMEOUT;
650 +    private static final TimeUnit RANDOM_TIMEUNIT;
651 +    static {
652 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
653 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
654 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
655 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
656 +        TimeUnit[] timeUnits = TimeUnit.values();
657 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
658 +    }
659 +
660      /**
661 <     * Returns the shortest timed delay. This could
662 <     * be reimplemented to use for example a Property.
661 >     * Returns a timeout for use when any value at all will do.
662 >     */
663 >    static long randomTimeout() { return RANDOM_TIMEOUT; }
664 >
665 >    /**
666 >     * Returns a timeout that means "no waiting", i.e. not positive.
667 >     */
668 >    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
669 >
670 >    /**
671 >     * Returns a random non-null TimeUnit.
672 >     */
673 >    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
674 >
675 >    /**
676 >     * Returns the shortest timed delay. This can be scaled up for
677 >     * slow machines using the jsr166.delay.factor system property,
678 >     * or via jtreg's -timeoutFactor: flag.
679 >     * http://openjdk.java.net/jtreg/command-help.html
680       */
681      protected long getShortDelay() {
682 <        return 50;
682 >        return (long) (50 * delayFactor);
683      }
684  
685      /**
# Line 396 | Line 692 | public class JSR166TestCase extends Test
692          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
693      }
694  
695 +    private static final long TIMEOUT_DELAY_MS
696 +        = (long) (12.0 * Math.cbrt(delayFactor));
697 +
698      /**
699 <     * Returns a timeout in milliseconds to be used in tests that
700 <     * verify that operations block or time out.
699 >     * Returns a timeout in milliseconds to be used in tests that verify
700 >     * that operations block or time out.  We want this to be longer
701 >     * than the OS scheduling quantum, but not too long, so don't scale
702 >     * linearly with delayFactor; we use "crazy" cube root instead.
703       */
704 <    long timeoutMillis() {
705 <        return SHORT_DELAY_MS / 4;
704 >    static long timeoutMillis() {
705 >        return TIMEOUT_DELAY_MS;
706      }
707  
708      /**
709 <     * Returns a new Date instance representing a time delayMillis
710 <     * milliseconds in the future.
709 >     * Returns a new Date instance representing a time at least
710 >     * delayMillis milliseconds in the future.
711       */
712      Date delayedDate(long delayMillis) {
713 <        return new Date(System.currentTimeMillis() + delayMillis);
713 >        // Add 1 because currentTimeMillis is known to round into the past.
714 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
715      }
716  
717      /**
718       * The first exception encountered if any threadAssertXXX method fails.
719       */
720      private final AtomicReference<Throwable> threadFailure
721 <        = new AtomicReference<Throwable>(null);
721 >        = new AtomicReference<>(null);
722  
723      /**
724       * Records an exception so that it can be rethrown later in the test
# Line 425 | Line 727 | public class JSR166TestCase extends Test
727       * the same test have no effect.
728       */
729      public void threadRecordFailure(Throwable t) {
730 +        System.err.println(t);
731 +        dumpTestThreads();
732          threadFailure.compareAndSet(null, t);
733      }
734  
# Line 432 | Line 736 | public class JSR166TestCase extends Test
736          setDelays();
737      }
738  
739 +    void tearDownFail(String format, Object... args) {
740 +        String msg = toString() + ": " + String.format(format, args);
741 +        System.err.println(msg);
742 +        dumpTestThreads();
743 +        throw new AssertionFailedError(msg);
744 +    }
745 +
746      /**
747       * Extra checks that get done for all test cases.
748       *
# Line 459 | Line 770 | public class JSR166TestCase extends Test
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 <     * Finds 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      /**
# Line 495 | Line 808 | public class JSR166TestCase extends Test
808              fail(reason);
809          } catch (AssertionFailedError t) {
810              threadRecordFailure(t);
811 <            fail(reason);
811 >            throw t;
812          }
813      }
814  
# Line 563 | Line 876 | public class JSR166TestCase extends Test
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 (AssertionFailedError fail) {
880 >            threadRecordFailure(fail);
881 >            throw fail;
882 >        } catch (Throwable fail) {
883 >            threadUnexpectedException(fail);
884          }
885      }
886  
# Line 579 | Line 892 | public class JSR166TestCase extends Test
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 (AssertionFailedError fail) {
896 >            threadRecordFailure(fail);
897 >            throw fail;
898          }
899      }
900  
# Line 622 | Line 935 | public class JSR166TestCase extends Test
935      /**
936       * Delays, via Thread.sleep, for the given millisecond delay, but
937       * if the sleep is shorter than specified, may re-sleep or yield
938 <     * until time elapses.
938 >     * until time elapses.  Ensures that the given time, as measured
939 >     * by System.nanoTime(), has elapsed.
940       */
941      static void delay(long millis) throws InterruptedException {
942 <        long startTime = System.nanoTime();
943 <        long ns = millis * 1000 * 1000;
944 <        for (;;) {
942 >        long nanos = millis * (1000 * 1000);
943 >        final long wakeupTime = System.nanoTime() + nanos;
944 >        do {
945              if (millis > 0L)
946                  Thread.sleep(millis);
947              else // too short to sleep
948                  Thread.yield();
949 <            long d = ns - (System.nanoTime() - startTime);
950 <            if (d > 0L)
951 <                millis = d / (1000 * 1000);
952 <            else
953 <                break;
949 >            nanos = wakeupTime - System.nanoTime();
950 >            millis = nanos / (1000 * 1000);
951 >        } while (nanos >= 0L);
952 >    }
953 >
954 >    /**
955 >     * Allows use of try-with-resources with per-test thread pools.
956 >     */
957 >    class PoolCleaner implements AutoCloseable {
958 >        private final ExecutorService pool;
959 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
960 >        public void close() { joinPool(pool); }
961 >    }
962 >
963 >    /**
964 >     * An extension of PoolCleaner that has an action to release the pool.
965 >     */
966 >    class PoolCleanerWithReleaser extends PoolCleaner {
967 >        private final Runnable releaser;
968 >        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
969 >            super(pool);
970 >            this.releaser = releaser;
971 >        }
972 >        public void close() {
973 >            try {
974 >                releaser.run();
975 >            } finally {
976 >                super.close();
977 >            }
978          }
979      }
980  
981 +    PoolCleaner cleaner(ExecutorService pool) {
982 +        return new PoolCleaner(pool);
983 +    }
984 +
985 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
986 +        return new PoolCleanerWithReleaser(pool, releaser);
987 +    }
988 +
989 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
990 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
991 +    }
992 +
993 +    Runnable releaser(final CountDownLatch latch) {
994 +        return new Runnable() { public void run() {
995 +            do { latch.countDown(); }
996 +            while (latch.getCount() > 0);
997 +        }};
998 +    }
999 +
1000 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
1001 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
1002 +    }
1003 +
1004 +    Runnable releaser(final AtomicBoolean flag) {
1005 +        return new Runnable() { public void run() { flag.set(true); }};
1006 +    }
1007 +
1008      /**
1009       * Waits out termination of a thread pool or fails doing so.
1010       */
1011 <    void joinPool(ExecutorService exec) {
1011 >    void joinPool(ExecutorService pool) {
1012          try {
1013 <            exec.shutdown();
1014 <            if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
1015 <                fail("ExecutorService " + exec +
1016 <                     " did not terminate in a timely manner");
1013 >            pool.shutdown();
1014 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
1015 >                try {
1016 >                    threadFail("ExecutorService " + pool +
1017 >                               " did not terminate in a timely manner");
1018 >                } finally {
1019 >                    // last resort, for the benefit of subsequent tests
1020 >                    pool.shutdownNow();
1021 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
1022 >                }
1023 >            }
1024          } catch (SecurityException ok) {
1025              // Allowed in case test doesn't have privs
1026 <        } catch (InterruptedException ie) {
1027 <            fail("Unexpected InterruptedException");
1026 >        } catch (InterruptedException fail) {
1027 >            threadFail("Unexpected InterruptedException");
1028          }
1029      }
1030  
1031      /**
1032 <     * A debugging tool to print all stack traces, as jstack does.
1032 >     * Like Runnable, but with the freedom to throw anything.
1033 >     * junit folks had the same idea:
1034 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1035       */
1036 <    static void printAllStackTraces() {
663 <        for (ThreadInfo info :
664 <                 ManagementFactory.getThreadMXBean()
665 <                 .dumpAllThreads(true, true))
666 <            System.err.print(info);
667 <    }
1036 >    interface Action { public void run() throws Throwable; }
1037  
1038      /**
1039 <     * Checks that thread does not terminate within the default
1040 <     * millisecond delay of {@code timeoutMillis()}.
1039 >     * Runs all the given actions in parallel, failing if any fail.
1040 >     * Useful for running multiple variants of tests that are
1041 >     * necessarily individually slow because they must block.
1042       */
1043 <    void assertThreadStaysAlive(Thread thread) {
1044 <        assertThreadStaysAlive(thread, timeoutMillis());
1043 >    void testInParallel(Action ... actions) {
1044 >        ExecutorService pool = Executors.newCachedThreadPool();
1045 >        try (PoolCleaner cleaner = cleaner(pool)) {
1046 >            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1047 >            for (final Action action : actions)
1048 >                futures.add(pool.submit(new CheckedRunnable() {
1049 >                    public void realRun() throws Throwable { action.run();}}));
1050 >            for (Future<?> future : futures)
1051 >                try {
1052 >                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
1053 >                } catch (ExecutionException ex) {
1054 >                    threadUnexpectedException(ex.getCause());
1055 >                } catch (Exception ex) {
1056 >                    threadUnexpectedException(ex);
1057 >                }
1058 >        }
1059      }
1060  
1061      /**
1062 <     * Checks that thread does not terminate within the given millisecond delay.
1062 >     * A debugging tool to print stack traces of most threads, as jstack does.
1063 >     * Uninteresting threads are filtered out.
1064       */
1065 <    void assertThreadStaysAlive(Thread thread, long millis) {
1066 <        try {
1067 <            // No need to optimize the failing case via Thread.join.
1068 <            delay(millis);
1069 <            assertTrue(thread.isAlive());
1070 <        } catch (InterruptedException ie) {
1071 <            fail("Unexpected InterruptedException");
1065 >    static void dumpTestThreads() {
1066 >        SecurityManager sm = System.getSecurityManager();
1067 >        if (sm != null) {
1068 >            try {
1069 >                System.setSecurityManager(null);
1070 >            } catch (SecurityException giveUp) {
1071 >                return;
1072 >            }
1073          }
688    }
1074  
1075 <    /**
1076 <     * Checks that the threads do not terminate within the default
1077 <     * millisecond delay of {@code timeoutMillis()}.
1078 <     */
1079 <    void assertThreadsStayAlive(Thread... threads) {
1080 <        assertThreadsStayAlive(timeoutMillis(), threads);
1075 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1076 >        System.err.println("------ stacktrace dump start ------");
1077 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1078 >            final String name = info.getThreadName();
1079 >            String lockName;
1080 >            if ("Signal Dispatcher".equals(name))
1081 >                continue;
1082 >            if ("Reference Handler".equals(name)
1083 >                && (lockName = info.getLockName()) != null
1084 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1085 >                continue;
1086 >            if ("Finalizer".equals(name)
1087 >                && (lockName = info.getLockName()) != null
1088 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1089 >                continue;
1090 >            if ("checkForWedgedTest".equals(name))
1091 >                continue;
1092 >            System.err.print(info);
1093 >        }
1094 >        System.err.println("------ stacktrace dump end ------");
1095 >
1096 >        if (sm != null) System.setSecurityManager(sm);
1097      }
1098  
1099      /**
1100 <     * Checks that the threads do not terminate within the given millisecond delay.
1100 >     * Checks that thread eventually enters the expected blocked thread state.
1101       */
1102 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1103 <        try {
1104 <            // No need to optimize the failing case via Thread.join.
1105 <            delay(millis);
1106 <            for (Thread thread : threads)
1107 <                assertTrue(thread.isAlive());
1108 <        } catch (InterruptedException ie) {
1109 <            fail("Unexpected InterruptedException");
1102 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1103 >        // always sleep at least 1 ms, with high probability avoiding
1104 >        // transitory states
1105 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1106 >            try { delay(1); }
1107 >            catch (InterruptedException fail) {
1108 >                fail("Unexpected InterruptedException");
1109 >            }
1110 >            Thread.State s = thread.getState();
1111 >            if (s == expected)
1112 >                return;
1113 >            else if (s == Thread.State.TERMINATED)
1114 >                fail("Unexpected thread termination");
1115          }
1116 +        fail("timed out waiting for thread to enter thread state " + expected);
1117      }
1118  
1119      /**
# Line 726 | Line 1133 | public class JSR166TestCase extends Test
1133              future.get(timeoutMillis, MILLISECONDS);
1134              shouldThrow();
1135          } catch (TimeoutException success) {
1136 <        } catch (Exception e) {
1137 <            threadUnexpectedException(e);
1136 >        } catch (Exception fail) {
1137 >            threadUnexpectedException(fail);
1138          } finally { future.cancel(true); }
1139          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1140      }
# Line 747 | Line 1154 | public class JSR166TestCase extends Test
1154      }
1155  
1156      /**
1157 +     * The maximum number of consecutive spurious wakeups we should
1158 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1159 +     */
1160 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1161 +
1162 +    /**
1163       * The number of elements to place in collections, arrays, etc.
1164       */
1165      public static final int SIZE = 20;
# Line 850 | Line 1263 | public class JSR166TestCase extends Test
1263          }
1264          public void refresh() {}
1265          public String toString() {
1266 <            List<Permission> ps = new ArrayList<Permission>();
1266 >            List<Permission> ps = new ArrayList<>();
1267              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1268                  ps.add(e.nextElement());
1269              return "AdjustablePolicy with permissions " + ps;
# Line 880 | Line 1293 | public class JSR166TestCase extends Test
1293       * Sleeps until the given time has elapsed.
1294       * Throws AssertionFailedError if interrupted.
1295       */
1296 <    void sleep(long millis) {
1296 >    static void sleep(long millis) {
1297          try {
1298              delay(millis);
1299 <        } catch (InterruptedException ie) {
1299 >        } catch (InterruptedException fail) {
1300              AssertionFailedError afe =
1301                  new AssertionFailedError("Unexpected InterruptedException");
1302 <            afe.initCause(ie);
1302 >            afe.initCause(fail);
1303              throw afe;
1304          }
1305      }
# Line 896 | Line 1309 | public class JSR166TestCase extends Test
1309       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1310       */
1311      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1312 <        long startTime = System.nanoTime();
1312 >        long startTime = 0L;
1313          for (;;) {
1314              Thread.State s = thread.getState();
1315              if (s == Thread.State.BLOCKED ||
# Line 905 | Line 1318 | public class JSR166TestCase extends Test
1318                  return;
1319              else if (s == Thread.State.TERMINATED)
1320                  fail("Unexpected thread termination");
1321 +            else if (startTime == 0L)
1322 +                startTime = System.nanoTime();
1323              else if (millisElapsedSince(startTime) > timeoutMillis) {
1324                  threadAssertTrue(thread.isAlive());
1325 <                return;
1325 >                fail("timed out waiting for thread to enter wait state");
1326 >            }
1327 >            Thread.yield();
1328 >        }
1329 >    }
1330 >
1331 >    /**
1332 >     * Spin-waits up to the specified number of milliseconds for the given
1333 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1334 >     * and additionally satisfy the given condition.
1335 >     */
1336 >    void waitForThreadToEnterWaitState(
1337 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1338 >        long startTime = 0L;
1339 >        for (;;) {
1340 >            Thread.State s = thread.getState();
1341 >            if (s == Thread.State.BLOCKED ||
1342 >                s == Thread.State.WAITING ||
1343 >                s == Thread.State.TIMED_WAITING) {
1344 >                try {
1345 >                    if (waitingForGodot.call())
1346 >                        return;
1347 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1348 >            }
1349 >            else if (s == Thread.State.TERMINATED)
1350 >                fail("Unexpected thread termination");
1351 >            else if (startTime == 0L)
1352 >                startTime = System.nanoTime();
1353 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1354 >                threadAssertTrue(thread.isAlive());
1355 >                fail("timed out waiting for thread to enter wait state");
1356              }
1357              Thread.yield();
1358          }
1359      }
1360  
1361      /**
1362 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1363 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1362 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1363 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1364       */
1365      void waitForThreadToEnterWaitState(Thread thread) {
1366          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1367      }
1368  
1369      /**
1370 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1371 +     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1372 +     * and additionally satisfy the given condition.
1373 +     */
1374 +    void waitForThreadToEnterWaitState(
1375 +        Thread thread, Callable<Boolean> waitingForGodot) {
1376 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1377 +    }
1378 +
1379 +    /**
1380       * Returns the number of milliseconds since time given by
1381       * startNanoTime, which must have been previously returned from a
1382       * call to {@link System#nanoTime()}.
# Line 978 | Line 1433 | public class JSR166TestCase extends Test
1433      void awaitTermination(Thread t, long timeoutMillis) {
1434          try {
1435              t.join(timeoutMillis);
1436 <        } catch (InterruptedException ie) {
1437 <            threadUnexpectedException(ie);
1436 >        } catch (InterruptedException fail) {
1437 >            threadUnexpectedException(fail);
1438          } finally {
1439              if (t.getState() != Thread.State.TERMINATED) {
1440                  t.interrupt();
1441 <                fail("Test timed out");
1441 >                threadFail("timed out waiting for thread to terminate");
1442              }
1443          }
1444      }
# Line 1005 | Line 1460 | public class JSR166TestCase extends Test
1460          public final void run() {
1461              try {
1462                  realRun();
1463 <            } catch (Throwable t) {
1464 <                threadUnexpectedException(t);
1463 >            } catch (Throwable fail) {
1464 >                threadUnexpectedException(fail);
1465              }
1466          }
1467      }
# Line 1060 | Line 1515 | public class JSR166TestCase extends Test
1515                  threadShouldThrow("InterruptedException");
1516              } catch (InterruptedException success) {
1517                  threadAssertFalse(Thread.interrupted());
1518 <            } catch (Throwable t) {
1519 <                threadUnexpectedException(t);
1518 >            } catch (Throwable fail) {
1519 >                threadUnexpectedException(fail);
1520              }
1521          }
1522      }
# Line 1072 | Line 1527 | public class JSR166TestCase extends Test
1527          public final T call() {
1528              try {
1529                  return realCall();
1530 <            } catch (Throwable t) {
1531 <                threadUnexpectedException(t);
1530 >            } catch (Throwable fail) {
1531 >                threadUnexpectedException(fail);
1532                  return null;
1533              }
1534          }
# Line 1090 | Line 1545 | public class JSR166TestCase extends Test
1545                  return result;
1546              } catch (InterruptedException success) {
1547                  threadAssertFalse(Thread.interrupted());
1548 <            } catch (Throwable t) {
1549 <                threadUnexpectedException(t);
1548 >            } catch (Throwable fail) {
1549 >                threadUnexpectedException(fail);
1550              }
1551              return null;
1552          }
# Line 1108 | Line 1563 | public class JSR166TestCase extends Test
1563      public static final String TEST_STRING = "a test string";
1564  
1565      public static class StringTask implements Callable<String> {
1566 <        public String call() { return TEST_STRING; }
1566 >        final String value;
1567 >        public StringTask() { this(TEST_STRING); }
1568 >        public StringTask(String value) { this.value = value; }
1569 >        public String call() { return value; }
1570      }
1571  
1572      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 1121 | Line 1579 | public class JSR166TestCase extends Test
1579              }};
1580      }
1581  
1582 <    public Runnable awaiter(final CountDownLatch latch) {
1582 >    public Runnable countDowner(final CountDownLatch latch) {
1583          return new CheckedRunnable() {
1584              public void realRun() throws InterruptedException {
1585 <                await(latch);
1585 >                latch.countDown();
1586              }};
1587      }
1588  
1589 +    class LatchAwaiter extends CheckedRunnable {
1590 +        static final int NEW = 0;
1591 +        static final int RUNNING = 1;
1592 +        static final int DONE = 2;
1593 +        final CountDownLatch latch;
1594 +        int state = NEW;
1595 +        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1596 +        public void realRun() throws InterruptedException {
1597 +            state = 1;
1598 +            await(latch);
1599 +            state = 2;
1600 +        }
1601 +    }
1602 +
1603 +    public LatchAwaiter awaiter(CountDownLatch latch) {
1604 +        return new LatchAwaiter(latch);
1605 +    }
1606 +
1607 +    public void await(CountDownLatch latch, long timeoutMillis) {
1608 +        try {
1609 +            if (!latch.await(timeoutMillis, MILLISECONDS))
1610 +                fail("timed out waiting for CountDownLatch for "
1611 +                     + (timeoutMillis/1000) + " sec");
1612 +        } catch (Throwable fail) {
1613 +            threadUnexpectedException(fail);
1614 +        }
1615 +    }
1616 +
1617      public void await(CountDownLatch latch) {
1618 +        await(latch, LONG_DELAY_MS);
1619 +    }
1620 +
1621 +    public void await(Semaphore semaphore) {
1622          try {
1623 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1624 <        } catch (Throwable t) {
1625 <            threadUnexpectedException(t);
1623 >            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1624 >                fail("timed out waiting for Semaphore for "
1625 >                     + (LONG_DELAY_MS/1000) + " sec");
1626 >        } catch (Throwable fail) {
1627 >            threadUnexpectedException(fail);
1628          }
1629      }
1630  
1631 <    public void await(Semaphore semaphore) {
1631 >    public void await(CyclicBarrier barrier) {
1632          try {
1633 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1634 <        } catch (Throwable t) {
1635 <            threadUnexpectedException(t);
1633 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1634 >        } catch (Throwable fail) {
1635 >            threadUnexpectedException(fail);
1636          }
1637      }
1638  
# Line 1167 | Line 1659 | public class JSR166TestCase extends Test
1659          public String call() { throw new NullPointerException(); }
1660      }
1661  
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
1662      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1663          protected void realRun() {
1664              try {
# Line 1197 | Line 1667 | public class JSR166TestCase extends Test
1667          }
1668      }
1669  
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
1670      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1671          return new CheckedRunnable() {
1672              protected void realRun() {
# Line 1225 | Line 1676 | public class JSR166TestCase extends Test
1676              }};
1677      }
1678  
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
1679      /**
1680       * For use as ThreadFactory in constructors
1681       */
# Line 1254 | Line 1689 | public class JSR166TestCase extends Test
1689          boolean isDone();
1690      }
1691  
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
1692      public static class TrackedNoOpRunnable implements Runnable {
1693          public volatile boolean done = false;
1694          public void run() {
# Line 1314 | Line 1696 | public class JSR166TestCase extends Test
1696          }
1697      }
1698  
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
1699      /**
1700       * Analog of CheckedRunnable for RecursiveAction
1701       */
# Line 1334 | Line 1705 | public class JSR166TestCase extends Test
1705          @Override protected final void compute() {
1706              try {
1707                  realCompute();
1708 <            } catch (Throwable t) {
1709 <                threadUnexpectedException(t);
1708 >            } catch (Throwable fail) {
1709 >                threadUnexpectedException(fail);
1710              }
1711          }
1712      }
# Line 1349 | Line 1720 | public class JSR166TestCase extends Test
1720          @Override protected final T compute() {
1721              try {
1722                  return realCompute();
1723 <            } catch (Throwable t) {
1724 <                threadUnexpectedException(t);
1723 >            } catch (Throwable fail) {
1724 >                threadUnexpectedException(fail);
1725                  return null;
1726              }
1727          }
# Line 1368 | Line 1739 | public class JSR166TestCase extends Test
1739       * A CyclicBarrier that uses timed await and fails with
1740       * AssertionFailedErrors instead of throwing checked exceptions.
1741       */
1742 <    public class CheckedBarrier extends CyclicBarrier {
1742 >    public static class CheckedBarrier extends CyclicBarrier {
1743          public CheckedBarrier(int parties) { super(parties); }
1744  
1745          public int await() {
1746              try {
1747                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1748 <            } catch (TimeoutException e) {
1748 >            } catch (TimeoutException timedOut) {
1749                  throw new AssertionFailedError("timed out");
1750 <            } catch (Exception e) {
1750 >            } catch (Exception fail) {
1751                  AssertionFailedError afe =
1752 <                    new AssertionFailedError("Unexpected exception: " + e);
1753 <                afe.initCause(e);
1752 >                    new AssertionFailedError("Unexpected exception: " + fail);
1753 >                afe.initCause(fail);
1754                  throw afe;
1755              }
1756          }
# Line 1391 | Line 1762 | public class JSR166TestCase extends Test
1762              assertEquals(0, q.size());
1763              assertNull(q.peek());
1764              assertNull(q.poll());
1765 <            assertNull(q.poll(0, MILLISECONDS));
1765 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1766              assertEquals(q.toString(), "[]");
1767              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1768              assertFalse(q.iterator().hasNext());
# Line 1407 | Line 1778 | public class JSR166TestCase extends Test
1778                  q.remove();
1779                  shouldThrow();
1780              } catch (NoSuchElementException success) {}
1781 <        } catch (InterruptedException ie) {
1411 <            threadUnexpectedException(ie);
1412 <        }
1781 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1782      }
1783  
1784      void assertSerialEquals(Object x, Object y) {
# Line 1428 | Line 1797 | public class JSR166TestCase extends Test
1797              oos.flush();
1798              oos.close();
1799              return bos.toByteArray();
1800 <        } catch (Throwable t) {
1801 <            threadUnexpectedException(t);
1800 >        } catch (Throwable fail) {
1801 >            threadUnexpectedException(fail);
1802              return new byte[0];
1803          }
1804      }
1805  
1806 +    void assertImmutable(final Object o) {
1807 +        if (o instanceof Collection) {
1808 +            assertThrows(
1809 +                UnsupportedOperationException.class,
1810 +                new Runnable() { public void run() {
1811 +                        ((Collection) o).add(null);}});
1812 +        }
1813 +    }
1814 +
1815      @SuppressWarnings("unchecked")
1816      <T> T serialClone(T o) {
1817          try {
1818              ObjectInputStream ois = new ObjectInputStream
1819                  (new ByteArrayInputStream(serialBytes(o)));
1820              T clone = (T) ois.readObject();
1821 +            if (o == clone) assertImmutable(o);
1822              assertSame(o.getClass(), clone.getClass());
1823              return clone;
1824 <        } catch (Throwable t) {
1825 <            threadUnexpectedException(t);
1824 >        } catch (Throwable fail) {
1825 >            threadUnexpectedException(fail);
1826 >            return null;
1827 >        }
1828 >    }
1829 >
1830 >    /**
1831 >     * A version of serialClone that leaves error handling (for
1832 >     * e.g. NotSerializableException) up to the caller.
1833 >     */
1834 >    @SuppressWarnings("unchecked")
1835 >    <T> T serialClonePossiblyFailing(T o)
1836 >        throws ReflectiveOperationException, java.io.IOException {
1837 >        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1838 >        ObjectOutputStream oos = new ObjectOutputStream(bos);
1839 >        oos.writeObject(o);
1840 >        oos.flush();
1841 >        oos.close();
1842 >        ObjectInputStream ois = new ObjectInputStream
1843 >            (new ByteArrayInputStream(bos.toByteArray()));
1844 >        T clone = (T) ois.readObject();
1845 >        if (o == clone) assertImmutable(o);
1846 >        assertSame(o.getClass(), clone.getClass());
1847 >        return clone;
1848 >    }
1849 >
1850 >    /**
1851 >     * If o implements Cloneable and has a public clone method,
1852 >     * returns a clone of o, else null.
1853 >     */
1854 >    @SuppressWarnings("unchecked")
1855 >    <T> T cloneableClone(T o) {
1856 >        if (!(o instanceof Cloneable)) return null;
1857 >        final T clone;
1858 >        try {
1859 >            clone = (T) o.getClass().getMethod("clone").invoke(o);
1860 >        } catch (NoSuchMethodException ok) {
1861              return null;
1862 +        } catch (ReflectiveOperationException unexpected) {
1863 +            throw new Error(unexpected);
1864          }
1865 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1866 +        assertSame(o.getClass(), clone.getClass());
1867 +        return clone;
1868      }
1869  
1870      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
# Line 1468 | Line 1887 | public class JSR166TestCase extends Test
1887                  shouldThrow(expectedExceptionClass.getName());
1888          }
1889      }
1890 +
1891 +    public void assertIteratorExhausted(Iterator<?> it) {
1892 +        try {
1893 +            it.next();
1894 +            shouldThrow();
1895 +        } catch (NoSuchElementException success) {}
1896 +        assertFalse(it.hasNext());
1897 +    }
1898 +
1899 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1900 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1901 +    }
1902 +
1903 +    public Runnable runnableThrowing(final RuntimeException ex) {
1904 +        return new Runnable() { public void run() { throw ex; }};
1905 +    }
1906 +
1907 +    /** A reusable thread pool to be shared by tests. */
1908 +    static final ExecutorService cachedThreadPool =
1909 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1910 +                               1000L, MILLISECONDS,
1911 +                               new SynchronousQueue<Runnable>());
1912 +
1913 +    static <T> void shuffle(T[] array) {
1914 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1915 +    }
1916 +
1917 +    /**
1918 +     * Returns the same String as would be returned by {@link
1919 +     * Object#toString}, whether or not the given object's class
1920 +     * overrides toString().
1921 +     *
1922 +     * @see System#identityHashCode
1923 +     */
1924 +    static String identityString(Object x) {
1925 +        return x.getClass().getName()
1926 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1927 +    }
1928 +
1929 +    // --- Shared assertions for Executor tests ---
1930 +
1931 +    /**
1932 +     * Returns maximum number of tasks that can be submitted to given
1933 +     * pool (with bounded queue) before saturation (when submission
1934 +     * throws RejectedExecutionException).
1935 +     */
1936 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1937 +        BlockingQueue<Runnable> q = pool.getQueue();
1938 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1939 +    }
1940 +
1941 +    @SuppressWarnings("FutureReturnValueIgnored")
1942 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1943 +        try {
1944 +            e.execute((Runnable) null);
1945 +            shouldThrow();
1946 +        } catch (NullPointerException success) {}
1947 +
1948 +        if (! (e instanceof ExecutorService)) return;
1949 +        ExecutorService es = (ExecutorService) e;
1950 +        try {
1951 +            es.submit((Runnable) null);
1952 +            shouldThrow();
1953 +        } catch (NullPointerException success) {}
1954 +        try {
1955 +            es.submit((Runnable) null, Boolean.TRUE);
1956 +            shouldThrow();
1957 +        } catch (NullPointerException success) {}
1958 +        try {
1959 +            es.submit((Callable) null);
1960 +            shouldThrow();
1961 +        } catch (NullPointerException success) {}
1962 +
1963 +        if (! (e instanceof ScheduledExecutorService)) return;
1964 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1965 +        try {
1966 +            ses.schedule((Runnable) null,
1967 +                         randomTimeout(), randomTimeUnit());
1968 +            shouldThrow();
1969 +        } catch (NullPointerException success) {}
1970 +        try {
1971 +            ses.schedule((Callable) null,
1972 +                         randomTimeout(), randomTimeUnit());
1973 +            shouldThrow();
1974 +        } catch (NullPointerException success) {}
1975 +        try {
1976 +            ses.scheduleAtFixedRate((Runnable) null,
1977 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1978 +            shouldThrow();
1979 +        } catch (NullPointerException success) {}
1980 +        try {
1981 +            ses.scheduleWithFixedDelay((Runnable) null,
1982 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1983 +            shouldThrow();
1984 +        } catch (NullPointerException success) {}
1985 +    }
1986 +
1987 +    void setRejectedExecutionHandler(
1988 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1989 +        p.setRejectedExecutionHandler(handler);
1990 +        assertSame(handler, p.getRejectedExecutionHandler());
1991 +    }
1992 +
1993 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1994 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1995 +        final long savedTaskCount = p.getTaskCount();
1996 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1997 +        final int savedQueueSize = p.getQueue().size();
1998 +        final boolean stock = (p.getClass().getClassLoader() == null);
1999 +
2000 +        Runnable r = () -> {};
2001 +        Callable<Boolean> c = () -> Boolean.TRUE;
2002 +
2003 +        class Recorder implements RejectedExecutionHandler {
2004 +            public volatile Runnable r = null;
2005 +            public volatile ThreadPoolExecutor p = null;
2006 +            public void reset() { r = null; p = null; }
2007 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
2008 +                assertNull(this.r);
2009 +                assertNull(this.p);
2010 +                this.r = r;
2011 +                this.p = p;
2012 +            }
2013 +        }
2014 +
2015 +        // check custom handler is invoked exactly once per task
2016 +        Recorder recorder = new Recorder();
2017 +        setRejectedExecutionHandler(p, recorder);
2018 +        for (int i = 2; i--> 0; ) {
2019 +            recorder.reset();
2020 +            p.execute(r);
2021 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
2022 +                assertSame(r, recorder.r);
2023 +            assertSame(p, recorder.p);
2024 +
2025 +            recorder.reset();
2026 +            assertFalse(p.submit(r).isDone());
2027 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2028 +            assertSame(p, recorder.p);
2029 +
2030 +            recorder.reset();
2031 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2032 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2033 +            assertSame(p, recorder.p);
2034 +
2035 +            recorder.reset();
2036 +            assertFalse(p.submit(c).isDone());
2037 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2038 +            assertSame(p, recorder.p);
2039 +
2040 +            if (p instanceof ScheduledExecutorService) {
2041 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2042 +                ScheduledFuture<?> future;
2043 +
2044 +                recorder.reset();
2045 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2046 +                assertFalse(future.isDone());
2047 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2048 +                assertSame(p, recorder.p);
2049 +
2050 +                recorder.reset();
2051 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2052 +                assertFalse(future.isDone());
2053 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2054 +                assertSame(p, recorder.p);
2055 +
2056 +                recorder.reset();
2057 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2058 +                assertFalse(future.isDone());
2059 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2060 +                assertSame(p, recorder.p);
2061 +
2062 +                recorder.reset();
2063 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2064 +                assertFalse(future.isDone());
2065 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2066 +                assertSame(p, recorder.p);
2067 +            }
2068 +        }
2069 +
2070 +        // Checking our custom handler above should be sufficient, but
2071 +        // we add some integration tests of standard handlers.
2072 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2073 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2074 +
2075 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2076 +        try {
2077 +            p.execute(setThread);
2078 +            shouldThrow();
2079 +        } catch (RejectedExecutionException success) {}
2080 +        assertNull(thread.get());
2081 +
2082 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2083 +        p.execute(setThread);
2084 +        assertNull(thread.get());
2085 +
2086 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2087 +        p.execute(setThread);
2088 +        if (p.isShutdown())
2089 +            assertNull(thread.get());
2090 +        else
2091 +            assertSame(Thread.currentThread(), thread.get());
2092 +
2093 +        setRejectedExecutionHandler(p, savedHandler);
2094 +
2095 +        // check that pool was not perturbed by handlers
2096 +        assertEquals(savedTaskCount, p.getTaskCount());
2097 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2098 +        assertEquals(savedQueueSize, p.getQueue().size());
2099 +    }
2100   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines