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.128 by jsr166, Fri Feb 27 22:06:24 2015 UTC vs.
Revision 1.235 by jsr166, Sat Jul 22 18:23:59 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;
# Line 35 | 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 62 | 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 84 | 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
105 < * 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 160 | 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 171 | 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();
189 <        long t0 = System.nanoTime();
190 <        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.
201     * Optional command line arg provides the number of iterations to
202     * 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) {
214 <            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          }
218        System.exit(0);
402      }
403  
404      public static TestSuite newTestSuite(Object... suiteOrClasses) {
# Line 266 | 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 289 | 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 311 | 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 339 | 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 +                "LinkedBlockingDeque8Test",
548 +                "LinkedBlockingQueue8Test",
549                  "LongAccumulatorTest",
550                  "LongAdderTest",
551                  "SplittableRandomTest",
552                  "StampedLockTest",
553 +                "SubmissionPublisherTest",
554                  "ThreadLocalRandom8Test",
555 +                "TimeUnit8Test",
556              };
557              addNamedTestClasses(suite, java8TestClassNames);
558          }
# Line 364 | Line 560 | public class JSR166TestCase extends Test
560          // Java9+ test classes
561          if (atLeastJava9()) {
562              String[] java9TestClassNames = {
563 <                "ThreadPoolExecutor9Test",
563 >                "AtomicBoolean9Test",
564 >                "AtomicInteger9Test",
565 >                "AtomicIntegerArray9Test",
566 >                "AtomicLong9Test",
567 >                "AtomicLongArray9Test",
568 >                "AtomicReference9Test",
569 >                "AtomicReferenceArray9Test",
570 >                "ExecutorCompletionService9Test",
571 >                "ForkJoinPool9Test",
572              };
573              addNamedTestClasses(suite, java9TestClassNames);
574          }
# Line 372 | Line 576 | public class JSR166TestCase extends Test
576          return suite;
577      }
578  
579 +    /** Returns list of junit-style test method names in given class. */
580 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
581 +        Method[] methods = testClass.getDeclaredMethods();
582 +        ArrayList<String> names = new ArrayList<>(methods.length);
583 +        for (Method method : methods) {
584 +            if (method.getName().startsWith("test")
585 +                && Modifier.isPublic(method.getModifiers())
586 +                // method.getParameterCount() requires jdk8+
587 +                && method.getParameterTypes().length == 0) {
588 +                names.add(method.getName());
589 +            }
590 +        }
591 +        return names;
592 +    }
593 +
594 +    /**
595 +     * Returns junit-style testSuite for the given test class, but
596 +     * parameterized by passing extra data to each test.
597 +     */
598 +    public static <ExtraData> Test parameterizedTestSuite
599 +        (Class<? extends JSR166TestCase> testClass,
600 +         Class<ExtraData> dataClass,
601 +         ExtraData data) {
602 +        try {
603 +            TestSuite suite = new TestSuite();
604 +            Constructor c =
605 +                testClass.getDeclaredConstructor(dataClass, String.class);
606 +            for (String methodName : testMethodNames(testClass))
607 +                suite.addTest((Test) c.newInstance(data, methodName));
608 +            return suite;
609 +        } catch (Exception e) {
610 +            throw new Error(e);
611 +        }
612 +    }
613 +
614 +    /**
615 +     * Returns junit-style testSuite for the jdk8 extension of the
616 +     * given test class, but parameterized by passing extra data to
617 +     * each test.  Uses reflection to allow compilation in jdk7.
618 +     */
619 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
620 +        (Class<? extends JSR166TestCase> testClass,
621 +         Class<ExtraData> dataClass,
622 +         ExtraData data) {
623 +        if (atLeastJava8()) {
624 +            String name = testClass.getName();
625 +            String name8 = name.replaceAll("Test$", "8Test");
626 +            if (name.equals(name8)) throw new Error(name);
627 +            try {
628 +                return (Test)
629 +                    Class.forName(name8)
630 +                    .getMethod("testSuite", new Class[] { dataClass })
631 +                    .invoke(null, data);
632 +            } catch (Exception e) {
633 +                throw new Error(e);
634 +            }
635 +        } else {
636 +            return new TestSuite();
637 +        }
638 +    }
639 +
640      // Delays for timing-dependent tests, in milliseconds.
641  
642      public static long SHORT_DELAY_MS;
# Line 379 | Line 644 | public class JSR166TestCase extends Test
644      public static long MEDIUM_DELAY_MS;
645      public static long LONG_DELAY_MS;
646  
647 +    private static final long RANDOM_TIMEOUT;
648 +    private static final long RANDOM_EXPIRED_TIMEOUT;
649 +    private static final TimeUnit RANDOM_TIMEUNIT;
650 +    static {
651 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
652 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
653 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
654 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
655 +        TimeUnit[] timeUnits = TimeUnit.values();
656 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
657 +    }
658 +
659 +    /**
660 +     * Returns a timeout for use when any value at all will do.
661 +     */
662 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
663 +
664 +    /**
665 +     * Returns a timeout that means "no waiting", i.e. not positive.
666 +     */
667 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
668 +
669 +    /**
670 +     * Returns a random non-null TimeUnit.
671 +     */
672 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
673 +
674      /**
675 <     * Returns the shortest timed delay. This could
676 <     * be reimplemented to use for example a Property.
675 >     * Returns the shortest timed delay. This can be scaled up for
676 >     * slow machines using the jsr166.delay.factor system property,
677 >     * or via jtreg's -timeoutFactor: flag.
678 >     * http://openjdk.java.net/jtreg/command-help.html
679       */
680      protected long getShortDelay() {
681 <        return 50;
681 >        return (long) (50 * delayFactor);
682      }
683  
684      /**
# Line 397 | Line 691 | public class JSR166TestCase extends Test
691          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
692      }
693  
694 +    private static final long TIMEOUT_DELAY_MS
695 +        = (long) (12.0 * Math.cbrt(delayFactor));
696 +
697      /**
698 <     * Returns a timeout in milliseconds to be used in tests that
699 <     * verify that operations block or time out.
698 >     * Returns a timeout in milliseconds to be used in tests that verify
699 >     * that operations block or time out.  We want this to be longer
700 >     * than the OS scheduling quantum, but not too long, so don't scale
701 >     * linearly with delayFactor; we use "crazy" cube root instead.
702       */
703 <    long timeoutMillis() {
704 <        return SHORT_DELAY_MS / 4;
703 >    static long timeoutMillis() {
704 >        return TIMEOUT_DELAY_MS;
705      }
706  
707      /**
708 <     * Returns a new Date instance representing a time delayMillis
709 <     * milliseconds in the future.
708 >     * Returns a new Date instance representing a time at least
709 >     * delayMillis milliseconds in the future.
710       */
711      Date delayedDate(long delayMillis) {
712 <        return new Date(System.currentTimeMillis() + delayMillis);
712 >        // Add 1 because currentTimeMillis is known to round into the past.
713 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
714      }
715  
716      /**
717       * The first exception encountered if any threadAssertXXX method fails.
718       */
719      private final AtomicReference<Throwable> threadFailure
720 <        = new AtomicReference<Throwable>(null);
720 >        = new AtomicReference<>(null);
721  
722      /**
723       * Records an exception so that it can be rethrown later in the test
# Line 426 | Line 726 | public class JSR166TestCase extends Test
726       * the same test have no effect.
727       */
728      public void threadRecordFailure(Throwable t) {
729 +        System.err.println(t);
730 +        dumpTestThreads();
731          threadFailure.compareAndSet(null, t);
732      }
733  
# Line 433 | Line 735 | public class JSR166TestCase extends Test
735          setDelays();
736      }
737  
738 +    void tearDownFail(String format, Object... args) {
739 +        String msg = toString() + ": " + String.format(format, args);
740 +        System.err.println(msg);
741 +        dumpTestThreads();
742 +        throw new AssertionFailedError(msg);
743 +    }
744 +
745      /**
746       * Extra checks that get done for all test cases.
747       *
# Line 460 | Line 769 | public class JSR166TestCase extends Test
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      /**
# Line 496 | Line 807 | public class JSR166TestCase extends Test
807              fail(reason);
808          } catch (AssertionFailedError t) {
809              threadRecordFailure(t);
810 <            fail(reason);
810 >            throw t;
811          }
812      }
813  
# Line 564 | Line 875 | public class JSR166TestCase extends Test
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 (AssertionFailedError fail) {
879 >            threadRecordFailure(fail);
880 >            throw fail;
881 >        } catch (Throwable fail) {
882 >            threadUnexpectedException(fail);
883          }
884      }
885  
# Line 580 | Line 891 | public class JSR166TestCase extends Test
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 (AssertionFailedError fail) {
895 >            threadRecordFailure(fail);
896 >            throw fail;
897          }
898      }
899  
# Line 623 | Line 934 | public class JSR166TestCase extends Test
934      /**
935       * Delays, via Thread.sleep, for the given millisecond delay, but
936       * if the sleep is shorter than specified, may re-sleep or yield
937 <     * until time elapses.
937 >     * until time elapses.  Ensures that the given time, as measured
938 >     * by System.nanoTime(), has elapsed.
939       */
940      static void delay(long millis) throws InterruptedException {
941 <        long startTime = System.nanoTime();
942 <        long ns = millis * 1000 * 1000;
943 <        for (;;) {
941 >        long nanos = millis * (1000 * 1000);
942 >        final long wakeupTime = System.nanoTime() + nanos;
943 >        do {
944              if (millis > 0L)
945                  Thread.sleep(millis);
946              else // too short to sleep
947                  Thread.yield();
948 <            long d = ns - (System.nanoTime() - startTime);
949 <            if (d > 0L)
950 <                millis = d / (1000 * 1000);
951 <            else
952 <                break;
948 >            nanos = wakeupTime - System.nanoTime();
949 >            millis = nanos / (1000 * 1000);
950 >        } while (nanos >= 0L);
951 >    }
952 >
953 >    /**
954 >     * Allows use of try-with-resources with per-test thread pools.
955 >     */
956 >    class PoolCleaner implements AutoCloseable {
957 >        private final ExecutorService pool;
958 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
959 >        public void close() { joinPool(pool); }
960 >    }
961 >
962 >    /**
963 >     * An extension of PoolCleaner that has an action to release the pool.
964 >     */
965 >    class PoolCleanerWithReleaser extends PoolCleaner {
966 >        private final Runnable releaser;
967 >        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
968 >            super(pool);
969 >            this.releaser = releaser;
970 >        }
971 >        public void close() {
972 >            try {
973 >                releaser.run();
974 >            } finally {
975 >                super.close();
976 >            }
977          }
978      }
979  
980 +    PoolCleaner cleaner(ExecutorService pool) {
981 +        return new PoolCleaner(pool);
982 +    }
983 +
984 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
985 +        return new PoolCleanerWithReleaser(pool, releaser);
986 +    }
987 +
988 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
989 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
990 +    }
991 +
992 +    Runnable releaser(final CountDownLatch latch) {
993 +        return new Runnable() { public void run() {
994 +            do { latch.countDown(); }
995 +            while (latch.getCount() > 0);
996 +        }};
997 +    }
998 +
999 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
1000 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
1001 +    }
1002 +
1003 +    Runnable releaser(final AtomicBoolean flag) {
1004 +        return new Runnable() { public void run() { flag.set(true); }};
1005 +    }
1006 +
1007      /**
1008       * Waits out termination of a thread pool or fails doing so.
1009       */
1010 <    void joinPool(ExecutorService exec) {
1010 >    void joinPool(ExecutorService pool) {
1011          try {
1012 <            exec.shutdown();
1013 <            if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
1014 <                fail("ExecutorService " + exec +
1015 <                     " did not terminate in a timely manner");
1012 >            pool.shutdown();
1013 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
1014 >                try {
1015 >                    threadFail("ExecutorService " + pool +
1016 >                               " did not terminate in a timely manner");
1017 >                } finally {
1018 >                    // last resort, for the benefit of subsequent tests
1019 >                    pool.shutdownNow();
1020 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
1021 >                }
1022 >            }
1023          } catch (SecurityException ok) {
1024              // Allowed in case test doesn't have privs
1025          } catch (InterruptedException fail) {
1026 <            fail("Unexpected InterruptedException");
1026 >            threadFail("Unexpected InterruptedException");
1027          }
1028      }
1029  
1030      /**
1031 <     * A debugging tool to print all stack traces, as jstack does.
1031 >     * Like Runnable, but with the freedom to throw anything.
1032 >     * junit folks had the same idea:
1033 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1034       */
1035 <    static void printAllStackTraces() {
664 <        for (ThreadInfo info :
665 <                 ManagementFactory.getThreadMXBean()
666 <                 .dumpAllThreads(true, true))
667 <            System.err.print(info);
668 <    }
1035 >    interface Action { public void run() throws Throwable; }
1036  
1037      /**
1038 <     * Checks that thread does not terminate within the default
1039 <     * millisecond delay of {@code timeoutMillis()}.
1038 >     * Runs all the given actions in parallel, failing if any fail.
1039 >     * Useful for running multiple variants of tests that are
1040 >     * necessarily individually slow because they must block.
1041       */
1042 <    void assertThreadStaysAlive(Thread thread) {
1043 <        assertThreadStaysAlive(thread, timeoutMillis());
1042 >    void testInParallel(Action ... actions) {
1043 >        ExecutorService pool = Executors.newCachedThreadPool();
1044 >        try (PoolCleaner cleaner = cleaner(pool)) {
1045 >            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1046 >            for (final Action action : actions)
1047 >                futures.add(pool.submit(new CheckedRunnable() {
1048 >                    public void realRun() throws Throwable { action.run();}}));
1049 >            for (Future<?> future : futures)
1050 >                try {
1051 >                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
1052 >                } catch (ExecutionException ex) {
1053 >                    threadUnexpectedException(ex.getCause());
1054 >                } catch (Exception ex) {
1055 >                    threadUnexpectedException(ex);
1056 >                }
1057 >        }
1058      }
1059  
1060      /**
1061 <     * Checks that thread does not terminate within the given millisecond delay.
1061 >     * A debugging tool to print stack traces of most threads, as jstack does.
1062 >     * Uninteresting threads are filtered out.
1063       */
1064 <    void assertThreadStaysAlive(Thread thread, long millis) {
1065 <        try {
1066 <            // No need to optimize the failing case via Thread.join.
1067 <            delay(millis);
1068 <            assertTrue(thread.isAlive());
1069 <        } catch (InterruptedException fail) {
1070 <            fail("Unexpected InterruptedException");
1064 >    static void dumpTestThreads() {
1065 >        SecurityManager sm = System.getSecurityManager();
1066 >        if (sm != null) {
1067 >            try {
1068 >                System.setSecurityManager(null);
1069 >            } catch (SecurityException giveUp) {
1070 >                return;
1071 >            }
1072          }
689    }
1073  
1074 <    /**
1075 <     * Checks that the threads do not terminate within the default
1076 <     * millisecond delay of {@code timeoutMillis()}.
1077 <     */
1078 <    void assertThreadsStayAlive(Thread... threads) {
1079 <        assertThreadsStayAlive(timeoutMillis(), threads);
1074 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1075 >        System.err.println("------ stacktrace dump start ------");
1076 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1077 >            final String name = info.getThreadName();
1078 >            String lockName;
1079 >            if ("Signal Dispatcher".equals(name))
1080 >                continue;
1081 >            if ("Reference Handler".equals(name)
1082 >                && (lockName = info.getLockName()) != null
1083 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1084 >                continue;
1085 >            if ("Finalizer".equals(name)
1086 >                && (lockName = info.getLockName()) != null
1087 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1088 >                continue;
1089 >            if ("checkForWedgedTest".equals(name))
1090 >                continue;
1091 >            System.err.print(info);
1092 >        }
1093 >        System.err.println("------ stacktrace dump end ------");
1094 >
1095 >        if (sm != null) System.setSecurityManager(sm);
1096      }
1097  
1098      /**
1099 <     * Checks that the threads do not terminate within the given millisecond delay.
1099 >     * Checks that thread eventually enters the expected blocked thread state.
1100       */
1101 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1102 <        try {
1103 <            // No need to optimize the failing case via Thread.join.
1104 <            delay(millis);
1105 <            for (Thread thread : threads)
1106 <                assertTrue(thread.isAlive());
1107 <        } catch (InterruptedException fail) {
1108 <            fail("Unexpected InterruptedException");
1101 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1102 >        // always sleep at least 1 ms, with high probability avoiding
1103 >        // transitory states
1104 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1105 >            try { delay(1); }
1106 >            catch (InterruptedException fail) {
1107 >                fail("Unexpected InterruptedException");
1108 >            }
1109 >            Thread.State s = thread.getState();
1110 >            if (s == expected)
1111 >                return;
1112 >            else if (s == Thread.State.TERMINATED)
1113 >                fail("Unexpected thread termination");
1114          }
1115 +        fail("timed out waiting for thread to enter thread state " + expected);
1116      }
1117  
1118      /**
# Line 748 | Line 1153 | public class JSR166TestCase extends Test
1153      }
1154  
1155      /**
1156 +     * The maximum number of consecutive spurious wakeups we should
1157 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1158 +     */
1159 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1160 +
1161 +    /**
1162       * The number of elements to place in collections, arrays, etc.
1163       */
1164      public static final int SIZE = 20;
# Line 851 | Line 1262 | public class JSR166TestCase extends Test
1262          }
1263          public void refresh() {}
1264          public String toString() {
1265 <            List<Permission> ps = new ArrayList<Permission>();
1265 >            List<Permission> ps = new ArrayList<>();
1266              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1267                  ps.add(e.nextElement());
1268              return "AdjustablePolicy with permissions " + ps;
# Line 881 | Line 1292 | public class JSR166TestCase extends Test
1292       * Sleeps until the given time has elapsed.
1293       * Throws AssertionFailedError if interrupted.
1294       */
1295 <    void sleep(long millis) {
1295 >    static void sleep(long millis) {
1296          try {
1297              delay(millis);
1298          } catch (InterruptedException fail) {
# Line 897 | Line 1308 | public class JSR166TestCase extends Test
1308       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1309       */
1310      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1311 <        long startTime = System.nanoTime();
1311 >        long startTime = 0L;
1312          for (;;) {
1313              Thread.State s = thread.getState();
1314              if (s == Thread.State.BLOCKED ||
# Line 906 | Line 1317 | public class JSR166TestCase extends Test
1317                  return;
1318              else if (s == Thread.State.TERMINATED)
1319                  fail("Unexpected thread termination");
1320 +            else if (startTime == 0L)
1321 +                startTime = System.nanoTime();
1322              else if (millisElapsedSince(startTime) > timeoutMillis) {
1323                  threadAssertTrue(thread.isAlive());
1324 <                return;
1324 >                fail("timed out waiting for thread to enter wait state");
1325 >            }
1326 >            Thread.yield();
1327 >        }
1328 >    }
1329 >
1330 >    /**
1331 >     * Spin-waits up to the specified number of milliseconds for the given
1332 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1333 >     * and additionally satisfy the given condition.
1334 >     */
1335 >    void waitForThreadToEnterWaitState(
1336 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1337 >        long startTime = 0L;
1338 >        for (;;) {
1339 >            Thread.State s = thread.getState();
1340 >            if (s == Thread.State.BLOCKED ||
1341 >                s == Thread.State.WAITING ||
1342 >                s == Thread.State.TIMED_WAITING) {
1343 >                try {
1344 >                    if (waitingForGodot.call())
1345 >                        return;
1346 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1347 >            }
1348 >            else if (s == Thread.State.TERMINATED)
1349 >                fail("Unexpected thread termination");
1350 >            else if (startTime == 0L)
1351 >                startTime = System.nanoTime();
1352 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1353 >                threadAssertTrue(thread.isAlive());
1354 >                fail("timed out waiting for thread to enter wait state");
1355              }
1356              Thread.yield();
1357          }
1358      }
1359  
1360      /**
1361 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1362 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1361 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1362 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1363       */
1364      void waitForThreadToEnterWaitState(Thread thread) {
1365          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1366      }
1367  
1368      /**
1369 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1370 +     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1371 +     * and additionally satisfy the given condition.
1372 +     */
1373 +    void waitForThreadToEnterWaitState(
1374 +        Thread thread, Callable<Boolean> waitingForGodot) {
1375 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1376 +    }
1377 +
1378 +    /**
1379       * Returns the number of milliseconds since time given by
1380       * startNanoTime, which must have been previously returned from a
1381       * call to {@link System#nanoTime()}.
# Line 984 | Line 1437 | public class JSR166TestCase extends Test
1437          } finally {
1438              if (t.getState() != Thread.State.TERMINATED) {
1439                  t.interrupt();
1440 <                fail("Test timed out");
1440 >                threadFail("timed out waiting for thread to terminate");
1441              }
1442          }
1443      }
# Line 1109 | Line 1562 | public class JSR166TestCase extends Test
1562      public static final String TEST_STRING = "a test string";
1563  
1564      public static class StringTask implements Callable<String> {
1565 <        public String call() { return TEST_STRING; }
1565 >        final String value;
1566 >        public StringTask() { this(TEST_STRING); }
1567 >        public StringTask(String value) { this.value = value; }
1568 >        public String call() { return value; }
1569      }
1570  
1571      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 1122 | Line 1578 | public class JSR166TestCase extends Test
1578              }};
1579      }
1580  
1581 <    public Runnable awaiter(final CountDownLatch latch) {
1581 >    public Runnable countDowner(final CountDownLatch latch) {
1582          return new CheckedRunnable() {
1583              public void realRun() throws InterruptedException {
1584 <                await(latch);
1584 >                latch.countDown();
1585              }};
1586      }
1587  
1588 <    public void await(CountDownLatch latch) {
1588 >    class LatchAwaiter extends CheckedRunnable {
1589 >        static final int NEW = 0;
1590 >        static final int RUNNING = 1;
1591 >        static final int DONE = 2;
1592 >        final CountDownLatch latch;
1593 >        int state = NEW;
1594 >        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1595 >        public void realRun() throws InterruptedException {
1596 >            state = 1;
1597 >            await(latch);
1598 >            state = 2;
1599 >        }
1600 >    }
1601 >
1602 >    public LatchAwaiter awaiter(CountDownLatch latch) {
1603 >        return new LatchAwaiter(latch);
1604 >    }
1605 >
1606 >    public void await(CountDownLatch latch, long timeoutMillis) {
1607          try {
1608 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1608 >            if (!latch.await(timeoutMillis, MILLISECONDS))
1609 >                fail("timed out waiting for CountDownLatch for "
1610 >                     + (timeoutMillis/1000) + " sec");
1611          } catch (Throwable fail) {
1612              threadUnexpectedException(fail);
1613          }
1614      }
1615  
1616 +    public void await(CountDownLatch latch) {
1617 +        await(latch, LONG_DELAY_MS);
1618 +    }
1619 +
1620      public void await(Semaphore semaphore) {
1621          try {
1622 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1622 >            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1623 >                fail("timed out waiting for Semaphore for "
1624 >                     + (LONG_DELAY_MS/1000) + " sec");
1625 >        } catch (Throwable fail) {
1626 >            threadUnexpectedException(fail);
1627 >        }
1628 >    }
1629 >
1630 >    public void await(CyclicBarrier barrier) {
1631 >        try {
1632 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1633          } catch (Throwable fail) {
1634              threadUnexpectedException(fail);
1635          }
# Line 1168 | Line 1658 | public class JSR166TestCase extends Test
1658          public String call() { throw new NullPointerException(); }
1659      }
1660  
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
1661      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1662          protected void realRun() {
1663              try {
# Line 1198 | Line 1666 | public class JSR166TestCase extends Test
1666          }
1667      }
1668  
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
1669      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1670          return new CheckedRunnable() {
1671              protected void realRun() {
# Line 1226 | Line 1675 | public class JSR166TestCase extends Test
1675              }};
1676      }
1677  
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
1678      /**
1679       * For use as ThreadFactory in constructors
1680       */
# Line 1255 | Line 1688 | public class JSR166TestCase extends Test
1688          boolean isDone();
1689      }
1690  
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
1691      public static class TrackedNoOpRunnable implements Runnable {
1692          public volatile boolean done = false;
1693          public void run() {
# Line 1315 | Line 1695 | public class JSR166TestCase extends Test
1695          }
1696      }
1697  
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
1698      /**
1699       * Analog of CheckedRunnable for RecursiveAction
1700       */
# Line 1369 | Line 1738 | public class JSR166TestCase extends Test
1738       * A CyclicBarrier that uses timed await and fails with
1739       * AssertionFailedErrors instead of throwing checked exceptions.
1740       */
1741 <    public class CheckedBarrier extends CyclicBarrier {
1741 >    public static class CheckedBarrier extends CyclicBarrier {
1742          public CheckedBarrier(int parties) { super(parties); }
1743  
1744          public int await() {
# Line 1392 | Line 1761 | public class JSR166TestCase extends Test
1761              assertEquals(0, q.size());
1762              assertNull(q.peek());
1763              assertNull(q.poll());
1764 <            assertNull(q.poll(0, MILLISECONDS));
1764 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1765              assertEquals(q.toString(), "[]");
1766              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1767              assertFalse(q.iterator().hasNext());
# Line 1433 | Line 1802 | public class JSR166TestCase extends Test
1802          }
1803      }
1804  
1805 +    void assertImmutable(final Object o) {
1806 +        if (o instanceof Collection) {
1807 +            assertThrows(
1808 +                UnsupportedOperationException.class,
1809 +                new Runnable() { public void run() {
1810 +                        ((Collection) o).add(null);}});
1811 +        }
1812 +    }
1813 +
1814      @SuppressWarnings("unchecked")
1815      <T> T serialClone(T o) {
1816          try {
1817              ObjectInputStream ois = new ObjectInputStream
1818                  (new ByteArrayInputStream(serialBytes(o)));
1819              T clone = (T) ois.readObject();
1820 +            if (o == clone) assertImmutable(o);
1821              assertSame(o.getClass(), clone.getClass());
1822              return clone;
1823          } catch (Throwable fail) {
# Line 1447 | Line 1826 | public class JSR166TestCase extends Test
1826          }
1827      }
1828  
1829 +    /**
1830 +     * A version of serialClone that leaves error handling (for
1831 +     * e.g. NotSerializableException) up to the caller.
1832 +     */
1833 +    @SuppressWarnings("unchecked")
1834 +    <T> T serialClonePossiblyFailing(T o)
1835 +        throws ReflectiveOperationException, java.io.IOException {
1836 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1837 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1838 +        oos.writeObject(o);
1839 +        oos.flush();
1840 +        oos.close();
1841 +        ObjectInputStream ois = new ObjectInputStream
1842 +            (new ByteArrayInputStream(bos.toByteArray()));
1843 +        T clone = (T) ois.readObject();
1844 +        if (o == clone) assertImmutable(o);
1845 +        assertSame(o.getClass(), clone.getClass());
1846 +        return clone;
1847 +    }
1848 +
1849 +    /**
1850 +     * If o implements Cloneable and has a public clone method,
1851 +     * returns a clone of o, else null.
1852 +     */
1853 +    @SuppressWarnings("unchecked")
1854 +    <T> T cloneableClone(T o) {
1855 +        if (!(o instanceof Cloneable)) return null;
1856 +        final T clone;
1857 +        try {
1858 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1859 +        } catch (NoSuchMethodException ok) {
1860 +            return null;
1861 +        } catch (ReflectiveOperationException unexpected) {
1862 +            throw new Error(unexpected);
1863 +        }
1864 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1865 +        assertSame(o.getClass(), clone.getClass());
1866 +        return clone;
1867 +    }
1868 +
1869      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1870                               Runnable... throwingActions) {
1871          for (Runnable throwingAction : throwingActions) {
# Line 1475 | Line 1894 | public class JSR166TestCase extends Test
1894          } catch (NoSuchElementException success) {}
1895          assertFalse(it.hasNext());
1896      }
1897 +
1898 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1899 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1900 +    }
1901 +
1902 +    public Runnable runnableThrowing(final RuntimeException ex) {
1903 +        return new Runnable() { public void run() { throw ex; }};
1904 +    }
1905 +
1906 +    /** A reusable thread pool to be shared by tests. */
1907 +    static final ExecutorService cachedThreadPool =
1908 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1909 +                               1000L, MILLISECONDS,
1910 +                               new SynchronousQueue<Runnable>());
1911 +
1912 +    static <T> void shuffle(T[] array) {
1913 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1914 +    }
1915 +
1916 +    // --- Shared assertions for Executor tests ---
1917 +
1918 +    /**
1919 +     * Returns maximum number of tasks that can be submitted to given
1920 +     * pool (with bounded queue) before saturation (when submission
1921 +     * throws RejectedExecutionException).
1922 +     */
1923 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1924 +        BlockingQueue<Runnable> q = pool.getQueue();
1925 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1926 +    }
1927 +
1928 +    @SuppressWarnings("FutureReturnValueIgnored")
1929 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1930 +        try {
1931 +            e.execute((Runnable) null);
1932 +            shouldThrow();
1933 +        } catch (NullPointerException success) {}
1934 +
1935 +        if (! (e instanceof ExecutorService)) return;
1936 +        ExecutorService es = (ExecutorService) e;
1937 +        try {
1938 +            es.submit((Runnable) null);
1939 +            shouldThrow();
1940 +        } catch (NullPointerException success) {}
1941 +        try {
1942 +            es.submit((Runnable) null, Boolean.TRUE);
1943 +            shouldThrow();
1944 +        } catch (NullPointerException success) {}
1945 +        try {
1946 +            es.submit((Callable) null);
1947 +            shouldThrow();
1948 +        } catch (NullPointerException success) {}
1949 +
1950 +        if (! (e instanceof ScheduledExecutorService)) return;
1951 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1952 +        try {
1953 +            ses.schedule((Runnable) null,
1954 +                         randomTimeout(), randomTimeUnit());
1955 +            shouldThrow();
1956 +        } catch (NullPointerException success) {}
1957 +        try {
1958 +            ses.schedule((Callable) null,
1959 +                         randomTimeout(), randomTimeUnit());
1960 +            shouldThrow();
1961 +        } catch (NullPointerException success) {}
1962 +        try {
1963 +            ses.scheduleAtFixedRate((Runnable) null,
1964 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1965 +            shouldThrow();
1966 +        } catch (NullPointerException success) {}
1967 +        try {
1968 +            ses.scheduleWithFixedDelay((Runnable) null,
1969 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1970 +            shouldThrow();
1971 +        } catch (NullPointerException success) {}
1972 +    }
1973 +
1974 +    void setRejectedExecutionHandler(
1975 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1976 +        p.setRejectedExecutionHandler(handler);
1977 +        assertSame(handler, p.getRejectedExecutionHandler());
1978 +    }
1979 +
1980 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1981 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1982 +        final long savedTaskCount = p.getTaskCount();
1983 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1984 +        final int savedQueueSize = p.getQueue().size();
1985 +        final boolean stock = (p.getClass().getClassLoader() == null);
1986 +
1987 +        Runnable r = () -> {};
1988 +        Callable<Boolean> c = () -> Boolean.TRUE;
1989 +
1990 +        class Recorder implements RejectedExecutionHandler {
1991 +            public volatile Runnable r = null;
1992 +            public volatile ThreadPoolExecutor p = null;
1993 +            public void reset() { r = null; p = null; }
1994 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1995 +                assertNull(this.r);
1996 +                assertNull(this.p);
1997 +                this.r = r;
1998 +                this.p = p;
1999 +            }
2000 +        }
2001 +
2002 +        // check custom handler is invoked exactly once per task
2003 +        Recorder recorder = new Recorder();
2004 +        setRejectedExecutionHandler(p, recorder);
2005 +        for (int i = 2; i--> 0; ) {
2006 +            recorder.reset();
2007 +            p.execute(r);
2008 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
2009 +                assertSame(r, recorder.r);
2010 +            assertSame(p, recorder.p);
2011 +
2012 +            recorder.reset();
2013 +            assertFalse(p.submit(r).isDone());
2014 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2015 +            assertSame(p, recorder.p);
2016 +
2017 +            recorder.reset();
2018 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2019 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2020 +            assertSame(p, recorder.p);
2021 +
2022 +            recorder.reset();
2023 +            assertFalse(p.submit(c).isDone());
2024 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2025 +            assertSame(p, recorder.p);
2026 +
2027 +            if (p instanceof ScheduledExecutorService) {
2028 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2029 +                ScheduledFuture<?> future;
2030 +
2031 +                recorder.reset();
2032 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2033 +                assertFalse(future.isDone());
2034 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2035 +                assertSame(p, recorder.p);
2036 +
2037 +                recorder.reset();
2038 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2039 +                assertFalse(future.isDone());
2040 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2041 +                assertSame(p, recorder.p);
2042 +
2043 +                recorder.reset();
2044 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2045 +                assertFalse(future.isDone());
2046 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2047 +                assertSame(p, recorder.p);
2048 +
2049 +                recorder.reset();
2050 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2051 +                assertFalse(future.isDone());
2052 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2053 +                assertSame(p, recorder.p);
2054 +            }
2055 +        }
2056 +
2057 +        // Checking our custom handler above should be sufficient, but
2058 +        // we add some integration tests of standard handlers.
2059 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2060 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2061 +
2062 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2063 +        try {
2064 +            p.execute(setThread);
2065 +            shouldThrow();
2066 +        } catch (RejectedExecutionException success) {}
2067 +        assertNull(thread.get());
2068 +
2069 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2070 +        p.execute(setThread);
2071 +        assertNull(thread.get());
2072 +
2073 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2074 +        p.execute(setThread);
2075 +        if (p.isShutdown())
2076 +            assertNull(thread.get());
2077 +        else
2078 +            assertSame(Thread.currentThread(), thread.get());
2079 +
2080 +        setRejectedExecutionHandler(p, savedHandler);
2081 +
2082 +        // check that pool was not perturbed by handlers
2083 +        assertEquals(savedTaskCount, p.getTaskCount());
2084 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2085 +        assertEquals(savedQueueSize, p.getQueue().size());
2086 +    }
2087   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines