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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines