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.84 by jsr166, Sat May 28 22:19:27 2011 UTC vs.
Revision 1.156 by jsr166, Sat Oct 3 21:09:42 2015 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
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.util.Arrays;
18 < import java.util.Date;
19 < import java.util.NoSuchElementException;
20 < import java.util.PropertyPermission;
21 < import java.util.concurrent.*;
22 < import java.util.concurrent.atomic.AtomicBoolean;
20 < import java.util.concurrent.atomic.AtomicReference;
21 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
22 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
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;
# Line 27 | Line 27 | 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 38 | Line 70 | import java.security.SecurityPermission;
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
87   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 60 | Line 92 | import java.security.SecurityPermission;
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 109 | Line 141 | public class JSR166TestCase extends Test
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       * If true, report on stdout all "slow" tests, that is, ones that
152       * take more than profileThreshold milliseconds to execute.
153       */
# Line 122 | Line 161 | public class JSR166TestCase extends Test
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 +            for (TestCase lastTestCase = currentTestCase;;) {
195 +                try { MINUTES.sleep(10); }
196 +                catch (InterruptedException unexpected) { break; }
197 +                if (lastTestCase == currentTestCase) {
198 +                    System.err.println
199 +                        ("Looks like we're stuck running test: "
200 +                         + lastTestCase);
201 +                    dumpTestThreads();
202 +                }
203 +                lastTestCase = currentTestCase;
204 +            }}};
205 +        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
206 +        thread.setDaemon(true);
207 +        thread.start();
208 +    }
209 +
210 +    public void runBare() throws Throwable {
211 +        currentTestCase = this;
212 +        if (methodFilter == null
213 +            || methodFilter.matcher(toString()).find())
214 +            super.runBare();
215 +    }
216 +
217      protected void runTest() throws Throwable {
218 <        if (profileTests)
219 <            runTestProfiled();
220 <        else
221 <            super.runTest();
218 >        for (int i = 0; i < runsPerTest; i++) {
219 >            if (profileTests)
220 >                runTestProfiled();
221 >            else
222 >                super.runTest();
223 >        }
224      }
225  
226      protected void runTestProfiled() throws Throwable {
227 <        long t0 = System.nanoTime();
228 <        try {
227 >        for (int i = 0; i < 2; i++) {
228 >            long startTime = System.nanoTime();
229              super.runTest();
230 <        } finally {
231 <            long elapsedMillis =
232 <                (System.nanoTime() - t0) / (1000L * 1000L);
233 <            if (elapsedMillis >= profileThreshold)
230 >            long elapsedMillis = millisElapsedSince(startTime);
231 >            if (elapsedMillis < profileThreshold)
232 >                break;
233 >            // Never report first run of any test; treat it as a
234 >            // warmup run, notably to trigger all needed classloading,
235 >            if (i > 0)
236                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
237          }
238      }
239  
240      /**
241 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
241 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
242       */
243      public static void main(String[] args) {
244 +        main(suite(), args);
245 +    }
246 +
247 +    /**
248 +     * Runs all unit tests in the given test suite.
249 +     * Actual behavior influenced by jsr166.* system properties.
250 +     */
251 +    static void main(Test suite, String[] args) {
252          if (useSecurityManager) {
253              System.err.println("Setting a permissive security manager");
254              Policy.setPolicy(permissivePolicy());
255              System.setSecurityManager(new SecurityManager());
256          }
257 <        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
258 <
259 <        Test s = suite();
260 <        for (int i = 0; i < iters; ++i) {
157 <            junit.textui.TestRunner.run(s);
257 >        for (int i = 0; i < suiteRuns; i++) {
258 >            TestResult result = junit.textui.TestRunner.run(suite);
259 >            if (!result.wasSuccessful())
260 >                System.exit(1);
261              System.gc();
262              System.runFinalization();
263          }
161        System.exit(0);
264      }
265  
266      public static TestSuite newTestSuite(Object... suiteOrClasses) {
# Line 174 | Line 276 | public class JSR166TestCase extends Test
276          return suite;
277      }
278  
279 +    public static void addNamedTestClasses(TestSuite suite,
280 +                                           String... testClassNames) {
281 +        for (String testClassName : testClassNames) {
282 +            try {
283 +                Class<?> testClass = Class.forName(testClassName);
284 +                Method m = testClass.getDeclaredMethod("suite",
285 +                                                       new Class<?>[0]);
286 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
287 +            } catch (Exception e) {
288 +                throw new Error("Missing test class", e);
289 +            }
290 +        }
291 +    }
292 +
293 +    public static final double JAVA_CLASS_VERSION;
294 +    public static final String JAVA_SPECIFICATION_VERSION;
295 +    static {
296 +        try {
297 +            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
298 +                new java.security.PrivilegedAction<Double>() {
299 +                public Double run() {
300 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
301 +            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
302 +                new java.security.PrivilegedAction<String>() {
303 +                public String run() {
304 +                    return System.getProperty("java.specification.version");}});
305 +        } catch (Throwable t) {
306 +            throw new Error(t);
307 +        }
308 +    }
309 +
310 +    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
311 +    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
312 +    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
313 +    public static boolean atLeastJava9() {
314 +        return JAVA_CLASS_VERSION >= 53.0
315 +            // As of 2015-09, java9 still uses 52.0 class file version
316 +            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
317 +    }
318 +    public static boolean atLeastJava10() {
319 +        return JAVA_CLASS_VERSION >= 54.0
320 +            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
321 +    }
322 +
323      /**
324       * Collects all JSR166 unit tests as one suite.
325       */
326      public static Test suite() {
327 <        return newTestSuite(
327 >        // Java7+ test classes
328 >        TestSuite suite = newTestSuite(
329              ForkJoinPoolTest.suite(),
330              ForkJoinTaskTest.suite(),
331              RecursiveActionTest.suite(),
# Line 243 | Line 390 | public class JSR166TestCase extends Test
390              TreeSetTest.suite(),
391              TreeSubMapTest.suite(),
392              TreeSubSetTest.suite());
393 +
394 +        // Java8+ test classes
395 +        if (atLeastJava8()) {
396 +            String[] java8TestClassNames = {
397 +                "Atomic8Test",
398 +                "CompletableFutureTest",
399 +                "ConcurrentHashMap8Test",
400 +                "CountedCompleterTest",
401 +                "DoubleAccumulatorTest",
402 +                "DoubleAdderTest",
403 +                "ForkJoinPool8Test",
404 +                "ForkJoinTask8Test",
405 +                "LongAccumulatorTest",
406 +                "LongAdderTest",
407 +                "SplittableRandomTest",
408 +                "StampedLockTest",
409 +                "SubmissionPublisherTest",
410 +                "ThreadLocalRandom8Test",
411 +            };
412 +            addNamedTestClasses(suite, java8TestClassNames);
413 +        }
414 +
415 +        // Java9+ test classes
416 +        if (atLeastJava9()) {
417 +            String[] java9TestClassNames = {
418 +                // Currently empty, but expecting varhandle tests
419 +            };
420 +            addNamedTestClasses(suite, java9TestClassNames);
421 +        }
422 +
423 +        return suite;
424 +    }
425 +
426 +    /** Returns list of junit-style test method names in given class. */
427 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
428 +        Method[] methods = testClass.getDeclaredMethods();
429 +        ArrayList<String> names = new ArrayList<String>(methods.length);
430 +        for (Method method : methods) {
431 +            if (method.getName().startsWith("test")
432 +                && Modifier.isPublic(method.getModifiers())
433 +                // method.getParameterCount() requires jdk8+
434 +                && method.getParameterTypes().length == 0) {
435 +                names.add(method.getName());
436 +            }
437 +        }
438 +        return names;
439      }
440  
441 +    /**
442 +     * Returns junit-style testSuite for the given test class, but
443 +     * parameterized by passing extra data to each test.
444 +     */
445 +    public static <ExtraData> Test parameterizedTestSuite
446 +        (Class<? extends JSR166TestCase> testClass,
447 +         Class<ExtraData> dataClass,
448 +         ExtraData data) {
449 +        try {
450 +            TestSuite suite = new TestSuite();
451 +            Constructor c =
452 +                testClass.getDeclaredConstructor(dataClass, String.class);
453 +            for (String methodName : testMethodNames(testClass))
454 +                suite.addTest((Test) c.newInstance(data, methodName));
455 +            return suite;
456 +        } catch (Exception e) {
457 +            throw new Error(e);
458 +        }
459 +    }
460 +
461 +    /**
462 +     * Returns junit-style testSuite for the jdk8 extension of the
463 +     * given test class, but parameterized by passing extra data to
464 +     * each test.  Uses reflection to allow compilation in jdk7.
465 +     */
466 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
467 +        (Class<? extends JSR166TestCase> testClass,
468 +         Class<ExtraData> dataClass,
469 +         ExtraData data) {
470 +        if (atLeastJava8()) {
471 +            String name = testClass.getName();
472 +            String name8 = name.replaceAll("Test$", "8Test");
473 +            if (name.equals(name8)) throw new Error(name);
474 +            try {
475 +                return (Test)
476 +                    Class.forName(name8)
477 +                    .getMethod("testSuite", new Class[] { dataClass })
478 +                    .invoke(null, data);
479 +            } catch (Exception e) {
480 +                throw new Error(e);
481 +            }
482 +        } else {
483 +            return new TestSuite();
484 +        }
485 +    }
486 +
487 +    // Delays for timing-dependent tests, in milliseconds.
488  
489      public static long SHORT_DELAY_MS;
490      public static long SMALL_DELAY_MS;
491      public static long MEDIUM_DELAY_MS;
492      public static long LONG_DELAY_MS;
493  
254
494      /**
495       * Returns the shortest timed delay. This could
496       * be reimplemented to use for example a Property.
# Line 279 | Line 518 | public class JSR166TestCase extends Test
518      }
519  
520      /**
521 <     * Returns a new Date instance representing a time delayMillis
522 <     * milliseconds in the future.
521 >     * Returns a new Date instance representing a time at least
522 >     * delayMillis milliseconds in the future.
523       */
524      Date delayedDate(long delayMillis) {
525 <        return new Date(System.currentTimeMillis() + delayMillis);
525 >        // Add 1 because currentTimeMillis is known to round into the past.
526 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
527      }
528  
529      /**
# Line 299 | Line 539 | public class JSR166TestCase extends Test
539       * the same test have no effect.
540       */
541      public void threadRecordFailure(Throwable t) {
542 +        dumpTestThreads();
543          threadFailure.compareAndSet(null, t);
544      }
545  
# Line 306 | Line 547 | public class JSR166TestCase extends Test
547          setDelays();
548      }
549  
550 +    void tearDownFail(String format, Object... args) {
551 +        String msg = toString() + ": " + String.format(format, args);
552 +        System.err.println(msg);
553 +        dumpTestThreads();
554 +        throw new AssertionFailedError(msg);
555 +    }
556 +
557      /**
558 +     * Extra checks that get done for all test cases.
559 +     *
560       * Triggers test case failure if any thread assertions have failed,
561       * by rethrowing, in the test harness thread, any exception recorded
562       * earlier by threadRecordFailure.
563 +     *
564 +     * Triggers test case failure if interrupt status is set in the main thread.
565       */
566      public void tearDown() throws Exception {
567          Throwable t = threadFailure.getAndSet(null);
# Line 327 | Line 579 | public class JSR166TestCase extends Test
579                  throw afe;
580              }
581          }
582 +
583 +        if (Thread.interrupted())
584 +            tearDownFail("interrupt status set in main thread");
585 +
586 +        checkForkJoinPoolThreadLeaks();
587 +    }
588 +
589 +    /**
590 +     * Finds missing try { ... } finally { joinPool(e); }
591 +     */
592 +    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
593 +        Thread[] survivors = new Thread[7];
594 +        int count = Thread.enumerate(survivors);
595 +        for (int i = 0; i < count; i++) {
596 +            Thread thread = survivors[i];
597 +            String name = thread.getName();
598 +            if (name.startsWith("ForkJoinPool-")) {
599 +                // give thread some time to terminate
600 +                thread.join(LONG_DELAY_MS);
601 +                if (thread.isAlive())
602 +                    tearDownFail("Found leaked ForkJoinPool thread thread=%s",
603 +                                 thread);
604 +            }
605 +        }
606 +
607 +        if (!ForkJoinPool.commonPool()
608 +            .awaitQuiescence(LONG_DELAY_MS, MILLISECONDS))
609 +            tearDownFail("ForkJoin common pool thread stuck");
610      }
611  
612      /**
# Line 339 | Line 619 | public class JSR166TestCase extends Test
619              fail(reason);
620          } catch (AssertionFailedError t) {
621              threadRecordFailure(t);
622 <            fail(reason);
622 >            throw t;
623          }
624      }
625  
# Line 407 | Line 687 | public class JSR166TestCase extends Test
687      public void threadAssertEquals(Object x, Object y) {
688          try {
689              assertEquals(x, y);
690 <        } catch (AssertionFailedError t) {
691 <            threadRecordFailure(t);
692 <            throw t;
693 <        } catch (Throwable t) {
694 <            threadUnexpectedException(t);
690 >        } catch (AssertionFailedError fail) {
691 >            threadRecordFailure(fail);
692 >            throw fail;
693 >        } catch (Throwable fail) {
694 >            threadUnexpectedException(fail);
695          }
696      }
697  
# Line 423 | Line 703 | public class JSR166TestCase extends Test
703      public void threadAssertSame(Object x, Object y) {
704          try {
705              assertSame(x, y);
706 <        } catch (AssertionFailedError t) {
707 <            threadRecordFailure(t);
708 <            throw t;
706 >        } catch (AssertionFailedError fail) {
707 >            threadRecordFailure(fail);
708 >            throw fail;
709          }
710      }
711  
# Line 485 | Line 765 | public class JSR166TestCase extends Test
765      }
766  
767      /**
768 +     * Allows use of try-with-resources with per-test thread pools.
769 +     */
770 +    static class PoolCloser<T extends ExecutorService>
771 +            implements AutoCloseable {
772 +        public final T pool;
773 +        public PoolCloser(T pool) { this.pool = pool; }
774 +        public void close() { joinPool(pool); }
775 +    }
776 +
777 +    /**
778       * Waits out termination of a thread pool or fails doing so.
779       */
780 <    void joinPool(ExecutorService exec) {
780 >    static void joinPool(ExecutorService pool) {
781          try {
782 <            exec.shutdown();
783 <            assertTrue("ExecutorService did not terminate in a timely manner",
784 <                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
782 >            pool.shutdown();
783 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
784 >                fail("ExecutorService " + pool +
785 >                     " did not terminate in a timely manner");
786          } catch (SecurityException ok) {
787              // Allowed in case test doesn't have privs
788 <        } catch (InterruptedException ie) {
788 >        } catch (InterruptedException fail) {
789              fail("Unexpected InterruptedException");
790          }
791      }
792  
793 +    /** Like Runnable, but with the freedom to throw anything */
794 +    interface Action { public void run() throws Throwable; }
795 +
796 +    /**
797 +     * Runs all the given actions in parallel, failing if any fail.
798 +     * Useful for running multiple variants of tests that are
799 +     * necessarily individually slow because they must block.
800 +     */
801 +    void testInParallel(Action ... actions) {
802 +        try (PoolCloser<ExecutorService> poolCloser
803 +             = new PoolCloser<>(Executors.newCachedThreadPool())) {
804 +            ExecutorService pool = poolCloser.pool;
805 +            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
806 +            for (final Action action : actions)
807 +                futures.add(pool.submit(new CheckedRunnable() {
808 +                    public void realRun() throws Throwable { action.run();}}));
809 +            for (Future<?> future : futures)
810 +                try {
811 +                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
812 +                } catch (ExecutionException ex) {
813 +                    threadUnexpectedException(ex.getCause());
814 +                } catch (Exception ex) {
815 +                    threadUnexpectedException(ex);
816 +                }
817 +        }
818 +    }
819 +
820 +    /**
821 +     * A debugging tool to print stack traces of most threads, as jstack does.
822 +     * Uninteresting threads are filtered out.
823 +     */
824 +    static void dumpTestThreads() {
825 +        ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
826 +        System.err.println("------ stacktrace dump start ------");
827 +        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
828 +            String name = info.getThreadName();
829 +            if ("Signal Dispatcher".equals(name))
830 +                continue;
831 +            if ("Reference Handler".equals(name)
832 +                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
833 +                continue;
834 +            if ("Finalizer".equals(name)
835 +                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
836 +                continue;
837 +            if ("checkForWedgedTest".equals(name))
838 +                continue;
839 +            System.err.print(info);
840 +        }
841 +        System.err.println("------ stacktrace dump end ------");
842 +    }
843 +
844      /**
845       * Checks that thread does not terminate within the default
846       * millisecond delay of {@code timeoutMillis()}.
# Line 515 | Line 857 | public class JSR166TestCase extends Test
857              // No need to optimize the failing case via Thread.join.
858              delay(millis);
859              assertTrue(thread.isAlive());
860 <        } catch (InterruptedException ie) {
860 >        } catch (InterruptedException fail) {
861 >            fail("Unexpected InterruptedException");
862 >        }
863 >    }
864 >
865 >    /**
866 >     * Checks that the threads do not terminate within the default
867 >     * millisecond delay of {@code timeoutMillis()}.
868 >     */
869 >    void assertThreadsStayAlive(Thread... threads) {
870 >        assertThreadsStayAlive(timeoutMillis(), threads);
871 >    }
872 >
873 >    /**
874 >     * Checks that the threads do not terminate within the given millisecond delay.
875 >     */
876 >    void assertThreadsStayAlive(long millis, Thread... threads) {
877 >        try {
878 >            // No need to optimize the failing case via Thread.join.
879 >            delay(millis);
880 >            for (Thread thread : threads)
881 >                assertTrue(thread.isAlive());
882 >        } catch (InterruptedException fail) {
883              fail("Unexpected InterruptedException");
884          }
885      }
# Line 537 | Line 901 | public class JSR166TestCase extends Test
901              future.get(timeoutMillis, MILLISECONDS);
902              shouldThrow();
903          } catch (TimeoutException success) {
904 <        } catch (Exception e) {
905 <            threadUnexpectedException(e);
904 >        } catch (Exception fail) {
905 >            threadUnexpectedException(fail);
906          } finally { future.cancel(true); }
907          assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
908      }
# Line 582 | Line 946 | public class JSR166TestCase extends Test
946      public static final Integer m6  = new Integer(-6);
947      public static final Integer m10 = new Integer(-10);
948  
585
949      /**
950       * Runs Runnable r with a security policy that permits precisely
951       * the specified permissions.  If there is no current security
# Line 594 | Line 957 | public class JSR166TestCase extends Test
957          SecurityManager sm = System.getSecurityManager();
958          if (sm == null) {
959              r.run();
960 +        }
961 +        runWithSecurityManagerWithPermissions(r, permissions);
962 +    }
963 +
964 +    /**
965 +     * Runs Runnable r with a security policy that permits precisely
966 +     * the specified permissions.  If there is no current security
967 +     * manager, a temporary one is set for the duration of the
968 +     * Runnable.  We require that any security manager permit
969 +     * getPolicy/setPolicy.
970 +     */
971 +    public void runWithSecurityManagerWithPermissions(Runnable r,
972 +                                                      Permission... permissions) {
973 +        SecurityManager sm = System.getSecurityManager();
974 +        if (sm == null) {
975              Policy savedPolicy = Policy.getPolicy();
976              try {
977                  Policy.setPolicy(permissivePolicy());
978                  System.setSecurityManager(new SecurityManager());
979 <                runWithPermissions(r, permissions);
979 >                runWithSecurityManagerWithPermissions(r, permissions);
980              } finally {
981                  System.setSecurityManager(null);
982                  Policy.setPolicy(savedPolicy);
# Line 646 | Line 1024 | public class JSR166TestCase extends Test
1024              return perms.implies(p);
1025          }
1026          public void refresh() {}
1027 +        public String toString() {
1028 +            List<Permission> ps = new ArrayList<Permission>();
1029 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1030 +                ps.add(e.nextElement());
1031 +            return "AdjustablePolicy with permissions " + ps;
1032 +        }
1033      }
1034  
1035      /**
# Line 674 | Line 1058 | public class JSR166TestCase extends Test
1058      void sleep(long millis) {
1059          try {
1060              delay(millis);
1061 <        } catch (InterruptedException ie) {
1061 >        } catch (InterruptedException fail) {
1062              AssertionFailedError afe =
1063                  new AssertionFailedError("Unexpected InterruptedException");
1064 <            afe.initCause(ie);
1064 >            afe.initCause(fail);
1065              throw afe;
1066          }
1067      }
1068  
1069      /**
1070 <     * Waits up to the specified number of milliseconds for the given
1070 >     * Spin-waits up to the specified number of milliseconds for the given
1071       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1072       */
1073      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1074 <        long timeoutNanos = timeoutMillis * 1000L * 1000L;
691 <        long t0 = System.nanoTime();
1074 >        long startTime = System.nanoTime();
1075          for (;;) {
1076              Thread.State s = thread.getState();
1077              if (s == Thread.State.BLOCKED ||
# Line 697 | Line 1080 | public class JSR166TestCase extends Test
1080                  return;
1081              else if (s == Thread.State.TERMINATED)
1082                  fail("Unexpected thread termination");
1083 <            else if (System.nanoTime() - t0 > timeoutNanos) {
1083 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1084                  threadAssertTrue(thread.isAlive());
1085                  return;
1086              }
# Line 716 | Line 1099 | public class JSR166TestCase extends Test
1099      /**
1100       * Returns the number of milliseconds since time given by
1101       * startNanoTime, which must have been previously returned from a
1102 <     * call to {@link System.nanoTime()}.
1102 >     * call to {@link System#nanoTime()}.
1103       */
1104 <    long millisElapsedSince(long startNanoTime) {
1104 >    static long millisElapsedSince(long startNanoTime) {
1105          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1106      }
1107  
1108 + //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1109 + //         long startTime = System.nanoTime();
1110 + //         try {
1111 + //             r.run();
1112 + //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1113 + //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1114 + //             throw new AssertionFailedError("did not return promptly");
1115 + //     }
1116 +
1117 + //     void assertTerminatesPromptly(Runnable r) {
1118 + //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1119 + //     }
1120 +
1121 +    /**
1122 +     * Checks that timed f.get() returns the expected value, and does not
1123 +     * wait for the timeout to elapse before returning.
1124 +     */
1125 +    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1126 +        long startTime = System.nanoTime();
1127 +        try {
1128 +            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1129 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
1130 +        if (millisElapsedSince(startTime) > timeoutMillis/2)
1131 +            throw new AssertionFailedError("timed get did not return promptly");
1132 +    }
1133 +
1134 +    <T> void checkTimedGet(Future<T> f, T expectedValue) {
1135 +        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1136 +    }
1137 +
1138      /**
1139       * Returns a new started daemon Thread running the given runnable.
1140       */
# Line 740 | Line 1153 | public class JSR166TestCase extends Test
1153      void awaitTermination(Thread t, long timeoutMillis) {
1154          try {
1155              t.join(timeoutMillis);
1156 <        } catch (InterruptedException ie) {
1157 <            threadUnexpectedException(ie);
1156 >        } catch (InterruptedException fail) {
1157 >            threadUnexpectedException(fail);
1158          } finally {
1159              if (t.getState() != Thread.State.TERMINATED) {
1160                  t.interrupt();
# Line 767 | Line 1180 | public class JSR166TestCase extends Test
1180          public final void run() {
1181              try {
1182                  realRun();
1183 <            } catch (Throwable t) {
1184 <                threadUnexpectedException(t);
1183 >            } catch (Throwable fail) {
1184 >                threadUnexpectedException(fail);
1185              }
1186          }
1187      }
# Line 822 | Line 1235 | public class JSR166TestCase extends Test
1235                  threadShouldThrow("InterruptedException");
1236              } catch (InterruptedException success) {
1237                  threadAssertFalse(Thread.interrupted());
1238 <            } catch (Throwable t) {
1239 <                threadUnexpectedException(t);
1238 >            } catch (Throwable fail) {
1239 >                threadUnexpectedException(fail);
1240              }
1241          }
1242      }
# Line 834 | Line 1247 | public class JSR166TestCase extends Test
1247          public final T call() {
1248              try {
1249                  return realCall();
1250 <            } catch (Throwable t) {
1251 <                threadUnexpectedException(t);
1250 >            } catch (Throwable fail) {
1251 >                threadUnexpectedException(fail);
1252                  return null;
1253              }
1254          }
# Line 852 | Line 1265 | public class JSR166TestCase extends Test
1265                  return result;
1266              } catch (InterruptedException success) {
1267                  threadAssertFalse(Thread.interrupted());
1268 <            } catch (Throwable t) {
1269 <                threadUnexpectedException(t);
1268 >            } catch (Throwable fail) {
1269 >                threadUnexpectedException(fail);
1270              }
1271              return null;
1272          }
# Line 870 | Line 1283 | public class JSR166TestCase extends Test
1283      public static final String TEST_STRING = "a test string";
1284  
1285      public static class StringTask implements Callable<String> {
1286 <        public String call() { return TEST_STRING; }
1286 >        final String value;
1287 >        public StringTask() { this(TEST_STRING); }
1288 >        public StringTask(String value) { this.value = value; }
1289 >        public String call() { return value; }
1290      }
1291  
1292      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
# Line 883 | Line 1299 | public class JSR166TestCase extends Test
1299              }};
1300      }
1301  
1302 +    public Runnable countDowner(final CountDownLatch latch) {
1303 +        return new CheckedRunnable() {
1304 +            public void realRun() throws InterruptedException {
1305 +                latch.countDown();
1306 +            }};
1307 +    }
1308 +
1309      public Runnable awaiter(final CountDownLatch latch) {
1310          return new CheckedRunnable() {
1311              public void realRun() throws InterruptedException {
# Line 893 | Line 1316 | public class JSR166TestCase extends Test
1316      public void await(CountDownLatch latch) {
1317          try {
1318              assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1319 <        } catch (Throwable t) {
1320 <            threadUnexpectedException(t);
1319 >        } catch (Throwable fail) {
1320 >            threadUnexpectedException(fail);
1321 >        }
1322 >    }
1323 >
1324 >    public void await(Semaphore semaphore) {
1325 >        try {
1326 >            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1327 >        } catch (Throwable fail) {
1328 >            threadUnexpectedException(fail);
1329          }
1330      }
1331  
# Line 1085 | Line 1516 | public class JSR166TestCase extends Test
1516      public abstract class CheckedRecursiveAction extends RecursiveAction {
1517          protected abstract void realCompute() throws Throwable;
1518  
1519 <        public final void compute() {
1519 >        @Override protected final void compute() {
1520              try {
1521                  realCompute();
1522 <            } catch (Throwable t) {
1523 <                threadUnexpectedException(t);
1522 >            } catch (Throwable fail) {
1523 >                threadUnexpectedException(fail);
1524              }
1525          }
1526      }
# Line 1100 | Line 1531 | public class JSR166TestCase extends Test
1531      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1532          protected abstract T realCompute() throws Throwable;
1533  
1534 <        public final T compute() {
1534 >        @Override protected final T compute() {
1535              try {
1536                  return realCompute();
1537 <            } catch (Throwable t) {
1538 <                threadUnexpectedException(t);
1537 >            } catch (Throwable fail) {
1538 >                threadUnexpectedException(fail);
1539                  return null;
1540              }
1541          }
# Line 1119 | Line 1550 | public class JSR166TestCase extends Test
1550      }
1551  
1552      /**
1553 <     * A CyclicBarrier that fails with AssertionFailedErrors instead
1554 <     * of throwing checked exceptions.
1553 >     * A CyclicBarrier that uses timed await and fails with
1554 >     * AssertionFailedErrors instead of throwing checked exceptions.
1555       */
1556      public class CheckedBarrier extends CyclicBarrier {
1557          public CheckedBarrier(int parties) { super(parties); }
1558  
1559          public int await() {
1560              try {
1561 <                return super.await();
1562 <            } catch (Exception e) {
1561 >                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1562 >            } catch (TimeoutException timedOut) {
1563 >                throw new AssertionFailedError("timed out");
1564 >            } catch (Exception fail) {
1565                  AssertionFailedError afe =
1566 <                    new AssertionFailedError("Unexpected exception: " + e);
1567 <                afe.initCause(e);
1566 >                    new AssertionFailedError("Unexpected exception: " + fail);
1567 >                afe.initCause(fail);
1568                  throw afe;
1569              }
1570          }
# Line 1159 | Line 1592 | public class JSR166TestCase extends Test
1592                  q.remove();
1593                  shouldThrow();
1594              } catch (NoSuchElementException success) {}
1595 <        } catch (InterruptedException ie) {
1163 <            threadUnexpectedException(ie);
1164 <        }
1595 >        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1596      }
1597  
1598 <    @SuppressWarnings("unchecked")
1599 <    <T> T serialClone(T o) {
1598 >    void assertSerialEquals(Object x, Object y) {
1599 >        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1600 >    }
1601 >
1602 >    void assertNotSerialEquals(Object x, Object y) {
1603 >        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1604 >    }
1605 >
1606 >    byte[] serialBytes(Object o) {
1607          try {
1608              ByteArrayOutputStream bos = new ByteArrayOutputStream();
1609              ObjectOutputStream oos = new ObjectOutputStream(bos);
1610              oos.writeObject(o);
1611              oos.flush();
1612              oos.close();
1613 <            ByteArrayInputStream bin =
1614 <                new ByteArrayInputStream(bos.toByteArray());
1615 <            ObjectInputStream ois = new ObjectInputStream(bin);
1616 <            return (T) ois.readObject();
1617 <        } catch (Throwable t) {
1618 <            threadUnexpectedException(t);
1613 >            return bos.toByteArray();
1614 >        } catch (Throwable fail) {
1615 >            threadUnexpectedException(fail);
1616 >            return new byte[0];
1617 >        }
1618 >    }
1619 >
1620 >    @SuppressWarnings("unchecked")
1621 >    <T> T serialClone(T o) {
1622 >        try {
1623 >            ObjectInputStream ois = new ObjectInputStream
1624 >                (new ByteArrayInputStream(serialBytes(o)));
1625 >            T clone = (T) ois.readObject();
1626 >            assertSame(o.getClass(), clone.getClass());
1627 >            return clone;
1628 >        } catch (Throwable fail) {
1629 >            threadUnexpectedException(fail);
1630              return null;
1631          }
1632      }
1633 +
1634 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1635 +                             Runnable... throwingActions) {
1636 +        for (Runnable throwingAction : throwingActions) {
1637 +            boolean threw = false;
1638 +            try { throwingAction.run(); }
1639 +            catch (Throwable t) {
1640 +                threw = true;
1641 +                if (!expectedExceptionClass.isInstance(t)) {
1642 +                    AssertionFailedError afe =
1643 +                        new AssertionFailedError
1644 +                        ("Expected " + expectedExceptionClass.getName() +
1645 +                         ", got " + t.getClass().getName());
1646 +                    afe.initCause(t);
1647 +                    threadUnexpectedException(afe);
1648 +                }
1649 +            }
1650 +            if (!threw)
1651 +                shouldThrow(expectedExceptionClass.getName());
1652 +        }
1653 +    }
1654 +
1655 +    public void assertIteratorExhausted(Iterator<?> it) {
1656 +        try {
1657 +            it.next();
1658 +            shouldThrow();
1659 +        } catch (NoSuchElementException success) {}
1660 +        assertFalse(it.hasNext());
1661 +    }
1662   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines