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.57 by jsr166, Mon Oct 4 05:45:19 2010 UTC vs.
Revision 1.214 by jsr166, Fri Dec 9 07:26:04 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines