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.36 by jsr166, Mon Aug 3 22:08:45 2009 UTC vs.
Revision 1.107 by jsr166, Sun Apr 21 06:19:58 2013 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.*;
10 > import java.io.ByteArrayInputStream;
11 > import java.io.ByteArrayOutputStream;
12 > import java.io.ObjectInputStream;
13 > import java.io.ObjectOutputStream;
14 > import java.lang.management.ManagementFactory;
15 > import java.lang.management.ThreadInfo;
16 > import java.lang.reflect.Method;
17 > import java.util.ArrayList;
18 > import java.util.Arrays;
19 > import java.util.Date;
20 > import java.util.Enumeration;
21 > import java.util.List;
22 > import java.util.NoSuchElementException;
23 > import java.util.PropertyPermission;
24   import java.util.concurrent.*;
25 + import java.util.concurrent.atomic.AtomicBoolean;
26 + import java.util.concurrent.atomic.AtomicReference;
27   import static java.util.concurrent.TimeUnit.MILLISECONDS;
28 < import java.io.*;
29 < import java.security.*;
28 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
29 > import java.security.CodeSource;
30 > import java.security.Permission;
31 > import java.security.PermissionCollection;
32 > import java.security.Permissions;
33 > import java.security.Policy;
34 > import java.security.ProtectionDomain;
35 > import java.security.SecurityPermission;
36  
37   /**
38   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 26 | Line 47 | import java.security.*;
47   * <li> All assertions in code running in generated threads must use
48   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
49   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
50 < * <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
50 > * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
51   * particularly recommended) for other code to use these forms too.
52   * Only the most typically used JUnit assertion methods are defined
53   * this way, but enough to live with.</li>
54   *
55   * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
56 < * to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within
56 > * to invoke {@code super.setUp} and {@code super.tearDown} within
57   * them. These methods are used to clear and check for thread
58   * assertion failures.</li>
59   *
60 < * <li>All delays and timeouts must use one of the constants <tt>
61 < * SHORT_DELAY_MS</tt>, <tt> SMALL_DELAY_MS</tt>, <tt> MEDIUM_DELAY_MS</tt>,
62 < * <tt> LONG_DELAY_MS</tt>. The idea here is that a SHORT is always
60 > * <li>All delays and timeouts must use one of the constants {@code
61 > * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
62 > * {@code LONG_DELAY_MS}. The idea here is that a SHORT is always
63   * discriminable from zero time, and always allows enough time for the
64   * small amounts of computation (creating a thread, calling a few
65   * methods, etc) needed to reach a timeout point. Similarly, a SMALL
# Line 48 | Line 69 | import java.security.*;
69   * in one spot to rerun tests on slower platforms.</li>
70   *
71   * <li> All threads generated must be joined inside each test case
72 < * method (or <tt>fail</tt> to do so) before returning from the
73 < * method. The <tt> joinPool</tt> method can be used to do this when
72 > * method (or {@code fail} to do so) before returning from the
73 > * method. The {@code joinPool} method can be used to do this when
74   * using Executors.</li>
75   *
76   * </ol>
77   *
78 < * <p> <b>Other notes</b>
78 > * <p><b>Other notes</b>
79   * <ul>
80   *
81   * <li> Usually, there is one testcase method per JSR166 method
# Line 81 | Line 102 | import java.security.*;
102   * any particular package to simplify things for people integrating
103   * them in TCK test suites.</li>
104   *
105 < * <li> As a convenience, the <tt>main</tt> of this class (JSR166TestCase)
105 > * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
106   * runs all JSR166 unit tests.</li>
107   *
108   * </ul>
109   */
110   public class JSR166TestCase extends TestCase {
111 +    private static final boolean useSecurityManager =
112 +        Boolean.getBoolean("jsr166.useSecurityManager");
113 +
114 +    protected static final boolean expensiveTests =
115 +        Boolean.getBoolean("jsr166.expensiveTests");
116 +
117 +    /**
118 +     * If true, report on stdout all "slow" tests, that is, ones that
119 +     * take more than profileThreshold milliseconds to execute.
120 +     */
121 +    private static final boolean profileTests =
122 +        Boolean.getBoolean("jsr166.profileTests");
123 +
124 +    /**
125 +     * The number of milliseconds that tests are permitted for
126 +     * execution without being reported, when profileTests is set.
127 +     */
128 +    private static final long profileThreshold =
129 +        Long.getLong("jsr166.profileThreshold", 100);
130 +
131 +    /**
132 +     * The number of repetitions per test (for tickling rare bugs).
133 +     */
134 +    private static final int runsPerTest =
135 +        Integer.getInteger("jsr166.runsPerTest", 1);
136 +
137 +    protected void runTest() throws Throwable {
138 +        for (int i = 0; i < runsPerTest; i++) {
139 +            if (profileTests)
140 +                runTestProfiled();
141 +            else
142 +                super.runTest();
143 +        }
144 +    }
145 +
146 +    protected void runTestProfiled() throws Throwable {
147 +        long t0 = System.nanoTime();
148 +        try {
149 +            super.runTest();
150 +        } finally {
151 +            long elapsedMillis =
152 +                (System.nanoTime() - t0) / (1000L * 1000L);
153 +            if (elapsedMillis >= profileThreshold)
154 +                System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
155 +        }
156 +    }
157 +
158      /**
159 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
159 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
160 >     * Optional command line arg provides the number of iterations to
161 >     * repeat running the tests.
162       */
163 <    public static void main (String[] args) {
164 <        int iters = 1;
165 <        if (args.length > 0)
166 <            iters = Integer.parseInt(args[0]);
163 >    public static void main(String[] args) {
164 >        if (useSecurityManager) {
165 >            System.err.println("Setting a permissive security manager");
166 >            Policy.setPolicy(permissivePolicy());
167 >            System.setSecurityManager(new SecurityManager());
168 >        }
169 >        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
170 >
171          Test s = suite();
172          for (int i = 0; i < iters; ++i) {
173 <            junit.textui.TestRunner.run (s);
173 >            junit.textui.TestRunner.run(s);
174              System.gc();
175              System.runFinalization();
176          }
177          System.exit(0);
178      }
179  
180 <    /**
181 <     * Collects all JSR166 unit tests as one suite
182 <     */
183 <    public static Test suite ( ) {
184 <        TestSuite suite = new TestSuite("JSR166 Unit Tests");
180 >    public static TestSuite newTestSuite(Object... suiteOrClasses) {
181 >        TestSuite suite = new TestSuite();
182 >        for (Object suiteOrClass : suiteOrClasses) {
183 >            if (suiteOrClass instanceof TestSuite)
184 >                suite.addTest((TestSuite) suiteOrClass);
185 >            else if (suiteOrClass instanceof Class)
186 >                suite.addTest(new TestSuite((Class<?>) suiteOrClass));
187 >            else
188 >                throw new ClassCastException("not a test suite or class");
189 >        }
190 >        return suite;
191 >    }
192 >
193 >    public static void addNamedTestClasses(TestSuite suite,
194 >                                           String... testClassNames) {
195 >        for (String testClassName : testClassNames) {
196 >            try {
197 >                Class<?> testClass = Class.forName(testClassName);
198 >                Method m = testClass.getDeclaredMethod("suite",
199 >                                                       new Class<?>[0]);
200 >                suite.addTest(newTestSuite((Test)m.invoke(null)));
201 >            } catch (Exception e) {
202 >                throw new Error("Missing test class", e);
203 >            }
204 >        }
205 >    }
206  
207 <        suite.addTest(new TestSuite(ForkJoinPoolTest.class));
208 <        suite.addTest(new TestSuite(ForkJoinTaskTest.class));
209 <        suite.addTest(new TestSuite(RecursiveActionTest.class));
210 <        suite.addTest(new TestSuite(RecursiveTaskTest.class));
211 <        suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
212 <        suite.addTest(new TestSuite(PhaserTest.class));
213 <        suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
214 <        suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
215 <        suite.addTest(new TestSuite(AbstractQueueTest.class));
216 <        suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
217 <        suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
218 <        suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
219 <        suite.addTest(new TestSuite(ArrayDequeTest.class));
220 <        suite.addTest(new TestSuite(AtomicBooleanTest.class));
221 <        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
222 <        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
223 <        suite.addTest(new TestSuite(AtomicIntegerTest.class));
224 <        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
225 <        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
226 <        suite.addTest(new TestSuite(AtomicLongTest.class));
227 <        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
228 <        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
229 <        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
230 <        suite.addTest(new TestSuite(AtomicReferenceTest.class));
231 <        suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
232 <        suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
233 <        suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
234 <        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
235 <        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
236 <        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
237 <        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
238 <        suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
239 <        suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
240 <        suite.addTest(new TestSuite(CountDownLatchTest.class));
241 <        suite.addTest(new TestSuite(CyclicBarrierTest.class));
242 <        suite.addTest(new TestSuite(DelayQueueTest.class));
243 <        suite.addTest(new TestSuite(EntryTest.class));
244 <        suite.addTest(new TestSuite(ExchangerTest.class));
245 <        suite.addTest(new TestSuite(ExecutorsTest.class));
246 <        suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
247 <        suite.addTest(new TestSuite(FutureTaskTest.class));
248 <        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
249 <        suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
250 <        suite.addTest(new TestSuite(LinkedListTest.class));
251 <        suite.addTest(new TestSuite(LockSupportTest.class));
252 <        suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
253 <        suite.addTest(new TestSuite(PriorityQueueTest.class));
254 <        suite.addTest(new TestSuite(ReentrantLockTest.class));
255 <        suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
256 <        suite.addTest(new TestSuite(ScheduledExecutorTest.class));
257 <        suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
258 <        suite.addTest(new TestSuite(SemaphoreTest.class));
259 <        suite.addTest(new TestSuite(SynchronousQueueTest.class));
260 <        suite.addTest(new TestSuite(SystemTest.class));
261 <        suite.addTest(new TestSuite(ThreadLocalTest.class));
262 <        suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
263 <        suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
264 <        suite.addTest(new TestSuite(ThreadTest.class));
265 <        suite.addTest(new TestSuite(TimeUnitTest.class));
266 <        suite.addTest(new TestSuite(TreeMapTest.class));
267 <        suite.addTest(new TestSuite(TreeSetTest.class));
268 <        suite.addTest(new TestSuite(TreeSubMapTest.class));
269 <        suite.addTest(new TestSuite(TreeSubSetTest.class));
207 >    public static final double JAVA_CLASS_VERSION;
208 >    static {
209 >        try {
210 >            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
211 >                new java.security.PrivilegedAction<Double>() {
212 >                public Double run() {
213 >                    return Double.valueOf(System.getProperty("java.class.version"));}});
214 >        } catch (Throwable t) {
215 >            throw new Error(t);
216 >        }
217 >    }
218 >
219 >    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
220 >    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
221 >    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
222 >
223 >    /**
224 >     * Collects all JSR166 unit tests as one suite.
225 >     */
226 >    public static Test suite() {
227 >        // Java7+ test classes
228 >        TestSuite suite = newTestSuite(
229 >            ForkJoinPoolTest.suite(),
230 >            ForkJoinTaskTest.suite(),
231 >            RecursiveActionTest.suite(),
232 >            RecursiveTaskTest.suite(),
233 >            LinkedTransferQueueTest.suite(),
234 >            PhaserTest.suite(),
235 >            ThreadLocalRandomTest.suite(),
236 >            AbstractExecutorServiceTest.suite(),
237 >            AbstractQueueTest.suite(),
238 >            AbstractQueuedSynchronizerTest.suite(),
239 >            AbstractQueuedLongSynchronizerTest.suite(),
240 >            ArrayBlockingQueueTest.suite(),
241 >            ArrayDequeTest.suite(),
242 >            AtomicBooleanTest.suite(),
243 >            AtomicIntegerArrayTest.suite(),
244 >            AtomicIntegerFieldUpdaterTest.suite(),
245 >            AtomicIntegerTest.suite(),
246 >            AtomicLongArrayTest.suite(),
247 >            AtomicLongFieldUpdaterTest.suite(),
248 >            AtomicLongTest.suite(),
249 >            AtomicMarkableReferenceTest.suite(),
250 >            AtomicReferenceArrayTest.suite(),
251 >            AtomicReferenceFieldUpdaterTest.suite(),
252 >            AtomicReferenceTest.suite(),
253 >            AtomicStampedReferenceTest.suite(),
254 >            ConcurrentHashMapTest.suite(),
255 >            ConcurrentLinkedDequeTest.suite(),
256 >            ConcurrentLinkedQueueTest.suite(),
257 >            ConcurrentSkipListMapTest.suite(),
258 >            ConcurrentSkipListSubMapTest.suite(),
259 >            ConcurrentSkipListSetTest.suite(),
260 >            ConcurrentSkipListSubSetTest.suite(),
261 >            CopyOnWriteArrayListTest.suite(),
262 >            CopyOnWriteArraySetTest.suite(),
263 >            CountDownLatchTest.suite(),
264 >            CyclicBarrierTest.suite(),
265 >            DelayQueueTest.suite(),
266 >            EntryTest.suite(),
267 >            ExchangerTest.suite(),
268 >            ExecutorsTest.suite(),
269 >            ExecutorCompletionServiceTest.suite(),
270 >            FutureTaskTest.suite(),
271 >            LinkedBlockingDequeTest.suite(),
272 >            LinkedBlockingQueueTest.suite(),
273 >            LinkedListTest.suite(),
274 >            LockSupportTest.suite(),
275 >            PriorityBlockingQueueTest.suite(),
276 >            PriorityQueueTest.suite(),
277 >            ReentrantLockTest.suite(),
278 >            ReentrantReadWriteLockTest.suite(),
279 >            ScheduledExecutorTest.suite(),
280 >            ScheduledExecutorSubclassTest.suite(),
281 >            SemaphoreTest.suite(),
282 >            SynchronousQueueTest.suite(),
283 >            SystemTest.suite(),
284 >            ThreadLocalTest.suite(),
285 >            ThreadPoolExecutorTest.suite(),
286 >            ThreadPoolExecutorSubclassTest.suite(),
287 >            ThreadTest.suite(),
288 >            TimeUnitTest.suite(),
289 >            TreeMapTest.suite(),
290 >            TreeSetTest.suite(),
291 >            TreeSubMapTest.suite(),
292 >            TreeSubSetTest.suite());
293 >
294 >        // Java8+ test classes
295 >        if (atLeastJava8()) {
296 >            String[] java8TestClassNames = {
297 >                "CompletableFutureTest",
298 >                "ConcurrentHashMap8Test",
299 >                "CountedCompleterTest",
300 >                "DoubleAccumulatorTest",
301 >                "DoubleAdderTest",
302 >                "ForkJoinPool8Test",
303 >                "LongAccumulatorTest",
304 >                "LongAdderTest",
305 >                "StampedLockTest",
306 >            };
307 >            addNamedTestClasses(suite, java8TestClassNames);
308 >        }
309  
310          return suite;
311      }
# Line 191 | Line 325 | public class JSR166TestCase extends Test
325          return 50;
326      }
327  
194
328      /**
329       * Sets delays as multiples of SHORT_DELAY.
330       */
331 <    protected  void setDelays() {
331 >    protected void setDelays() {
332          SHORT_DELAY_MS = getShortDelay();
333 <        SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
333 >        SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
334          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
335 <        LONG_DELAY_MS = SHORT_DELAY_MS * 50;
335 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
336 >    }
337 >
338 >    /**
339 >     * Returns a timeout in milliseconds to be used in tests that
340 >     * verify that operations block or time out.
341 >     */
342 >    long timeoutMillis() {
343 >        return SHORT_DELAY_MS / 4;
344      }
345  
346      /**
347 <     * Flag set true if any threadAssert methods fail
347 >     * Returns a new Date instance representing a time delayMillis
348 >     * milliseconds in the future.
349       */
350 <    volatile boolean threadFailed;
350 >    Date delayedDate(long delayMillis) {
351 >        return new Date(System.currentTimeMillis() + delayMillis);
352 >    }
353  
354      /**
355 <     * Initializes test to indicate that no thread assertions have failed
355 >     * The first exception encountered if any threadAssertXXX method fails.
356       */
357 +    private final AtomicReference<Throwable> threadFailure
358 +        = new AtomicReference<Throwable>(null);
359 +
360 +    /**
361 +     * Records an exception so that it can be rethrown later in the test
362 +     * harness thread, triggering a test case failure.  Only the first
363 +     * failure is recorded; subsequent calls to this method from within
364 +     * the same test have no effect.
365 +     */
366 +    public void threadRecordFailure(Throwable t) {
367 +        threadFailure.compareAndSet(null, t);
368 +    }
369 +
370      public void setUp() {
371          setDelays();
215        threadFailed = false;
372      }
373  
374      /**
375 <     * Triggers test case failure if any thread assertions have failed
375 >     * Extra checks that get done for all test cases.
376 >     *
377 >     * Triggers test case failure if any thread assertions have failed,
378 >     * by rethrowing, in the test harness thread, any exception recorded
379 >     * earlier by threadRecordFailure.
380 >     *
381 >     * Triggers test case failure if interrupt status is set in the main thread.
382 >     */
383 >    public void tearDown() throws Exception {
384 >        Throwable t = threadFailure.getAndSet(null);
385 >        if (t != null) {
386 >            if (t instanceof Error)
387 >                throw (Error) t;
388 >            else if (t instanceof RuntimeException)
389 >                throw (RuntimeException) t;
390 >            else if (t instanceof Exception)
391 >                throw (Exception) t;
392 >            else {
393 >                AssertionFailedError afe =
394 >                    new AssertionFailedError(t.toString());
395 >                afe.initCause(t);
396 >                throw afe;
397 >            }
398 >        }
399 >
400 >        if (Thread.interrupted())
401 >            throw new AssertionFailedError("interrupt status set in main thread");
402 >
403 >        checkForkJoinPoolThreadLeaks();
404 >    }
405 >
406 >    /**
407 >     * Find missing try { ... } finally { joinPool(e); }
408       */
409 <    public void tearDown() {
410 <        assertFalse(threadFailed);
409 >    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
410 >        Thread[] survivors = new Thread[5];
411 >        int count = Thread.enumerate(survivors);
412 >        for (int i = 0; i < count; i++) {
413 >            Thread thread = survivors[i];
414 >            String name = thread.getName();
415 >            if (name.startsWith("ForkJoinPool-")) {
416 >                // give thread some time to terminate
417 >                thread.join(LONG_DELAY_MS);
418 >                if (!thread.isAlive()) continue;
419 >                thread.stop();
420 >                throw new AssertionFailedError
421 >                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
422 >                                   toString(), name));
423 >            }
424 >        }
425      }
426  
427      /**
428 <     * Fail, also setting status to indicate current testcase should fail
428 >     * Just like fail(reason), but additionally recording (using
429 >     * threadRecordFailure) any AssertionFailedError thrown, so that
430 >     * the current testcase will fail.
431       */
432      public void threadFail(String reason) {
433 <        threadFailed = true;
434 <        fail(reason);
433 >        try {
434 >            fail(reason);
435 >        } catch (AssertionFailedError t) {
436 >            threadRecordFailure(t);
437 >            fail(reason);
438 >        }
439      }
440  
441      /**
442 <     * If expression not true, set status to indicate current testcase
443 <     * should fail
442 >     * Just like assertTrue(b), but additionally recording (using
443 >     * threadRecordFailure) any AssertionFailedError thrown, so that
444 >     * the current testcase will fail.
445       */
446      public void threadAssertTrue(boolean b) {
447 <        if (!b) {
239 <            threadFailed = true;
447 >        try {
448              assertTrue(b);
449 +        } catch (AssertionFailedError t) {
450 +            threadRecordFailure(t);
451 +            throw t;
452          }
453      }
454  
455      /**
456 <     * If expression not false, set status to indicate current testcase
457 <     * should fail
456 >     * Just like assertFalse(b), but additionally recording (using
457 >     * threadRecordFailure) any AssertionFailedError thrown, so that
458 >     * the current testcase will fail.
459       */
460      public void threadAssertFalse(boolean b) {
461 <        if (b) {
250 <            threadFailed = true;
461 >        try {
462              assertFalse(b);
463 +        } catch (AssertionFailedError t) {
464 +            threadRecordFailure(t);
465 +            throw t;
466          }
467      }
468  
469      /**
470 <     * If argument not null, set status to indicate current testcase
471 <     * should fail
470 >     * Just like assertNull(x), but additionally recording (using
471 >     * threadRecordFailure) any AssertionFailedError thrown, so that
472 >     * the current testcase will fail.
473       */
474      public void threadAssertNull(Object x) {
475 <        if (x != null) {
261 <            threadFailed = true;
475 >        try {
476              assertNull(x);
477 +        } catch (AssertionFailedError t) {
478 +            threadRecordFailure(t);
479 +            throw t;
480          }
481      }
482  
483      /**
484 <     * If arguments not equal, set status to indicate current testcase
485 <     * should fail
484 >     * Just like assertEquals(x, y), but additionally recording (using
485 >     * threadRecordFailure) any AssertionFailedError thrown, so that
486 >     * the current testcase will fail.
487       */
488      public void threadAssertEquals(long x, long y) {
489 <        if (x != y) {
272 <            threadFailed = true;
489 >        try {
490              assertEquals(x, y);
491 +        } catch (AssertionFailedError t) {
492 +            threadRecordFailure(t);
493 +            throw t;
494          }
495      }
496  
497      /**
498 <     * If arguments not equal, set status to indicate current testcase
499 <     * should fail
498 >     * Just like assertEquals(x, y), but additionally recording (using
499 >     * threadRecordFailure) any AssertionFailedError thrown, so that
500 >     * the current testcase will fail.
501       */
502      public void threadAssertEquals(Object x, Object y) {
503 <        if (x != y && (x == null || !x.equals(y))) {
283 <            threadFailed = true;
503 >        try {
504              assertEquals(x, y);
505 +        } catch (AssertionFailedError t) {
506 +            threadRecordFailure(t);
507 +            throw t;
508 +        } catch (Throwable t) {
509 +            threadUnexpectedException(t);
510          }
511      }
512  
513      /**
514 <     * threadFail with message "should throw exception"
514 >     * Just like assertSame(x, y), but additionally recording (using
515 >     * threadRecordFailure) any AssertionFailedError thrown, so that
516 >     * the current testcase will fail.
517       */
518 <    public void threadShouldThrow() {
518 >    public void threadAssertSame(Object x, Object y) {
519          try {
520 <            threadFailed = true;
521 <            fail("should throw exception");
522 <        } catch (AssertionFailedError e) {
523 <            e.printStackTrace();
297 <            throw e;
520 >            assertSame(x, y);
521 >        } catch (AssertionFailedError t) {
522 >            threadRecordFailure(t);
523 >            throw t;
524          }
525      }
526  
527      /**
528 <     * threadFail with message "Unexpected exception"
528 >     * Calls threadFail with message "should throw exception".
529 >     */
530 >    public void threadShouldThrow() {
531 >        threadFail("should throw exception");
532 >    }
533 >
534 >    /**
535 >     * Calls threadFail with message "should throw" + exceptionName.
536       */
537 <    public void threadUnexpectedException() {
538 <        threadFailed = true;
306 <        fail("Unexpected exception");
537 >    public void threadShouldThrow(String exceptionName) {
538 >        threadFail("should throw " + exceptionName);
539      }
540  
541      /**
542 <     * threadFail with message "Unexpected exception", with argument
542 >     * Records the given exception using {@link #threadRecordFailure},
543 >     * then rethrows the exception, wrapping it in an
544 >     * AssertionFailedError if necessary.
545       */
546 <    public void threadUnexpectedException(Throwable ex) {
547 <        threadFailed = true;
548 <        ex.printStackTrace();
549 <        fail("Unexpected exception: " + ex);
546 >    public void threadUnexpectedException(Throwable t) {
547 >        threadRecordFailure(t);
548 >        t.printStackTrace();
549 >        if (t instanceof RuntimeException)
550 >            throw (RuntimeException) t;
551 >        else if (t instanceof Error)
552 >            throw (Error) t;
553 >        else {
554 >            AssertionFailedError afe =
555 >                new AssertionFailedError("unexpected exception: " + t);
556 >            afe.initCause(t);
557 >            throw afe;
558 >        }
559 >    }
560 >
561 >    /**
562 >     * Delays, via Thread.sleep, for the given millisecond delay, but
563 >     * if the sleep is shorter than specified, may re-sleep or yield
564 >     * until time elapses.
565 >     */
566 >    static void delay(long millis) throws InterruptedException {
567 >        long startTime = System.nanoTime();
568 >        long ns = millis * 1000 * 1000;
569 >        for (;;) {
570 >            if (millis > 0L)
571 >                Thread.sleep(millis);
572 >            else // too short to sleep
573 >                Thread.yield();
574 >            long d = ns - (System.nanoTime() - startTime);
575 >            if (d > 0L)
576 >                millis = d / (1000 * 1000);
577 >            else
578 >                break;
579 >        }
580      }
581  
582      /**
583 <     * Wait out termination of a thread pool or fail doing so
583 >     * Waits out termination of a thread pool or fails doing so.
584       */
585 <    public void joinPool(ExecutorService exec) {
585 >    void joinPool(ExecutorService exec) {
586          try {
587              exec.shutdown();
588 <            assertTrue(exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
588 >            assertTrue("ExecutorService did not terminate in a timely manner",
589 >                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
590          } catch (SecurityException ok) {
591              // Allowed in case test doesn't have privs
592          } catch (InterruptedException ie) {
593 <            fail("Unexpected exception");
593 >            fail("Unexpected InterruptedException");
594          }
595      }
596  
597 +    /**
598 +     * A debugging tool to print all stack traces, as jstack does.
599 +     */
600 +    static void printAllStackTraces() {
601 +        for (ThreadInfo info :
602 +                 ManagementFactory.getThreadMXBean()
603 +                 .dumpAllThreads(true, true))
604 +            System.err.print(info);
605 +    }
606  
607      /**
608 <     * fail with message "should throw exception"
608 >     * Checks that thread does not terminate within the default
609 >     * millisecond delay of {@code timeoutMillis()}.
610       */
611 <    public void shouldThrow() {
612 <        fail("Should throw exception");
611 >    void assertThreadStaysAlive(Thread thread) {
612 >        assertThreadStaysAlive(thread, timeoutMillis());
613 >    }
614 >
615 >    /**
616 >     * Checks that thread does not terminate within the given millisecond delay.
617 >     */
618 >    void assertThreadStaysAlive(Thread thread, long millis) {
619 >        try {
620 >            // No need to optimize the failing case via Thread.join.
621 >            delay(millis);
622 >            assertTrue(thread.isAlive());
623 >        } catch (InterruptedException ie) {
624 >            fail("Unexpected InterruptedException");
625 >        }
626 >    }
627 >
628 >    /**
629 >     * Checks that the threads do not terminate within the default
630 >     * millisecond delay of {@code timeoutMillis()}.
631 >     */
632 >    void assertThreadsStayAlive(Thread... threads) {
633 >        assertThreadsStayAlive(timeoutMillis(), threads);
634 >    }
635 >
636 >    /**
637 >     * Checks that the threads do not terminate within the given millisecond delay.
638 >     */
639 >    void assertThreadsStayAlive(long millis, Thread... threads) {
640 >        try {
641 >            // No need to optimize the failing case via Thread.join.
642 >            delay(millis);
643 >            for (Thread thread : threads)
644 >                assertTrue(thread.isAlive());
645 >        } catch (InterruptedException ie) {
646 >            fail("Unexpected InterruptedException");
647 >        }
648 >    }
649 >
650 >    /**
651 >     * Checks that future.get times out, with the default timeout of
652 >     * {@code timeoutMillis()}.
653 >     */
654 >    void assertFutureTimesOut(Future future) {
655 >        assertFutureTimesOut(future, timeoutMillis());
656      }
657  
658      /**
659 <     * fail with message "Unexpected exception"
659 >     * Checks that future.get times out, with the given millisecond timeout.
660       */
661 <    public void unexpectedException() {
662 <        fail("Unexpected exception");
661 >    void assertFutureTimesOut(Future future, long timeoutMillis) {
662 >        long startTime = System.nanoTime();
663 >        try {
664 >            future.get(timeoutMillis, MILLISECONDS);
665 >            shouldThrow();
666 >        } catch (TimeoutException success) {
667 >        } catch (Exception e) {
668 >            threadUnexpectedException(e);
669 >        } finally { future.cancel(true); }
670 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
671      }
672  
673      /**
674 <     * fail with message "Unexpected exception", with argument
674 >     * Fails with message "should throw exception".
675       */
676 <    public void unexpectedException(Throwable ex) {
677 <        ex.printStackTrace();
352 <        fail("Unexpected exception: " + ex);
676 >    public void shouldThrow() {
677 >        fail("Should throw exception");
678      }
679  
680 +    /**
681 +     * Fails with message "should throw " + exceptionName.
682 +     */
683 +    public void shouldThrow(String exceptionName) {
684 +        fail("Should throw " + exceptionName);
685 +    }
686  
687      /**
688       * The number of elements to place in collections, arrays, etc.
689       */
690 <    static final int SIZE = 20;
690 >    public static final int SIZE = 20;
691  
692      // Some convenient Integer constants
693  
694 <    static final Integer zero = new Integer(0);
695 <    static final Integer one = new Integer(1);
696 <    static final Integer two = new Integer(2);
697 <    static final Integer three  = new Integer(3);
698 <    static final Integer four  = new Integer(4);
699 <    static final Integer five  = new Integer(5);
700 <    static final Integer six = new Integer(6);
701 <    static final Integer seven = new Integer(7);
702 <    static final Integer eight = new Integer(8);
703 <    static final Integer nine = new Integer(9);
704 <    static final Integer m1  = new Integer(-1);
705 <    static final Integer m2  = new Integer(-2);
706 <    static final Integer m3  = new Integer(-3);
707 <    static final Integer m4 = new Integer(-4);
708 <    static final Integer m5 = new Integer(-5);
709 <    static final Integer m6 = new Integer(-6);
710 <    static final Integer m10 = new Integer(-10);
694 >    public static final Integer zero  = new Integer(0);
695 >    public static final Integer one   = new Integer(1);
696 >    public static final Integer two   = new Integer(2);
697 >    public static final Integer three = new Integer(3);
698 >    public static final Integer four  = new Integer(4);
699 >    public static final Integer five  = new Integer(5);
700 >    public static final Integer six   = new Integer(6);
701 >    public static final Integer seven = new Integer(7);
702 >    public static final Integer eight = new Integer(8);
703 >    public static final Integer nine  = new Integer(9);
704 >    public static final Integer m1  = new Integer(-1);
705 >    public static final Integer m2  = new Integer(-2);
706 >    public static final Integer m3  = new Integer(-3);
707 >    public static final Integer m4  = new Integer(-4);
708 >    public static final Integer m5  = new Integer(-5);
709 >    public static final Integer m6  = new Integer(-6);
710 >    public static final Integer m10 = new Integer(-10);
711 >
712 >
713 >    /**
714 >     * Runs Runnable r with a security policy that permits precisely
715 >     * the specified permissions.  If there is no current security
716 >     * manager, the runnable is run twice, both with and without a
717 >     * security manager.  We require that any security manager permit
718 >     * getPolicy/setPolicy.
719 >     */
720 >    public void runWithPermissions(Runnable r, Permission... permissions) {
721 >        SecurityManager sm = System.getSecurityManager();
722 >        if (sm == null) {
723 >            r.run();
724 >        }
725 >        runWithSecurityManagerWithPermissions(r, permissions);
726 >    }
727 >
728 >    /**
729 >     * Runs Runnable r with a security policy that permits precisely
730 >     * the specified permissions.  If there is no current security
731 >     * manager, a temporary one is set for the duration of the
732 >     * Runnable.  We require that any security manager permit
733 >     * getPolicy/setPolicy.
734 >     */
735 >    public void runWithSecurityManagerWithPermissions(Runnable r,
736 >                                                      Permission... permissions) {
737 >        SecurityManager sm = System.getSecurityManager();
738 >        if (sm == null) {
739 >            Policy savedPolicy = Policy.getPolicy();
740 >            try {
741 >                Policy.setPolicy(permissivePolicy());
742 >                System.setSecurityManager(new SecurityManager());
743 >                runWithSecurityManagerWithPermissions(r, permissions);
744 >            } finally {
745 >                System.setSecurityManager(null);
746 >                Policy.setPolicy(savedPolicy);
747 >            }
748 >        } else {
749 >            Policy savedPolicy = Policy.getPolicy();
750 >            AdjustablePolicy policy = new AdjustablePolicy(permissions);
751 >            Policy.setPolicy(policy);
752 >
753 >            try {
754 >                r.run();
755 >            } finally {
756 >                policy.addPermission(new SecurityPermission("setPolicy"));
757 >                Policy.setPolicy(savedPolicy);
758 >            }
759 >        }
760 >    }
761  
762 +    /**
763 +     * Runs a runnable without any permissions.
764 +     */
765 +    public void runWithoutPermissions(Runnable r) {
766 +        runWithPermissions(r);
767 +    }
768  
769      /**
770       * A security policy where new permissions can be dynamically added
771       * or all cleared.
772       */
773 <    static class AdjustablePolicy extends java.security.Policy {
773 >    public static class AdjustablePolicy extends java.security.Policy {
774          Permissions perms = new Permissions();
775 <        AdjustablePolicy() { }
775 >        AdjustablePolicy(Permission... permissions) {
776 >            for (Permission permission : permissions)
777 >                perms.add(permission);
778 >        }
779          void addPermission(Permission perm) { perms.add(perm); }
780          void clearPermissions() { perms = new Permissions(); }
781 <        public PermissionCollection getPermissions(CodeSource cs) {
782 <            return perms;
783 <        }
784 <        public PermissionCollection getPermissions(ProtectionDomain pd) {
785 <            return perms;
786 <        }
787 <        public boolean implies(ProtectionDomain pd, Permission p) {
788 <            return perms.implies(p);
789 <        }
790 <        public void refresh() {}
781 >        public PermissionCollection getPermissions(CodeSource cs) {
782 >            return perms;
783 >        }
784 >        public PermissionCollection getPermissions(ProtectionDomain pd) {
785 >            return perms;
786 >        }
787 >        public boolean implies(ProtectionDomain pd, Permission p) {
788 >            return perms.implies(p);
789 >        }
790 >        public void refresh() {}
791 >        public String toString() {
792 >            List<Permission> ps = new ArrayList<Permission>();
793 >            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
794 >                ps.add(e.nextElement());
795 >            return "AdjustablePolicy with permissions " + ps;
796 >        }
797      }
798  
799 +    /**
800 +     * Returns a policy containing all the permissions we ever need.
801 +     */
802 +    public static Policy permissivePolicy() {
803 +        return new AdjustablePolicy
804 +            // Permissions j.u.c. needs directly
805 +            (new RuntimePermission("modifyThread"),
806 +             new RuntimePermission("getClassLoader"),
807 +             new RuntimePermission("setContextClassLoader"),
808 +             // Permissions needed to change permissions!
809 +             new SecurityPermission("getPolicy"),
810 +             new SecurityPermission("setPolicy"),
811 +             new RuntimePermission("setSecurityManager"),
812 +             // Permissions needed by the junit test harness
813 +             new RuntimePermission("accessDeclaredMembers"),
814 +             new PropertyPermission("*", "read"),
815 +             new java.io.FilePermission("<<ALL FILES>>", "read"));
816 +    }
817 +
818 +    /**
819 +     * Sleeps until the given time has elapsed.
820 +     * Throws AssertionFailedError if interrupted.
821 +     */
822 +    void sleep(long millis) {
823 +        try {
824 +            delay(millis);
825 +        } catch (InterruptedException ie) {
826 +            AssertionFailedError afe =
827 +                new AssertionFailedError("Unexpected InterruptedException");
828 +            afe.initCause(ie);
829 +            throw afe;
830 +        }
831 +    }
832 +
833 +    /**
834 +     * Spin-waits up to the specified number of milliseconds for the given
835 +     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
836 +     */
837 +    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
838 +        long startTime = System.nanoTime();
839 +        for (;;) {
840 +            Thread.State s = thread.getState();
841 +            if (s == Thread.State.BLOCKED ||
842 +                s == Thread.State.WAITING ||
843 +                s == Thread.State.TIMED_WAITING)
844 +                return;
845 +            else if (s == Thread.State.TERMINATED)
846 +                fail("Unexpected thread termination");
847 +            else if (millisElapsedSince(startTime) > timeoutMillis) {
848 +                threadAssertTrue(thread.isAlive());
849 +                return;
850 +            }
851 +            Thread.yield();
852 +        }
853 +    }
854 +
855 +    /**
856 +     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
857 +     * state: BLOCKED, WAITING, or TIMED_WAITING.
858 +     */
859 +    void waitForThreadToEnterWaitState(Thread thread) {
860 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
861 +    }
862 +
863 +    /**
864 +     * Returns the number of milliseconds since time given by
865 +     * startNanoTime, which must have been previously returned from a
866 +     * call to {@link System.nanoTime()}.
867 +     */
868 +    long millisElapsedSince(long startNanoTime) {
869 +        return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
870 +    }
871 +
872 +    /**
873 +     * Returns a new started daemon Thread running the given runnable.
874 +     */
875 +    Thread newStartedThread(Runnable runnable) {
876 +        Thread t = new Thread(runnable);
877 +        t.setDaemon(true);
878 +        t.start();
879 +        return t;
880 +    }
881 +
882 +    /**
883 +     * Waits for the specified time (in milliseconds) for the thread
884 +     * to terminate (using {@link Thread#join(long)}), else interrupts
885 +     * the thread (in the hope that it may terminate later) and fails.
886 +     */
887 +    void awaitTermination(Thread t, long timeoutMillis) {
888 +        try {
889 +            t.join(timeoutMillis);
890 +        } catch (InterruptedException ie) {
891 +            threadUnexpectedException(ie);
892 +        } finally {
893 +            if (t.getState() != Thread.State.TERMINATED) {
894 +                t.interrupt();
895 +                fail("Test timed out");
896 +            }
897 +        }
898 +    }
899 +
900 +    /**
901 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
902 +     * terminate (using {@link Thread#join(long)}), else interrupts
903 +     * the thread (in the hope that it may terminate later) and fails.
904 +     */
905 +    void awaitTermination(Thread t) {
906 +        awaitTermination(t, LONG_DELAY_MS);
907 +    }
908  
909      // Some convenient Runnable classes
910  
911 <    abstract class CheckedRunnable implements Runnable {
912 <        abstract void realRun() throws Throwable;
911 >    public abstract class CheckedRunnable implements Runnable {
912 >        protected abstract void realRun() throws Throwable;
913  
914          public final void run() {
915              try {
# Line 415 | Line 920 | public class JSR166TestCase extends Test
920          }
921      }
922  
923 <    abstract class CheckedInterruptedRunnable implements Runnable {
924 <        abstract void realRun() throws Throwable;
923 >    public abstract class RunnableShouldThrow implements Runnable {
924 >        protected abstract void realRun() throws Throwable;
925 >
926 >        final Class<?> exceptionClass;
927 >
928 >        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
929 >            this.exceptionClass = exceptionClass;
930 >        }
931 >
932 >        public final void run() {
933 >            try {
934 >                realRun();
935 >                threadShouldThrow(exceptionClass.getSimpleName());
936 >            } catch (Throwable t) {
937 >                if (! exceptionClass.isInstance(t))
938 >                    threadUnexpectedException(t);
939 >            }
940 >        }
941 >    }
942 >
943 >    public abstract class ThreadShouldThrow extends Thread {
944 >        protected abstract void realRun() throws Throwable;
945 >
946 >        final Class<?> exceptionClass;
947 >
948 >        <T extends Throwable> ThreadShouldThrow(Class<T> exceptionClass) {
949 >            this.exceptionClass = exceptionClass;
950 >        }
951 >
952 >        public final void run() {
953 >            try {
954 >                realRun();
955 >                threadShouldThrow(exceptionClass.getSimpleName());
956 >            } catch (Throwable t) {
957 >                if (! exceptionClass.isInstance(t))
958 >                    threadUnexpectedException(t);
959 >            }
960 >        }
961 >    }
962 >
963 >    public abstract class CheckedInterruptedRunnable implements Runnable {
964 >        protected abstract void realRun() throws Throwable;
965  
966          public final void run() {
967              try {
968                  realRun();
969 <                threadShouldThrow();
969 >                threadShouldThrow("InterruptedException");
970              } catch (InterruptedException success) {
971 +                threadAssertFalse(Thread.interrupted());
972              } catch (Throwable t) {
973                  threadUnexpectedException(t);
974              }
975          }
976      }
977  
978 <    abstract class CheckedCallable<T> implements Callable<T> {
979 <        abstract T realCall() throws Throwable;
978 >    public abstract class CheckedCallable<T> implements Callable<T> {
979 >        protected abstract T realCall() throws Throwable;
980  
981          public final T call() {
982              try {
# Line 442 | Line 988 | public class JSR166TestCase extends Test
988          }
989      }
990  
991 <    static class NoOpRunnable implements Runnable {
991 >    public abstract class CheckedInterruptedCallable<T>
992 >        implements Callable<T> {
993 >        protected abstract T realCall() throws Throwable;
994 >
995 >        public final T call() {
996 >            try {
997 >                T result = realCall();
998 >                threadShouldThrow("InterruptedException");
999 >                return result;
1000 >            } catch (InterruptedException success) {
1001 >                threadAssertFalse(Thread.interrupted());
1002 >            } catch (Throwable t) {
1003 >                threadUnexpectedException(t);
1004 >            }
1005 >            return null;
1006 >        }
1007 >    }
1008 >
1009 >    public static class NoOpRunnable implements Runnable {
1010          public void run() {}
1011      }
1012  
1013 <    static class NoOpCallable implements Callable {
1013 >    public static class NoOpCallable implements Callable {
1014          public Object call() { return Boolean.TRUE; }
1015      }
1016  
1017 <    static final String TEST_STRING = "a test string";
1017 >    public static final String TEST_STRING = "a test string";
1018  
1019 <    static class StringTask implements Callable<String> {
1019 >    public static class StringTask implements Callable<String> {
1020          public String call() { return TEST_STRING; }
1021      }
1022  
1023 <    static class NPETask implements Callable<String> {
1023 >    public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
1024 >        return new CheckedCallable<String>() {
1025 >            protected String realCall() {
1026 >                try {
1027 >                    latch.await();
1028 >                } catch (InterruptedException quittingTime) {}
1029 >                return TEST_STRING;
1030 >            }};
1031 >    }
1032 >
1033 >    public Runnable awaiter(final CountDownLatch latch) {
1034 >        return new CheckedRunnable() {
1035 >            public void realRun() throws InterruptedException {
1036 >                await(latch);
1037 >            }};
1038 >    }
1039 >
1040 >    public void await(CountDownLatch latch) {
1041 >        try {
1042 >            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1043 >        } catch (Throwable t) {
1044 >            threadUnexpectedException(t);
1045 >        }
1046 >    }
1047 >
1048 >    public void await(Semaphore semaphore) {
1049 >        try {
1050 >            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1051 >        } catch (Throwable t) {
1052 >            threadUnexpectedException(t);
1053 >        }
1054 >    }
1055 >
1056 > //     /**
1057 > //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1058 > //      */
1059 > //     public void await(AtomicBoolean flag) {
1060 > //         await(flag, LONG_DELAY_MS);
1061 > //     }
1062 >
1063 > //     /**
1064 > //      * Spin-waits up to the specified timeout until flag becomes true.
1065 > //      */
1066 > //     public void await(AtomicBoolean flag, long timeoutMillis) {
1067 > //         long startTime = System.nanoTime();
1068 > //         while (!flag.get()) {
1069 > //             if (millisElapsedSince(startTime) > timeoutMillis)
1070 > //                 throw new AssertionFailedError("timed out");
1071 > //             Thread.yield();
1072 > //         }
1073 > //     }
1074 >
1075 >    public static class NPETask implements Callable<String> {
1076          public String call() { throw new NullPointerException(); }
1077      }
1078  
1079 <    static class CallableOne implements Callable<Integer> {
1079 >    public static class CallableOne implements Callable<Integer> {
1080          public Integer call() { return one; }
1081      }
1082  
1083 <    class ShortRunnable extends CheckedRunnable {
1084 <        void realRun() throws Throwable {
1085 <            Thread.sleep(SHORT_DELAY_MS);
1083 >    public class ShortRunnable extends CheckedRunnable {
1084 >        protected void realRun() throws Throwable {
1085 >            delay(SHORT_DELAY_MS);
1086          }
1087      }
1088  
1089 <    class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1090 <        void realRun() throws InterruptedException {
1091 <            Thread.sleep(SHORT_DELAY_MS);
1089 >    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1090 >        protected void realRun() throws InterruptedException {
1091 >            delay(SHORT_DELAY_MS);
1092          }
1093      }
1094  
1095 <    class SmallRunnable extends CheckedRunnable {
1096 <        void realRun() throws Throwable {
1097 <            Thread.sleep(SMALL_DELAY_MS);
1095 >    public class SmallRunnable extends CheckedRunnable {
1096 >        protected void realRun() throws Throwable {
1097 >            delay(SMALL_DELAY_MS);
1098          }
1099      }
1100  
1101 <    class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1102 <        void realRun() {
1101 >    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1102 >        protected void realRun() {
1103              try {
1104 <                Thread.sleep(SMALL_DELAY_MS);
1105 <            }
490 <            catch (InterruptedException ok) {
491 <            }
1104 >                delay(SMALL_DELAY_MS);
1105 >            } catch (InterruptedException ok) {}
1106          }
1107      }
1108  
1109 <    class SmallCallable extends CheckedCallable {
1110 <        Object realCall() throws Throwable {
1111 <            Thread.sleep(SMALL_DELAY_MS);
1109 >    public class SmallCallable extends CheckedCallable {
1110 >        protected Object realCall() throws InterruptedException {
1111 >            delay(SMALL_DELAY_MS);
1112              return Boolean.TRUE;
1113          }
1114      }
1115  
1116 <    class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
1117 <        void realRun() throws InterruptedException {
1118 <            Thread.sleep(SMALL_DELAY_MS);
1116 >    public class MediumRunnable extends CheckedRunnable {
1117 >        protected void realRun() throws Throwable {
1118 >            delay(MEDIUM_DELAY_MS);
1119          }
1120      }
1121  
1122 <    class MediumRunnable extends CheckedRunnable {
1123 <        void realRun() throws Throwable {
1124 <            Thread.sleep(MEDIUM_DELAY_MS);
1122 >    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1123 >        protected void realRun() throws InterruptedException {
1124 >            delay(MEDIUM_DELAY_MS);
1125          }
1126      }
1127  
1128 <    class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1129 <        void realRun() throws InterruptedException {
1130 <            Thread.sleep(MEDIUM_DELAY_MS);
1131 <        }
1128 >    public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1129 >        return new CheckedRunnable() {
1130 >            protected void realRun() {
1131 >                try {
1132 >                    delay(timeoutMillis);
1133 >                } catch (InterruptedException ok) {}
1134 >            }};
1135      }
1136  
1137 <    class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1138 <        void realRun() {
1137 >    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1138 >        protected void realRun() {
1139              try {
1140 <                Thread.sleep(MEDIUM_DELAY_MS);
1141 <            }
525 <            catch (InterruptedException ok) {
526 <            }
1140 >                delay(MEDIUM_DELAY_MS);
1141 >            } catch (InterruptedException ok) {}
1142          }
1143      }
1144  
1145 <    class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1146 <        void realRun() {
1145 >    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1146 >        protected void realRun() {
1147              try {
1148 <                Thread.sleep(LONG_DELAY_MS);
1149 <            }
535 <            catch (InterruptedException ok) {
536 <            }
1148 >                delay(LONG_DELAY_MS);
1149 >            } catch (InterruptedException ok) {}
1150          }
1151      }
1152  
1153      /**
1154       * For use as ThreadFactory in constructors
1155       */
1156 <    static class SimpleThreadFactory implements ThreadFactory {
1156 >    public static class SimpleThreadFactory implements ThreadFactory {
1157          public Thread newThread(Runnable r) {
1158              return new Thread(r);
1159          }
1160      }
1161  
1162 <    static class TrackedShortRunnable implements Runnable {
1163 <        volatile boolean done = false;
1162 >    public interface TrackedRunnable extends Runnable {
1163 >        boolean isDone();
1164 >    }
1165 >
1166 >    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1167 >        return new TrackedRunnable() {
1168 >                private volatile boolean done = false;
1169 >                public boolean isDone() { return done; }
1170 >                public void run() {
1171 >                    try {
1172 >                        delay(timeoutMillis);
1173 >                        done = true;
1174 >                    } catch (InterruptedException ok) {}
1175 >                }
1176 >            };
1177 >    }
1178 >
1179 >    public static class TrackedShortRunnable implements Runnable {
1180 >        public volatile boolean done = false;
1181          public void run() {
1182              try {
1183 <                Thread.sleep(SMALL_DELAY_MS);
1183 >                delay(SHORT_DELAY_MS);
1184                  done = true;
1185 <            } catch (Exception e) {
556 <            }
1185 >            } catch (InterruptedException ok) {}
1186          }
1187      }
1188  
1189 <    static class TrackedMediumRunnable implements Runnable {
1190 <        volatile boolean done = false;
1189 >    public static class TrackedSmallRunnable implements Runnable {
1190 >        public volatile boolean done = false;
1191          public void run() {
1192              try {
1193 <                Thread.sleep(MEDIUM_DELAY_MS);
1193 >                delay(SMALL_DELAY_MS);
1194                  done = true;
1195 <            } catch (Exception e) {
567 <            }
1195 >            } catch (InterruptedException ok) {}
1196          }
1197      }
1198  
1199 <    static class TrackedLongRunnable implements Runnable {
1200 <        volatile boolean done = false;
1199 >    public static class TrackedMediumRunnable implements Runnable {
1200 >        public volatile boolean done = false;
1201          public void run() {
1202              try {
1203 <                Thread.sleep(LONG_DELAY_MS);
1203 >                delay(MEDIUM_DELAY_MS);
1204                  done = true;
1205 <            } catch (Exception e) {
578 <            }
1205 >            } catch (InterruptedException ok) {}
1206          }
1207      }
1208  
1209 <    static class TrackedNoOpRunnable implements Runnable {
1210 <        volatile boolean done = false;
1209 >    public static class TrackedLongRunnable implements Runnable {
1210 >        public volatile boolean done = false;
1211 >        public void run() {
1212 >            try {
1213 >                delay(LONG_DELAY_MS);
1214 >                done = true;
1215 >            } catch (InterruptedException ok) {}
1216 >        }
1217 >    }
1218 >
1219 >    public static class TrackedNoOpRunnable implements Runnable {
1220 >        public volatile boolean done = false;
1221          public void run() {
1222              done = true;
1223          }
1224      }
1225  
1226 <    static class TrackedCallable implements Callable {
1227 <        volatile boolean done = false;
1226 >    public static class TrackedCallable implements Callable {
1227 >        public volatile boolean done = false;
1228          public Object call() {
1229              try {
1230 <                Thread.sleep(SMALL_DELAY_MS);
1230 >                delay(SMALL_DELAY_MS);
1231                  done = true;
1232 <            } catch (Exception e) {
596 <            }
1232 >            } catch (InterruptedException ok) {}
1233              return Boolean.TRUE;
1234          }
1235      }
1236  
1237 +    /**
1238 +     * Analog of CheckedRunnable for RecursiveAction
1239 +     */
1240 +    public abstract class CheckedRecursiveAction extends RecursiveAction {
1241 +        protected abstract void realCompute() throws Throwable;
1242 +
1243 +        public final void compute() {
1244 +            try {
1245 +                realCompute();
1246 +            } catch (Throwable t) {
1247 +                threadUnexpectedException(t);
1248 +            }
1249 +        }
1250 +    }
1251 +
1252 +    /**
1253 +     * Analog of CheckedCallable for RecursiveTask
1254 +     */
1255 +    public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1256 +        protected abstract T realCompute() throws Throwable;
1257 +
1258 +        public final T compute() {
1259 +            try {
1260 +                return realCompute();
1261 +            } catch (Throwable t) {
1262 +                threadUnexpectedException(t);
1263 +                return null;
1264 +            }
1265 +        }
1266 +    }
1267  
1268      /**
1269       * For use as RejectedExecutionHandler in constructors
1270       */
1271 <    static class NoOpREHandler implements RejectedExecutionHandler {
1271 >    public static class NoOpREHandler implements RejectedExecutionHandler {
1272          public void rejectedExecution(Runnable r,
1273                                        ThreadPoolExecutor executor) {}
1274      }
1275  
1276 +    /**
1277 +     * A CyclicBarrier that uses timed await and fails with
1278 +     * AssertionFailedErrors instead of throwing checked exceptions.
1279 +     */
1280 +    public class CheckedBarrier extends CyclicBarrier {
1281 +        public CheckedBarrier(int parties) { super(parties); }
1282 +
1283 +        public int await() {
1284 +            try {
1285 +                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1286 +            } catch (TimeoutException e) {
1287 +                throw new AssertionFailedError("timed out");
1288 +            } catch (Exception e) {
1289 +                AssertionFailedError afe =
1290 +                    new AssertionFailedError("Unexpected exception: " + e);
1291 +                afe.initCause(e);
1292 +                throw afe;
1293 +            }
1294 +        }
1295 +    }
1296 +
1297 +    void checkEmpty(BlockingQueue q) {
1298 +        try {
1299 +            assertTrue(q.isEmpty());
1300 +            assertEquals(0, q.size());
1301 +            assertNull(q.peek());
1302 +            assertNull(q.poll());
1303 +            assertNull(q.poll(0, MILLISECONDS));
1304 +            assertEquals(q.toString(), "[]");
1305 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1306 +            assertFalse(q.iterator().hasNext());
1307 +            try {
1308 +                q.element();
1309 +                shouldThrow();
1310 +            } catch (NoSuchElementException success) {}
1311 +            try {
1312 +                q.iterator().next();
1313 +                shouldThrow();
1314 +            } catch (NoSuchElementException success) {}
1315 +            try {
1316 +                q.remove();
1317 +                shouldThrow();
1318 +            } catch (NoSuchElementException success) {}
1319 +        } catch (InterruptedException ie) {
1320 +            threadUnexpectedException(ie);
1321 +        }
1322 +    }
1323 +
1324 +    void assertSerialEquals(Object x, Object y) {
1325 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1326 +    }
1327 +
1328 +    void assertNotSerialEquals(Object x, Object y) {
1329 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1330 +    }
1331 +
1332 +    byte[] serialBytes(Object o) {
1333 +        try {
1334 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1335 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1336 +            oos.writeObject(o);
1337 +            oos.flush();
1338 +            oos.close();
1339 +            return bos.toByteArray();
1340 +        } catch (Throwable t) {
1341 +            threadUnexpectedException(t);
1342 +            return new byte[0];
1343 +        }
1344 +    }
1345 +
1346 +    @SuppressWarnings("unchecked")
1347 +    <T> T serialClone(T o) {
1348 +        try {
1349 +            ObjectInputStream ois = new ObjectInputStream
1350 +                (new ByteArrayInputStream(serialBytes(o)));
1351 +            T clone = (T) ois.readObject();
1352 +            assertSame(o.getClass(), clone.getClass());
1353 +            return clone;
1354 +        } catch (Throwable t) {
1355 +            threadUnexpectedException(t);
1356 +            return null;
1357 +        }
1358 +    }
1359 +
1360 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1361 +                             Runnable... throwingActions) {
1362 +        for (Runnable throwingAction : throwingActions) {
1363 +            boolean threw = false;
1364 +            try { throwingAction.run(); }
1365 +            catch (Throwable t) {
1366 +                threw = true;
1367 +                if (!expectedExceptionClass.isInstance(t)) {
1368 +                    AssertionFailedError afe =
1369 +                        new AssertionFailedError
1370 +                        ("Expected " + expectedExceptionClass.getName() +
1371 +                         ", got " + t.getClass().getName());
1372 +                    afe.initCause(t);
1373 +                    threadUnexpectedException(afe);
1374 +                }
1375 +            }
1376 +            if (!threw)
1377 +                shouldThrow(expectedExceptionClass.getName());
1378 +        }
1379 +    }
1380   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines