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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines