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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines