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.7 by dl, Sat Oct 25 16:02:13 2003 UTC vs.
Revision 1.105 by dl, Thu Mar 21 19:06:54 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines