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.94 by jsr166, Mon Jan 21 19:32:19 2013 UTC vs.
Revision 1.229 by jsr166, Sun May 14 03:15:37 2017 UTC

# Line 1 | Line 1
1   /*
2 < * Written by Doug Lea with assistance from members of JCP JSR-166
3 < * Expert Group and released to the public domain, as explained at
2 > * Written by Doug Lea and Martin Buchholz with assistance from
3 > * members of JCP JSR-166 Expert Group and released to the public
4 > * domain, as explained at
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   * Other contributors include Andrew Wright, Jeffrey Hayes,
7   * Pat Fisher, Mike Judd.
8   */
9  
10 < 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.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.*;
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 static java.util.concurrent.TimeUnit.MILLISECONDS;
95 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
96 < import java.security.CodeSource;
97 < import java.security.Permission;
98 < import java.security.PermissionCollection;
99 < import java.security.Permissions;
100 < import java.security.Policy;
31 < import java.security.ProtectionDomain;
32 < import java.security.SecurityPermission;
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 41 | 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 63 | 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>
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
84 < * 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 112 | Line 179 | public class JSR166TestCase extends Test
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       */
# Line 125 | Line 199 | public class JSR166TestCase extends Test
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 +     * 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 <        if (profileTests)
322 <            runTestProfiled();
323 <        else
324 <            super.runTest();
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 <        long t0 = System.nanoTime();
332 <        try {
331 >        for (int i = 0; i < 2; i++) {
332 >            long startTime = System.nanoTime();
333              super.runTest();
334 <        } finally {
335 <            long elapsedMillis =
336 <                (System.nanoTime() - t0) / (1000L * 1000L);
337 <            if (elapsedMillis >= profileThreshold)
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.
149     * Optional command line arg provides the number of iterations to
150     * repeat running the tests.
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) {
162 <            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          }
166        System.exit(0);
396      }
397  
398      public static TestSuite newTestSuite(Object... suiteOrClasses) {
# Line 179 | Line 408 | public class JSR166TestCase extends Test
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.
457       */
458      public static Test suite() {
459 <        return newTestSuite(
459 >        // Java7+ test classes
460 >        TestSuite suite = newTestSuite(
461              ForkJoinPoolTest.suite(),
462              ForkJoinTaskTest.suite(),
463              RecursiveActionTest.suite(),
# Line 197 | Line 471 | public class JSR166TestCase extends Test
471              AbstractQueuedLongSynchronizerTest.suite(),
472              ArrayBlockingQueueTest.suite(),
473              ArrayDequeTest.suite(),
474 +            ArrayListTest.suite(),
475              AtomicBooleanTest.suite(),
476              AtomicIntegerArrayTest.suite(),
477              AtomicIntegerFieldUpdaterTest.suite(),
# Line 219 | Line 494 | public class JSR166TestCase extends Test
494              CopyOnWriteArrayListTest.suite(),
495              CopyOnWriteArraySetTest.suite(),
496              CountDownLatchTest.suite(),
497 +            CountedCompleterTest.suite(),
498              CyclicBarrierTest.suite(),
499              DelayQueueTest.suite(),
500              EntryTest.suite(),
# Line 247 | Line 523 | public class JSR166TestCase extends Test
523              TreeMapTest.suite(),
524              TreeSetTest.suite(),
525              TreeSubMapTest.suite(),
526 <            TreeSubSetTest.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  
259
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  
651      /**
# Line 275 | Line 658 | public class JSR166TestCase extends Test
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
666 <     * verify that operations block or time out.
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 <    long timeoutMillis() {
671 <        return SHORT_DELAY_MS / 4;
670 >    static long timeoutMillis() {
671 >        return TIMEOUT_DELAY_MS;
672      }
673  
674      /**
675 <     * Returns a new Date instance representing a time delayMillis
676 <     * milliseconds in the future.
675 >     * Returns a new Date instance representing a time at least
676 >     * delayMillis milliseconds in the future.
677       */
678      Date delayedDate(long delayMillis) {
679 <        return new Date(System.currentTimeMillis() + 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 304 | 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 311 | 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       *
# Line 338 | Line 736 | public class JSR166TestCase extends Test
736          }
737  
738          if (Thread.interrupted())
739 <            throw new AssertionFailedError("interrupt status set in main thread");
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 351 | 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 419 | 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 435 | 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 478 | Line 901 | public class JSR166TestCase extends Test
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.
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 startTime = System.nanoTime();
909 <        long ns = millis * 1000 * 1000;
910 <        for (;;) {
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 <            long d = ns - (System.nanoTime() - startTime);
916 <            if (d > 0L)
917 <                millis = d / (1000 * 1000);
918 <            else
919 <                break;
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 <    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(2 * 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 <     * Checks that thread does not terminate within the default
999 <     * millisecond delay of {@code timeoutMillis()}.
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 <    void assertThreadStaysAlive(Thread thread) {
519 <        assertThreadStaysAlive(thread, timeoutMillis());
520 <    }
1002 >    interface Action { public void run() throws Throwable; }
1003  
1004      /**
1005 <     * Checks that thread does not terminate within the given millisecond delay.
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 assertThreadStaysAlive(Thread thread, long millis) {
1010 <        try {
1011 <            // No need to optimize the failing case via Thread.join.
1012 <            delay(millis);
1013 <            assertTrue(thread.isAlive());
1014 <        } catch (InterruptedException ie) {
1015 <            fail("Unexpected InterruptedException");
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 <     * Checks that the threads do not terminate within the default
1029 <     * millisecond delay of {@code timeoutMillis()}.
1028 >     * A debugging tool to print stack traces of most threads, as jstack does.
1029 >     * Uninteresting threads are filtered out.
1030       */
1031 <    void assertThreadsStayAlive(Thread... threads) {
1032 <        assertThreadsStayAlive(timeoutMillis(), threads);
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 the threads do not terminate within the given millisecond delay.
1067 <     */
1068 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1069 <        try {
1070 <            // No need to optimize the failing case via Thread.join.
1071 <            delay(millis);
1072 <            for (Thread thread : threads)
1073 <                assertTrue(thread.isAlive());
1074 <        } catch (InterruptedException ie) {
1075 <            fail("Unexpected InterruptedException");
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      /**
# Line 571 | Line 1099 | public class JSR166TestCase extends Test
1099              future.get(timeoutMillis, MILLISECONDS);
1100              shouldThrow();
1101          } catch (TimeoutException success) {
1102 <        } catch (Exception e) {
1103 <            threadUnexpectedException(e);
1102 >        } catch (Exception fail) {
1103 >            threadUnexpectedException(fail);
1104          } finally { future.cancel(true); }
1105          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1106      }
# Line 592 | Line 1120 | public class JSR166TestCase extends Test
1120      }
1121  
1122      /**
1123 +     * The maximum number of consecutive spurious wakeups we should
1124 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1125 +     */
1126 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1127 +
1128 +    /**
1129       * The number of elements to place in collections, arrays, etc.
1130       */
1131      public static final int SIZE = 20;
# Line 616 | Line 1150 | public class JSR166TestCase extends Test
1150      public static final Integer m6  = new Integer(-6);
1151      public static final Integer m10 = new Integer(-10);
1152  
619
1153      /**
1154       * Runs Runnable r with a security policy that permits precisely
1155       * the specified permissions.  If there is no current security
# Line 696 | Line 1229 | public class JSR166TestCase extends Test
1229          }
1230          public void refresh() {}
1231          public String toString() {
1232 <            List<Permission> ps = new ArrayList<Permission>();
1232 >            List<Permission> ps = new ArrayList<>();
1233              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1234                  ps.add(e.nextElement());
1235              return "AdjustablePolicy with permissions " + ps;
# Line 726 | Line 1259 | public class JSR166TestCase extends Test
1259       * Sleeps until the given time has elapsed.
1260       * Throws AssertionFailedError if interrupted.
1261       */
1262 <    void sleep(long millis) {
1262 >    static void sleep(long millis) {
1263          try {
1264              delay(millis);
1265 <        } catch (InterruptedException ie) {
1265 >        } catch (InterruptedException fail) {
1266              AssertionFailedError afe =
1267                  new AssertionFailedError("Unexpected InterruptedException");
1268 <            afe.initCause(ie);
1268 >            afe.initCause(fail);
1269              throw afe;
1270          }
1271      }
# Line 742 | Line 1275 | public class JSR166TestCase extends Test
1275       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1276       */
1277      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1278 <        long startTime = System.nanoTime();
1278 >        long startTime = 0L;
1279          for (;;) {
1280              Thread.State s = thread.getState();
1281              if (s == Thread.State.BLOCKED ||
# Line 751 | Line 1284 | public class JSR166TestCase extends Test
1284                  return;
1285              else if (s == Thread.State.TERMINATED)
1286                  fail("Unexpected thread termination");
1287 +            else if (startTime == 0L)
1288 +                startTime = System.nanoTime();
1289              else if (millisElapsedSince(startTime) > timeoutMillis) {
1290                  threadAssertTrue(thread.isAlive());
1291 <                return;
1291 >                fail("timed out waiting for thread to enter wait state");
1292              }
1293              Thread.yield();
1294          }
1295      }
1296  
1297      /**
1298 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1299 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1298 >     * Spin-waits up to the specified number of milliseconds for the given
1299 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1300 >     * and additionally satisfy the given condition.
1301 >     */
1302 >    void waitForThreadToEnterWaitState(
1303 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1304 >        long startTime = 0L;
1305 >        for (;;) {
1306 >            Thread.State s = thread.getState();
1307 >            if (s == Thread.State.BLOCKED ||
1308 >                s == Thread.State.WAITING ||
1309 >                s == Thread.State.TIMED_WAITING) {
1310 >                try {
1311 >                    if (waitingForGodot.call())
1312 >                        return;
1313 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1314 >            }
1315 >            else if (s == Thread.State.TERMINATED)
1316 >                fail("Unexpected thread termination");
1317 >            else if (startTime == 0L)
1318 >                startTime = System.nanoTime();
1319 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1320 >                threadAssertTrue(thread.isAlive());
1321 >                fail("timed out waiting for thread to enter wait state");
1322 >            }
1323 >            Thread.yield();
1324 >        }
1325 >    }
1326 >
1327 >    /**
1328 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1329 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1330       */
1331      void waitForThreadToEnterWaitState(Thread thread) {
1332          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1333      }
1334  
1335      /**
1336 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1337 +     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1338 +     * and additionally satisfy the given condition.
1339 +     */
1340 +    void waitForThreadToEnterWaitState(
1341 +        Thread thread, Callable<Boolean> waitingForGodot) {
1342 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1343 +    }
1344 +
1345 +    /**
1346       * Returns the number of milliseconds since time given by
1347       * startNanoTime, which must have been previously returned from a
1348 <     * call to {@link System.nanoTime()}.
1348 >     * call to {@link System#nanoTime()}.
1349       */
1350 <    long millisElapsedSince(long startNanoTime) {
1350 >    static long millisElapsedSince(long startNanoTime) {
1351          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1352      }
1353  
1354 + //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1355 + //         long startTime = System.nanoTime();
1356 + //         try {
1357 + //             r.run();
1358 + //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1359 + //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1360 + //             throw new AssertionFailedError("did not return promptly");
1361 + //     }
1362 +
1363 + //     void assertTerminatesPromptly(Runnable r) {
1364 + //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1365 + //     }
1366 +
1367 +    /**
1368 +     * Checks that timed f.get() returns the expected value, and does not
1369 +     * wait for the timeout to elapse before returning.
1370 +     */
1371 +    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1372 +        long startTime = System.nanoTime();
1373 +        try {
1374 +            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1375 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
1376 +        if (millisElapsedSince(startTime) > timeoutMillis/2)
1377 +            throw new AssertionFailedError("timed get did not return promptly");
1378 +    }
1379 +
1380 +    <T> void checkTimedGet(Future<T> f, T expectedValue) {
1381 +        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1382 +    }
1383 +
1384      /**
1385       * Returns a new started daemon Thread running the given runnable.
1386       */
# Line 794 | Line 1399 | public class JSR166TestCase extends Test
1399      void awaitTermination(Thread t, long timeoutMillis) {
1400          try {
1401              t.join(timeoutMillis);
1402 <        } catch (InterruptedException ie) {
1403 <            threadUnexpectedException(ie);
1402 >        } catch (InterruptedException fail) {
1403 >            threadUnexpectedException(fail);
1404          } finally {
1405              if (t.getState() != Thread.State.TERMINATED) {
1406                  t.interrupt();
1407 <                fail("Test timed out");
1407 >                threadFail("timed out waiting for thread to terminate");
1408              }
1409          }
1410      }
# Line 821 | Line 1426 | public class JSR166TestCase extends Test
1426          public final void run() {
1427              try {
1428                  realRun();
1429 <            } catch (Throwable t) {
1430 <                threadUnexpectedException(t);
1429 >            } catch (Throwable fail) {
1430 >                threadUnexpectedException(fail);
1431              }
1432          }
1433      }
# Line 876 | Line 1481 | public class JSR166TestCase extends Test
1481                  threadShouldThrow("InterruptedException");
1482              } catch (InterruptedException success) {
1483                  threadAssertFalse(Thread.interrupted());
1484 <            } catch (Throwable t) {
1485 <                threadUnexpectedException(t);
1484 >            } catch (Throwable fail) {
1485 >                threadUnexpectedException(fail);
1486              }
1487          }
1488      }
# Line 888 | Line 1493 | public class JSR166TestCase extends Test
1493          public final T call() {
1494              try {
1495                  return realCall();
1496 <            } catch (Throwable t) {
1497 <                threadUnexpectedException(t);
1496 >            } catch (Throwable fail) {
1497 >                threadUnexpectedException(fail);
1498                  return null;
1499              }
1500          }
# Line 906 | Line 1511 | public class JSR166TestCase extends Test
1511                  return result;
1512              } catch (InterruptedException success) {
1513                  threadAssertFalse(Thread.interrupted());
1514 <            } catch (Throwable t) {
1515 <                threadUnexpectedException(t);
1514 >            } catch (Throwable fail) {
1515 >                threadUnexpectedException(fail);
1516              }
1517              return null;
1518          }
# Line 924 | Line 1529 | public class JSR166TestCase extends Test
1529      public static final String TEST_STRING = "a test string";
1530  
1531      public static class StringTask implements Callable<String> {
1532 <        public String call() { return TEST_STRING; }
1532 >        final String value;
1533 >        public StringTask() { this(TEST_STRING); }
1534 >        public StringTask(String value) { this.value = value; }
1535 >        public String call() { return value; }
1536      }
1537  
1538      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 937 | Line 1545 | public class JSR166TestCase extends Test
1545              }};
1546      }
1547  
1548 <    public Runnable awaiter(final CountDownLatch latch) {
1548 >    public Runnable countDowner(final CountDownLatch latch) {
1549          return new CheckedRunnable() {
1550              public void realRun() throws InterruptedException {
1551 <                await(latch);
1551 >                latch.countDown();
1552              }};
1553      }
1554  
1555 <    public void await(CountDownLatch latch) {
1555 >    class LatchAwaiter extends CheckedRunnable {
1556 >        static final int NEW = 0;
1557 >        static final int RUNNING = 1;
1558 >        static final int DONE = 2;
1559 >        final CountDownLatch latch;
1560 >        int state = NEW;
1561 >        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1562 >        public void realRun() throws InterruptedException {
1563 >            state = 1;
1564 >            await(latch);
1565 >            state = 2;
1566 >        }
1567 >    }
1568 >
1569 >    public LatchAwaiter awaiter(CountDownLatch latch) {
1570 >        return new LatchAwaiter(latch);
1571 >    }
1572 >
1573 >    public void await(CountDownLatch latch, long timeoutMillis) {
1574          try {
1575 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1576 <        } catch (Throwable t) {
1577 <            threadUnexpectedException(t);
1575 >            if (!latch.await(timeoutMillis, MILLISECONDS))
1576 >                fail("timed out waiting for CountDownLatch for "
1577 >                     + (timeoutMillis/1000) + " sec");
1578 >        } catch (Throwable fail) {
1579 >            threadUnexpectedException(fail);
1580          }
1581      }
1582  
1583 +    public void await(CountDownLatch latch) {
1584 +        await(latch, LONG_DELAY_MS);
1585 +    }
1586 +
1587      public void await(Semaphore semaphore) {
1588          try {
1589 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1590 <        } catch (Throwable t) {
1591 <            threadUnexpectedException(t);
1589 >            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1590 >                fail("timed out waiting for Semaphore for "
1591 >                     + (LONG_DELAY_MS/1000) + " sec");
1592 >        } catch (Throwable fail) {
1593 >            threadUnexpectedException(fail);
1594 >        }
1595 >    }
1596 >
1597 >    public void await(CyclicBarrier barrier) {
1598 >        try {
1599 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1600 >        } catch (Throwable fail) {
1601 >            threadUnexpectedException(fail);
1602          }
1603      }
1604  
# Line 1147 | Line 1789 | public class JSR166TestCase extends Test
1789      public abstract class CheckedRecursiveAction extends RecursiveAction {
1790          protected abstract void realCompute() throws Throwable;
1791  
1792 <        public final void compute() {
1792 >        @Override protected final void compute() {
1793              try {
1794                  realCompute();
1795 <            } catch (Throwable t) {
1796 <                threadUnexpectedException(t);
1795 >            } catch (Throwable fail) {
1796 >                threadUnexpectedException(fail);
1797              }
1798          }
1799      }
# Line 1162 | Line 1804 | public class JSR166TestCase extends Test
1804      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1805          protected abstract T realCompute() throws Throwable;
1806  
1807 <        public final T compute() {
1807 >        @Override protected final T compute() {
1808              try {
1809                  return realCompute();
1810 <            } catch (Throwable t) {
1811 <                threadUnexpectedException(t);
1810 >            } catch (Throwable fail) {
1811 >                threadUnexpectedException(fail);
1812                  return null;
1813              }
1814          }
# Line 1184 | Line 1826 | public class JSR166TestCase extends Test
1826       * A CyclicBarrier that uses timed await and fails with
1827       * AssertionFailedErrors instead of throwing checked exceptions.
1828       */
1829 <    public class CheckedBarrier extends CyclicBarrier {
1829 >    public static class CheckedBarrier extends CyclicBarrier {
1830          public CheckedBarrier(int parties) { super(parties); }
1831  
1832          public int await() {
1833              try {
1834                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1835 <            } catch (TimeoutException e) {
1835 >            } catch (TimeoutException timedOut) {
1836                  throw new AssertionFailedError("timed out");
1837 <            } catch (Exception e) {
1837 >            } catch (Exception fail) {
1838                  AssertionFailedError afe =
1839 <                    new AssertionFailedError("Unexpected exception: " + e);
1840 <                afe.initCause(e);
1839 >                    new AssertionFailedError("Unexpected exception: " + fail);
1840 >                afe.initCause(fail);
1841                  throw afe;
1842              }
1843          }
# Line 1223 | Line 1865 | public class JSR166TestCase extends Test
1865                  q.remove();
1866                  shouldThrow();
1867              } catch (NoSuchElementException success) {}
1868 <        } catch (InterruptedException ie) {
1227 <            threadUnexpectedException(ie);
1228 <        }
1868 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1869      }
1870  
1871      void assertSerialEquals(Object x, Object y) {
# Line 1244 | Line 1884 | public class JSR166TestCase extends Test
1884              oos.flush();
1885              oos.close();
1886              return bos.toByteArray();
1887 <        } catch (Throwable t) {
1888 <            threadUnexpectedException(t);
1887 >        } catch (Throwable fail) {
1888 >            threadUnexpectedException(fail);
1889              return new byte[0];
1890          }
1891      }
1892  
1893 +    void assertImmutable(final Object o) {
1894 +        if (o instanceof Collection) {
1895 +            assertThrows(
1896 +                UnsupportedOperationException.class,
1897 +                new Runnable() { public void run() {
1898 +                        ((Collection) o).add(null);}});
1899 +        }
1900 +    }
1901 +
1902      @SuppressWarnings("unchecked")
1903      <T> T serialClone(T o) {
1904          try {
1905              ObjectInputStream ois = new ObjectInputStream
1906                  (new ByteArrayInputStream(serialBytes(o)));
1907              T clone = (T) ois.readObject();
1908 +            if (o == clone) assertImmutable(o);
1909              assertSame(o.getClass(), clone.getClass());
1910              return clone;
1911 <        } catch (Throwable t) {
1912 <            threadUnexpectedException(t);
1911 >        } catch (Throwable fail) {
1912 >            threadUnexpectedException(fail);
1913              return null;
1914          }
1915      }
1916 +
1917 +    /**
1918 +     * A version of serialClone that leaves error handling (for
1919 +     * e.g. NotSerializableException) up to the caller.
1920 +     */
1921 +    @SuppressWarnings("unchecked")
1922 +    <T> T serialClonePossiblyFailing(T o)
1923 +        throws ReflectiveOperationException, java.io.IOException {
1924 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1925 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1926 +        oos.writeObject(o);
1927 +        oos.flush();
1928 +        oos.close();
1929 +        ObjectInputStream ois = new ObjectInputStream
1930 +            (new ByteArrayInputStream(bos.toByteArray()));
1931 +        T clone = (T) ois.readObject();
1932 +        if (o == clone) assertImmutable(o);
1933 +        assertSame(o.getClass(), clone.getClass());
1934 +        return clone;
1935 +    }
1936 +
1937 +    /**
1938 +     * If o implements Cloneable and has a public clone method,
1939 +     * returns a clone of o, else null.
1940 +     */
1941 +    @SuppressWarnings("unchecked")
1942 +    <T> T cloneableClone(T o) {
1943 +        if (!(o instanceof Cloneable)) return null;
1944 +        final T clone;
1945 +        try {
1946 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1947 +        } catch (NoSuchMethodException ok) {
1948 +            return null;
1949 +        } catch (ReflectiveOperationException unexpected) {
1950 +            throw new Error(unexpected);
1951 +        }
1952 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1953 +        assertSame(o.getClass(), clone.getClass());
1954 +        return clone;
1955 +    }
1956 +
1957 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1958 +                             Runnable... throwingActions) {
1959 +        for (Runnable throwingAction : throwingActions) {
1960 +            boolean threw = false;
1961 +            try { throwingAction.run(); }
1962 +            catch (Throwable t) {
1963 +                threw = true;
1964 +                if (!expectedExceptionClass.isInstance(t)) {
1965 +                    AssertionFailedError afe =
1966 +                        new AssertionFailedError
1967 +                        ("Expected " + expectedExceptionClass.getName() +
1968 +                         ", got " + t.getClass().getName());
1969 +                    afe.initCause(t);
1970 +                    threadUnexpectedException(afe);
1971 +                }
1972 +            }
1973 +            if (!threw)
1974 +                shouldThrow(expectedExceptionClass.getName());
1975 +        }
1976 +    }
1977 +
1978 +    public void assertIteratorExhausted(Iterator<?> it) {
1979 +        try {
1980 +            it.next();
1981 +            shouldThrow();
1982 +        } catch (NoSuchElementException success) {}
1983 +        assertFalse(it.hasNext());
1984 +    }
1985 +
1986 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1987 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1988 +    }
1989 +
1990 +    public Runnable runnableThrowing(final RuntimeException ex) {
1991 +        return new Runnable() { public void run() { throw ex; }};
1992 +    }
1993 +
1994 +    /** A reusable thread pool to be shared by tests. */
1995 +    static final ExecutorService cachedThreadPool =
1996 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1997 +                               1000L, MILLISECONDS,
1998 +                               new SynchronousQueue<Runnable>());
1999 +
2000 +    static <T> void shuffle(T[] array) {
2001 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2002 +    }
2003   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines