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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines