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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines