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.58 by jsr166, Wed Oct 6 02:11:57 2010 UTC vs.
Revision 1.230 by jsr166, Mon May 15 16:21:07 2017 UTC

# Line 1 | Line 1
1   /*
2 < * Written by Doug Lea with assistance from members of JCP JSR-166
3 < * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
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.*;
11 < import java.util.PropertyPermission;
12 < import java.util.concurrent.*;
13 < import java.util.concurrent.atomic.AtomicReference;
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;
# Line 18 | Line 61 | 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.Enumeration;
70 + import java.util.Iterator;
71 + import java.util.List;
72 + import java.util.NoSuchElementException;
73 + import java.util.PropertyPermission;
74 + import java.util.concurrent.BlockingQueue;
75 + import java.util.concurrent.Callable;
76 + import java.util.concurrent.CountDownLatch;
77 + import java.util.concurrent.CyclicBarrier;
78 + import java.util.concurrent.ExecutionException;
79 + import java.util.concurrent.Executors;
80 + import java.util.concurrent.ExecutorService;
81 + import java.util.concurrent.ForkJoinPool;
82 + import java.util.concurrent.Future;
83 + import java.util.concurrent.RecursiveAction;
84 + import java.util.concurrent.RecursiveTask;
85 + import java.util.concurrent.RejectedExecutionHandler;
86 + import java.util.concurrent.Semaphore;
87 + import java.util.concurrent.SynchronousQueue;
88 + import java.util.concurrent.ThreadFactory;
89 + import java.util.concurrent.ThreadLocalRandom;
90 + import java.util.concurrent.ThreadPoolExecutor;
91 + import java.util.concurrent.TimeoutException;
92 + import java.util.concurrent.atomic.AtomicBoolean;
93 + import java.util.concurrent.atomic.AtomicReference;
94 + import java.util.regex.Pattern;
95 +
96 + import junit.framework.AssertionFailedError;
97 + import junit.framework.Test;
98 + import junit.framework.TestCase;
99 + import junit.framework.TestResult;
100 + import junit.framework.TestSuite;
101  
102   /**
103   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 29 | Line 109 | import java.security.SecurityPermission;
109   *
110   * <ol>
111   *
112 < * <li> All assertions in code running in generated threads must use
112 > * <li>All assertions in code running in generated threads must use
113   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
114   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
115   * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
116   * particularly recommended) for other code to use these forms too.
117   * Only the most typically used JUnit assertion methods are defined
118 < * this way, but enough to live with.</li>
118 > * this way, but enough to live with.
119   *
120 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
120 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
121   * to invoke {@code super.setUp} and {@code super.tearDown} within
122   * them. These methods are used to clear and check for thread
123 < * assertion failures.</li>
123 > * assertion failures.
124   *
125   * <li>All delays and timeouts must use one of the constants {@code
126   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 51 | Line 131 | import java.security.SecurityPermission;
131   * is always discriminable as larger than SHORT and smaller than
132   * MEDIUM.  And so on. These constants are set to conservative values,
133   * but even so, if there is ever any doubt, they can all be increased
134 < * in one spot to rerun tests on slower platforms.</li>
134 > * in one spot to rerun tests on slower platforms.
135   *
136 < * <li> All threads generated must be joined inside each test case
136 > * <li>All threads generated must be joined inside each test case
137   * method (or {@code fail} to do so) before returning from the
138   * method. The {@code joinPool} method can be used to do this when
139 < * using Executors.</li>
139 > * using Executors.
140   *
141   * </ol>
142   *
143 < * <p> <b>Other notes</b>
143 > * <p><b>Other notes</b>
144   * <ul>
145   *
146 < * <li> Usually, there is one testcase method per JSR166 method
146 > * <li>Usually, there is one testcase method per JSR166 method
147   * covering "normal" operation, and then as many exception-testing
148   * methods as there are exceptions the method can throw. Sometimes
149   * there are multiple tests per JSR166 method when the different
150   * "normal" behaviors differ significantly. And sometimes testcases
151 < * cover multiple methods when they cannot be tested in
72 < * isolation.</li>
151 > * cover multiple methods when they cannot be tested in isolation.
152   *
153 < * <li> The documentation style for testcases is to provide as javadoc
153 > * <li>The documentation style for testcases is to provide as javadoc
154   * a simple sentence or two describing the property that the testcase
155   * method purports to test. The javadocs do not say anything about how
156 < * the property is tested. To find out, read the code.</li>
156 > * the property is tested. To find out, read the code.
157   *
158 < * <li> These tests are "conformance tests", and do not attempt to
158 > * <li>These tests are "conformance tests", and do not attempt to
159   * test throughput, latency, scalability or other performance factors
160   * (see the separate "jtreg" tests for a set intended to check these
161   * for the most central aspects of functionality.) So, most tests use
162   * the smallest sensible numbers of threads, collection sizes, etc
163 < * needed to check basic conformance.</li>
163 > * needed to check basic conformance.
164   *
165   * <li>The test classes currently do not declare inclusion in
166   * any particular package to simplify things for people integrating
167 < * them in TCK test suites.</li>
167 > * them in TCK test suites.
168   *
169 < * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
170 < * runs all JSR166 unit tests.</li>
169 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
170 > * runs all JSR166 unit tests.
171   *
172   * </ul>
173   */
# Line 96 | Line 175 | public class JSR166TestCase extends Test
175      private static final boolean useSecurityManager =
176          Boolean.getBoolean("jsr166.useSecurityManager");
177  
178 +    protected static final boolean expensiveTests =
179 +        Boolean.getBoolean("jsr166.expensiveTests");
180 +
181 +    /**
182 +     * If true, also run tests that are not part of the official tck
183 +     * because they test unspecified implementation details.
184 +     */
185 +    protected static final boolean testImplementationDetails =
186 +        Boolean.getBoolean("jsr166.testImplementationDetails");
187 +
188 +    /**
189 +     * If true, report on stdout all "slow" tests, that is, ones that
190 +     * take more than profileThreshold milliseconds to execute.
191 +     */
192 +    private static final boolean profileTests =
193 +        Boolean.getBoolean("jsr166.profileTests");
194 +
195 +    /**
196 +     * The number of milliseconds that tests are permitted for
197 +     * execution without being reported, when profileTests is set.
198 +     */
199 +    private static final long profileThreshold =
200 +        Long.getLong("jsr166.profileThreshold", 100);
201 +
202 +    /**
203 +     * The number of repetitions per test (for tickling rare bugs).
204 +     */
205 +    private static final int runsPerTest =
206 +        Integer.getInteger("jsr166.runsPerTest", 1);
207 +
208      /**
209 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
209 >     * The number of repetitions of the test suite (for finding leaks?).
210 >     */
211 >    private static final int suiteRuns =
212 >        Integer.getInteger("jsr166.suiteRuns", 1);
213 >
214 >    /**
215 >     * Returns the value of the system property, or NaN if not defined.
216 >     */
217 >    private static float systemPropertyValue(String name) {
218 >        String floatString = System.getProperty(name);
219 >        if (floatString == null)
220 >            return Float.NaN;
221 >        try {
222 >            return Float.parseFloat(floatString);
223 >        } catch (NumberFormatException ex) {
224 >            throw new IllegalArgumentException(
225 >                String.format("Bad float value in system property %s=%s",
226 >                              name, floatString));
227 >        }
228 >    }
229 >
230 >    /**
231 >     * The scaling factor to apply to standard delays used in tests.
232 >     * May be initialized from any of:
233 >     * - the "jsr166.delay.factor" system property
234 >     * - the "test.timeout.factor" system property (as used by jtreg)
235 >     *   See: http://openjdk.java.net/jtreg/tag-spec.html
236 >     * - hard-coded fuzz factor when using a known slowpoke VM
237 >     */
238 >    private static final float delayFactor = delayFactor();
239 >
240 >    private static float delayFactor() {
241 >        float x;
242 >        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
243 >            return x;
244 >        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
245 >            return x;
246 >        String prop = System.getProperty("java.vm.version");
247 >        if (prop != null && prop.matches(".*debug.*"))
248 >            return 4.0f; // How much slower is fastdebug than product?!
249 >        return 1.0f;
250 >    }
251 >
252 >    public JSR166TestCase() { super(); }
253 >    public JSR166TestCase(String name) { super(name); }
254 >
255 >    /**
256 >     * A filter for tests to run, matching strings of the form
257 >     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
258 >     * Usefully combined with jsr166.runsPerTest.
259 >     */
260 >    private static final Pattern methodFilter = methodFilter();
261 >
262 >    private static Pattern methodFilter() {
263 >        String regex = System.getProperty("jsr166.methodFilter");
264 >        return (regex == null) ? null : Pattern.compile(regex);
265 >    }
266 >
267 >    // Instrumentation to debug very rare, but very annoying hung test runs.
268 >    static volatile TestCase currentTestCase;
269 >    // static volatile int currentRun = 0;
270 >    static {
271 >        Runnable checkForWedgedTest = new Runnable() { public void run() {
272 >            // Avoid spurious reports with enormous runsPerTest.
273 >            // A single test case run should never take more than 1 second.
274 >            // But let's cap it at the high end too ...
275 >            final int timeoutMinutes =
276 >                Math.min(15, Math.max(runsPerTest / 60, 1));
277 >            for (TestCase lastTestCase = currentTestCase;;) {
278 >                try { MINUTES.sleep(timeoutMinutes); }
279 >                catch (InterruptedException unexpected) { break; }
280 >                if (lastTestCase == currentTestCase) {
281 >                    System.err.printf(
282 >                        "Looks like we're stuck running test: %s%n",
283 >                        lastTestCase);
284 > //                     System.err.printf(
285 > //                         "Looks like we're stuck running test: %s (%d/%d)%n",
286 > //                         lastTestCase, currentRun, runsPerTest);
287 > //                     System.err.println("availableProcessors=" +
288 > //                         Runtime.getRuntime().availableProcessors());
289 > //                     System.err.printf("cpu model = %s%n", cpuModel());
290 >                    dumpTestThreads();
291 >                    // one stack dump is probably enough; more would be spam
292 >                    break;
293 >                }
294 >                lastTestCase = currentTestCase;
295 >            }}};
296 >        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
297 >        thread.setDaemon(true);
298 >        thread.start();
299 >    }
300 >
301 > //     public static String cpuModel() {
302 > //         try {
303 > //             java.util.regex.Matcher matcher
304 > //               = Pattern.compile("model name\\s*: (.*)")
305 > //                 .matcher(new String(
306 > //                     java.nio.file.Files.readAllBytes(
307 > //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
308 > //             matcher.find();
309 > //             return matcher.group(1);
310 > //         } catch (Exception ex) { return null; }
311 > //     }
312 >
313 >    public void runBare() throws Throwable {
314 >        currentTestCase = this;
315 >        if (methodFilter == null
316 >            || methodFilter.matcher(toString()).find())
317 >            super.runBare();
318 >    }
319 >
320 >    protected void runTest() throws Throwable {
321 >        for (int i = 0; i < runsPerTest; i++) {
322 >            // currentRun = i;
323 >            if (profileTests)
324 >                runTestProfiled();
325 >            else
326 >                super.runTest();
327 >        }
328 >    }
329 >
330 >    protected void runTestProfiled() throws Throwable {
331 >        for (int i = 0; i < 2; i++) {
332 >            long startTime = System.nanoTime();
333 >            super.runTest();
334 >            long elapsedMillis = millisElapsedSince(startTime);
335 >            if (elapsedMillis < profileThreshold)
336 >                break;
337 >            // Never report first run of any test; treat it as a
338 >            // warmup run, notably to trigger all needed classloading,
339 >            if (i > 0)
340 >                System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
341 >        }
342 >    }
343 >
344 >    /**
345 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
346       */
347      public static void main(String[] args) {
348 +        main(suite(), args);
349 +    }
350 +
351 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
352 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
353 +        long runTime;
354 +        public void startTest(Test test) {}
355 +        protected void printHeader(long runTime) {
356 +            this.runTime = runTime; // defer printing for later
357 +        }
358 +        protected void printFooter(TestResult result) {
359 +            if (result.wasSuccessful()) {
360 +                getWriter().println("OK (" + result.runCount() + " tests)"
361 +                    + "  Time: " + elapsedTimeAsString(runTime));
362 +            } else {
363 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
364 +                super.printFooter(result);
365 +            }
366 +        }
367 +    }
368 +
369 +    /**
370 +     * Returns a TestRunner that doesn't bother with unnecessary
371 +     * fluff, like printing a "." for each test case.
372 +     */
373 +    static junit.textui.TestRunner newPithyTestRunner() {
374 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
375 +        runner.setPrinter(new PithyResultPrinter(System.out));
376 +        return runner;
377 +    }
378 +
379 +    /**
380 +     * Runs all unit tests in the given test suite.
381 +     * Actual behavior influenced by jsr166.* system properties.
382 +     */
383 +    static void main(Test suite, String[] args) {
384          if (useSecurityManager) {
385              System.err.println("Setting a permissive security manager");
386              Policy.setPolicy(permissivePolicy());
387              System.setSecurityManager(new SecurityManager());
388          }
389 <        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
390 <
391 <        Test s = suite();
392 <        for (int i = 0; i < iters; ++i) {
112 <            junit.textui.TestRunner.run(s);
389 >        for (int i = 0; i < suiteRuns; i++) {
390 >            TestResult result = newPithyTestRunner().doRun(suite);
391 >            if (!result.wasSuccessful())
392 >                System.exit(1);
393              System.gc();
394              System.runFinalization();
395          }
396 <        System.exit(0);
396 >    }
397 >
398 >    public static TestSuite newTestSuite(Object... suiteOrClasses) {
399 >        TestSuite suite = new TestSuite();
400 >        for (Object suiteOrClass : suiteOrClasses) {
401 >            if (suiteOrClass instanceof TestSuite)
402 >                suite.addTest((TestSuite) suiteOrClass);
403 >            else if (suiteOrClass instanceof Class)
404 >                suite.addTest(new TestSuite((Class<?>) suiteOrClass));
405 >            else
406 >                throw new ClassCastException("not a test suite or class");
407 >        }
408 >        return suite;
409 >    }
410 >
411 >    public static void addNamedTestClasses(TestSuite suite,
412 >                                           String... testClassNames) {
413 >        for (String testClassName : testClassNames) {
414 >            try {
415 >                Class<?> testClass = Class.forName(testClassName);
416 >                Method m = testClass.getDeclaredMethod("suite",
417 >                                                       new Class<?>[0]);
418 >                suite.addTest(newTestSuite((Test)m.invoke(null)));
419 >            } catch (Exception e) {
420 >                throw new Error("Missing test class", e);
421 >            }
422 >        }
423 >    }
424 >
425 >    public static final double JAVA_CLASS_VERSION;
426 >    public static final String JAVA_SPECIFICATION_VERSION;
427 >    static {
428 >        try {
429 >            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
430 >                new java.security.PrivilegedAction<Double>() {
431 >                public Double run() {
432 >                    return Double.valueOf(System.getProperty("java.class.version"));}});
433 >            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
434 >                new java.security.PrivilegedAction<String>() {
435 >                public String run() {
436 >                    return System.getProperty("java.specification.version");}});
437 >        } catch (Throwable t) {
438 >            throw new Error(t);
439 >        }
440 >    }
441 >
442 >    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
443 >    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
444 >    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
445 >    public static boolean atLeastJava9() {
446 >        return JAVA_CLASS_VERSION >= 53.0
447 >            // As of 2015-09, java9 still uses 52.0 class file version
448 >            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
449 >    }
450 >    public static boolean atLeastJava10() {
451 >        return JAVA_CLASS_VERSION >= 54.0
452 >            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
453      }
454  
455      /**
456 <     * Collects all JSR166 unit tests as one suite
456 >     * Collects all JSR166 unit tests as one suite.
457       */
458      public static Test suite() {
459 <        TestSuite suite = new TestSuite("JSR166 Unit Tests");
460 <
461 <        suite.addTest(ForkJoinPoolTest.suite());
462 <        suite.addTest(ForkJoinTaskTest.suite());
463 <        suite.addTest(RecursiveActionTest.suite());
464 <        suite.addTest(RecursiveTaskTest.suite());
465 <        suite.addTest(LinkedTransferQueueTest.suite());
466 <        suite.addTest(PhaserTest.suite());
467 <        suite.addTest(ThreadLocalRandomTest.suite());
468 <        suite.addTest(AbstractExecutorServiceTest.suite());
469 <        suite.addTest(AbstractQueueTest.suite());
470 <        suite.addTest(AbstractQueuedSynchronizerTest.suite());
471 <        suite.addTest(AbstractQueuedLongSynchronizerTest.suite());
472 <        suite.addTest(ArrayBlockingQueueTest.suite());
473 <        suite.addTest(ArrayDequeTest.suite());
474 <        suite.addTest(AtomicBooleanTest.suite());
475 <        suite.addTest(AtomicIntegerArrayTest.suite());
476 <        suite.addTest(AtomicIntegerFieldUpdaterTest.suite());
477 <        suite.addTest(AtomicIntegerTest.suite());
478 <        suite.addTest(AtomicLongArrayTest.suite());
479 <        suite.addTest(AtomicLongFieldUpdaterTest.suite());
480 <        suite.addTest(AtomicLongTest.suite());
481 <        suite.addTest(AtomicMarkableReferenceTest.suite());
482 <        suite.addTest(AtomicReferenceArrayTest.suite());
483 <        suite.addTest(AtomicReferenceFieldUpdaterTest.suite());
484 <        suite.addTest(AtomicReferenceTest.suite());
485 <        suite.addTest(AtomicStampedReferenceTest.suite());
486 <        suite.addTest(ConcurrentHashMapTest.suite());
487 <        suite.addTest(ConcurrentLinkedDequeTest.suite());
488 <        suite.addTest(ConcurrentLinkedQueueTest.suite());
489 <        suite.addTest(ConcurrentSkipListMapTest.suite());
490 <        suite.addTest(ConcurrentSkipListSubMapTest.suite());
491 <        suite.addTest(ConcurrentSkipListSetTest.suite());
492 <        suite.addTest(ConcurrentSkipListSubSetTest.suite());
493 <        suite.addTest(CopyOnWriteArrayListTest.suite());
494 <        suite.addTest(CopyOnWriteArraySetTest.suite());
495 <        suite.addTest(CountDownLatchTest.suite());
496 <        suite.addTest(CyclicBarrierTest.suite());
497 <        suite.addTest(DelayQueueTest.suite());
498 <        suite.addTest(EntryTest.suite());
499 <        suite.addTest(ExchangerTest.suite());
500 <        suite.addTest(ExecutorsTest.suite());
501 <        suite.addTest(ExecutorCompletionServiceTest.suite());
502 <        suite.addTest(FutureTaskTest.suite());
503 <        suite.addTest(LinkedBlockingDequeTest.suite());
504 <        suite.addTest(LinkedBlockingQueueTest.suite());
505 <        suite.addTest(LinkedListTest.suite());
506 <        suite.addTest(LockSupportTest.suite());
507 <        suite.addTest(PriorityBlockingQueueTest.suite());
508 <        suite.addTest(PriorityQueueTest.suite());
509 <        suite.addTest(ReentrantLockTest.suite());
510 <        suite.addTest(ReentrantReadWriteLockTest.suite());
511 <        suite.addTest(ScheduledExecutorTest.suite());
512 <        suite.addTest(ScheduledExecutorSubclassTest.suite());
513 <        suite.addTest(SemaphoreTest.suite());
514 <        suite.addTest(SynchronousQueueTest.suite());
515 <        suite.addTest(SystemTest.suite());
516 <        suite.addTest(ThreadLocalTest.suite());
517 <        suite.addTest(ThreadPoolExecutorTest.suite());
518 <        suite.addTest(ThreadPoolExecutorSubclassTest.suite());
519 <        suite.addTest(ThreadTest.suite());
520 <        suite.addTest(TimeUnitTest.suite());
521 <        suite.addTest(TreeMapTest.suite());
522 <        suite.addTest(TreeSetTest.suite());
523 <        suite.addTest(TreeSubMapTest.suite());
524 <        suite.addTest(TreeSubSetTest.suite());
459 >        // Java7+ test classes
460 >        TestSuite suite = newTestSuite(
461 >            ForkJoinPoolTest.suite(),
462 >            ForkJoinTaskTest.suite(),
463 >            RecursiveActionTest.suite(),
464 >            RecursiveTaskTest.suite(),
465 >            LinkedTransferQueueTest.suite(),
466 >            PhaserTest.suite(),
467 >            ThreadLocalRandomTest.suite(),
468 >            AbstractExecutorServiceTest.suite(),
469 >            AbstractQueueTest.suite(),
470 >            AbstractQueuedSynchronizerTest.suite(),
471 >            AbstractQueuedLongSynchronizerTest.suite(),
472 >            ArrayBlockingQueueTest.suite(),
473 >            ArrayDequeTest.suite(),
474 >            ArrayListTest.suite(),
475 >            AtomicBooleanTest.suite(),
476 >            AtomicIntegerArrayTest.suite(),
477 >            AtomicIntegerFieldUpdaterTest.suite(),
478 >            AtomicIntegerTest.suite(),
479 >            AtomicLongArrayTest.suite(),
480 >            AtomicLongFieldUpdaterTest.suite(),
481 >            AtomicLongTest.suite(),
482 >            AtomicMarkableReferenceTest.suite(),
483 >            AtomicReferenceArrayTest.suite(),
484 >            AtomicReferenceFieldUpdaterTest.suite(),
485 >            AtomicReferenceTest.suite(),
486 >            AtomicStampedReferenceTest.suite(),
487 >            ConcurrentHashMapTest.suite(),
488 >            ConcurrentLinkedDequeTest.suite(),
489 >            ConcurrentLinkedQueueTest.suite(),
490 >            ConcurrentSkipListMapTest.suite(),
491 >            ConcurrentSkipListSubMapTest.suite(),
492 >            ConcurrentSkipListSetTest.suite(),
493 >            ConcurrentSkipListSubSetTest.suite(),
494 >            CopyOnWriteArrayListTest.suite(),
495 >            CopyOnWriteArraySetTest.suite(),
496 >            CountDownLatchTest.suite(),
497 >            CountedCompleterTest.suite(),
498 >            CyclicBarrierTest.suite(),
499 >            DelayQueueTest.suite(),
500 >            EntryTest.suite(),
501 >            ExchangerTest.suite(),
502 >            ExecutorsTest.suite(),
503 >            ExecutorCompletionServiceTest.suite(),
504 >            FutureTaskTest.suite(),
505 >            LinkedBlockingDequeTest.suite(),
506 >            LinkedBlockingQueueTest.suite(),
507 >            LinkedListTest.suite(),
508 >            LockSupportTest.suite(),
509 >            PriorityBlockingQueueTest.suite(),
510 >            PriorityQueueTest.suite(),
511 >            ReentrantLockTest.suite(),
512 >            ReentrantReadWriteLockTest.suite(),
513 >            ScheduledExecutorTest.suite(),
514 >            ScheduledExecutorSubclassTest.suite(),
515 >            SemaphoreTest.suite(),
516 >            SynchronousQueueTest.suite(),
517 >            SystemTest.suite(),
518 >            ThreadLocalTest.suite(),
519 >            ThreadPoolExecutorTest.suite(),
520 >            ThreadPoolExecutorSubclassTest.suite(),
521 >            ThreadTest.suite(),
522 >            TimeUnitTest.suite(),
523 >            TreeMapTest.suite(),
524 >            TreeSetTest.suite(),
525 >            TreeSubMapTest.suite(),
526 >            TreeSubSetTest.suite(),
527 >            VectorTest.suite());
528 >
529 >        // Java8+ test classes
530 >        if (atLeastJava8()) {
531 >            String[] java8TestClassNames = {
532 >                "ArrayDeque8Test",
533 >                "Atomic8Test",
534 >                "CompletableFutureTest",
535 >                "ConcurrentHashMap8Test",
536 >                "CountedCompleter8Test",
537 >                "DoubleAccumulatorTest",
538 >                "DoubleAdderTest",
539 >                "ForkJoinPool8Test",
540 >                "ForkJoinTask8Test",
541 >                "LinkedBlockingDeque8Test",
542 >                "LinkedBlockingQueue8Test",
543 >                "LongAccumulatorTest",
544 >                "LongAdderTest",
545 >                "SplittableRandomTest",
546 >                "StampedLockTest",
547 >                "SubmissionPublisherTest",
548 >                "ThreadLocalRandom8Test",
549 >                "TimeUnit8Test",
550 >            };
551 >            addNamedTestClasses(suite, java8TestClassNames);
552 >        }
553 >
554 >        // Java9+ test classes
555 >        if (atLeastJava9()) {
556 >            String[] java9TestClassNames = {
557 >                "AtomicBoolean9Test",
558 >                "AtomicInteger9Test",
559 >                "AtomicIntegerArray9Test",
560 >                "AtomicLong9Test",
561 >                "AtomicLongArray9Test",
562 >                "AtomicReference9Test",
563 >                "AtomicReferenceArray9Test",
564 >                "ExecutorCompletionService9Test",
565 >                "ForkJoinPool9Test",
566 >            };
567 >            addNamedTestClasses(suite, java9TestClassNames);
568 >        }
569  
570          return suite;
571      }
572  
573 +    /** Returns list of junit-style test method names in given class. */
574 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
575 +        Method[] methods = testClass.getDeclaredMethods();
576 +        ArrayList<String> names = new ArrayList<>(methods.length);
577 +        for (Method method : methods) {
578 +            if (method.getName().startsWith("test")
579 +                && Modifier.isPublic(method.getModifiers())
580 +                // method.getParameterCount() requires jdk8+
581 +                && method.getParameterTypes().length == 0) {
582 +                names.add(method.getName());
583 +            }
584 +        }
585 +        return names;
586 +    }
587 +
588 +    /**
589 +     * Returns junit-style testSuite for the given test class, but
590 +     * parameterized by passing extra data to each test.
591 +     */
592 +    public static <ExtraData> Test parameterizedTestSuite
593 +        (Class<? extends JSR166TestCase> testClass,
594 +         Class<ExtraData> dataClass,
595 +         ExtraData data) {
596 +        try {
597 +            TestSuite suite = new TestSuite();
598 +            Constructor c =
599 +                testClass.getDeclaredConstructor(dataClass, String.class);
600 +            for (String methodName : testMethodNames(testClass))
601 +                suite.addTest((Test) c.newInstance(data, methodName));
602 +            return suite;
603 +        } catch (Exception e) {
604 +            throw new Error(e);
605 +        }
606 +    }
607 +
608 +    /**
609 +     * Returns junit-style testSuite for the jdk8 extension of the
610 +     * given test class, but parameterized by passing extra data to
611 +     * each test.  Uses reflection to allow compilation in jdk7.
612 +     */
613 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
614 +        (Class<? extends JSR166TestCase> testClass,
615 +         Class<ExtraData> dataClass,
616 +         ExtraData data) {
617 +        if (atLeastJava8()) {
618 +            String name = testClass.getName();
619 +            String name8 = name.replaceAll("Test$", "8Test");
620 +            if (name.equals(name8)) throw new Error(name);
621 +            try {
622 +                return (Test)
623 +                    Class.forName(name8)
624 +                    .getMethod("testSuite", new Class[] { dataClass })
625 +                    .invoke(null, data);
626 +            } catch (Exception e) {
627 +                throw new Error(e);
628 +            }
629 +        } else {
630 +            return new TestSuite();
631 +        }
632 +    }
633 +
634 +    // Delays for timing-dependent tests, in milliseconds.
635  
636      public static long SHORT_DELAY_MS;
637      public static long SMALL_DELAY_MS;
638      public static long MEDIUM_DELAY_MS;
639      public static long LONG_DELAY_MS;
640  
199
641      /**
642 <     * Returns the shortest timed delay. This could
643 <     * be reimplemented to use for example a Property.
642 >     * Returns the shortest timed delay. This can be scaled up for
643 >     * slow machines using the jsr166.delay.factor system property,
644 >     * or via jtreg's -timeoutFactor: flag.
645 >     * http://openjdk.java.net/jtreg/command-help.html
646       */
647      protected long getShortDelay() {
648 <        return 50;
648 >        return (long) (50 * delayFactor);
649      }
650  
208
651      /**
652       * Sets delays as multiples of SHORT_DELAY.
653       */
# Line 213 | Line 655 | public class JSR166TestCase extends Test
655          SHORT_DELAY_MS = getShortDelay();
656          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
657          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
658 <        LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
658 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
659 >    }
660 >
661 >    private static final long TIMEOUT_DELAY_MS
662 >        = (long) (12.0 * Math.cbrt(delayFactor));
663 >
664 >    /**
665 >     * Returns a timeout in milliseconds to be used in tests that verify
666 >     * that operations block or time out.  We want this to be longer
667 >     * than the OS scheduling quantum, but not too long, so don't scale
668 >     * linearly with delayFactor; we use "crazy" cube root instead.
669 >     */
670 >    static long timeoutMillis() {
671 >        return TIMEOUT_DELAY_MS;
672 >    }
673 >
674 >    /**
675 >     * Returns a new Date instance representing a time at least
676 >     * delayMillis milliseconds in the future.
677 >     */
678 >    Date delayedDate(long delayMillis) {
679 >        // Add 1 because currentTimeMillis is known to round into the past.
680 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
681      }
682  
683      /**
684       * The first exception encountered if any threadAssertXXX method fails.
685       */
686      private final AtomicReference<Throwable> threadFailure
687 <        = new AtomicReference<Throwable>(null);
687 >        = new AtomicReference<>(null);
688  
689      /**
690       * Records an exception so that it can be rethrown later in the test
# Line 229 | Line 693 | public class JSR166TestCase extends Test
693       * the same test have no effect.
694       */
695      public void threadRecordFailure(Throwable t) {
696 +        System.err.println(t);
697 +        dumpTestThreads();
698          threadFailure.compareAndSet(null, t);
699      }
700  
# Line 236 | Line 702 | public class JSR166TestCase extends Test
702          setDelays();
703      }
704  
705 +    void tearDownFail(String format, Object... args) {
706 +        String msg = toString() + ": " + String.format(format, args);
707 +        System.err.println(msg);
708 +        dumpTestThreads();
709 +        throw new AssertionFailedError(msg);
710 +    }
711 +
712      /**
713 +     * Extra checks that get done for all test cases.
714 +     *
715       * Triggers test case failure if any thread assertions have failed,
716       * by rethrowing, in the test harness thread, any exception recorded
717       * earlier by threadRecordFailure.
718 +     *
719 +     * Triggers test case failure if interrupt status is set in the main thread.
720       */
721      public void tearDown() throws Exception {
722 <        Throwable t = threadFailure.get();
722 >        Throwable t = threadFailure.getAndSet(null);
723          if (t != null) {
724              if (t instanceof Error)
725                  throw (Error) t;
# Line 257 | Line 734 | public class JSR166TestCase extends Test
734                  throw afe;
735              }
736          }
737 +
738 +        if (Thread.interrupted())
739 +            tearDownFail("interrupt status set in main thread");
740 +
741 +        checkForkJoinPoolThreadLeaks();
742 +    }
743 +
744 +    /**
745 +     * Finds missing PoolCleaners
746 +     */
747 +    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
748 +        Thread[] survivors = new Thread[7];
749 +        int count = Thread.enumerate(survivors);
750 +        for (int i = 0; i < count; i++) {
751 +            Thread thread = survivors[i];
752 +            String name = thread.getName();
753 +            if (name.startsWith("ForkJoinPool-")) {
754 +                // give thread some time to terminate
755 +                thread.join(LONG_DELAY_MS);
756 +                if (thread.isAlive())
757 +                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
758 +                                 thread);
759 +            }
760 +        }
761 +
762 +        if (!ForkJoinPool.commonPool()
763 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
764 +            tearDownFail("ForkJoin common pool thread stuck");
765      }
766  
767      /**
# Line 269 | Line 774 | public class JSR166TestCase extends Test
774              fail(reason);
775          } catch (AssertionFailedError t) {
776              threadRecordFailure(t);
777 <            fail(reason);
777 >            throw t;
778          }
779      }
780  
# Line 337 | Line 842 | public class JSR166TestCase extends Test
842      public void threadAssertEquals(Object x, Object y) {
843          try {
844              assertEquals(x, y);
845 <        } catch (AssertionFailedError t) {
846 <            threadRecordFailure(t);
847 <            throw t;
848 <        } catch (Throwable t) {
849 <            threadUnexpectedException(t);
845 >        } catch (AssertionFailedError fail) {
846 >            threadRecordFailure(fail);
847 >            throw fail;
848 >        } catch (Throwable fail) {
849 >            threadUnexpectedException(fail);
850          }
851      }
852  
# Line 353 | Line 858 | public class JSR166TestCase extends Test
858      public void threadAssertSame(Object x, Object y) {
859          try {
860              assertSame(x, y);
861 <        } catch (AssertionFailedError t) {
862 <            threadRecordFailure(t);
863 <            throw t;
861 >        } catch (AssertionFailedError fail) {
862 >            threadRecordFailure(fail);
863 >            throw fail;
864          }
865      }
866  
# Line 388 | Line 893 | public class JSR166TestCase extends Test
893          else {
894              AssertionFailedError afe =
895                  new AssertionFailedError("unexpected exception: " + t);
896 <            t.initCause(t);
896 >            afe.initCause(t);
897              throw afe;
898          }
899      }
900  
901      /**
902 +     * Delays, via Thread.sleep, for the given millisecond delay, but
903 +     * if the sleep is shorter than specified, may re-sleep or yield
904 +     * until time elapses.  Ensures that the given time, as measured
905 +     * by System.nanoTime(), has elapsed.
906 +     */
907 +    static void delay(long millis) throws InterruptedException {
908 +        long nanos = millis * (1000 * 1000);
909 +        final long wakeupTime = System.nanoTime() + nanos;
910 +        do {
911 +            if (millis > 0L)
912 +                Thread.sleep(millis);
913 +            else // too short to sleep
914 +                Thread.yield();
915 +            nanos = wakeupTime - System.nanoTime();
916 +            millis = nanos / (1000 * 1000);
917 +        } while (nanos >= 0L);
918 +    }
919 +
920 +    /**
921 +     * Allows use of try-with-resources with per-test thread pools.
922 +     */
923 +    class PoolCleaner implements AutoCloseable {
924 +        private final ExecutorService pool;
925 +        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
926 +        public void close() { joinPool(pool); }
927 +    }
928 +
929 +    /**
930 +     * An extension of PoolCleaner that has an action to release the pool.
931 +     */
932 +    class PoolCleanerWithReleaser extends PoolCleaner {
933 +        private final Runnable releaser;
934 +        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
935 +            super(pool);
936 +            this.releaser = releaser;
937 +        }
938 +        public void close() {
939 +            try {
940 +                releaser.run();
941 +            } finally {
942 +                super.close();
943 +            }
944 +        }
945 +    }
946 +
947 +    PoolCleaner cleaner(ExecutorService pool) {
948 +        return new PoolCleaner(pool);
949 +    }
950 +
951 +    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
952 +        return new PoolCleanerWithReleaser(pool, releaser);
953 +    }
954 +
955 +    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
956 +        return new PoolCleanerWithReleaser(pool, releaser(latch));
957 +    }
958 +
959 +    Runnable releaser(final CountDownLatch latch) {
960 +        return new Runnable() { public void run() {
961 +            do { latch.countDown(); }
962 +            while (latch.getCount() > 0);
963 +        }};
964 +    }
965 +
966 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
967 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
968 +    }
969 +
970 +    Runnable releaser(final AtomicBoolean flag) {
971 +        return new Runnable() { public void run() { flag.set(true); }};
972 +    }
973 +
974 +    /**
975       * Waits out termination of a thread pool or fails doing so.
976       */
977 <    public void joinPool(ExecutorService exec) {
977 >    void joinPool(ExecutorService pool) {
978          try {
979 <            exec.shutdown();
980 <            assertTrue("ExecutorService did not terminate in a timely manner",
981 <                       exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
979 >            pool.shutdown();
980 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
981 >                try {
982 >                    threadFail("ExecutorService " + pool +
983 >                               " did not terminate in a timely manner");
984 >                } finally {
985 >                    // last resort, for the benefit of subsequent tests
986 >                    pool.shutdownNow();
987 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
988 >                }
989 >            }
990          } catch (SecurityException ok) {
991              // Allowed in case test doesn't have privs
992 <        } catch (InterruptedException ie) {
993 <            fail("Unexpected InterruptedException");
992 >        } catch (InterruptedException fail) {
993 >            threadFail("Unexpected InterruptedException");
994 >        }
995 >    }
996 >
997 >    /**
998 >     * Like Runnable, but with the freedom to throw anything.
999 >     * junit folks had the same idea:
1000 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1001 >     */
1002 >    interface Action { public void run() throws Throwable; }
1003 >
1004 >    /**
1005 >     * Runs all the given actions in parallel, failing if any fail.
1006 >     * Useful for running multiple variants of tests that are
1007 >     * necessarily individually slow because they must block.
1008 >     */
1009 >    void testInParallel(Action ... actions) {
1010 >        ExecutorService pool = Executors.newCachedThreadPool();
1011 >        try (PoolCleaner cleaner = cleaner(pool)) {
1012 >            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
1013 >            for (final Action action : actions)
1014 >                futures.add(pool.submit(new CheckedRunnable() {
1015 >                    public void realRun() throws Throwable { action.run();}}));
1016 >            for (Future<?> future : futures)
1017 >                try {
1018 >                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
1019 >                } catch (ExecutionException ex) {
1020 >                    threadUnexpectedException(ex.getCause());
1021 >                } catch (Exception ex) {
1022 >                    threadUnexpectedException(ex);
1023 >                }
1024 >        }
1025 >    }
1026 >
1027 >    /**
1028 >     * A debugging tool to print stack traces of most threads, as jstack does.
1029 >     * Uninteresting threads are filtered out.
1030 >     */
1031 >    static void dumpTestThreads() {
1032 >        SecurityManager sm = System.getSecurityManager();
1033 >        if (sm != null) {
1034 >            try {
1035 >                System.setSecurityManager(null);
1036 >            } catch (SecurityException giveUp) {
1037 >                return;
1038 >            }
1039 >        }
1040 >
1041 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1042 >        System.err.println("------ stacktrace dump start ------");
1043 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1044 >            final String name = info.getThreadName();
1045 >            String lockName;
1046 >            if ("Signal Dispatcher".equals(name))
1047 >                continue;
1048 >            if ("Reference Handler".equals(name)
1049 >                && (lockName = info.getLockName()) != null
1050 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1051 >                continue;
1052 >            if ("Finalizer".equals(name)
1053 >                && (lockName = info.getLockName()) != null
1054 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1055 >                continue;
1056 >            if ("checkForWedgedTest".equals(name))
1057 >                continue;
1058 >            System.err.print(info);
1059 >        }
1060 >        System.err.println("------ stacktrace dump end ------");
1061 >
1062 >        if (sm != null) System.setSecurityManager(sm);
1063 >    }
1064 >
1065 >    /**
1066 >     * Checks that thread eventually enters the expected blocked thread state.
1067 >     */
1068 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1069 >        // always sleep at least 1 ms, with high probability avoiding
1070 >        // transitory states
1071 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1072 >            try { delay(1); }
1073 >            catch (InterruptedException fail) {
1074 >                fail("Unexpected InterruptedException");
1075 >            }
1076 >            Thread.State s = thread.getState();
1077 >            if (s == expected)
1078 >                return;
1079 >            else if (s == Thread.State.TERMINATED)
1080 >                fail("Unexpected thread termination");
1081 >        }
1082 >        fail("timed out waiting for thread to enter thread state " + expected);
1083 >    }
1084 >
1085 >    /**
1086 >     * Checks that thread does not terminate within the default
1087 >     * millisecond delay of {@code timeoutMillis()}.
1088 >     * TODO: REMOVEME
1089 >     */
1090 >    void assertThreadStaysAlive(Thread thread) {
1091 >        assertThreadStaysAlive(thread, timeoutMillis());
1092 >    }
1093 >
1094 >    /**
1095 >     * Checks that thread does not terminate within the given millisecond delay.
1096 >     * TODO: REMOVEME
1097 >     */
1098 >    void assertThreadStaysAlive(Thread thread, long millis) {
1099 >        try {
1100 >            // No need to optimize the failing case via Thread.join.
1101 >            delay(millis);
1102 >            assertTrue(thread.isAlive());
1103 >        } catch (InterruptedException fail) {
1104 >            threadFail("Unexpected InterruptedException");
1105          }
1106      }
1107  
1108 +    /**
1109 +     * Checks that future.get times out, with the default timeout of
1110 +     * {@code timeoutMillis()}.
1111 +     */
1112 +    void assertFutureTimesOut(Future future) {
1113 +        assertFutureTimesOut(future, timeoutMillis());
1114 +    }
1115 +
1116 +    /**
1117 +     * Checks that future.get times out, with the given millisecond timeout.
1118 +     */
1119 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
1120 +        long startTime = System.nanoTime();
1121 +        try {
1122 +            future.get(timeoutMillis, MILLISECONDS);
1123 +            shouldThrow();
1124 +        } catch (TimeoutException success) {
1125 +        } catch (Exception fail) {
1126 +            threadUnexpectedException(fail);
1127 +        } finally { future.cancel(true); }
1128 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1129 +    }
1130  
1131      /**
1132       * Fails with message "should throw exception".
# Line 424 | Line 1143 | public class JSR166TestCase extends Test
1143      }
1144  
1145      /**
1146 +     * The maximum number of consecutive spurious wakeups we should
1147 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1148 +     */
1149 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1150 +
1151 +    /**
1152       * The number of elements to place in collections, arrays, etc.
1153       */
1154      public static final int SIZE = 20;
# Line 448 | Line 1173 | public class JSR166TestCase extends Test
1173      public static final Integer m6  = new Integer(-6);
1174      public static final Integer m10 = new Integer(-10);
1175  
451
1176      /**
1177       * Runs Runnable r with a security policy that permits precisely
1178       * the specified permissions.  If there is no current security
# Line 460 | Line 1184 | public class JSR166TestCase extends Test
1184          SecurityManager sm = System.getSecurityManager();
1185          if (sm == null) {
1186              r.run();
1187 +        }
1188 +        runWithSecurityManagerWithPermissions(r, permissions);
1189 +    }
1190 +
1191 +    /**
1192 +     * Runs Runnable r with a security policy that permits precisely
1193 +     * the specified permissions.  If there is no current security
1194 +     * manager, a temporary one is set for the duration of the
1195 +     * Runnable.  We require that any security manager permit
1196 +     * getPolicy/setPolicy.
1197 +     */
1198 +    public void runWithSecurityManagerWithPermissions(Runnable r,
1199 +                                                      Permission... permissions) {
1200 +        SecurityManager sm = System.getSecurityManager();
1201 +        if (sm == null) {
1202              Policy savedPolicy = Policy.getPolicy();
1203              try {
1204                  Policy.setPolicy(permissivePolicy());
1205                  System.setSecurityManager(new SecurityManager());
1206 <                runWithPermissions(r, permissions);
1206 >                runWithSecurityManagerWithPermissions(r, permissions);
1207              } finally {
1208                  System.setSecurityManager(null);
1209                  Policy.setPolicy(savedPolicy);
# Line 512 | Line 1251 | public class JSR166TestCase extends Test
1251              return perms.implies(p);
1252          }
1253          public void refresh() {}
1254 +        public String toString() {
1255 +            List<Permission> ps = new ArrayList<>();
1256 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1257 +                ps.add(e.nextElement());
1258 +            return "AdjustablePolicy with permissions " + ps;
1259 +        }
1260      }
1261  
1262      /**
# Line 534 | Line 1279 | public class JSR166TestCase extends Test
1279      }
1280  
1281      /**
1282 <     * Sleep until the timeout has elapsed, or interrupted.
1283 <     * Does <em>NOT</em> throw InterruptedException.
1282 >     * Sleeps until the given time has elapsed.
1283 >     * Throws AssertionFailedError if interrupted.
1284       */
1285 <    void sleepTillInterrupted(long timeoutMillis) {
1285 >    static void sleep(long millis) {
1286          try {
1287 <            Thread.sleep(timeoutMillis);
1288 <        } catch (InterruptedException wakeup) {}
1287 >            delay(millis);
1288 >        } catch (InterruptedException fail) {
1289 >            AssertionFailedError afe =
1290 >                new AssertionFailedError("Unexpected InterruptedException");
1291 >            afe.initCause(fail);
1292 >            throw afe;
1293 >        }
1294 >    }
1295 >
1296 >    /**
1297 >     * Spin-waits up to the specified number of milliseconds for the given
1298 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1299 >     */
1300 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1301 >        long startTime = 0L;
1302 >        for (;;) {
1303 >            Thread.State s = thread.getState();
1304 >            if (s == Thread.State.BLOCKED ||
1305 >                s == Thread.State.WAITING ||
1306 >                s == Thread.State.TIMED_WAITING)
1307 >                return;
1308 >            else if (s == Thread.State.TERMINATED)
1309 >                fail("Unexpected thread termination");
1310 >            else if (startTime == 0L)
1311 >                startTime = System.nanoTime();
1312 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1313 >                threadAssertTrue(thread.isAlive());
1314 >                fail("timed out waiting for thread to enter wait state");
1315 >            }
1316 >            Thread.yield();
1317 >        }
1318 >    }
1319 >
1320 >    /**
1321 >     * Spin-waits up to the specified number of milliseconds for the given
1322 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1323 >     * and additionally satisfy the given condition.
1324 >     */
1325 >    void waitForThreadToEnterWaitState(
1326 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1327 >        long startTime = 0L;
1328 >        for (;;) {
1329 >            Thread.State s = thread.getState();
1330 >            if (s == Thread.State.BLOCKED ||
1331 >                s == Thread.State.WAITING ||
1332 >                s == Thread.State.TIMED_WAITING) {
1333 >                try {
1334 >                    if (waitingForGodot.call())
1335 >                        return;
1336 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1337 >            }
1338 >            else if (s == Thread.State.TERMINATED)
1339 >                fail("Unexpected thread termination");
1340 >            else if (startTime == 0L)
1341 >                startTime = System.nanoTime();
1342 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1343 >                threadAssertTrue(thread.isAlive());
1344 >                fail("timed out waiting for thread to enter wait state");
1345 >            }
1346 >            Thread.yield();
1347 >        }
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);
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(
1364 >        Thread thread, 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()}.
1372 >     */
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 AssertionFailedError("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 >        try {
1397 >            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1398 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
1399 >        if (millisElapsedSince(startTime) > timeoutMillis/2)
1400 >            throw new AssertionFailedError("timed get did not return promptly");
1401 >    }
1402 >
1403 >    <T> void checkTimedGet(Future<T> f, T expectedValue) {
1404 >        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1405      }
1406  
1407      /**
# Line 553 | Line 1414 | public class JSR166TestCase extends Test
1414          return t;
1415      }
1416  
1417 +    /**
1418 +     * Waits for the specified time (in milliseconds) for the thread
1419 +     * to terminate (using {@link Thread#join(long)}), else interrupts
1420 +     * the thread (in the hope that it may terminate later) and fails.
1421 +     */
1422 +    void awaitTermination(Thread t, long timeoutMillis) {
1423 +        try {
1424 +            t.join(timeoutMillis);
1425 +        } catch (InterruptedException fail) {
1426 +            threadUnexpectedException(fail);
1427 +        } finally {
1428 +            if (t.getState() != Thread.State.TERMINATED) {
1429 +                t.interrupt();
1430 +                threadFail("timed out waiting for thread to terminate");
1431 +            }
1432 +        }
1433 +    }
1434 +
1435 +    /**
1436 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
1437 +     * terminate (using {@link Thread#join(long)}), else interrupts
1438 +     * the thread (in the hope that it may terminate later) and fails.
1439 +     */
1440 +    void awaitTermination(Thread t) {
1441 +        awaitTermination(t, LONG_DELAY_MS);
1442 +    }
1443 +
1444      // Some convenient Runnable classes
1445  
1446      public abstract class CheckedRunnable implements Runnable {
# Line 561 | Line 1449 | public class JSR166TestCase extends Test
1449          public final void run() {
1450              try {
1451                  realRun();
1452 <            } catch (Throwable t) {
1453 <                threadUnexpectedException(t);
1452 >            } catch (Throwable fail) {
1453 >                threadUnexpectedException(fail);
1454              }
1455          }
1456      }
# Line 615 | Line 1503 | public class JSR166TestCase extends Test
1503                  realRun();
1504                  threadShouldThrow("InterruptedException");
1505              } catch (InterruptedException success) {
1506 <            } catch (Throwable t) {
1507 <                threadUnexpectedException(t);
1506 >                threadAssertFalse(Thread.interrupted());
1507 >            } catch (Throwable fail) {
1508 >                threadUnexpectedException(fail);
1509              }
1510          }
1511      }
# Line 627 | Line 1516 | public class JSR166TestCase extends Test
1516          public final T call() {
1517              try {
1518                  return realCall();
1519 <            } catch (Throwable t) {
1520 <                threadUnexpectedException(t);
1519 >            } catch (Throwable fail) {
1520 >                threadUnexpectedException(fail);
1521                  return null;
1522              }
1523          }
# Line 644 | Line 1533 | public class JSR166TestCase extends Test
1533                  threadShouldThrow("InterruptedException");
1534                  return result;
1535              } catch (InterruptedException success) {
1536 <            } catch (Throwable t) {
1537 <                threadUnexpectedException(t);
1536 >                threadAssertFalse(Thread.interrupted());
1537 >            } catch (Throwable fail) {
1538 >                threadUnexpectedException(fail);
1539              }
1540              return null;
1541          }
# Line 662 | Line 1552 | public class JSR166TestCase extends Test
1552      public static final String TEST_STRING = "a test string";
1553  
1554      public static class StringTask implements Callable<String> {
1555 <        public String call() { return TEST_STRING; }
1555 >        final String value;
1556 >        public StringTask() { this(TEST_STRING); }
1557 >        public StringTask(String value) { this.value = value; }
1558 >        public String call() { return value; }
1559      }
1560  
1561      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
1562          return new CheckedCallable<String>() {
1563 <            public String realCall() {
1563 >            protected String realCall() {
1564                  try {
1565                      latch.await();
1566                  } catch (InterruptedException quittingTime) {}
# Line 675 | Line 1568 | public class JSR166TestCase extends Test
1568              }};
1569      }
1570  
1571 +    public Runnable countDowner(final CountDownLatch latch) {
1572 +        return new CheckedRunnable() {
1573 +            public void realRun() throws InterruptedException {
1574 +                latch.countDown();
1575 +            }};
1576 +    }
1577 +
1578 +    class LatchAwaiter extends CheckedRunnable {
1579 +        static final int NEW = 0;
1580 +        static final int RUNNING = 1;
1581 +        static final int DONE = 2;
1582 +        final CountDownLatch latch;
1583 +        int state = NEW;
1584 +        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1585 +        public void realRun() throws InterruptedException {
1586 +            state = 1;
1587 +            await(latch);
1588 +            state = 2;
1589 +        }
1590 +    }
1591 +
1592 +    public LatchAwaiter awaiter(CountDownLatch latch) {
1593 +        return new LatchAwaiter(latch);
1594 +    }
1595 +
1596 +    public void await(CountDownLatch latch, long timeoutMillis) {
1597 +        try {
1598 +            if (!latch.await(timeoutMillis, MILLISECONDS))
1599 +                fail("timed out waiting for CountDownLatch for "
1600 +                     + (timeoutMillis/1000) + " sec");
1601 +        } catch (Throwable fail) {
1602 +            threadUnexpectedException(fail);
1603 +        }
1604 +    }
1605 +
1606 +    public void await(CountDownLatch latch) {
1607 +        await(latch, LONG_DELAY_MS);
1608 +    }
1609 +
1610 +    public void await(Semaphore semaphore) {
1611 +        try {
1612 +            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1613 +                fail("timed out waiting for Semaphore for "
1614 +                     + (LONG_DELAY_MS/1000) + " sec");
1615 +        } catch (Throwable fail) {
1616 +            threadUnexpectedException(fail);
1617 +        }
1618 +    }
1619 +
1620 +    public void await(CyclicBarrier barrier) {
1621 +        try {
1622 +            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1623 +        } catch (Throwable fail) {
1624 +            threadUnexpectedException(fail);
1625 +        }
1626 +    }
1627 +
1628 + //     /**
1629 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1630 + //      */
1631 + //     public void await(AtomicBoolean flag) {
1632 + //         await(flag, LONG_DELAY_MS);
1633 + //     }
1634 +
1635 + //     /**
1636 + //      * Spin-waits up to the specified timeout until flag becomes true.
1637 + //      */
1638 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
1639 + //         long startTime = System.nanoTime();
1640 + //         while (!flag.get()) {
1641 + //             if (millisElapsedSince(startTime) > timeoutMillis)
1642 + //                 throw new AssertionFailedError("timed out");
1643 + //             Thread.yield();
1644 + //         }
1645 + //     }
1646 +
1647      public static class NPETask implements Callable<String> {
1648          public String call() { throw new NullPointerException(); }
1649      }
# Line 685 | Line 1654 | public class JSR166TestCase extends Test
1654  
1655      public class ShortRunnable extends CheckedRunnable {
1656          protected void realRun() throws Throwable {
1657 <            Thread.sleep(SHORT_DELAY_MS);
1657 >            delay(SHORT_DELAY_MS);
1658          }
1659      }
1660  
1661      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1662          protected void realRun() throws InterruptedException {
1663 <            Thread.sleep(SHORT_DELAY_MS);
1663 >            delay(SHORT_DELAY_MS);
1664          }
1665      }
1666  
1667      public class SmallRunnable extends CheckedRunnable {
1668          protected void realRun() throws Throwable {
1669 <            Thread.sleep(SMALL_DELAY_MS);
1669 >            delay(SMALL_DELAY_MS);
1670          }
1671      }
1672  
1673      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1674          protected void realRun() {
1675              try {
1676 <                Thread.sleep(SMALL_DELAY_MS);
1676 >                delay(SMALL_DELAY_MS);
1677              } catch (InterruptedException ok) {}
1678          }
1679      }
1680  
1681      public class SmallCallable extends CheckedCallable {
1682          protected Object realCall() throws InterruptedException {
1683 <            Thread.sleep(SMALL_DELAY_MS);
1683 >            delay(SMALL_DELAY_MS);
1684              return Boolean.TRUE;
1685          }
1686      }
1687  
1688      public class MediumRunnable extends CheckedRunnable {
1689          protected void realRun() throws Throwable {
1690 <            Thread.sleep(MEDIUM_DELAY_MS);
1690 >            delay(MEDIUM_DELAY_MS);
1691          }
1692      }
1693  
1694      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1695          protected void realRun() throws InterruptedException {
1696 <            Thread.sleep(MEDIUM_DELAY_MS);
1696 >            delay(MEDIUM_DELAY_MS);
1697          }
1698      }
1699  
1700 +    public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1701 +        return new CheckedRunnable() {
1702 +            protected void realRun() {
1703 +                try {
1704 +                    delay(timeoutMillis);
1705 +                } catch (InterruptedException ok) {}
1706 +            }};
1707 +    }
1708 +
1709      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1710          protected void realRun() {
1711              try {
1712 <                Thread.sleep(MEDIUM_DELAY_MS);
1712 >                delay(MEDIUM_DELAY_MS);
1713              } catch (InterruptedException ok) {}
1714          }
1715      }
# Line 739 | Line 1717 | public class JSR166TestCase extends Test
1717      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1718          protected void realRun() {
1719              try {
1720 <                Thread.sleep(LONG_DELAY_MS);
1720 >                delay(LONG_DELAY_MS);
1721              } catch (InterruptedException ok) {}
1722          }
1723      }
# Line 753 | Line 1731 | public class JSR166TestCase extends Test
1731          }
1732      }
1733  
1734 +    public interface TrackedRunnable extends Runnable {
1735 +        boolean isDone();
1736 +    }
1737 +
1738 +    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1739 +        return new TrackedRunnable() {
1740 +                private volatile boolean done = false;
1741 +                public boolean isDone() { return done; }
1742 +                public void run() {
1743 +                    try {
1744 +                        delay(timeoutMillis);
1745 +                        done = true;
1746 +                    } catch (InterruptedException ok) {}
1747 +                }
1748 +            };
1749 +    }
1750 +
1751      public static class TrackedShortRunnable implements Runnable {
1752          public volatile boolean done = false;
1753          public void run() {
1754              try {
1755 <                Thread.sleep(SMALL_DELAY_MS);
1755 >                delay(SHORT_DELAY_MS);
1756 >                done = true;
1757 >            } catch (InterruptedException ok) {}
1758 >        }
1759 >    }
1760 >
1761 >    public static class TrackedSmallRunnable implements Runnable {
1762 >        public volatile boolean done = false;
1763 >        public void run() {
1764 >            try {
1765 >                delay(SMALL_DELAY_MS);
1766                  done = true;
1767              } catch (InterruptedException ok) {}
1768          }
# Line 767 | Line 1772 | public class JSR166TestCase extends Test
1772          public volatile boolean done = false;
1773          public void run() {
1774              try {
1775 <                Thread.sleep(MEDIUM_DELAY_MS);
1775 >                delay(MEDIUM_DELAY_MS);
1776                  done = true;
1777              } catch (InterruptedException ok) {}
1778          }
# Line 777 | Line 1782 | public class JSR166TestCase extends Test
1782          public volatile boolean done = false;
1783          public void run() {
1784              try {
1785 <                Thread.sleep(LONG_DELAY_MS);
1785 >                delay(LONG_DELAY_MS);
1786                  done = true;
1787              } catch (InterruptedException ok) {}
1788          }
# Line 794 | Line 1799 | public class JSR166TestCase extends Test
1799          public volatile boolean done = false;
1800          public Object call() {
1801              try {
1802 <                Thread.sleep(SMALL_DELAY_MS);
1802 >                delay(SMALL_DELAY_MS);
1803                  done = true;
1804              } catch (InterruptedException ok) {}
1805              return Boolean.TRUE;
# Line 807 | Line 1812 | public class JSR166TestCase extends Test
1812      public abstract class CheckedRecursiveAction extends RecursiveAction {
1813          protected abstract void realCompute() throws Throwable;
1814  
1815 <        public final void compute() {
1815 >        @Override protected final void compute() {
1816              try {
1817                  realCompute();
1818 <            } catch (Throwable t) {
1819 <                threadUnexpectedException(t);
1818 >            } catch (Throwable fail) {
1819 >                threadUnexpectedException(fail);
1820              }
1821          }
1822      }
# Line 822 | Line 1827 | public class JSR166TestCase extends Test
1827      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1828          protected abstract T realCompute() throws Throwable;
1829  
1830 <        public final T compute() {
1830 >        @Override protected final T compute() {
1831              try {
1832                  return realCompute();
1833 <            } catch (Throwable t) {
1834 <                threadUnexpectedException(t);
1833 >            } catch (Throwable fail) {
1834 >                threadUnexpectedException(fail);
1835                  return null;
1836              }
1837          }
# Line 840 | Line 1845 | public class JSR166TestCase extends Test
1845                                        ThreadPoolExecutor executor) {}
1846      }
1847  
1848 +    /**
1849 +     * A CyclicBarrier that uses timed await and fails with
1850 +     * AssertionFailedErrors instead of throwing checked exceptions.
1851 +     */
1852 +    public static class CheckedBarrier extends CyclicBarrier {
1853 +        public CheckedBarrier(int parties) { super(parties); }
1854 +
1855 +        public int await() {
1856 +            try {
1857 +                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1858 +            } catch (TimeoutException timedOut) {
1859 +                throw new AssertionFailedError("timed out");
1860 +            } catch (Exception fail) {
1861 +                AssertionFailedError afe =
1862 +                    new AssertionFailedError("Unexpected exception: " + fail);
1863 +                afe.initCause(fail);
1864 +                throw afe;
1865 +            }
1866 +        }
1867 +    }
1868 +
1869 +    void checkEmpty(BlockingQueue q) {
1870 +        try {
1871 +            assertTrue(q.isEmpty());
1872 +            assertEquals(0, q.size());
1873 +            assertNull(q.peek());
1874 +            assertNull(q.poll());
1875 +            assertNull(q.poll(0, MILLISECONDS));
1876 +            assertEquals(q.toString(), "[]");
1877 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1878 +            assertFalse(q.iterator().hasNext());
1879 +            try {
1880 +                q.element();
1881 +                shouldThrow();
1882 +            } catch (NoSuchElementException success) {}
1883 +            try {
1884 +                q.iterator().next();
1885 +                shouldThrow();
1886 +            } catch (NoSuchElementException success) {}
1887 +            try {
1888 +                q.remove();
1889 +                shouldThrow();
1890 +            } catch (NoSuchElementException success) {}
1891 +        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1892 +    }
1893 +
1894 +    void assertSerialEquals(Object x, Object y) {
1895 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1896 +    }
1897 +
1898 +    void assertNotSerialEquals(Object x, Object y) {
1899 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1900 +    }
1901 +
1902 +    byte[] serialBytes(Object o) {
1903 +        try {
1904 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1905 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1906 +            oos.writeObject(o);
1907 +            oos.flush();
1908 +            oos.close();
1909 +            return bos.toByteArray();
1910 +        } catch (Throwable fail) {
1911 +            threadUnexpectedException(fail);
1912 +            return new byte[0];
1913 +        }
1914 +    }
1915 +
1916 +    void assertImmutable(final Object o) {
1917 +        if (o instanceof Collection) {
1918 +            assertThrows(
1919 +                UnsupportedOperationException.class,
1920 +                new Runnable() { public void run() {
1921 +                        ((Collection) o).add(null);}});
1922 +        }
1923 +    }
1924 +
1925 +    @SuppressWarnings("unchecked")
1926 +    <T> T serialClone(T o) {
1927 +        try {
1928 +            ObjectInputStream ois = new ObjectInputStream
1929 +                (new ByteArrayInputStream(serialBytes(o)));
1930 +            T clone = (T) ois.readObject();
1931 +            if (o == clone) assertImmutable(o);
1932 +            assertSame(o.getClass(), clone.getClass());
1933 +            return clone;
1934 +        } catch (Throwable fail) {
1935 +            threadUnexpectedException(fail);
1936 +            return null;
1937 +        }
1938 +    }
1939 +
1940 +    /**
1941 +     * A version of serialClone that leaves error handling (for
1942 +     * e.g. NotSerializableException) up to the caller.
1943 +     */
1944 +    @SuppressWarnings("unchecked")
1945 +    <T> T serialClonePossiblyFailing(T o)
1946 +        throws ReflectiveOperationException, java.io.IOException {
1947 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1948 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1949 +        oos.writeObject(o);
1950 +        oos.flush();
1951 +        oos.close();
1952 +        ObjectInputStream ois = new ObjectInputStream
1953 +            (new ByteArrayInputStream(bos.toByteArray()));
1954 +        T clone = (T) ois.readObject();
1955 +        if (o == clone) assertImmutable(o);
1956 +        assertSame(o.getClass(), clone.getClass());
1957 +        return clone;
1958 +    }
1959 +
1960 +    /**
1961 +     * If o implements Cloneable and has a public clone method,
1962 +     * returns a clone of o, else null.
1963 +     */
1964 +    @SuppressWarnings("unchecked")
1965 +    <T> T cloneableClone(T o) {
1966 +        if (!(o instanceof Cloneable)) return null;
1967 +        final T clone;
1968 +        try {
1969 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1970 +        } catch (NoSuchMethodException ok) {
1971 +            return null;
1972 +        } catch (ReflectiveOperationException unexpected) {
1973 +            throw new Error(unexpected);
1974 +        }
1975 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1976 +        assertSame(o.getClass(), clone.getClass());
1977 +        return clone;
1978 +    }
1979 +
1980 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1981 +                             Runnable... throwingActions) {
1982 +        for (Runnable throwingAction : throwingActions) {
1983 +            boolean threw = false;
1984 +            try { throwingAction.run(); }
1985 +            catch (Throwable t) {
1986 +                threw = true;
1987 +                if (!expectedExceptionClass.isInstance(t)) {
1988 +                    AssertionFailedError afe =
1989 +                        new AssertionFailedError
1990 +                        ("Expected " + expectedExceptionClass.getName() +
1991 +                         ", got " + t.getClass().getName());
1992 +                    afe.initCause(t);
1993 +                    threadUnexpectedException(afe);
1994 +                }
1995 +            }
1996 +            if (!threw)
1997 +                shouldThrow(expectedExceptionClass.getName());
1998 +        }
1999 +    }
2000 +
2001 +    public void assertIteratorExhausted(Iterator<?> it) {
2002 +        try {
2003 +            it.next();
2004 +            shouldThrow();
2005 +        } catch (NoSuchElementException success) {}
2006 +        assertFalse(it.hasNext());
2007 +    }
2008 +
2009 +    public <T> Callable<T> callableThrowing(final Exception ex) {
2010 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
2011 +    }
2012 +
2013 +    public Runnable runnableThrowing(final RuntimeException ex) {
2014 +        return new Runnable() { public void run() { throw ex; }};
2015 +    }
2016 +
2017 +    /** A reusable thread pool to be shared by tests. */
2018 +    static final ExecutorService cachedThreadPool =
2019 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2020 +                               1000L, MILLISECONDS,
2021 +                               new SynchronousQueue<Runnable>());
2022 +
2023 +    static <T> void shuffle(T[] array) {
2024 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2025 +    }
2026   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines