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.70 by jsr166, Sun Nov 21 19:04:45 2010 UTC vs.
Revision 1.143 by jsr166, Sun Sep 13 16:28:14 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.PropertyPermission;
11 import java.util.concurrent.*;
12 import java.util.concurrent.atomic.AtomicReference;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10   import static java.util.concurrent.TimeUnit.NANOSECONDS;
11 +
12 + import java.io.ByteArrayInputStream;
13 + import java.io.ByteArrayOutputStream;
14 + import java.io.ObjectInputStream;
15 + import java.io.ObjectOutputStream;
16 + import java.lang.management.ManagementFactory;
17 + import java.lang.management.ThreadInfo;
18 + import java.lang.reflect.Constructor;
19 + import java.lang.reflect.Method;
20 + import java.lang.reflect.Modifier;
21   import java.security.CodeSource;
22   import java.security.Permission;
23   import java.security.PermissionCollection;
# Line 19 | Line 25 | import java.security.Permissions;
25   import java.security.Policy;
26   import java.security.ProtectionDomain;
27   import java.security.SecurityPermission;
28 + import java.util.ArrayList;
29 + import java.util.Arrays;
30 + import java.util.Date;
31 + import java.util.Enumeration;
32 + import java.util.Iterator;
33 + import java.util.List;
34 + import java.util.NoSuchElementException;
35 + import java.util.PropertyPermission;
36 + import java.util.concurrent.BlockingQueue;
37 + import java.util.concurrent.Callable;
38 + import java.util.concurrent.CountDownLatch;
39 + import java.util.concurrent.CyclicBarrier;
40 + import java.util.concurrent.ExecutionException;
41 + import java.util.concurrent.Executors;
42 + import java.util.concurrent.ExecutorService;
43 + import java.util.concurrent.Future;
44 + import java.util.concurrent.RecursiveAction;
45 + import java.util.concurrent.RecursiveTask;
46 + import java.util.concurrent.RejectedExecutionHandler;
47 + import java.util.concurrent.Semaphore;
48 + import java.util.concurrent.ThreadFactory;
49 + import java.util.concurrent.ThreadPoolExecutor;
50 + import java.util.concurrent.TimeoutException;
51 + import java.util.concurrent.atomic.AtomicReference;
52 + import java.util.regex.Pattern;
53 +
54 + import junit.framework.AssertionFailedError;
55 + import junit.framework.Test;
56 + import junit.framework.TestCase;
57 + import junit.framework.TestResult;
58 + import junit.framework.TestSuite;
59  
60   /**
61   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 30 | Line 67 | import java.security.SecurityPermission;
67   *
68   * <ol>
69   *
70 < * <li> All assertions in code running in generated threads must use
70 > * <li>All assertions in code running in generated threads must use
71   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
72   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
73   * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
74   * particularly recommended) for other code to use these forms too.
75   * Only the most typically used JUnit assertion methods are defined
76 < * this way, but enough to live with.</li>
76 > * this way, but enough to live with.
77   *
78 < * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
78 > * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
79   * to invoke {@code super.setUp} and {@code super.tearDown} within
80   * them. These methods are used to clear and check for thread
81 < * assertion failures.</li>
81 > * assertion failures.
82   *
83   * <li>All delays and timeouts must use one of the constants {@code
84   * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
# Line 52 | Line 89 | import java.security.SecurityPermission;
89   * is always discriminable as larger than SHORT and smaller than
90   * MEDIUM.  And so on. These constants are set to conservative values,
91   * but even so, if there is ever any doubt, they can all be increased
92 < * in one spot to rerun tests on slower platforms.</li>
92 > * in one spot to rerun tests on slower platforms.
93   *
94 < * <li> All threads generated must be joined inside each test case
94 > * <li>All threads generated must be joined inside each test case
95   * method (or {@code fail} to do so) before returning from the
96   * method. The {@code joinPool} method can be used to do this when
97 < * using Executors.</li>
97 > * using Executors.
98   *
99   * </ol>
100   *
101 < * <p> <b>Other notes</b>
101 > * <p><b>Other notes</b>
102   * <ul>
103   *
104 < * <li> Usually, there is one testcase method per JSR166 method
104 > * <li>Usually, there is one testcase method per JSR166 method
105   * covering "normal" operation, and then as many exception-testing
106   * methods as there are exceptions the method can throw. Sometimes
107   * there are multiple tests per JSR166 method when the different
108   * "normal" behaviors differ significantly. And sometimes testcases
109   * cover multiple methods when they cannot be tested in
110 < * isolation.</li>
110 > * isolation.
111   *
112 < * <li> The documentation style for testcases is to provide as javadoc
112 > * <li>The documentation style for testcases is to provide as javadoc
113   * a simple sentence or two describing the property that the testcase
114   * method purports to test. The javadocs do not say anything about how
115 < * the property is tested. To find out, read the code.</li>
115 > * the property is tested. To find out, read the code.
116   *
117 < * <li> These tests are "conformance tests", and do not attempt to
117 > * <li>These tests are "conformance tests", and do not attempt to
118   * test throughput, latency, scalability or other performance factors
119   * (see the separate "jtreg" tests for a set intended to check these
120   * for the most central aspects of functionality.) So, most tests use
121   * the smallest sensible numbers of threads, collection sizes, etc
122 < * needed to check basic conformance.</li>
122 > * needed to check basic conformance.
123   *
124   * <li>The test classes currently do not declare inclusion in
125   * any particular package to simplify things for people integrating
126 < * them in TCK test suites.</li>
126 > * them in TCK test suites.
127   *
128 < * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
129 < * runs all JSR166 unit tests.</li>
128 > * <li>As a convenience, the {@code main} of this class (JSR166TestCase)
129 > * runs all JSR166 unit tests.
130   *
131   * </ul>
132   */
# Line 101 | Line 138 | public class JSR166TestCase extends Test
138          Boolean.getBoolean("jsr166.expensiveTests");
139  
140      /**
141 +     * If true, also run tests that are not part of the official tck
142 +     * because they test unspecified implementation details.
143 +     */
144 +    protected static final boolean testImplementationDetails =
145 +        Boolean.getBoolean("jsr166.testImplementationDetails");
146 +
147 +    /**
148       * If true, report on stdout all "slow" tests, that is, ones that
149       * take more than profileThreshold milliseconds to execute.
150       */
# Line 114 | Line 158 | public class JSR166TestCase extends Test
158      private static final long profileThreshold =
159          Long.getLong("jsr166.profileThreshold", 100);
160  
161 +    /**
162 +     * The number of repetitions per test (for tickling rare bugs).
163 +     */
164 +    private static final int runsPerTest =
165 +        Integer.getInteger("jsr166.runsPerTest", 1);
166 +
167 +    /**
168 +     * The number of repetitions of the test suite (for finding leaks?).
169 +     */
170 +    private static final int suiteRuns =
171 +        Integer.getInteger("jsr166.suiteRuns", 1);
172 +
173 +    public JSR166TestCase() { super(); }
174 +    public JSR166TestCase(String name) { super(name); }
175 +
176 +    /**
177 +     * A filter for tests to run, matching strings of the form
178 +     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
179 +     * Usefully combined with jsr166.runsPerTest.
180 +     */
181 +    private static final Pattern methodFilter = methodFilter();
182 +
183 +    private static Pattern methodFilter() {
184 +        String regex = System.getProperty("jsr166.methodFilter");
185 +        return (regex == null) ? null : Pattern.compile(regex);
186 +    }
187 +
188      protected void runTest() throws Throwable {
189 <        if (profileTests)
190 <            runTestProfiled();
191 <        else
192 <            super.runTest();
189 >        if (methodFilter == null
190 >            || methodFilter.matcher(toString()).find()) {
191 >            for (int i = 0; i < runsPerTest; i++) {
192 >                if (profileTests)
193 >                    runTestProfiled();
194 >                else
195 >                    super.runTest();
196 >            }
197 >        }
198      }
199  
200      protected void runTestProfiled() throws Throwable {
201 +        // Warmup run, notably to trigger all needed classloading.
202 +        super.runTest();
203          long t0 = System.nanoTime();
204          try {
205              super.runTest();
206          } finally {
207 <            long elapsedMillis =
130 <                (System.nanoTime() - t0) / (1000L * 1000L);
207 >            long elapsedMillis = millisElapsedSince(t0);
208              if (elapsedMillis >= profileThreshold)
209                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
210          }
211      }
212  
213      /**
214 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
214 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
215       */
216      public static void main(String[] args) {
217 +        main(suite(), args);
218 +    }
219 +
220 +    /**
221 +     * Runs all unit tests in the given test suite.
222 +     * Actual behavior influenced by jsr166.* system properties.
223 +     */
224 +    static void main(Test suite, String[] args) {
225          if (useSecurityManager) {
226              System.err.println("Setting a permissive security manager");
227              Policy.setPolicy(permissivePolicy());
228              System.setSecurityManager(new SecurityManager());
229          }
230 <        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
231 <
232 <        Test s = suite();
233 <        for (int i = 0; i < iters; ++i) {
149 <            junit.textui.TestRunner.run(s);
230 >        for (int i = 0; i < suiteRuns; i++) {
231 >            TestResult result = junit.textui.TestRunner.run(suite);
232 >            if (!result.wasSuccessful())
233 >                System.exit(1);
234              System.gc();
235              System.runFinalization();
236          }
153        System.exit(0);
237      }
238  
239      public static TestSuite newTestSuite(Object... suiteOrClasses) {
# Line 166 | Line 249 | public class JSR166TestCase extends Test
249          return suite;
250      }
251  
252 +    public static void addNamedTestClasses(TestSuite suite,
253 +                                           String... testClassNames) {
254 +        for (String testClassName : testClassNames) {
255 +            try {
256 +                Class<?> testClass = Class.forName(testClassName);
257 +                Method m = testClass.getDeclaredMethod("suite",
258 +                                                       new Class<?>[0]);
259 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
260 +            } catch (Exception e) {
261 +                throw new Error("Missing test class", e);
262 +            }
263 +        }
264 +    }
265 +
266 +    public static final double JAVA_CLASS_VERSION;
267 +    public static final String JAVA_SPECIFICATION_VERSION;
268 +    static {
269 +        try {
270 +            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
271 +                new java.security.PrivilegedAction<Double>() {
272 +                public Double run() {
273 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
274 +            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
275 +                new java.security.PrivilegedAction<String>() {
276 +                public String run() {
277 +                    return System.getProperty("java.specification.version");}});
278 +        } catch (Throwable t) {
279 +            throw new Error(t);
280 +        }
281 +    }
282 +
283 +    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
284 +    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
285 +    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
286 +    public static boolean atLeastJava9() {
287 +        return JAVA_CLASS_VERSION >= 53.0
288 +            // As of 2015-09, java9 still uses 52.0 class file version
289 +            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
290 +    }
291 +    public static boolean atLeastJava10() {
292 +        return JAVA_CLASS_VERSION >= 54.0
293 +            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
294 +    }
295 +
296      /**
297       * Collects all JSR166 unit tests as one suite.
298       */
299      public static Test suite() {
300 <        return newTestSuite(
300 >        // Java7+ test classes
301 >        TestSuite suite = newTestSuite(
302              ForkJoinPoolTest.suite(),
303              ForkJoinTaskTest.suite(),
304              RecursiveActionTest.suite(),
# Line 235 | Line 363 | public class JSR166TestCase extends Test
363              TreeSetTest.suite(),
364              TreeSubMapTest.suite(),
365              TreeSubSetTest.suite());
366 +
367 +        // Java8+ test classes
368 +        if (atLeastJava8()) {
369 +            String[] java8TestClassNames = {
370 +                "Atomic8Test",
371 +                "CompletableFutureTest",
372 +                "ConcurrentHashMap8Test",
373 +                "CountedCompleterTest",
374 +                "DoubleAccumulatorTest",
375 +                "DoubleAdderTest",
376 +                "ForkJoinPool8Test",
377 +                "ForkJoinTask8Test",
378 +                "LongAccumulatorTest",
379 +                "LongAdderTest",
380 +                "SplittableRandomTest",
381 +                "StampedLockTest",
382 +                "SubmissionPublisherTest",
383 +                "ThreadLocalRandom8Test",
384 +            };
385 +            addNamedTestClasses(suite, java8TestClassNames);
386 +        }
387 +
388 +        // Java9+ test classes
389 +        if (atLeastJava9()) {
390 +            String[] java9TestClassNames = {
391 +                // Currently empty, but expecting varhandle tests
392 +            };
393 +            addNamedTestClasses(suite, java9TestClassNames);
394 +        }
395 +
396 +        return suite;
397      }
398  
399 +    /** Returns list of junit-style test method names in given class. */
400 +    public static ArrayList<String> testMethodNames(Class<?> testClass) {
401 +        Method[] methods = testClass.getDeclaredMethods();
402 +        ArrayList<String> names = new ArrayList<String>(methods.length);
403 +        for (Method method : methods) {
404 +            if (method.getName().startsWith("test")
405 +                && Modifier.isPublic(method.getModifiers())
406 +                // method.getParameterCount() requires jdk8+
407 +                && method.getParameterTypes().length == 0) {
408 +                names.add(method.getName());
409 +            }
410 +        }
411 +        return names;
412 +    }
413 +
414 +    /**
415 +     * Returns junit-style testSuite for the given test class, but
416 +     * parameterized by passing extra data to each test.
417 +     */
418 +    public static <ExtraData> Test parameterizedTestSuite
419 +        (Class<? extends JSR166TestCase> testClass,
420 +         Class<ExtraData> dataClass,
421 +         ExtraData data) {
422 +        try {
423 +            TestSuite suite = new TestSuite();
424 +            Constructor c =
425 +                testClass.getDeclaredConstructor(dataClass, String.class);
426 +            for (String methodName : testMethodNames(testClass))
427 +                suite.addTest((Test) c.newInstance(data, methodName));
428 +            return suite;
429 +        } catch (Exception e) {
430 +            throw new Error(e);
431 +        }
432 +    }
433 +
434 +    /**
435 +     * Returns junit-style testSuite for the jdk8 extension of the
436 +     * given test class, but parameterized by passing extra data to
437 +     * each test.  Uses reflection to allow compilation in jdk7.
438 +     */
439 +    public static <ExtraData> Test jdk8ParameterizedTestSuite
440 +        (Class<? extends JSR166TestCase> testClass,
441 +         Class<ExtraData> dataClass,
442 +         ExtraData data) {
443 +        if (atLeastJava8()) {
444 +            String name = testClass.getName();
445 +            String name8 = name.replaceAll("Test$", "8Test");
446 +            if (name.equals(name8)) throw new Error(name);
447 +            try {
448 +                return (Test)
449 +                    Class.forName(name8)
450 +                    .getMethod("testSuite", new Class[] { dataClass })
451 +                    .invoke(null, data);
452 +            } catch (Exception e) {
453 +                throw new Error(e);
454 +            }
455 +        } else {
456 +            return new TestSuite();
457 +        }
458 +
459 +    }
460 +
461 +    // Delays for timing-dependent tests, in milliseconds.
462  
463      public static long SHORT_DELAY_MS;
464      public static long SMALL_DELAY_MS;
465      public static long MEDIUM_DELAY_MS;
466      public static long LONG_DELAY_MS;
467  
246
468      /**
469       * Returns the shortest timed delay. This could
470       * be reimplemented to use for example a Property.
# Line 252 | Line 473 | public class JSR166TestCase extends Test
473          return 50;
474      }
475  
255
476      /**
477       * Sets delays as multiples of SHORT_DELAY.
478       */
# Line 260 | Line 480 | public class JSR166TestCase extends Test
480          SHORT_DELAY_MS = getShortDelay();
481          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
482          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
483 <        LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
483 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
484 >    }
485 >
486 >    /**
487 >     * Returns a timeout in milliseconds to be used in tests that
488 >     * verify that operations block or time out.
489 >     */
490 >    long timeoutMillis() {
491 >        return SHORT_DELAY_MS / 4;
492 >    }
493 >
494 >    /**
495 >     * Returns a new Date instance representing a time at least
496 >     * delayMillis milliseconds in the future.
497 >     */
498 >    Date delayedDate(long delayMillis) {
499 >        // Add 1 because currentTimeMillis is known to round into the past.
500 >        return new Date(System.currentTimeMillis() + delayMillis + 1);
501      }
502  
503      /**
# Line 284 | Line 521 | public class JSR166TestCase extends Test
521      }
522  
523      /**
524 +     * Extra checks that get done for all test cases.
525 +     *
526       * Triggers test case failure if any thread assertions have failed,
527       * by rethrowing, in the test harness thread, any exception recorded
528       * earlier by threadRecordFailure.
529 +     *
530 +     * Triggers test case failure if interrupt status is set in the main thread.
531       */
532      public void tearDown() throws Exception {
533          Throwable t = threadFailure.getAndSet(null);
# Line 304 | Line 545 | public class JSR166TestCase extends Test
545                  throw afe;
546              }
547          }
548 +
549 +        if (Thread.interrupted())
550 +            throw new AssertionFailedError("interrupt status set in main thread");
551 +
552 +        checkForkJoinPoolThreadLeaks();
553 +    }
554 +
555 +    /**
556 +     * Finds missing try { ... } finally { joinPool(e); }
557 +     */
558 +    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
559 +        Thread[] survivors = new Thread[5];
560 +        int count = Thread.enumerate(survivors);
561 +        for (int i = 0; i < count; i++) {
562 +            Thread thread = survivors[i];
563 +            String name = thread.getName();
564 +            if (name.startsWith("ForkJoinPool-")) {
565 +                // give thread some time to terminate
566 +                thread.join(LONG_DELAY_MS);
567 +                if (!thread.isAlive()) continue;
568 +                throw new AssertionFailedError
569 +                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
570 +                                   toString(), name));
571 +            }
572 +        }
573      }
574  
575      /**
# Line 384 | Line 650 | public class JSR166TestCase extends Test
650      public void threadAssertEquals(Object x, Object y) {
651          try {
652              assertEquals(x, y);
653 <        } catch (AssertionFailedError t) {
654 <            threadRecordFailure(t);
655 <            throw t;
656 <        } catch (Throwable t) {
657 <            threadUnexpectedException(t);
653 >        } catch (AssertionFailedError fail) {
654 >            threadRecordFailure(fail);
655 >            throw fail;
656 >        } catch (Throwable fail) {
657 >            threadUnexpectedException(fail);
658          }
659      }
660  
# Line 400 | Line 666 | public class JSR166TestCase extends Test
666      public void threadAssertSame(Object x, Object y) {
667          try {
668              assertSame(x, y);
669 <        } catch (AssertionFailedError t) {
670 <            threadRecordFailure(t);
671 <            throw t;
669 >        } catch (AssertionFailedError fail) {
670 >            threadRecordFailure(fail);
671 >            throw fail;
672          }
673      }
674  
# Line 435 | Line 701 | public class JSR166TestCase extends Test
701          else {
702              AssertionFailedError afe =
703                  new AssertionFailedError("unexpected exception: " + t);
704 <            t.initCause(t);
704 >            afe.initCause(t);
705              throw afe;
706          }
707      }
708  
709      /**
710 +     * Delays, via Thread.sleep, for the given millisecond delay, but
711 +     * if the sleep is shorter than specified, may re-sleep or yield
712 +     * until time elapses.
713 +     */
714 +    static void delay(long millis) throws InterruptedException {
715 +        long startTime = System.nanoTime();
716 +        long ns = millis * 1000 * 1000;
717 +        for (;;) {
718 +            if (millis > 0L)
719 +                Thread.sleep(millis);
720 +            else // too short to sleep
721 +                Thread.yield();
722 +            long d = ns - (System.nanoTime() - startTime);
723 +            if (d > 0L)
724 +                millis = d / (1000 * 1000);
725 +            else
726 +                break;
727 +        }
728 +    }
729 +
730 +    /**
731       * Waits out termination of a thread pool or fails doing so.
732       */
733 <    public void joinPool(ExecutorService exec) {
733 >    void joinPool(ExecutorService pool) {
734          try {
735 <            exec.shutdown();
736 <            assertTrue("ExecutorService did not terminate in a timely manner",
737 <                       exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
735 >            pool.shutdown();
736 >            if (!pool.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
737 >                fail("ExecutorService " + pool +
738 >                     " did not terminate in a timely manner");
739          } catch (SecurityException ok) {
740              // Allowed in case test doesn't have privs
741 <        } catch (InterruptedException ie) {
741 >        } catch (InterruptedException fail) {
742 >            fail("Unexpected InterruptedException");
743 >        }
744 >    }
745 >
746 >    /** Like Runnable, but with the freedom to throw anything */
747 >    interface Action { public void run() throws Throwable; }
748 >
749 >    /**
750 >     * Runs all the given actions in parallel, failing if any fail.
751 >     * Useful for running multiple variants of tests that are
752 >     * necessarily individually slow because they must block.
753 >     */
754 >    void testInParallel(Action ... actions) {
755 >        ExecutorService pool = Executors.newCachedThreadPool();
756 >        try {
757 >            ArrayList<Future<?>> futures = new ArrayList<>(actions.length);
758 >            for (final Action action : actions)
759 >                futures.add(pool.submit(new CheckedRunnable() {
760 >                    public void realRun() throws Throwable { action.run();}}));
761 >            for (Future<?> future : futures)
762 >                try {
763 >                    assertNull(future.get(LONG_DELAY_MS, MILLISECONDS));
764 >                } catch (ExecutionException ex) {
765 >                    threadUnexpectedException(ex.getCause());
766 >                } catch (Exception ex) {
767 >                    threadUnexpectedException(ex);
768 >                }
769 >        } finally {
770 >            joinPool(pool);
771 >        }
772 >    }
773 >
774 >    /**
775 >     * A debugging tool to print all stack traces, as jstack does.
776 >     */
777 >    static void printAllStackTraces() {
778 >        for (ThreadInfo info :
779 >                 ManagementFactory.getThreadMXBean()
780 >                 .dumpAllThreads(true, true))
781 >            System.err.print(info);
782 >    }
783 >
784 >    /**
785 >     * Checks that thread does not terminate within the default
786 >     * millisecond delay of {@code timeoutMillis()}.
787 >     */
788 >    void assertThreadStaysAlive(Thread thread) {
789 >        assertThreadStaysAlive(thread, timeoutMillis());
790 >    }
791 >
792 >    /**
793 >     * Checks that thread does not terminate within the given millisecond delay.
794 >     */
795 >    void assertThreadStaysAlive(Thread thread, long millis) {
796 >        try {
797 >            // No need to optimize the failing case via Thread.join.
798 >            delay(millis);
799 >            assertTrue(thread.isAlive());
800 >        } catch (InterruptedException fail) {
801              fail("Unexpected InterruptedException");
802          }
803      }
804  
805 +    /**
806 +     * Checks that the threads do not terminate within the default
807 +     * millisecond delay of {@code timeoutMillis()}.
808 +     */
809 +    void assertThreadsStayAlive(Thread... threads) {
810 +        assertThreadsStayAlive(timeoutMillis(), threads);
811 +    }
812 +
813 +    /**
814 +     * Checks that the threads do not terminate within the given millisecond delay.
815 +     */
816 +    void assertThreadsStayAlive(long millis, Thread... threads) {
817 +        try {
818 +            // No need to optimize the failing case via Thread.join.
819 +            delay(millis);
820 +            for (Thread thread : threads)
821 +                assertTrue(thread.isAlive());
822 +        } catch (InterruptedException fail) {
823 +            fail("Unexpected InterruptedException");
824 +        }
825 +    }
826 +
827 +    /**
828 +     * Checks that future.get times out, with the default timeout of
829 +     * {@code timeoutMillis()}.
830 +     */
831 +    void assertFutureTimesOut(Future future) {
832 +        assertFutureTimesOut(future, timeoutMillis());
833 +    }
834 +
835 +    /**
836 +     * Checks that future.get times out, with the given millisecond timeout.
837 +     */
838 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
839 +        long startTime = System.nanoTime();
840 +        try {
841 +            future.get(timeoutMillis, MILLISECONDS);
842 +            shouldThrow();
843 +        } catch (TimeoutException success) {
844 +        } catch (Exception fail) {
845 +            threadUnexpectedException(fail);
846 +        } finally { future.cancel(true); }
847 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
848 +    }
849  
850      /**
851       * Fails with message "should throw exception".
# Line 495 | Line 886 | public class JSR166TestCase extends Test
886      public static final Integer m6  = new Integer(-6);
887      public static final Integer m10 = new Integer(-10);
888  
498
889      /**
890       * Runs Runnable r with a security policy that permits precisely
891       * the specified permissions.  If there is no current security
# Line 507 | Line 897 | public class JSR166TestCase extends Test
897          SecurityManager sm = System.getSecurityManager();
898          if (sm == null) {
899              r.run();
900 +        }
901 +        runWithSecurityManagerWithPermissions(r, permissions);
902 +    }
903 +
904 +    /**
905 +     * Runs Runnable r with a security policy that permits precisely
906 +     * the specified permissions.  If there is no current security
907 +     * manager, a temporary one is set for the duration of the
908 +     * Runnable.  We require that any security manager permit
909 +     * getPolicy/setPolicy.
910 +     */
911 +    public void runWithSecurityManagerWithPermissions(Runnable r,
912 +                                                      Permission... permissions) {
913 +        SecurityManager sm = System.getSecurityManager();
914 +        if (sm == null) {
915              Policy savedPolicy = Policy.getPolicy();
916              try {
917                  Policy.setPolicy(permissivePolicy());
918                  System.setSecurityManager(new SecurityManager());
919 <                runWithPermissions(r, permissions);
919 >                runWithSecurityManagerWithPermissions(r, permissions);
920              } finally {
921                  System.setSecurityManager(null);
922                  Policy.setPolicy(savedPolicy);
# Line 559 | Line 964 | public class JSR166TestCase extends Test
964              return perms.implies(p);
965          }
966          public void refresh() {}
967 +        public String toString() {
968 +            List<Permission> ps = new ArrayList<Permission>();
969 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
970 +                ps.add(e.nextElement());
971 +            return "AdjustablePolicy with permissions " + ps;
972 +        }
973      }
974  
975      /**
# Line 586 | Line 997 | public class JSR166TestCase extends Test
997       */
998      void sleep(long millis) {
999          try {
1000 <            Thread.sleep(millis);
1001 <        } catch (InterruptedException ie) {
1000 >            delay(millis);
1001 >        } catch (InterruptedException fail) {
1002              AssertionFailedError afe =
1003                  new AssertionFailedError("Unexpected InterruptedException");
1004 <            afe.initCause(ie);
1004 >            afe.initCause(fail);
1005              throw afe;
1006          }
1007      }
1008  
1009      /**
1010 <     * Sleeps until the timeout has elapsed, or interrupted.
600 <     * Does <em>NOT</em> throw InterruptedException.
601 <     */
602 <    void sleepTillInterrupted(long timeoutMillis) {
603 <        try {
604 <            Thread.sleep(timeoutMillis);
605 <        } catch (InterruptedException wakeup) {}
606 <    }
607 <
608 <    /**
609 <     * Waits up to the specified number of milliseconds for the given
1010 >     * Spin-waits up to the specified number of milliseconds for the given
1011       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1012       */
1013      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1014 <        long timeoutNanos = timeoutMillis * 1000L * 1000L;
614 <        long t0 = System.nanoTime();
1014 >        long startTime = System.nanoTime();
1015          for (;;) {
1016              Thread.State s = thread.getState();
1017              if (s == Thread.State.BLOCKED ||
# Line 620 | Line 1020 | public class JSR166TestCase extends Test
1020                  return;
1021              else if (s == Thread.State.TERMINATED)
1022                  fail("Unexpected thread termination");
1023 <            else if (System.nanoTime() - t0 > timeoutNanos) {
1023 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1024                  threadAssertTrue(thread.isAlive());
1025                  return;
1026              }
# Line 629 | Line 1029 | public class JSR166TestCase extends Test
1029      }
1030  
1031      /**
1032 +     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1033 +     * state: BLOCKED, WAITING, or TIMED_WAITING.
1034 +     */
1035 +    void waitForThreadToEnterWaitState(Thread thread) {
1036 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1037 +    }
1038 +
1039 +    /**
1040       * Returns the number of milliseconds since time given by
1041       * startNanoTime, which must have been previously returned from a
1042 <     * call to {@link System.nanoTime()}.
1042 >     * call to {@link System#nanoTime()}.
1043       */
1044 <    long millisElapsedSince(long startNanoTime) {
1044 >    static long millisElapsedSince(long startNanoTime) {
1045          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1046      }
1047  
1048 + //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1049 + //         long startTime = System.nanoTime();
1050 + //         try {
1051 + //             r.run();
1052 + //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1053 + //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1054 + //             throw new AssertionFailedError("did not return promptly");
1055 + //     }
1056 +
1057 + //     void assertTerminatesPromptly(Runnable r) {
1058 + //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1059 + //     }
1060 +
1061 +    /**
1062 +     * Checks that timed f.get() returns the expected value, and does not
1063 +     * wait for the timeout to elapse before returning.
1064 +     */
1065 +    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1066 +        long startTime = System.nanoTime();
1067 +        try {
1068 +            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1069 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
1070 +        if (millisElapsedSince(startTime) > timeoutMillis/2)
1071 +            throw new AssertionFailedError("timed get did not return promptly");
1072 +    }
1073 +
1074 +    <T> void checkTimedGet(Future<T> f, T expectedValue) {
1075 +        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
1076 +    }
1077 +
1078      /**
1079       * Returns a new started daemon Thread running the given runnable.
1080       */
# Line 655 | Line 1093 | public class JSR166TestCase extends Test
1093      void awaitTermination(Thread t, long timeoutMillis) {
1094          try {
1095              t.join(timeoutMillis);
1096 <        } catch (InterruptedException ie) {
1097 <            threadUnexpectedException(ie);
1096 >        } catch (InterruptedException fail) {
1097 >            threadUnexpectedException(fail);
1098          } finally {
1099 <            if (t.isAlive()) {
1099 >            if (t.getState() != Thread.State.TERMINATED) {
1100                  t.interrupt();
1101                  fail("Test timed out");
1102              }
1103          }
1104      }
1105  
1106 +    /**
1107 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
1108 +     * terminate (using {@link Thread#join(long)}), else interrupts
1109 +     * the thread (in the hope that it may terminate later) and fails.
1110 +     */
1111 +    void awaitTermination(Thread t) {
1112 +        awaitTermination(t, LONG_DELAY_MS);
1113 +    }
1114 +
1115      // Some convenient Runnable classes
1116  
1117      public abstract class CheckedRunnable implements Runnable {
# Line 673 | Line 1120 | public class JSR166TestCase extends Test
1120          public final void run() {
1121              try {
1122                  realRun();
1123 <            } catch (Throwable t) {
1124 <                threadUnexpectedException(t);
1123 >            } catch (Throwable fail) {
1124 >                threadUnexpectedException(fail);
1125              }
1126          }
1127      }
# Line 727 | Line 1174 | public class JSR166TestCase extends Test
1174                  realRun();
1175                  threadShouldThrow("InterruptedException");
1176              } catch (InterruptedException success) {
1177 <            } catch (Throwable t) {
1178 <                threadUnexpectedException(t);
1177 >                threadAssertFalse(Thread.interrupted());
1178 >            } catch (Throwable fail) {
1179 >                threadUnexpectedException(fail);
1180              }
1181          }
1182      }
# Line 739 | Line 1187 | public class JSR166TestCase extends Test
1187          public final T call() {
1188              try {
1189                  return realCall();
1190 <            } catch (Throwable t) {
1191 <                threadUnexpectedException(t);
1190 >            } catch (Throwable fail) {
1191 >                threadUnexpectedException(fail);
1192                  return null;
1193              }
1194          }
# Line 756 | Line 1204 | public class JSR166TestCase extends Test
1204                  threadShouldThrow("InterruptedException");
1205                  return result;
1206              } catch (InterruptedException success) {
1207 <            } catch (Throwable t) {
1208 <                threadUnexpectedException(t);
1207 >                threadAssertFalse(Thread.interrupted());
1208 >            } catch (Throwable fail) {
1209 >                threadUnexpectedException(fail);
1210              }
1211              return null;
1212          }
# Line 787 | Line 1236 | public class JSR166TestCase extends Test
1236              }};
1237      }
1238  
1239 +    public Runnable awaiter(final CountDownLatch latch) {
1240 +        return new CheckedRunnable() {
1241 +            public void realRun() throws InterruptedException {
1242 +                await(latch);
1243 +            }};
1244 +    }
1245 +
1246 +    public void await(CountDownLatch latch) {
1247 +        try {
1248 +            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1249 +        } catch (Throwable fail) {
1250 +            threadUnexpectedException(fail);
1251 +        }
1252 +    }
1253 +
1254 +    public void await(Semaphore semaphore) {
1255 +        try {
1256 +            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1257 +        } catch (Throwable fail) {
1258 +            threadUnexpectedException(fail);
1259 +        }
1260 +    }
1261 +
1262 + //     /**
1263 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1264 + //      */
1265 + //     public void await(AtomicBoolean flag) {
1266 + //         await(flag, LONG_DELAY_MS);
1267 + //     }
1268 +
1269 + //     /**
1270 + //      * Spin-waits up to the specified timeout until flag becomes true.
1271 + //      */
1272 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
1273 + //         long startTime = System.nanoTime();
1274 + //         while (!flag.get()) {
1275 + //             if (millisElapsedSince(startTime) > timeoutMillis)
1276 + //                 throw new AssertionFailedError("timed out");
1277 + //             Thread.yield();
1278 + //         }
1279 + //     }
1280 +
1281      public static class NPETask implements Callable<String> {
1282          public String call() { throw new NullPointerException(); }
1283      }
# Line 797 | Line 1288 | public class JSR166TestCase extends Test
1288  
1289      public class ShortRunnable extends CheckedRunnable {
1290          protected void realRun() throws Throwable {
1291 <            Thread.sleep(SHORT_DELAY_MS);
1291 >            delay(SHORT_DELAY_MS);
1292          }
1293      }
1294  
1295      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1296          protected void realRun() throws InterruptedException {
1297 <            Thread.sleep(SHORT_DELAY_MS);
1297 >            delay(SHORT_DELAY_MS);
1298          }
1299      }
1300  
1301      public class SmallRunnable extends CheckedRunnable {
1302          protected void realRun() throws Throwable {
1303 <            Thread.sleep(SMALL_DELAY_MS);
1303 >            delay(SMALL_DELAY_MS);
1304          }
1305      }
1306  
1307      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1308          protected void realRun() {
1309              try {
1310 <                Thread.sleep(SMALL_DELAY_MS);
1310 >                delay(SMALL_DELAY_MS);
1311              } catch (InterruptedException ok) {}
1312          }
1313      }
1314  
1315      public class SmallCallable extends CheckedCallable {
1316          protected Object realCall() throws InterruptedException {
1317 <            Thread.sleep(SMALL_DELAY_MS);
1317 >            delay(SMALL_DELAY_MS);
1318              return Boolean.TRUE;
1319          }
1320      }
1321  
1322      public class MediumRunnable extends CheckedRunnable {
1323          protected void realRun() throws Throwable {
1324 <            Thread.sleep(MEDIUM_DELAY_MS);
1324 >            delay(MEDIUM_DELAY_MS);
1325          }
1326      }
1327  
1328      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1329          protected void realRun() throws InterruptedException {
1330 <            Thread.sleep(MEDIUM_DELAY_MS);
1330 >            delay(MEDIUM_DELAY_MS);
1331          }
1332      }
1333  
# Line 844 | Line 1335 | public class JSR166TestCase extends Test
1335          return new CheckedRunnable() {
1336              protected void realRun() {
1337                  try {
1338 <                    Thread.sleep(timeoutMillis);
1338 >                    delay(timeoutMillis);
1339                  } catch (InterruptedException ok) {}
1340              }};
1341      }
# Line 852 | Line 1343 | public class JSR166TestCase extends Test
1343      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1344          protected void realRun() {
1345              try {
1346 <                Thread.sleep(MEDIUM_DELAY_MS);
1346 >                delay(MEDIUM_DELAY_MS);
1347              } catch (InterruptedException ok) {}
1348          }
1349      }
# Line 860 | Line 1351 | public class JSR166TestCase extends Test
1351      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1352          protected void realRun() {
1353              try {
1354 <                Thread.sleep(LONG_DELAY_MS);
1354 >                delay(LONG_DELAY_MS);
1355              } catch (InterruptedException ok) {}
1356          }
1357      }
# Line 884 | Line 1375 | public class JSR166TestCase extends Test
1375                  public boolean isDone() { return done; }
1376                  public void run() {
1377                      try {
1378 <                        Thread.sleep(timeoutMillis);
1378 >                        delay(timeoutMillis);
1379                          done = true;
1380                      } catch (InterruptedException ok) {}
1381                  }
# Line 895 | Line 1386 | public class JSR166TestCase extends Test
1386          public volatile boolean done = false;
1387          public void run() {
1388              try {
1389 <                Thread.sleep(SHORT_DELAY_MS);
1389 >                delay(SHORT_DELAY_MS);
1390                  done = true;
1391              } catch (InterruptedException ok) {}
1392          }
# Line 905 | Line 1396 | public class JSR166TestCase extends Test
1396          public volatile boolean done = false;
1397          public void run() {
1398              try {
1399 <                Thread.sleep(SMALL_DELAY_MS);
1399 >                delay(SMALL_DELAY_MS);
1400                  done = true;
1401              } catch (InterruptedException ok) {}
1402          }
# Line 915 | Line 1406 | public class JSR166TestCase extends Test
1406          public volatile boolean done = false;
1407          public void run() {
1408              try {
1409 <                Thread.sleep(MEDIUM_DELAY_MS);
1409 >                delay(MEDIUM_DELAY_MS);
1410                  done = true;
1411              } catch (InterruptedException ok) {}
1412          }
# Line 925 | Line 1416 | public class JSR166TestCase extends Test
1416          public volatile boolean done = false;
1417          public void run() {
1418              try {
1419 <                Thread.sleep(LONG_DELAY_MS);
1419 >                delay(LONG_DELAY_MS);
1420                  done = true;
1421              } catch (InterruptedException ok) {}
1422          }
# Line 942 | Line 1433 | public class JSR166TestCase extends Test
1433          public volatile boolean done = false;
1434          public Object call() {
1435              try {
1436 <                Thread.sleep(SMALL_DELAY_MS);
1436 >                delay(SMALL_DELAY_MS);
1437                  done = true;
1438              } catch (InterruptedException ok) {}
1439              return Boolean.TRUE;
# Line 955 | Line 1446 | public class JSR166TestCase extends Test
1446      public abstract class CheckedRecursiveAction extends RecursiveAction {
1447          protected abstract void realCompute() throws Throwable;
1448  
1449 <        public final void compute() {
1449 >        @Override protected final void compute() {
1450              try {
1451                  realCompute();
1452 <            } catch (Throwable t) {
1453 <                threadUnexpectedException(t);
1452 >            } catch (Throwable fail) {
1453 >                threadUnexpectedException(fail);
1454              }
1455          }
1456      }
# Line 970 | Line 1461 | public class JSR166TestCase extends Test
1461      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1462          protected abstract T realCompute() throws Throwable;
1463  
1464 <        public final T compute() {
1464 >        @Override protected final T compute() {
1465              try {
1466                  return realCompute();
1467 <            } catch (Throwable t) {
1468 <                threadUnexpectedException(t);
1467 >            } catch (Throwable fail) {
1468 >                threadUnexpectedException(fail);
1469                  return null;
1470              }
1471          }
# Line 989 | Line 1480 | public class JSR166TestCase extends Test
1480      }
1481  
1482      /**
1483 <     * A CyclicBarrier that fails with AssertionFailedErrors instead
1484 <     * of throwing checked exceptions.
1483 >     * A CyclicBarrier that uses timed await and fails with
1484 >     * AssertionFailedErrors instead of throwing checked exceptions.
1485       */
1486      public class CheckedBarrier extends CyclicBarrier {
1487          public CheckedBarrier(int parties) { super(parties); }
1488  
1489          public int await() {
1490              try {
1491 <                return super.await();
1492 <            } catch (Exception e) {
1491 >                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1492 >            } catch (TimeoutException timedOut) {
1493 >                throw new AssertionFailedError("timed out");
1494 >            } catch (Exception fail) {
1495                  AssertionFailedError afe =
1496 <                    new AssertionFailedError("Unexpected exception: " + e);
1497 <                afe.initCause(e);
1496 >                    new AssertionFailedError("Unexpected exception: " + fail);
1497 >                afe.initCause(fail);
1498                  throw afe;
1499              }
1500          }
1501      }
1502  
1503 +    void checkEmpty(BlockingQueue q) {
1504 +        try {
1505 +            assertTrue(q.isEmpty());
1506 +            assertEquals(0, q.size());
1507 +            assertNull(q.peek());
1508 +            assertNull(q.poll());
1509 +            assertNull(q.poll(0, MILLISECONDS));
1510 +            assertEquals(q.toString(), "[]");
1511 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1512 +            assertFalse(q.iterator().hasNext());
1513 +            try {
1514 +                q.element();
1515 +                shouldThrow();
1516 +            } catch (NoSuchElementException success) {}
1517 +            try {
1518 +                q.iterator().next();
1519 +                shouldThrow();
1520 +            } catch (NoSuchElementException success) {}
1521 +            try {
1522 +                q.remove();
1523 +                shouldThrow();
1524 +            } catch (NoSuchElementException success) {}
1525 +        } catch (InterruptedException fail) { threadUnexpectedException(fail); }
1526 +    }
1527 +
1528 +    void assertSerialEquals(Object x, Object y) {
1529 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1530 +    }
1531 +
1532 +    void assertNotSerialEquals(Object x, Object y) {
1533 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1534 +    }
1535 +
1536 +    byte[] serialBytes(Object o) {
1537 +        try {
1538 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1539 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1540 +            oos.writeObject(o);
1541 +            oos.flush();
1542 +            oos.close();
1543 +            return bos.toByteArray();
1544 +        } catch (Throwable fail) {
1545 +            threadUnexpectedException(fail);
1546 +            return new byte[0];
1547 +        }
1548 +    }
1549 +
1550 +    @SuppressWarnings("unchecked")
1551 +    <T> T serialClone(T o) {
1552 +        try {
1553 +            ObjectInputStream ois = new ObjectInputStream
1554 +                (new ByteArrayInputStream(serialBytes(o)));
1555 +            T clone = (T) ois.readObject();
1556 +            assertSame(o.getClass(), clone.getClass());
1557 +            return clone;
1558 +        } catch (Throwable fail) {
1559 +            threadUnexpectedException(fail);
1560 +            return null;
1561 +        }
1562 +    }
1563 +
1564 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1565 +                             Runnable... throwingActions) {
1566 +        for (Runnable throwingAction : throwingActions) {
1567 +            boolean threw = false;
1568 +            try { throwingAction.run(); }
1569 +            catch (Throwable t) {
1570 +                threw = true;
1571 +                if (!expectedExceptionClass.isInstance(t)) {
1572 +                    AssertionFailedError afe =
1573 +                        new AssertionFailedError
1574 +                        ("Expected " + expectedExceptionClass.getName() +
1575 +                         ", got " + t.getClass().getName());
1576 +                    afe.initCause(t);
1577 +                    threadUnexpectedException(afe);
1578 +                }
1579 +            }
1580 +            if (!threw)
1581 +                shouldThrow(expectedExceptionClass.getName());
1582 +        }
1583 +    }
1584 +
1585 +    public void assertIteratorExhausted(Iterator<?> it) {
1586 +        try {
1587 +            it.next();
1588 +            shouldThrow();
1589 +        } catch (NoSuchElementException success) {}
1590 +        assertFalse(it.hasNext());
1591 +    }
1592   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines