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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines