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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines