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.48 by jsr166, Tue Dec 1 22:51:44 2009 UTC vs.
Revision 1.213 by jsr166, Fri Dec 9 06:58:57 2016 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
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
10 < import java.util.*;
11 < import java.util.concurrent.*;
9 > /*
10 > * @test
11 > * @summary JSR-166 tck tests (conformance testing mode)
12 > * @build *
13 > * @modules java.management
14 > * @run junit/othervm/timeout=1000 JSR166TestCase
15 > */
16 >
17 > /*
18 > * @test
19 > * @summary JSR-166 tck tests (whitebox tests allowed)
20 > * @build *
21 > * @modules java.base/java.util.concurrent:open
22 > *          java.management
23 > * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
24 > * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 JSR166TestCase
25 > */
26 >
27   import static java.util.concurrent.TimeUnit.MILLISECONDS;
28 < import java.io.*;
29 < import java.security.*;
28 > import static java.util.concurrent.TimeUnit.MINUTES;
29 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
30 >
31 > import java.io.ByteArrayInputStream;
32 > import java.io.ByteArrayOutputStream;
33 > import java.io.ObjectInputStream;
34 > import java.io.ObjectOutputStream;
35 > import java.lang.management.ManagementFactory;
36 > import java.lang.management.ThreadInfo;
37 > import java.lang.management.ThreadMXBean;
38 > import java.lang.reflect.Constructor;
39 > import java.lang.reflect.Method;
40 > import java.lang.reflect.Modifier;
41 > import java.nio.file.Files;
42 > import java.nio.file.Paths;
43 > import java.security.CodeSource;
44 > import java.security.Permission;
45 > import java.security.PermissionCollection;
46 > import java.security.Permissions;
47 > import java.security.Policy;
48 > import java.security.ProtectionDomain;
49 > import java.security.SecurityPermission;
50 > import java.util.ArrayList;
51 > import java.util.Arrays;
52 > import java.util.Collection;
53 > import java.util.Collections;
54 > import java.util.Date;
55 > import java.util.Enumeration;
56 > import java.util.Iterator;
57 > import java.util.List;
58 > import java.util.NoSuchElementException;
59 > import java.util.PropertyPermission;
60 > import java.util.concurrent.BlockingQueue;
61 > import java.util.concurrent.Callable;
62 > import java.util.concurrent.CountDownLatch;
63 > import java.util.concurrent.CyclicBarrier;
64 > import java.util.concurrent.ExecutionException;
65 > import java.util.concurrent.Executors;
66 > import java.util.concurrent.ExecutorService;
67 > import java.util.concurrent.ForkJoinPool;
68 > import java.util.concurrent.Future;
69 > import java.util.concurrent.RecursiveAction;
70 > import java.util.concurrent.RecursiveTask;
71 > import java.util.concurrent.RejectedExecutionHandler;
72 > import java.util.concurrent.Semaphore;
73 > import java.util.concurrent.SynchronousQueue;
74 > import java.util.concurrent.ThreadFactory;
75 > import java.util.concurrent.ThreadLocalRandom;
76 > import java.util.concurrent.ThreadPoolExecutor;
77 > import java.util.concurrent.TimeoutException;
78 > import java.util.concurrent.atomic.AtomicBoolean;
79 > import java.util.concurrent.atomic.AtomicReference;
80 > import java.util.regex.Matcher;
81 > import java.util.regex.Pattern;
82 >
83 > import junit.framework.AssertionFailedError;
84 > import junit.framework.Test;
85 > import junit.framework.TestCase;
86 > import junit.framework.TestResult;
87 > import junit.framework.TestSuite;
88  
89   /**
90   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 23 | Line 96 | import java.security.*;
96   *
97   * <ol>
98   *
99 < * <li> All assertions in code running in generated threads must use
99 > * <li>All assertions in code running in generated threads must use
100   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
101   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
102 < * <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
102 > * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
103   * particularly recommended) for other code to use these forms too.
104   * Only the most typically used JUnit assertion methods are defined
105 < * this way, but enough to live with.</li>
105 > * this way, but enough to live with.
106   *
107 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
108 < * to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within
107 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
108 > * to invoke {@code super.setUp} and {@code super.tearDown} within
109   * them. These methods are used to clear and check for thread
110 < * assertion failures.</li>
110 > * assertion failures.
111   *
112 < * <li>All delays and timeouts must use one of the constants <tt>
113 < * SHORT_DELAY_MS</tt>, <tt> SMALL_DELAY_MS</tt>, <tt> MEDIUM_DELAY_MS</tt>,
114 < * <tt> LONG_DELAY_MS</tt>. The idea here is that a SHORT is always
112 > * <li>All delays and timeouts must use one of the constants {@code
113 > * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
114 > * {@code LONG_DELAY_MS}. The idea here is that a SHORT is always
115   * discriminable from zero time, and always allows enough time for the
116   * small amounts of computation (creating a thread, calling a few
117   * methods, etc) needed to reach a timeout point. Similarly, a SMALL
118   * is always discriminable as larger than SHORT and smaller than
119   * MEDIUM.  And so on. These constants are set to conservative values,
120   * but even so, if there is ever any doubt, they can all be increased
121 < * in one spot to rerun tests on slower platforms.</li>
121 > * in one spot to rerun tests on slower platforms.
122   *
123 < * <li> All threads generated must be joined inside each test case
124 < * method (or <tt>fail</tt> to do so) before returning from the
125 < * method. The <tt> joinPool</tt> method can be used to do this when
126 < * using Executors.</li>
123 > * <li>All threads generated must be joined inside each test case
124 > * method (or {@code fail} to do so) before returning from the
125 > * method. The {@code joinPool} method can be used to do this when
126 > * using Executors.
127   *
128   * </ol>
129   *
130 < * <p> <b>Other notes</b>
130 > * <p><b>Other notes</b>
131   * <ul>
132   *
133 < * <li> Usually, there is one testcase method per JSR166 method
133 > * <li>Usually, there is one testcase method per JSR166 method
134   * covering "normal" operation, and then as many exception-testing
135   * methods as there are exceptions the method can throw. Sometimes
136   * there are multiple tests per JSR166 method when the different
137   * "normal" behaviors differ significantly. And sometimes testcases
138 < * cover multiple methods when they cannot be tested in
66 < * isolation.</li>
138 > * cover multiple methods when they cannot be tested in isolation.
139   *
140 < * <li> The documentation style for testcases is to provide as javadoc
140 > * <li>The documentation style for testcases is to provide as javadoc
141   * a simple sentence or two describing the property that the testcase
142   * method purports to test. The javadocs do not say anything about how
143 < * the property is tested. To find out, read the code.</li>
143 > * the property is tested. To find out, read the code.
144   *
145 < * <li> These tests are "conformance tests", and do not attempt to
145 > * <li>These tests are "conformance tests", and do not attempt to
146   * test throughput, latency, scalability or other performance factors
147   * (see the separate "jtreg" tests for a set intended to check these
148   * for the most central aspects of functionality.) So, most tests use
149   * the smallest sensible numbers of threads, collection sizes, etc
150 < * needed to check basic conformance.</li>
150 > * needed to check basic conformance.
151   *
152   * <li>The test classes currently do not declare inclusion in
153   * any particular package to simplify things for people integrating
154 < * them in TCK test suites.</li>
154 > * them in TCK test suites.
155   *
156 < * <li> As a convenience, the <tt>main</tt> of this class (JSR166TestCase)
157 < * runs all JSR166 unit tests.</li>
156 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
157 > * runs all JSR166 unit tests.
158   *
159   * </ul>
160   */
161   public class JSR166TestCase extends TestCase {
162 +    private static final boolean useSecurityManager =
163 +        Boolean.getBoolean("jsr166.useSecurityManager");
164 +
165 +    protected static final boolean expensiveTests =
166 +        Boolean.getBoolean("jsr166.expensiveTests");
167 +
168 +    /**
169 +     * If true, also run tests that are not part of the official tck
170 +     * because they test unspecified implementation details.
171 +     */
172 +    protected static final boolean testImplementationDetails =
173 +        Boolean.getBoolean("jsr166.testImplementationDetails");
174 +
175 +    /**
176 +     * If true, report on stdout all "slow" tests, that is, ones that
177 +     * take more than profileThreshold milliseconds to execute.
178 +     */
179 +    private static final boolean profileTests =
180 +        Boolean.getBoolean("jsr166.profileTests");
181 +
182 +    /**
183 +     * The number of milliseconds that tests are permitted for
184 +     * execution without being reported, when profileTests is set.
185 +     */
186 +    private static final long profileThreshold =
187 +        Long.getLong("jsr166.profileThreshold", 100);
188 +
189 +    /**
190 +     * The number of repetitions per test (for tickling rare bugs).
191 +     */
192 +    private static final int runsPerTest =
193 +        Integer.getInteger("jsr166.runsPerTest", 1);
194 +
195 +    /**
196 +     * The number of repetitions of the test suite (for finding leaks?).
197 +     */
198 +    private static final int suiteRuns =
199 +        Integer.getInteger("jsr166.suiteRuns", 1);
200 +
201      /**
202 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
202 >     * Returns the value of the system property, or NaN if not defined.
203 >     */
204 >    private static float systemPropertyValue(String name) {
205 >        String floatString = System.getProperty(name);
206 >        if (floatString == null)
207 >            return Float.NaN;
208 >        try {
209 >            return Float.parseFloat(floatString);
210 >        } catch (NumberFormatException ex) {
211 >            throw new IllegalArgumentException(
212 >                String.format("Bad float value in system property %s=%s",
213 >                              name, floatString));
214 >        }
215 >    }
216 >
217 >    /**
218 >     * The scaling factor to apply to standard delays used in tests.
219 >     * May be initialized from any of:
220 >     * - the "jsr166.delay.factor" system property
221 >     * - the "test.timeout.factor" system property (as used by jtreg)
222 >     *   See: http://openjdk.java.net/jtreg/tag-spec.html
223 >     * - hard-coded fuzz factor when using a known slowpoke VM
224 >     */
225 >    private static final float delayFactor = delayFactor();
226 >
227 >    private static float delayFactor() {
228 >        float x;
229 >        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
230 >            return x;
231 >        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
232 >            return x;
233 >        String prop = System.getProperty("java.vm.version");
234 >        if (prop != null && prop.matches(".*debug.*"))
235 >            return 4.0f; // How much slower is fastdebug than product?!
236 >        return 1.0f;
237 >    }
238 >
239 >    public JSR166TestCase() { super(); }
240 >    public JSR166TestCase(String name) { super(name); }
241 >
242 >    /**
243 >     * A filter for tests to run, matching strings of the form
244 >     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
245 >     * Usefully combined with jsr166.runsPerTest.
246 >     */
247 >    private static final Pattern methodFilter = methodFilter();
248 >
249 >    private static Pattern methodFilter() {
250 >        String regex = System.getProperty("jsr166.methodFilter");
251 >        return (regex == null) ? null : Pattern.compile(regex);
252 >    }
253 >
254 >    // Instrumentation to debug very rare, but very annoying hung test runs.
255 >    static volatile TestCase currentTestCase;
256 >    // static volatile int currentRun = 0;
257 >    static {
258 >        Runnable checkForWedgedTest = new Runnable() { public void run() {
259 >            // Avoid spurious reports with enormous runsPerTest.
260 >            // A single test case run should never take more than 1 second.
261 >            // But let's cap it at the high end too ...
262 >            final int timeoutMinutes =
263 >                Math.min(15, Math.max(runsPerTest / 60, 1));
264 >            for (TestCase lastTestCase = currentTestCase;;) {
265 >                try { MINUTES.sleep(timeoutMinutes); }
266 >                catch (InterruptedException unexpected) { break; }
267 >                if (lastTestCase == currentTestCase) {
268 >                    System.err.printf(
269 >                        "Looks like we're stuck running test: %s%n",
270 >                        lastTestCase);
271 > //                     System.err.printf(
272 > //                         "Looks like we're stuck running test: %s (%d/%d)%n",
273 > //                         lastTestCase, currentRun, runsPerTest);
274 > //                     System.err.println("availableProcessors=" +
275 > //                         Runtime.getRuntime().availableProcessors());
276 > //                     System.err.printf("cpu model = %s%n", cpuModel());
277 >                    dumpTestThreads();
278 >                    // one stack dump is probably enough; more would be spam
279 >                    break;
280 >                }
281 >                lastTestCase = currentTestCase;
282 >            }}};
283 >        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
284 >        thread.setDaemon(true);
285 >        thread.start();
286 >    }
287 >
288 > //     public static String cpuModel() {
289 > //         try {
290 > //             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
291 > //                 .matcher(new String(
292 > //                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
293 > //             matcher.find();
294 > //             return matcher.group(1);
295 > //         } catch (Exception ex) { return null; }
296 > //     }
297 >
298 >    public void runBare() throws Throwable {
299 >        currentTestCase = this;
300 >        if (methodFilter == null
301 >            || methodFilter.matcher(toString()).find())
302 >            super.runBare();
303 >    }
304 >
305 >    protected void runTest() throws Throwable {
306 >        for (int i = 0; i < runsPerTest; i++) {
307 >            // currentRun = i;
308 >            if (profileTests)
309 >                runTestProfiled();
310 >            else
311 >                super.runTest();
312 >        }
313 >    }
314 >
315 >    protected void runTestProfiled() throws Throwable {
316 >        for (int i = 0; i < 2; i++) {
317 >            long startTime = System.nanoTime();
318 >            super.runTest();
319 >            long elapsedMillis = millisElapsedSince(startTime);
320 >            if (elapsedMillis < profileThreshold)
321 >                break;
322 >            // Never report first run of any test; treat it as a
323 >            // warmup run, notably to trigger all needed classloading,
324 >            if (i > 0)
325 >                System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
326 >        }
327 >    }
328 >
329 >    /**
330 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
331       */
332      public static void main(String[] args) {
333 <        int iters = 1;
334 <        if (args.length > 0)
335 <            iters = Integer.parseInt(args[0]);
336 <        Test s = suite();
337 <        for (int i = 0; i < iters; ++i) {
338 <            junit.textui.TestRunner.run(s);
333 >        main(suite(), args);
334 >    }
335 >
336 >    static class PithyResultPrinter extends junit.textui.ResultPrinter {
337 >        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
338 >        long runTime;
339 >        public void startTest(Test test) {}
340 >        protected void printHeader(long runTime) {
341 >            this.runTime = runTime; // defer printing for later
342 >        }
343 >        protected void printFooter(TestResult result) {
344 >            if (result.wasSuccessful()) {
345 >                getWriter().println("OK (" + result.runCount() + " tests)"
346 >                    + "  Time: " + elapsedTimeAsString(runTime));
347 >            } else {
348 >                getWriter().println("Time: " + elapsedTimeAsString(runTime));
349 >                super.printFooter(result);
350 >            }
351 >        }
352 >    }
353 >
354 >    /**
355 >     * Returns a TestRunner that doesn't bother with unnecessary
356 >     * fluff, like printing a "." for each test case.
357 >     */
358 >    static junit.textui.TestRunner newPithyTestRunner() {
359 >        junit.textui.TestRunner runner = new junit.textui.TestRunner();
360 >        runner.setPrinter(new PithyResultPrinter(System.out));
361 >        return runner;
362 >    }
363 >
364 >    /**
365 >     * Runs all unit tests in the given test suite.
366 >     * Actual behavior influenced by jsr166.* system properties.
367 >     */
368 >    static void main(Test suite, String[] args) {
369 >        if (useSecurityManager) {
370 >            System.err.println("Setting a permissive security manager");
371 >            Policy.setPolicy(permissivePolicy());
372 >            System.setSecurityManager(new SecurityManager());
373 >        }
374 >        for (int i = 0; i < suiteRuns; i++) {
375 >            TestResult result = newPithyTestRunner().doRun(suite);
376 >            if (!result.wasSuccessful())
377 >                System.exit(1);
378              System.gc();
379              System.runFinalization();
380          }
381 <        System.exit(0);
381 >    }
382 >
383 >    public static TestSuite newTestSuite(Object... suiteOrClasses) {
384 >        TestSuite suite = new TestSuite();
385 >        for (Object suiteOrClass : suiteOrClasses) {
386 >            if (suiteOrClass instanceof TestSuite)
387 >                suite.addTest((TestSuite) suiteOrClass);
388 >            else if (suiteOrClass instanceof Class)
389 >                suite.addTest(new TestSuite((Class<?>) suiteOrClass));
390 >            else
391 >                throw new ClassCastException("not a test suite or class");
392 >        }
393 >        return suite;
394 >    }
395 >
396 >    public static void addNamedTestClasses(TestSuite suite,
397 >                                           String... testClassNames) {
398 >        for (String testClassName : testClassNames) {
399 >            try {
400 >                Class<?> testClass = Class.forName(testClassName);
401 >                Method m = testClass.getDeclaredMethod("suite",
402 >                                                       new Class<?>[0]);
403 >                suite.addTest(newTestSuite((Test)m.invoke(null)));
404 >            } catch (Exception e) {
405 >                throw new Error("Missing test class", e);
406 >            }
407 >        }
408 >    }
409 >
410 >    public static final double JAVA_CLASS_VERSION;
411 >    public static final String JAVA_SPECIFICATION_VERSION;
412 >    static {
413 >        try {
414 >            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
415 >                new java.security.PrivilegedAction<Double>() {
416 >                public Double run() {
417 >                    return Double.valueOf(System.getProperty("java.class.version"));}});
418 >            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
419 >                new java.security.PrivilegedAction<String>() {
420 >                public String run() {
421 >                    return System.getProperty("java.specification.version");}});
422 >        } catch (Throwable t) {
423 >            throw new Error(t);
424 >        }
425 >    }
426 >
427 >    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
428 >    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
429 >    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
430 >    public static boolean atLeastJava9() {
431 >        return JAVA_CLASS_VERSION >= 53.0
432 >            // As of 2015-09, java9 still uses 52.0 class file version
433 >            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
434 >    }
435 >    public static boolean atLeastJava10() {
436 >        return JAVA_CLASS_VERSION >= 54.0
437 >            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
438      }
439  
440      /**
441 <     * Collects all JSR166 unit tests as one suite
441 >     * Collects all JSR166 unit tests as one suite.
442       */
443      public static Test suite() {
444 <        TestSuite suite = new TestSuite("JSR166 Unit Tests");
445 <
446 <        suite.addTest(new TestSuite(ForkJoinPoolTest.class));
447 <        suite.addTest(new TestSuite(ForkJoinTaskTest.class));
448 <        suite.addTest(new TestSuite(RecursiveActionTest.class));
449 <        suite.addTest(new TestSuite(RecursiveTaskTest.class));
450 <        suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
451 <        suite.addTest(new TestSuite(PhaserTest.class));
452 <        suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
453 <        suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
454 <        suite.addTest(new TestSuite(AbstractQueueTest.class));
455 <        suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
456 <        suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
457 <        suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
458 <        suite.addTest(new TestSuite(ArrayDequeTest.class));
459 <        suite.addTest(new TestSuite(AtomicBooleanTest.class));
460 <        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
461 <        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
462 <        suite.addTest(new TestSuite(AtomicIntegerTest.class));
463 <        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
464 <        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
465 <        suite.addTest(new TestSuite(AtomicLongTest.class));
466 <        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
467 <        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
468 <        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
469 <        suite.addTest(new TestSuite(AtomicReferenceTest.class));
470 <        suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
471 <        suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
472 <        suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
473 <        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
474 <        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
475 <        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
476 <        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
477 <        suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
478 <        suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
479 <        suite.addTest(new TestSuite(CountDownLatchTest.class));
480 <        suite.addTest(new TestSuite(CyclicBarrierTest.class));
481 <        suite.addTest(new TestSuite(DelayQueueTest.class));
482 <        suite.addTest(new TestSuite(EntryTest.class));
483 <        suite.addTest(new TestSuite(ExchangerTest.class));
484 <        suite.addTest(new TestSuite(ExecutorsTest.class));
485 <        suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
486 <        suite.addTest(new TestSuite(FutureTaskTest.class));
487 <        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
488 <        suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
489 <        suite.addTest(new TestSuite(LinkedListTest.class));
490 <        suite.addTest(new TestSuite(LockSupportTest.class));
491 <        suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
492 <        suite.addTest(new TestSuite(PriorityQueueTest.class));
493 <        suite.addTest(new TestSuite(ReentrantLockTest.class));
494 <        suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
495 <        suite.addTest(new TestSuite(ScheduledExecutorTest.class));
496 <        suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
497 <        suite.addTest(new TestSuite(SemaphoreTest.class));
498 <        suite.addTest(new TestSuite(SynchronousQueueTest.class));
499 <        suite.addTest(new TestSuite(SystemTest.class));
500 <        suite.addTest(new TestSuite(ThreadLocalTest.class));
501 <        suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
502 <        suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
503 <        suite.addTest(new TestSuite(ThreadTest.class));
504 <        suite.addTest(new TestSuite(TimeUnitTest.class));
505 <        suite.addTest(new TestSuite(TreeMapTest.class));
506 <        suite.addTest(new TestSuite(TreeSetTest.class));
507 <        suite.addTest(new TestSuite(TreeSubMapTest.class));
508 <        suite.addTest(new TestSuite(TreeSubSetTest.class));
444 >        // Java7+ test classes
445 >        TestSuite suite = newTestSuite(
446 >            ForkJoinPoolTest.suite(),
447 >            ForkJoinTaskTest.suite(),
448 >            RecursiveActionTest.suite(),
449 >            RecursiveTaskTest.suite(),
450 >            LinkedTransferQueueTest.suite(),
451 >            PhaserTest.suite(),
452 >            ThreadLocalRandomTest.suite(),
453 >            AbstractExecutorServiceTest.suite(),
454 >            AbstractQueueTest.suite(),
455 >            AbstractQueuedSynchronizerTest.suite(),
456 >            AbstractQueuedLongSynchronizerTest.suite(),
457 >            ArrayBlockingQueueTest.suite(),
458 >            ArrayDequeTest.suite(),
459 >            ArrayListTest.suite(),
460 >            AtomicBooleanTest.suite(),
461 >            AtomicIntegerArrayTest.suite(),
462 >            AtomicIntegerFieldUpdaterTest.suite(),
463 >            AtomicIntegerTest.suite(),
464 >            AtomicLongArrayTest.suite(),
465 >            AtomicLongFieldUpdaterTest.suite(),
466 >            AtomicLongTest.suite(),
467 >            AtomicMarkableReferenceTest.suite(),
468 >            AtomicReferenceArrayTest.suite(),
469 >            AtomicReferenceFieldUpdaterTest.suite(),
470 >            AtomicReferenceTest.suite(),
471 >            AtomicStampedReferenceTest.suite(),
472 >            ConcurrentHashMapTest.suite(),
473 >            ConcurrentLinkedDequeTest.suite(),
474 >            ConcurrentLinkedQueueTest.suite(),
475 >            ConcurrentSkipListMapTest.suite(),
476 >            ConcurrentSkipListSubMapTest.suite(),
477 >            ConcurrentSkipListSetTest.suite(),
478 >            ConcurrentSkipListSubSetTest.suite(),
479 >            CopyOnWriteArrayListTest.suite(),
480 >            CopyOnWriteArraySetTest.suite(),
481 >            CountDownLatchTest.suite(),
482 >            CountedCompleterTest.suite(),
483 >            CyclicBarrierTest.suite(),
484 >            DelayQueueTest.suite(),
485 >            EntryTest.suite(),
486 >            ExchangerTest.suite(),
487 >            ExecutorsTest.suite(),
488 >            ExecutorCompletionServiceTest.suite(),
489 >            FutureTaskTest.suite(),
490 >            LinkedBlockingDequeTest.suite(),
491 >            LinkedBlockingQueueTest.suite(),
492 >            LinkedListTest.suite(),
493 >            LockSupportTest.suite(),
494 >            PriorityBlockingQueueTest.suite(),
495 >            PriorityQueueTest.suite(),
496 >            ReentrantLockTest.suite(),
497 >            ReentrantReadWriteLockTest.suite(),
498 >            ScheduledExecutorTest.suite(),
499 >            ScheduledExecutorSubclassTest.suite(),
500 >            SemaphoreTest.suite(),
501 >            SynchronousQueueTest.suite(),
502 >            SystemTest.suite(),
503 >            ThreadLocalTest.suite(),
504 >            ThreadPoolExecutorTest.suite(),
505 >            ThreadPoolExecutorSubclassTest.suite(),
506 >            ThreadTest.suite(),
507 >            TimeUnitTest.suite(),
508 >            TreeMapTest.suite(),
509 >            TreeSetTest.suite(),
510 >            TreeSubMapTest.suite(),
511 >            TreeSubSetTest.suite(),
512 >            VectorTest.suite());
513 >
514 >        // Java8+ test classes
515 >        if (atLeastJava8()) {
516 >            String[] java8TestClassNames = {
517 >                "ArrayDeque8Test",
518 >                "Atomic8Test",
519 >                "CompletableFutureTest",
520 >                "ConcurrentHashMap8Test",
521 >                "CountedCompleter8Test",
522 >                "DoubleAccumulatorTest",
523 >                "DoubleAdderTest",
524 >                "ForkJoinPool8Test",
525 >                "ForkJoinTask8Test",
526 >                "LongAccumulatorTest",
527 >                "LongAdderTest",
528 >                "SplittableRandomTest",
529 >                "StampedLockTest",
530 >                "SubmissionPublisherTest",
531 >                "ThreadLocalRandom8Test",
532 >                "TimeUnit8Test",
533 >            };
534 >            addNamedTestClasses(suite, java8TestClassNames);
535 >        }
536 >
537 >        // Java9+ test classes
538 >        if (atLeastJava9()) {
539 >            String[] java9TestClassNames = {
540 >                "AtomicBoolean9Test",
541 >                "AtomicInteger9Test",
542 >                "AtomicIntegerArray9Test",
543 >                "AtomicLong9Test",
544 >                "AtomicLongArray9Test",
545 >                "AtomicReference9Test",
546 >                "AtomicReferenceArray9Test",
547 >                "ExecutorCompletionService9Test",
548 >            };
549 >            addNamedTestClasses(suite, java9TestClassNames);
550 >        }
551  
552          return suite;
553      }
554  
555 +    /** Returns list of junit-style test method names in given class. */
556 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
557 +        Method[] methods = testClass.getDeclaredMethods();
558 +        ArrayList<String> names = new ArrayList<String>(methods.length);
559 +        for (Method method : methods) {
560 +            if (method.getName().startsWith("test")
561 +                && Modifier.isPublic(method.getModifiers())
562 +                // method.getParameterCount() requires jdk8+
563 +                && method.getParameterTypes().length == 0) {
564 +                names.add(method.getName());
565 +            }
566 +        }
567 +        return names;
568 +    }
569 +
570 +    /**
571 +     * Returns junit-style testSuite for the given test class, but
572 +     * parameterized by passing extra data to each test.
573 +     */
574 +    public static <ExtraData> Test parameterizedTestSuite
575 +        (Class<? extends JSR166TestCase> testClass,
576 +         Class<ExtraData> dataClass,
577 +         ExtraData data) {
578 +        try {
579 +            TestSuite suite = new TestSuite();
580 +            Constructor c =
581 +                testClass.getDeclaredConstructor(dataClass, String.class);
582 +            for (String methodName : testMethodNames(testClass))
583 +                suite.addTest((Test) c.newInstance(data, methodName));
584 +            return suite;
585 +        } catch (Exception e) {
586 +            throw new Error(e);
587 +        }
588 +    }
589 +
590 +    /**
591 +     * Returns junit-style testSuite for the jdk8 extension of the
592 +     * given test class, but parameterized by passing extra data to
593 +     * each test.  Uses reflection to allow compilation in jdk7.
594 +     */
595 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
596 +        (Class<? extends JSR166TestCase> testClass,
597 +         Class<ExtraData> dataClass,
598 +         ExtraData data) {
599 +        if (atLeastJava8()) {
600 +            String name = testClass.getName();
601 +            String name8 = name.replaceAll("Test$", "8Test");
602 +            if (name.equals(name8)) throw new Error(name);
603 +            try {
604 +                return (Test)
605 +                    Class.forName(name8)
606 +                    .getMethod("testSuite", new Class[] { dataClass })
607 +                    .invoke(null, data);
608 +            } catch (Exception e) {
609 +                throw new Error(e);
610 +            }
611 +        } else {
612 +            return new TestSuite();
613 +        }
614 +    }
615 +
616 +    // Delays for timing-dependent tests, in milliseconds.
617  
618      public static long SHORT_DELAY_MS;
619      public static long SMALL_DELAY_MS;
620      public static long MEDIUM_DELAY_MS;
621      public static long LONG_DELAY_MS;
622  
185
623      /**
624 <     * Returns the shortest timed delay. This could
625 <     * be reimplemented to use for example a Property.
624 >     * Returns the shortest timed delay. This can be scaled up for
625 >     * slow machines using the jsr166.delay.factor system property,
626 >     * or via jtreg's -timeoutFactor: flag.
627 >     * http://openjdk.java.net/jtreg/command-help.html
628       */
629      protected long getShortDelay() {
630 <        return 50;
630 >        return (long) (50 * delayFactor);
631      }
632  
194
633      /**
634       * Sets delays as multiples of SHORT_DELAY.
635       */
636      protected void setDelays() {
637          SHORT_DELAY_MS = getShortDelay();
638 <        SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
638 >        SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
639          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
640 <        LONG_DELAY_MS = SHORT_DELAY_MS * 50;
640 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
641 >    }
642 >
643 >    /**
644 >     * Returns a timeout in milliseconds to be used in tests that
645 >     * verify that operations block or time out.
646 >     */
647 >    long timeoutMillis() {
648 >        return SHORT_DELAY_MS / 4;
649      }
650  
651      /**
652 <     * Flag set true if any threadAssert methods fail
652 >     * Returns a new Date instance representing a time at least
653 >     * delayMillis milliseconds in the future.
654       */
655 <    volatile boolean threadFailed;
655 >    Date delayedDate(long delayMillis) {
656 >        // Add 1 because currentTimeMillis is known to round into the past.
657 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
658 >    }
659  
660      /**
661 <     * Initializes test to indicate that no thread assertions have failed
661 >     * The first exception encountered if any threadAssertXXX method fails.
662       */
663 +    private final AtomicReference<Throwable> threadFailure
664 +        = new AtomicReference<Throwable>(null);
665 +
666 +    /**
667 +     * Records an exception so that it can be rethrown later in the test
668 +     * harness thread, triggering a test case failure.  Only the first
669 +     * failure is recorded; subsequent calls to this method from within
670 +     * the same test have no effect.
671 +     */
672 +    public void threadRecordFailure(Throwable t) {
673 +        System.err.println(t);
674 +        dumpTestThreads();
675 +        threadFailure.compareAndSet(null, t);
676 +    }
677 +
678      public void setUp() {
679          setDelays();
680 <        threadFailed = false;
680 >    }
681 >
682 >    void tearDownFail(String format, Object... args) {
683 >        String msg = toString() + ": " + String.format(format, args);
684 >        System.err.println(msg);
685 >        dumpTestThreads();
686 >        throw new AssertionFailedError(msg);
687      }
688  
689      /**
690 <     * Triggers test case failure if any thread assertions have failed
690 >     * Extra checks that get done for all test cases.
691 >     *
692 >     * Triggers test case failure if any thread assertions have failed,
693 >     * by rethrowing, in the test harness thread, any exception recorded
694 >     * earlier by threadRecordFailure.
695 >     *
696 >     * Triggers test case failure if interrupt status is set in the main thread.
697 >     */
698 >    public void tearDown() throws Exception {
699 >        Throwable t = threadFailure.getAndSet(null);
700 >        if (t != null) {
701 >            if (t instanceof Error)
702 >                throw (Error) t;
703 >            else if (t instanceof RuntimeException)
704 >                throw (RuntimeException) t;
705 >            else if (t instanceof Exception)
706 >                throw (Exception) t;
707 >            else {
708 >                AssertionFailedError afe =
709 >                    new AssertionFailedError(t.toString());
710 >                afe.initCause(t);
711 >                throw afe;
712 >            }
713 >        }
714 >
715 >        if (Thread.interrupted())
716 >            tearDownFail("interrupt status set in main thread");
717 >
718 >        checkForkJoinPoolThreadLeaks();
719 >    }
720 >
721 >    /**
722 >     * Finds missing PoolCleaners
723       */
724 <    public void tearDown() {
725 <        assertFalse(threadFailed);
724 >    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
725 >        Thread[] survivors = new Thread[7];
726 >        int count = Thread.enumerate(survivors);
727 >        for (int i = 0; i < count; i++) {
728 >            Thread thread = survivors[i];
729 >            String name = thread.getName();
730 >            if (name.startsWith("ForkJoinPool-")) {
731 >                // give thread some time to terminate
732 >                thread.join(LONG_DELAY_MS);
733 >                if (thread.isAlive())
734 >                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
735 >                                 thread);
736 >            }
737 >        }
738 >
739 >        if (!ForkJoinPool.commonPool()
740 >            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
741 >            tearDownFail("ForkJoin common pool thread stuck");
742      }
743  
744      /**
745 <     * Fail, also setting status to indicate current testcase should fail
745 >     * Just like fail(reason), but additionally recording (using
746 >     * threadRecordFailure) any AssertionFailedError thrown, so that
747 >     * the current testcase will fail.
748       */
749      public void threadFail(String reason) {
750 <        threadFailed = true;
751 <        fail(reason);
750 >        try {
751 >            fail(reason);
752 >        } catch (AssertionFailedError t) {
753 >            threadRecordFailure(t);
754 >            throw t;
755 >        }
756      }
757  
758      /**
759 <     * If expression not true, set status to indicate current testcase
760 <     * should fail
759 >     * Just like assertTrue(b), but additionally recording (using
760 >     * threadRecordFailure) any AssertionFailedError thrown, so that
761 >     * the current testcase will fail.
762       */
763      public void threadAssertTrue(boolean b) {
764 <        if (!b) {
239 <            threadFailed = true;
764 >        try {
765              assertTrue(b);
766 +        } catch (AssertionFailedError t) {
767 +            threadRecordFailure(t);
768 +            throw t;
769          }
770      }
771  
772      /**
773 <     * If expression not false, set status to indicate current testcase
774 <     * should fail
773 >     * Just like assertFalse(b), but additionally recording (using
774 >     * threadRecordFailure) any AssertionFailedError thrown, so that
775 >     * the current testcase will fail.
776       */
777      public void threadAssertFalse(boolean b) {
778 <        if (b) {
250 <            threadFailed = true;
778 >        try {
779              assertFalse(b);
780 +        } catch (AssertionFailedError t) {
781 +            threadRecordFailure(t);
782 +            throw t;
783          }
784      }
785  
786      /**
787 <     * If argument not null, set status to indicate current testcase
788 <     * should fail
787 >     * Just like assertNull(x), but additionally recording (using
788 >     * threadRecordFailure) any AssertionFailedError thrown, so that
789 >     * the current testcase will fail.
790       */
791      public void threadAssertNull(Object x) {
792 <        if (x != null) {
261 <            threadFailed = true;
792 >        try {
793              assertNull(x);
794 +        } catch (AssertionFailedError t) {
795 +            threadRecordFailure(t);
796 +            throw t;
797          }
798      }
799  
800      /**
801 <     * If arguments not equal, set status to indicate current testcase
802 <     * should fail
801 >     * Just like assertEquals(x, y), but additionally recording (using
802 >     * threadRecordFailure) any AssertionFailedError thrown, so that
803 >     * the current testcase will fail.
804       */
805      public void threadAssertEquals(long x, long y) {
806 <        if (x != y) {
272 <            threadFailed = true;
806 >        try {
807              assertEquals(x, y);
808 +        } catch (AssertionFailedError t) {
809 +            threadRecordFailure(t);
810 +            throw t;
811          }
812      }
813  
814      /**
815 <     * If arguments not equal, set status to indicate current testcase
816 <     * should fail
815 >     * Just like assertEquals(x, y), but additionally recording (using
816 >     * threadRecordFailure) any AssertionFailedError thrown, so that
817 >     * the current testcase will fail.
818       */
819      public void threadAssertEquals(Object x, Object y) {
820 <        if (x != y && (x == null || !x.equals(y))) {
283 <            threadFailed = true;
820 >        try {
821              assertEquals(x, y);
822 +        } catch (AssertionFailedError fail) {
823 +            threadRecordFailure(fail);
824 +            throw fail;
825 +        } catch (Throwable fail) {
826 +            threadUnexpectedException(fail);
827 +        }
828 +    }
829 +
830 +    /**
831 +     * Just like assertSame(x, y), but additionally recording (using
832 +     * threadRecordFailure) any AssertionFailedError thrown, so that
833 +     * the current testcase will fail.
834 +     */
835 +    public void threadAssertSame(Object x, Object y) {
836 +        try {
837 +            assertSame(x, y);
838 +        } catch (AssertionFailedError fail) {
839 +            threadRecordFailure(fail);
840 +            throw fail;
841          }
842      }
843  
844      /**
845 <     * threadFail with message "should throw exception"
845 >     * Calls threadFail with message "should throw exception".
846       */
847      public void threadShouldThrow() {
848 <        threadFailed = true;
293 <        fail("should throw exception");
848 >        threadFail("should throw exception");
849      }
850  
851      /**
852 <     * threadFail with message "should throw" + exceptionName
852 >     * Calls threadFail with message "should throw" + exceptionName.
853       */
854      public void threadShouldThrow(String exceptionName) {
855 <        threadFailed = true;
856 <        fail("should throw " + exceptionName);
855 >        threadFail("should throw " + exceptionName);
856 >    }
857 >
858 >    /**
859 >     * Records the given exception using {@link #threadRecordFailure},
860 >     * then rethrows the exception, wrapping it in an
861 >     * AssertionFailedError if necessary.
862 >     */
863 >    public void threadUnexpectedException(Throwable t) {
864 >        threadRecordFailure(t);
865 >        t.printStackTrace();
866 >        if (t instanceof RuntimeException)
867 >            throw (RuntimeException) t;
868 >        else if (t instanceof Error)
869 >            throw (Error) t;
870 >        else {
871 >            AssertionFailedError afe =
872 >                new AssertionFailedError("unexpected exception: " + t);
873 >            afe.initCause(t);
874 >            throw afe;
875 >        }
876 >    }
877 >
878 >    /**
879 >     * Delays, via Thread.sleep, for the given millisecond delay, but
880 >     * if the sleep is shorter than specified, may re-sleep or yield
881 >     * until time elapses.  Ensures that the given time, as measured
882 >     * by System.nanoTime(), has elapsed.
883 >     */
884 >    static void delay(long millis) throws InterruptedException {
885 >        long nanos = millis * (1000 * 1000);
886 >        final long wakeupTime = System.nanoTime() + nanos;
887 >        do {
888 >            if (millis > 0L)
889 >                Thread.sleep(millis);
890 >            else // too short to sleep
891 >                Thread.yield();
892 >            nanos = wakeupTime - System.nanoTime();
893 >            millis = nanos / (1000 * 1000);
894 >        } while (nanos >= 0L);
895      }
896  
897      /**
898 <     * threadFail with message "Unexpected exception"
898 >     * Allows use of try-with-resources with per-test thread pools.
899       */
900 <    public void threadUnexpectedException() {
901 <        threadFailed = true;
902 <        fail("Unexpected exception");
900 >    class PoolCleaner implements AutoCloseable {
901 >        private final ExecutorService pool;
902 >        public PoolCleaner(ExecutorService pool) { this.pool = pool; }
903 >        public void close() { joinPool(pool); }
904      }
905  
906      /**
907 <     * threadFail with message "Unexpected exception", with argument
907 >     * An extension of PoolCleaner that has an action to release the pool.
908       */
909 <    public void threadUnexpectedException(Throwable ex) {
910 <        threadFailed = true;
911 <        ex.printStackTrace();
912 <        fail("Unexpected exception: " + ex);
909 >    class PoolCleanerWithReleaser extends PoolCleaner {
910 >        private final Runnable releaser;
911 >        public PoolCleanerWithReleaser(ExecutorService pool, Runnable releaser) {
912 >            super(pool);
913 >            this.releaser = releaser;
914 >        }
915 >        public void close() {
916 >            try {
917 >                releaser.run();
918 >            } finally {
919 >                super.close();
920 >            }
921 >        }
922 >    }
923 >
924 >    PoolCleaner cleaner(ExecutorService pool) {
925 >        return new PoolCleaner(pool);
926 >    }
927 >
928 >    PoolCleaner cleaner(ExecutorService pool, Runnable releaser) {
929 >        return new PoolCleanerWithReleaser(pool, releaser);
930 >    }
931 >
932 >    PoolCleaner cleaner(ExecutorService pool, CountDownLatch latch) {
933 >        return new PoolCleanerWithReleaser(pool, releaser(latch));
934 >    }
935 >
936 >    Runnable releaser(final CountDownLatch latch) {
937 >        return new Runnable() { public void run() {
938 >            do { latch.countDown(); }
939 >            while (latch.getCount() > 0);
940 >        }};
941 >    }
942 >
943 >    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
944 >        return new PoolCleanerWithReleaser(pool, releaser(flag));
945 >    }
946 >
947 >    Runnable releaser(final AtomicBoolean flag) {
948 >        return new Runnable() { public void run() { flag.set(true); }};
949      }
950  
951      /**
952 <     * Wait out termination of a thread pool or fail doing so
952 >     * Waits out termination of a thread pool or fails doing so.
953       */
954 <    public void joinPool(ExecutorService exec) {
954 >    void joinPool(ExecutorService pool) {
955          try {
956 <            exec.shutdown();
957 <            assertTrue(exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
956 >            pool.shutdown();
957 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS)) {
958 >                try {
959 >                    threadFail("ExecutorService " + pool +
960 >                               " did not terminate in a timely manner");
961 >                } finally {
962 >                    // last resort, for the benefit of subsequent tests
963 >                    pool.shutdownNow();
964 >                    pool.awaitTermination(MEDIUM_DELAY_MS, MILLISECONDS);
965 >                }
966 >            }
967          } catch (SecurityException ok) {
968              // Allowed in case test doesn't have privs
969 <        } catch (InterruptedException ie) {
970 <            fail("Unexpected InterruptedException");
969 >        } catch (InterruptedException fail) {
970 >            threadFail("Unexpected InterruptedException");
971          }
972      }
973  
974 +    /**
975 +     * Like Runnable, but with the freedom to throw anything.
976 +     * junit folks had the same idea:
977 +     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
978 +     */
979 +    interface Action { public void run() throws Throwable; }
980  
981      /**
982 <     * fail with message "should throw exception"
982 >     * Runs all the given actions in parallel, failing if any fail.
983 >     * Useful for running multiple variants of tests that are
984 >     * necessarily individually slow because they must block.
985       */
986 <    public void shouldThrow() {
987 <        fail("Should throw exception");
986 >    void testInParallel(Action ... actions) {
987 >        ExecutorService pool = Executors.newCachedThreadPool();
988 >        try (PoolCleaner cleaner = cleaner(pool)) {
989 >            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
990 >            for (final Action action : actions)
991 >                futures.add(pool.submit(new CheckedRunnable() {
992 >                    public void realRun() throws Throwable { action.run();}}));
993 >            for (Future<?> future : futures)
994 >                try {
995 >                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
996 >                } catch (ExecutionException ex) {
997 >                    threadUnexpectedException(ex.getCause());
998 >                } catch (Exception ex) {
999 >                    threadUnexpectedException(ex);
1000 >                }
1001 >        }
1002      }
1003  
1004      /**
1005 <     * fail with message "should throw " + exceptionName
1005 >     * A debugging tool to print stack traces of most threads, as jstack does.
1006 >     * Uninteresting threads are filtered out.
1007       */
1008 <    public void shouldThrow(String exceptionName) {
1009 <        fail("Should throw " + exceptionName);
1008 >    static void dumpTestThreads() {
1009 >        SecurityManager sm = System.getSecurityManager();
1010 >        if (sm != null) {
1011 >            try {
1012 >                System.setSecurityManager(null);
1013 >            } catch (SecurityException giveUp) {
1014 >                return;
1015 >            }
1016 >        }
1017 >
1018 >        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1019 >        System.err.println("------ stacktrace dump start ------");
1020 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1021 >            final String name = info.getThreadName();
1022 >            String lockName;
1023 >            if ("Signal Dispatcher".equals(name))
1024 >                continue;
1025 >            if ("Reference Handler".equals(name)
1026 >                && (lockName = info.getLockName()) != null
1027 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1028 >                continue;
1029 >            if ("Finalizer".equals(name)
1030 >                && (lockName = info.getLockName()) != null
1031 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1032 >                continue;
1033 >            if ("checkForWedgedTest".equals(name))
1034 >                continue;
1035 >            System.err.print(info);
1036 >        }
1037 >        System.err.println("------ stacktrace dump end ------");
1038 >
1039 >        if (sm != null) System.setSecurityManager(sm);
1040      }
1041  
1042      /**
1043 <     * fail with message "Unexpected exception"
1043 >     * Checks that thread does not terminate within the default
1044 >     * millisecond delay of {@code timeoutMillis()}.
1045       */
1046 <    public void unexpectedException() {
1047 <        fail("Unexpected exception");
1046 >    void assertThreadStaysAlive(Thread thread) {
1047 >        assertThreadStaysAlive(thread, timeoutMillis());
1048      }
1049  
1050      /**
1051 <     * fail with message "Unexpected exception", with argument
1051 >     * Checks that thread does not terminate within the given millisecond delay.
1052       */
1053 <    public void unexpectedException(Throwable ex) {
1054 <        ex.printStackTrace();
1055 <        fail("Unexpected exception: " + ex);
1053 >    void assertThreadStaysAlive(Thread thread, long millis) {
1054 >        try {
1055 >            // No need to optimize the failing case via Thread.join.
1056 >            delay(millis);
1057 >            assertTrue(thread.isAlive());
1058 >        } catch (InterruptedException fail) {
1059 >            threadFail("Unexpected InterruptedException");
1060 >        }
1061 >    }
1062 >
1063 >    /**
1064 >     * Checks that the threads do not terminate within the default
1065 >     * millisecond delay of {@code timeoutMillis()}.
1066 >     */
1067 >    void assertThreadsStayAlive(Thread... threads) {
1068 >        assertThreadsStayAlive(timeoutMillis(), threads);
1069 >    }
1070 >
1071 >    /**
1072 >     * Checks that the threads do not terminate within the given millisecond delay.
1073 >     */
1074 >    void assertThreadsStayAlive(long millis, Thread... threads) {
1075 >        try {
1076 >            // No need to optimize the failing case via Thread.join.
1077 >            delay(millis);
1078 >            for (Thread thread : threads)
1079 >                assertTrue(thread.isAlive());
1080 >        } catch (InterruptedException fail) {
1081 >            threadFail("Unexpected InterruptedException");
1082 >        }
1083      }
1084  
1085 +    /**
1086 +     * Checks that future.get times out, with the default timeout of
1087 +     * {@code timeoutMillis()}.
1088 +     */
1089 +    void assertFutureTimesOut(Future future) {
1090 +        assertFutureTimesOut(future, timeoutMillis());
1091 +    }
1092 +
1093 +    /**
1094 +     * Checks that future.get times out, with the given millisecond timeout.
1095 +     */
1096 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
1097 +        long startTime = System.nanoTime();
1098 +        try {
1099 +            future.get(timeoutMillis, MILLISECONDS);
1100 +            shouldThrow();
1101 +        } catch (TimeoutException success) {
1102 +        } catch (Exception fail) {
1103 +            threadUnexpectedException(fail);
1104 +        } finally { future.cancel(true); }
1105 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
1106 +    }
1107 +
1108 +    /**
1109 +     * Fails with message "should throw exception".
1110 +     */
1111 +    public void shouldThrow() {
1112 +        fail("Should throw exception");
1113 +    }
1114 +
1115 +    /**
1116 +     * Fails with message "should throw " + exceptionName.
1117 +     */
1118 +    public void shouldThrow(String exceptionName) {
1119 +        fail("Should throw " + exceptionName);
1120 +    }
1121  
1122      /**
1123       * The number of elements to place in collections, arrays, etc.
# Line 388 | Line 1144 | public class JSR166TestCase extends Test
1144      public static final Integer m6  = new Integer(-6);
1145      public static final Integer m10 = new Integer(-10);
1146  
1147 +    /**
1148 +     * Runs Runnable r with a security policy that permits precisely
1149 +     * the specified permissions.  If there is no current security
1150 +     * manager, the runnable is run twice, both with and without a
1151 +     * security manager.  We require that any security manager permit
1152 +     * getPolicy/setPolicy.
1153 +     */
1154 +    public void runWithPermissions(Runnable r, Permission... permissions) {
1155 +        SecurityManager sm = System.getSecurityManager();
1156 +        if (sm == null) {
1157 +            r.run();
1158 +        }
1159 +        runWithSecurityManagerWithPermissions(r, permissions);
1160 +    }
1161 +
1162 +    /**
1163 +     * Runs Runnable r with a security policy that permits precisely
1164 +     * the specified permissions.  If there is no current security
1165 +     * manager, a temporary one is set for the duration of the
1166 +     * Runnable.  We require that any security manager permit
1167 +     * getPolicy/setPolicy.
1168 +     */
1169 +    public void runWithSecurityManagerWithPermissions(Runnable r,
1170 +                                                      Permission... permissions) {
1171 +        SecurityManager sm = System.getSecurityManager();
1172 +        if (sm == null) {
1173 +            Policy savedPolicy = Policy.getPolicy();
1174 +            try {
1175 +                Policy.setPolicy(permissivePolicy());
1176 +                System.setSecurityManager(new SecurityManager());
1177 +                runWithSecurityManagerWithPermissions(r, permissions);
1178 +            } finally {
1179 +                System.setSecurityManager(null);
1180 +                Policy.setPolicy(savedPolicy);
1181 +            }
1182 +        } else {
1183 +            Policy savedPolicy = Policy.getPolicy();
1184 +            AdjustablePolicy policy = new AdjustablePolicy(permissions);
1185 +            Policy.setPolicy(policy);
1186 +
1187 +            try {
1188 +                r.run();
1189 +            } finally {
1190 +                policy.addPermission(new SecurityPermission("setPolicy"));
1191 +                Policy.setPolicy(savedPolicy);
1192 +            }
1193 +        }
1194 +    }
1195 +
1196 +    /**
1197 +     * Runs a runnable without any permissions.
1198 +     */
1199 +    public void runWithoutPermissions(Runnable r) {
1200 +        runWithPermissions(r);
1201 +    }
1202  
1203      /**
1204       * A security policy where new permissions can be dynamically added
# Line 395 | Line 1206 | public class JSR166TestCase extends Test
1206       */
1207      public static class AdjustablePolicy extends java.security.Policy {
1208          Permissions perms = new Permissions();
1209 <        AdjustablePolicy() { }
1209 >        AdjustablePolicy(Permission... permissions) {
1210 >            for (Permission permission : permissions)
1211 >                perms.add(permission);
1212 >        }
1213          void addPermission(Permission perm) { perms.add(perm); }
1214          void clearPermissions() { perms = new Permissions(); }
1215          public PermissionCollection getPermissions(CodeSource cs) {
# Line 408 | Line 1222 | public class JSR166TestCase extends Test
1222              return perms.implies(p);
1223          }
1224          public void refresh() {}
1225 +        public String toString() {
1226 +            List<Permission> ps = new ArrayList<Permission>();
1227 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1228 +                ps.add(e.nextElement());
1229 +            return "AdjustablePolicy with permissions " + ps;
1230 +        }
1231 +    }
1232 +
1233 +    /**
1234 +     * Returns a policy containing all the permissions we ever need.
1235 +     */
1236 +    public static Policy permissivePolicy() {
1237 +        return new AdjustablePolicy
1238 +            // Permissions j.u.c. needs directly
1239 +            (new RuntimePermission("modifyThread"),
1240 +             new RuntimePermission("getClassLoader"),
1241 +             new RuntimePermission("setContextClassLoader"),
1242 +             // Permissions needed to change permissions!
1243 +             new SecurityPermission("getPolicy"),
1244 +             new SecurityPermission("setPolicy"),
1245 +             new RuntimePermission("setSecurityManager"),
1246 +             // Permissions needed by the junit test harness
1247 +             new RuntimePermission("accessDeclaredMembers"),
1248 +             new PropertyPermission("*", "read"),
1249 +             new java.io.FilePermission("<<ALL FILES>>", "read"));
1250 +    }
1251 +
1252 +    /**
1253 +     * Sleeps until the given time has elapsed.
1254 +     * Throws AssertionFailedError if interrupted.
1255 +     */
1256 +    static void sleep(long millis) {
1257 +        try {
1258 +            delay(millis);
1259 +        } catch (InterruptedException fail) {
1260 +            AssertionFailedError afe =
1261 +                new AssertionFailedError("Unexpected InterruptedException");
1262 +            afe.initCause(fail);
1263 +            throw afe;
1264 +        }
1265 +    }
1266 +
1267 +    /**
1268 +     * Spin-waits up to the specified number of milliseconds for the given
1269 +     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1270 +     */
1271 +    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1272 +        long startTime = 0L;
1273 +        for (;;) {
1274 +            Thread.State s = thread.getState();
1275 +            if (s == Thread.State.BLOCKED ||
1276 +                s == Thread.State.WAITING ||
1277 +                s == Thread.State.TIMED_WAITING)
1278 +                return;
1279 +            else if (s == Thread.State.TERMINATED)
1280 +                fail("Unexpected thread termination");
1281 +            else if (startTime == 0L)
1282 +                startTime = System.nanoTime();
1283 +            else if (millisElapsedSince(startTime) > timeoutMillis) {
1284 +                threadAssertTrue(thread.isAlive());
1285 +                return;
1286 +            }
1287 +            Thread.yield();
1288 +        }
1289 +    }
1290 +
1291 +    /**
1292 +     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1293 +     * state: BLOCKED, WAITING, or TIMED_WAITING.
1294 +     */
1295 +    void waitForThreadToEnterWaitState(Thread thread) {
1296 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1297      }
1298  
1299      /**
1300 <     * Sleep until the timeout has elapsed, or interrupted.
1301 <     * Does <em>NOT</em> throw InterruptedException.
1300 >     * Returns the number of milliseconds since time given by
1301 >     * startNanoTime, which must have been previously returned from a
1302 >     * call to {@link System#nanoTime()}.
1303       */
1304 <    void sleepTillInterrupted(long timeoutMillis) {
1304 >    static long millisElapsedSince(long startNanoTime) {
1305 >        return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1306 >    }
1307 >
1308 > //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1309 > //         long startTime = System.nanoTime();
1310 > //         try {
1311 > //             r.run();
1312 > //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1313 > //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1314 > //             throw new AssertionFailedError("did not return promptly");
1315 > //     }
1316 >
1317 > //     void assertTerminatesPromptly(Runnable r) {
1318 > //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1319 > //     }
1320 >
1321 >    /**
1322 >     * Checks that timed f.get() returns the expected value, and does not
1323 >     * wait for the timeout to elapse before returning.
1324 >     */
1325 >    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1326 >        long startTime = System.nanoTime();
1327          try {
1328 <            Thread.sleep(timeoutMillis);
1329 <        } catch (InterruptedException wakeup) {}
1328 >            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1329 >        } catch (Throwable fail) { threadUnexpectedException(fail); }
1330 >        if (millisElapsedSince(startTime) > timeoutMillis/2)
1331 >            throw new AssertionFailedError("timed get did not return promptly");
1332 >    }
1333 >
1334 >    <T> void checkTimedGet(Future<T> f, T expectedValue) {
1335 >        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1336      }
1337  
1338      /**
1339 <     * Returns a new started Thread running the given runnable.
1339 >     * Returns a new started daemon Thread running the given runnable.
1340       */
1341      Thread newStartedThread(Runnable runnable) {
1342          Thread t = new Thread(runnable);
1343 +        t.setDaemon(true);
1344          t.start();
1345          return t;
1346      }
1347  
1348 +    /**
1349 +     * Waits for the specified time (in milliseconds) for the thread
1350 +     * to terminate (using {@link Thread#join(long)}), else interrupts
1351 +     * the thread (in the hope that it may terminate later) and fails.
1352 +     */
1353 +    void awaitTermination(Thread t, long timeoutMillis) {
1354 +        try {
1355 +            t.join(timeoutMillis);
1356 +        } catch (InterruptedException fail) {
1357 +            threadUnexpectedException(fail);
1358 +        } finally {
1359 +            if (t.getState() != Thread.State.TERMINATED) {
1360 +                t.interrupt();
1361 +                threadFail("timed out waiting for thread to terminate");
1362 +            }
1363 +        }
1364 +    }
1365 +
1366 +    /**
1367 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
1368 +     * terminate (using {@link Thread#join(long)}), else interrupts
1369 +     * the thread (in the hope that it may terminate later) and fails.
1370 +     */
1371 +    void awaitTermination(Thread t) {
1372 +        awaitTermination(t, LONG_DELAY_MS);
1373 +    }
1374 +
1375      // Some convenient Runnable classes
1376  
1377      public abstract class CheckedRunnable implements Runnable {
# Line 437 | Line 1380 | public class JSR166TestCase extends Test
1380          public final void run() {
1381              try {
1382                  realRun();
1383 <            } catch (Throwable t) {
1384 <                threadUnexpectedException(t);
1383 >            } catch (Throwable fail) {
1384 >                threadUnexpectedException(fail);
1385              }
1386          }
1387      }
# Line 491 | Line 1434 | public class JSR166TestCase extends Test
1434                  realRun();
1435                  threadShouldThrow("InterruptedException");
1436              } catch (InterruptedException success) {
1437 <            } catch (Throwable t) {
1438 <                threadUnexpectedException(t);
1437 >                threadAssertFalse(Thread.interrupted());
1438 >            } catch (Throwable fail) {
1439 >                threadUnexpectedException(fail);
1440              }
1441          }
1442      }
# Line 503 | Line 1447 | public class JSR166TestCase extends Test
1447          public final T call() {
1448              try {
1449                  return realCall();
1450 <            } catch (Throwable t) {
1451 <                threadUnexpectedException(t);
1450 >            } catch (Throwable fail) {
1451 >                threadUnexpectedException(fail);
1452 >                return null;
1453              }
509            return null;
1454          }
1455      }
1456  
1457 <    public abstract class CheckedInterruptedCallable<T> implements Callable<T> {
1457 >    public abstract class CheckedInterruptedCallable<T>
1458 >        implements Callable<T> {
1459          protected abstract T realCall() throws Throwable;
1460  
1461          public final T call() {
# Line 519 | Line 1464 | public class JSR166TestCase extends Test
1464                  threadShouldThrow("InterruptedException");
1465                  return result;
1466              } catch (InterruptedException success) {
1467 <            } catch (Throwable t) {
1468 <                threadUnexpectedException(t);
1467 >                threadAssertFalse(Thread.interrupted());
1468 >            } catch (Throwable fail) {
1469 >                threadUnexpectedException(fail);
1470              }
1471              return null;
1472          }
# Line 537 | Line 1483 | public class JSR166TestCase extends Test
1483      public static final String TEST_STRING = "a test string";
1484  
1485      public static class StringTask implements Callable<String> {
1486 <        public String call() { return TEST_STRING; }
1486 >        final String value;
1487 >        public StringTask() { this(TEST_STRING); }
1488 >        public StringTask(String value) { this.value = value; }
1489 >        public String call() { return value; }
1490      }
1491  
1492      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
1493          return new CheckedCallable<String>() {
1494 <            public String realCall() {
1494 >            protected String realCall() {
1495                  try {
1496                      latch.await();
1497                  } catch (InterruptedException quittingTime) {}
# Line 550 | Line 1499 | public class JSR166TestCase extends Test
1499              }};
1500      }
1501  
1502 +    public Runnable countDowner(final CountDownLatch latch) {
1503 +        return new CheckedRunnable() {
1504 +            public void realRun() throws InterruptedException {
1505 +                latch.countDown();
1506 +            }};
1507 +    }
1508 +
1509 +    class LatchAwaiter extends CheckedRunnable {
1510 +        static final int NEW = 0;
1511 +        static final int RUNNING = 1;
1512 +        static final int DONE = 2;
1513 +        final CountDownLatch latch;
1514 +        int state = NEW;
1515 +        LatchAwaiter(CountDownLatch latch) { this.latch = latch; }
1516 +        public void realRun() throws InterruptedException {
1517 +            state = 1;
1518 +            await(latch);
1519 +            state = 2;
1520 +        }
1521 +    }
1522 +
1523 +    public LatchAwaiter awaiter(CountDownLatch latch) {
1524 +        return new LatchAwaiter(latch);
1525 +    }
1526 +
1527 +    public void await(CountDownLatch latch, long timeoutMillis) {
1528 +        try {
1529 +            if (!latch.await(timeoutMillis, MILLISECONDS))
1530 +                fail("timed out waiting for CountDownLatch for "
1531 +                     + (timeoutMillis/1000) + " sec");
1532 +        } catch (Throwable fail) {
1533 +            threadUnexpectedException(fail);
1534 +        }
1535 +    }
1536 +
1537 +    public void await(CountDownLatch latch) {
1538 +        await(latch, LONG_DELAY_MS);
1539 +    }
1540 +
1541 +    public void await(Semaphore semaphore) {
1542 +        try {
1543 +            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1544 +                fail("timed out waiting for Semaphore for "
1545 +                     + (LONG_DELAY_MS/1000) + " sec");
1546 +        } catch (Throwable fail) {
1547 +            threadUnexpectedException(fail);
1548 +        }
1549 +    }
1550 +
1551 + //     /**
1552 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1553 + //      */
1554 + //     public void await(AtomicBoolean flag) {
1555 + //         await(flag, LONG_DELAY_MS);
1556 + //     }
1557 +
1558 + //     /**
1559 + //      * Spin-waits up to the specified timeout until flag becomes true.
1560 + //      */
1561 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
1562 + //         long startTime = System.nanoTime();
1563 + //         while (!flag.get()) {
1564 + //             if (millisElapsedSince(startTime) > timeoutMillis)
1565 + //                 throw new AssertionFailedError("timed out");
1566 + //             Thread.yield();
1567 + //         }
1568 + //     }
1569 +
1570      public static class NPETask implements Callable<String> {
1571          public String call() { throw new NullPointerException(); }
1572      }
# Line 560 | Line 1577 | public class JSR166TestCase extends Test
1577  
1578      public class ShortRunnable extends CheckedRunnable {
1579          protected void realRun() throws Throwable {
1580 <            Thread.sleep(SHORT_DELAY_MS);
1580 >            delay(SHORT_DELAY_MS);
1581          }
1582      }
1583  
1584      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1585          protected void realRun() throws InterruptedException {
1586 <            Thread.sleep(SHORT_DELAY_MS);
1586 >            delay(SHORT_DELAY_MS);
1587          }
1588      }
1589  
1590      public class SmallRunnable extends CheckedRunnable {
1591          protected void realRun() throws Throwable {
1592 <            Thread.sleep(SMALL_DELAY_MS);
1592 >            delay(SMALL_DELAY_MS);
1593          }
1594      }
1595  
1596      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1597          protected void realRun() {
1598              try {
1599 <                Thread.sleep(SMALL_DELAY_MS);
1599 >                delay(SMALL_DELAY_MS);
1600              } catch (InterruptedException ok) {}
1601          }
1602      }
1603  
1604      public class SmallCallable extends CheckedCallable {
1605          protected Object realCall() throws InterruptedException {
1606 <            Thread.sleep(SMALL_DELAY_MS);
1606 >            delay(SMALL_DELAY_MS);
1607              return Boolean.TRUE;
1608          }
1609      }
1610  
594    public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
595        protected void realRun() throws InterruptedException {
596            Thread.sleep(SMALL_DELAY_MS);
597        }
598    }
599
1611      public class MediumRunnable extends CheckedRunnable {
1612          protected void realRun() throws Throwable {
1613 <            Thread.sleep(MEDIUM_DELAY_MS);
1613 >            delay(MEDIUM_DELAY_MS);
1614          }
1615      }
1616  
1617      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1618          protected void realRun() throws InterruptedException {
1619 <            Thread.sleep(MEDIUM_DELAY_MS);
1619 >            delay(MEDIUM_DELAY_MS);
1620          }
1621      }
1622  
1623 +    public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1624 +        return new CheckedRunnable() {
1625 +            protected void realRun() {
1626 +                try {
1627 +                    delay(timeoutMillis);
1628 +                } catch (InterruptedException ok) {}
1629 +            }};
1630 +    }
1631 +
1632      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1633          protected void realRun() {
1634              try {
1635 <                Thread.sleep(MEDIUM_DELAY_MS);
1635 >                delay(MEDIUM_DELAY_MS);
1636              } catch (InterruptedException ok) {}
1637          }
1638      }
# Line 620 | Line 1640 | public class JSR166TestCase extends Test
1640      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1641          protected void realRun() {
1642              try {
1643 <                Thread.sleep(LONG_DELAY_MS);
1643 >                delay(LONG_DELAY_MS);
1644              } catch (InterruptedException ok) {}
1645          }
1646      }
# Line 634 | Line 1654 | public class JSR166TestCase extends Test
1654          }
1655      }
1656  
1657 +    public interface TrackedRunnable extends Runnable {
1658 +        boolean isDone();
1659 +    }
1660 +
1661 +    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1662 +        return new TrackedRunnable() {
1663 +                private volatile boolean done = false;
1664 +                public boolean isDone() { return done; }
1665 +                public void run() {
1666 +                    try {
1667 +                        delay(timeoutMillis);
1668 +                        done = true;
1669 +                    } catch (InterruptedException ok) {}
1670 +                }
1671 +            };
1672 +    }
1673 +
1674      public static class TrackedShortRunnable implements Runnable {
1675          public volatile boolean done = false;
1676          public void run() {
1677              try {
1678 <                Thread.sleep(SMALL_DELAY_MS);
1678 >                delay(SHORT_DELAY_MS);
1679 >                done = true;
1680 >            } catch (InterruptedException ok) {}
1681 >        }
1682 >    }
1683 >
1684 >    public static class TrackedSmallRunnable implements Runnable {
1685 >        public volatile boolean done = false;
1686 >        public void run() {
1687 >            try {
1688 >                delay(SMALL_DELAY_MS);
1689                  done = true;
1690              } catch (InterruptedException ok) {}
1691          }
# Line 648 | Line 1695 | public class JSR166TestCase extends Test
1695          public volatile boolean done = false;
1696          public void run() {
1697              try {
1698 <                Thread.sleep(MEDIUM_DELAY_MS);
1698 >                delay(MEDIUM_DELAY_MS);
1699                  done = true;
1700              } catch (InterruptedException ok) {}
1701          }
# Line 658 | Line 1705 | public class JSR166TestCase extends Test
1705          public volatile boolean done = false;
1706          public void run() {
1707              try {
1708 <                Thread.sleep(LONG_DELAY_MS);
1708 >                delay(LONG_DELAY_MS);
1709                  done = true;
1710              } catch (InterruptedException ok) {}
1711          }
# Line 675 | Line 1722 | public class JSR166TestCase extends Test
1722          public volatile boolean done = false;
1723          public Object call() {
1724              try {
1725 <                Thread.sleep(SMALL_DELAY_MS);
1725 >                delay(SMALL_DELAY_MS);
1726                  done = true;
1727              } catch (InterruptedException ok) {}
1728              return Boolean.TRUE;
1729          }
1730      }
1731  
1732 +    /**
1733 +     * Analog of CheckedRunnable for RecursiveAction
1734 +     */
1735 +    public abstract class CheckedRecursiveAction extends RecursiveAction {
1736 +        protected abstract void realCompute() throws Throwable;
1737 +
1738 +        @Override protected final void compute() {
1739 +            try {
1740 +                realCompute();
1741 +            } catch (Throwable fail) {
1742 +                threadUnexpectedException(fail);
1743 +            }
1744 +        }
1745 +    }
1746 +
1747 +    /**
1748 +     * Analog of CheckedCallable for RecursiveTask
1749 +     */
1750 +    public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1751 +        protected abstract T realCompute() throws Throwable;
1752 +
1753 +        @Override protected final T compute() {
1754 +            try {
1755 +                return realCompute();
1756 +            } catch (Throwable fail) {
1757 +                threadUnexpectedException(fail);
1758 +                return null;
1759 +            }
1760 +        }
1761 +    }
1762  
1763      /**
1764       * For use as RejectedExecutionHandler in constructors
# Line 691 | Line 1768 | public class JSR166TestCase extends Test
1768                                        ThreadPoolExecutor executor) {}
1769      }
1770  
1771 +    /**
1772 +     * A CyclicBarrier that uses timed await and fails with
1773 +     * AssertionFailedErrors instead of throwing checked exceptions.
1774 +     */
1775 +    public static class CheckedBarrier extends CyclicBarrier {
1776 +        public CheckedBarrier(int parties) { super(parties); }
1777 +
1778 +        public int await() {
1779 +            try {
1780 +                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1781 +            } catch (TimeoutException timedOut) {
1782 +                throw new AssertionFailedError("timed out");
1783 +            } catch (Exception fail) {
1784 +                AssertionFailedError afe =
1785 +                    new AssertionFailedError("Unexpected exception: " + fail);
1786 +                afe.initCause(fail);
1787 +                throw afe;
1788 +            }
1789 +        }
1790 +    }
1791 +
1792 +    void checkEmpty(BlockingQueue q) {
1793 +        try {
1794 +            assertTrue(q.isEmpty());
1795 +            assertEquals(0, q.size());
1796 +            assertNull(q.peek());
1797 +            assertNull(q.poll());
1798 +            assertNull(q.poll(0, MILLISECONDS));
1799 +            assertEquals(q.toString(), "[]");
1800 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1801 +            assertFalse(q.iterator().hasNext());
1802 +            try {
1803 +                q.element();
1804 +                shouldThrow();
1805 +            } catch (NoSuchElementException success) {}
1806 +            try {
1807 +                q.iterator().next();
1808 +                shouldThrow();
1809 +            } catch (NoSuchElementException success) {}
1810 +            try {
1811 +                q.remove();
1812 +                shouldThrow();
1813 +            } catch (NoSuchElementException success) {}
1814 +        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1815 +    }
1816 +
1817 +    void assertSerialEquals(Object x, Object y) {
1818 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1819 +    }
1820 +
1821 +    void assertNotSerialEquals(Object x, Object y) {
1822 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1823 +    }
1824 +
1825 +    byte[] serialBytes(Object o) {
1826 +        try {
1827 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1828 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1829 +            oos.writeObject(o);
1830 +            oos.flush();
1831 +            oos.close();
1832 +            return bos.toByteArray();
1833 +        } catch (Throwable fail) {
1834 +            threadUnexpectedException(fail);
1835 +            return new byte[0];
1836 +        }
1837 +    }
1838 +
1839 +    void assertImmutable(final Object o) {
1840 +        if (o instanceof Collection) {
1841 +            assertThrows(
1842 +                UnsupportedOperationException.class,
1843 +                new Runnable() { public void run() {
1844 +                        ((Collection) o).add(null);}});
1845 +        }
1846 +    }
1847 +
1848 +    @SuppressWarnings("unchecked")
1849 +    <T> T serialClone(T o) {
1850 +        try {
1851 +            ObjectInputStream ois = new ObjectInputStream
1852 +                (new ByteArrayInputStream(serialBytes(o)));
1853 +            T clone = (T) ois.readObject();
1854 +            if (o == clone) assertImmutable(o);
1855 +            assertSame(o.getClass(), clone.getClass());
1856 +            return clone;
1857 +        } catch (Throwable fail) {
1858 +            threadUnexpectedException(fail);
1859 +            return null;
1860 +        }
1861 +    }
1862 +
1863 +    /**
1864 +     * A version of serialClone that leaves error handling (for
1865 +     * e.g. NotSerializableException) up to the caller.
1866 +     */
1867 +    @SuppressWarnings("unchecked")
1868 +    <T> T serialClonePossiblyFailing(T o)
1869 +        throws ReflectiveOperationException, java.io.IOException {
1870 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1871 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1872 +        oos.writeObject(o);
1873 +        oos.flush();
1874 +        oos.close();
1875 +        ObjectInputStream ois = new ObjectInputStream
1876 +            (new ByteArrayInputStream(bos.toByteArray()));
1877 +        T clone = (T) ois.readObject();
1878 +        if (o == clone) assertImmutable(o);
1879 +        assertSame(o.getClass(), clone.getClass());
1880 +        return clone;
1881 +    }
1882 +
1883 +    /**
1884 +     * If o implements Cloneable and has a public clone method,
1885 +     * returns a clone of o, else null.
1886 +     */
1887 +    @SuppressWarnings("unchecked")
1888 +    <T> T cloneableClone(T o) {
1889 +        if (!(o instanceof Cloneable)) return null;
1890 +        final T clone;
1891 +        try {
1892 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1893 +        } catch (NoSuchMethodException ok) {
1894 +            return null;
1895 +        } catch (ReflectiveOperationException unexpected) {
1896 +            throw new Error(unexpected);
1897 +        }
1898 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1899 +        assertSame(o.getClass(), clone.getClass());
1900 +        return clone;
1901 +    }
1902 +
1903 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1904 +                             Runnable... throwingActions) {
1905 +        for (Runnable throwingAction : throwingActions) {
1906 +            boolean threw = false;
1907 +            try { throwingAction.run(); }
1908 +            catch (Throwable t) {
1909 +                threw = true;
1910 +                if (!expectedExceptionClass.isInstance(t)) {
1911 +                    AssertionFailedError afe =
1912 +                        new AssertionFailedError
1913 +                        ("Expected " + expectedExceptionClass.getName() +
1914 +                         ", got " + t.getClass().getName());
1915 +                    afe.initCause(t);
1916 +                    threadUnexpectedException(afe);
1917 +                }
1918 +            }
1919 +            if (!threw)
1920 +                shouldThrow(expectedExceptionClass.getName());
1921 +        }
1922 +    }
1923 +
1924 +    public void assertIteratorExhausted(Iterator<?> it) {
1925 +        try {
1926 +            it.next();
1927 +            shouldThrow();
1928 +        } catch (NoSuchElementException success) {}
1929 +        assertFalse(it.hasNext());
1930 +    }
1931 +
1932 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1933 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1934 +    }
1935 +
1936 +    public Runnable runnableThrowing(final RuntimeException ex) {
1937 +        return new Runnable() { public void run() { throw ex; }};
1938 +    }
1939 +
1940 +    /** A reusable thread pool to be shared by tests. */
1941 +    static final ExecutorService cachedThreadPool =
1942 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1943 +                               1000L, MILLISECONDS,
1944 +                               new SynchronousQueue<Runnable>());
1945 +
1946 +    static <T> void shuffle(T[] array) {
1947 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1948 +    }
1949   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines