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.5 by dl, Fri Sep 26 15:33:13 2003 UTC vs.
Revision 1.57 by jsr166, Mon Oct 4 05:45:19 2010 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
2 > * Written by Doug Lea with assistance from members of JCP JSR-166
3 > * Expert Group and released to the public domain, as explained at
4 > * http://creativecommons.org/licenses/publicdomain
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.util.PropertyPermission;
11   import java.util.concurrent.*;
12 < import java.io.*;
13 <
12 > import java.util.concurrent.atomic.AtomicReference;
13 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
14 > import java.security.CodeSource;
15 > import java.security.Permission;
16 > import java.security.PermissionCollection;
17 > import java.security.Permissions;
18 > import java.security.Policy;
19 > import java.security.ProtectionDomain;
20 > import java.security.SecurityPermission;
21  
22   /**
23   * Base class for JSR166 Junit TCK tests.  Defines some constants,
24   * utility methods and classes, as well as a simple framework for
25   * helping to make sure that assertions failing in generated threads
26   * cause the associated test that generated them to itself fail (which
27 < * JUnit doe not otherwise arrange).  The rules for creating such
27 > * JUnit does not otherwise arrange).  The rules for creating such
28   * tests are:
29   *
30   * <ol>
31   *
32   * <li> All assertions in code running in generated threads must use
33 < * the forms {@link threadFail} , {@link threadAssertTrue} {@link
34 < * threadAssertEquals}, or {@link threadAssertNull}, (not
35 < * <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
33 > * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
34 > * #threadAssertEquals}, or {@link #threadAssertNull}, (not
35 > * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
36   * particularly recommended) for other code to use these forms too.
37   * Only the most typically used JUnit assertion methods are defined
38   * this way, but enough to live with.</li>
39   *
40 < * <li> If you override {@link setUp} or {@link tearDown}, make sure
41 < * to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within
40 > * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
41 > * to invoke {@code super.setUp} and {@code super.tearDown} within
42   * them. These methods are used to clear and check for thread
43   * assertion failures.</li>
44   *
45 < * <li>All delays and timeouts must use one of the constants {@link
46 < * SHORT_DELAY_MS}, {@link SMALL_DELAY_MS}, {@link MEDIUM_DELAY_MS},
47 < * {@link LONG_DELAY_MS}. The idea here is that a SHORT is always
45 > * <li>All delays and timeouts must use one of the constants {@code
46 > * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
47 > * {@code LONG_DELAY_MS}. The idea here is that a SHORT is always
48   * discriminable from zero time, and always allows enough time for the
49   * small amounts of computation (creating a thread, calling a few
50   * methods, etc) needed to reach a timeout point. Similarly, a SMALL
51   * is always discriminable as larger than SHORT and smaller than
52   * MEDIUM.  And so on. These constants are set to conservative values,
53   * but even so, if there is ever any doubt, they can all be increased
54 < * in one spot to rerun tests on slower platforms</li>
54 > * in one spot to rerun tests on slower platforms.</li>
55   *
56   * <li> All threads generated must be joined inside each test case
57 < * method (or <tt>fail</tt> to do so) before returning from the
58 < * method. The {@link joinPool} method can be used to do this when
57 > * method (or {@code fail} to do so) before returning from the
58 > * method. The {@code joinPool} method can be used to do this when
59   * using Executors.</li>
60   *
61   * </ol>
62 + *
63 + * <p> <b>Other notes</b>
64 + * <ul>
65 + *
66 + * <li> Usually, there is one testcase method per JSR166 method
67 + * covering "normal" operation, and then as many exception-testing
68 + * methods as there are exceptions the method can throw. Sometimes
69 + * there are multiple tests per JSR166 method when the different
70 + * "normal" behaviors differ significantly. And sometimes testcases
71 + * cover multiple methods when they cannot be tested in
72 + * isolation.</li>
73 + *
74 + * <li> The documentation style for testcases is to provide as javadoc
75 + * a simple sentence or two describing the property that the testcase
76 + * method purports to test. The javadocs do not say anything about how
77 + * the property is tested. To find out, read the code.</li>
78 + *
79 + * <li> These tests are "conformance tests", and do not attempt to
80 + * test throughput, latency, scalability or other performance factors
81 + * (see the separate "jtreg" tests for a set intended to check these
82 + * for the most central aspects of functionality.) So, most tests use
83 + * the smallest sensible numbers of threads, collection sizes, etc
84 + * needed to check basic conformance.</li>
85 + *
86 + * <li>The test classes currently do not declare inclusion in
87 + * any particular package to simplify things for people integrating
88 + * them in TCK test suites.</li>
89 + *
90 + * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
91 + * runs all JSR166 unit tests.</li>
92 + *
93 + * </ul>
94   */
95   public class JSR166TestCase extends TestCase {
96 +    private static final boolean useSecurityManager =
97 +        Boolean.getBoolean("jsr166.useSecurityManager");
98 +
99 +    /**
100 +     * Runs all JSR166 unit tests using junit.textui.TestRunner
101 +     */
102 +    public static void main(String[] args) {
103 +        if (useSecurityManager) {
104 +            System.err.println("Setting a permissive security manager");
105 +            Policy.setPolicy(permissivePolicy());
106 +            System.setSecurityManager(new SecurityManager());
107 +        }
108 +        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
109 +
110 +        Test s = suite();
111 +        for (int i = 0; i < iters; ++i) {
112 +            junit.textui.TestRunner.run(s);
113 +            System.gc();
114 +            System.runFinalization();
115 +        }
116 +        System.exit(0);
117 +    }
118 +
119 +    /**
120 +     * Collects all JSR166 unit tests as one suite
121 +     */
122 +    public static Test suite() {
123 +        TestSuite suite = new TestSuite("JSR166 Unit Tests");
124 +
125 +        suite.addTest(ForkJoinPoolTest.suite());
126 +        suite.addTest(ForkJoinTaskTest.suite());
127 +        suite.addTest(RecursiveActionTest.suite());
128 +        suite.addTest(RecursiveTaskTest.suite());
129 +        suite.addTest(LinkedTransferQueueTest.suite());
130 +        suite.addTest(PhaserTest.suite());
131 +        suite.addTest(ThreadLocalRandomTest.suite());
132 +        suite.addTest(AbstractExecutorServiceTest.suite());
133 +        suite.addTest(AbstractQueueTest.suite());
134 +        suite.addTest(AbstractQueuedSynchronizerTest.suite());
135 +        suite.addTest(AbstractQueuedLongSynchronizerTest.suite());
136 +        suite.addTest(ArrayBlockingQueueTest.suite());
137 +        suite.addTest(ArrayDequeTest.suite());
138 +        suite.addTest(AtomicBooleanTest.suite());
139 +        suite.addTest(AtomicIntegerArrayTest.suite());
140 +        suite.addTest(AtomicIntegerFieldUpdaterTest.suite());
141 +        suite.addTest(AtomicIntegerTest.suite());
142 +        suite.addTest(AtomicLongArrayTest.suite());
143 +        suite.addTest(AtomicLongFieldUpdaterTest.suite());
144 +        suite.addTest(AtomicLongTest.suite());
145 +        suite.addTest(AtomicMarkableReferenceTest.suite());
146 +        suite.addTest(AtomicReferenceArrayTest.suite());
147 +        suite.addTest(AtomicReferenceFieldUpdaterTest.suite());
148 +        suite.addTest(AtomicReferenceTest.suite());
149 +        suite.addTest(AtomicStampedReferenceTest.suite());
150 +        suite.addTest(ConcurrentHashMapTest.suite());
151 +        suite.addTest(ConcurrentLinkedDequeTest.suite());
152 +        suite.addTest(ConcurrentLinkedQueueTest.suite());
153 +        suite.addTest(ConcurrentSkipListMapTest.suite());
154 +        suite.addTest(ConcurrentSkipListSubMapTest.suite());
155 +        suite.addTest(ConcurrentSkipListSetTest.suite());
156 +        suite.addTest(ConcurrentSkipListSubSetTest.suite());
157 +        suite.addTest(CopyOnWriteArrayListTest.suite());
158 +        suite.addTest(CopyOnWriteArraySetTest.suite());
159 +        suite.addTest(CountDownLatchTest.suite());
160 +        suite.addTest(CyclicBarrierTest.suite());
161 +        suite.addTest(DelayQueueTest.suite());
162 +        suite.addTest(EntryTest.suite());
163 +        suite.addTest(ExchangerTest.suite());
164 +        suite.addTest(ExecutorsTest.suite());
165 +        suite.addTest(ExecutorCompletionServiceTest.suite());
166 +        suite.addTest(FutureTaskTest.suite());
167 +        suite.addTest(LinkedBlockingDequeTest.suite());
168 +        suite.addTest(LinkedBlockingQueueTest.suite());
169 +        suite.addTest(LinkedListTest.suite());
170 +        suite.addTest(LockSupportTest.suite());
171 +        suite.addTest(PriorityBlockingQueueTest.suite());
172 +        suite.addTest(PriorityQueueTest.suite());
173 +        suite.addTest(ReentrantLockTest.suite());
174 +        suite.addTest(ReentrantReadWriteLockTest.suite());
175 +        suite.addTest(ScheduledExecutorTest.suite());
176 +        suite.addTest(ScheduledExecutorSubclassTest.suite());
177 +        suite.addTest(SemaphoreTest.suite());
178 +        suite.addTest(SynchronousQueueTest.suite());
179 +        suite.addTest(SystemTest.suite());
180 +        suite.addTest(ThreadLocalTest.suite());
181 +        suite.addTest(ThreadPoolExecutorTest.suite());
182 +        suite.addTest(ThreadPoolExecutorSubclassTest.suite());
183 +        suite.addTest(ThreadTest.suite());
184 +        suite.addTest(TimeUnitTest.suite());
185 +        suite.addTest(TreeMapTest.suite());
186 +        suite.addTest(TreeSetTest.suite());
187 +        suite.addTest(TreeSubMapTest.suite());
188 +        suite.addTest(TreeSubSetTest.suite());
189 +
190 +        return suite;
191 +    }
192 +
193  
194      public static long SHORT_DELAY_MS;
195      public static long SMALL_DELAY_MS;
# Line 61 | Line 198 | public class JSR166TestCase extends Test
198  
199  
200      /**
201 <     * Return the shortest timed delay. This could
202 <     * be reimplmented to use for example a Property.
203 <     */
201 >     * Returns the shortest timed delay. This could
202 >     * be reimplemented to use for example a Property.
203 >     */
204      protected long getShortDelay() {
205 <        return 100;
205 >        return 50;
206      }
207  
208  
209      /**
210 <     * Set delays as multiples of SHORT_DELAY.
210 >     * Sets delays as multiples of SHORT_DELAY.
211       */
212 <    protected  void setDelays() {
212 >    protected void setDelays() {
213          SHORT_DELAY_MS = getShortDelay();
214 <        SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
214 >        SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
215          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
216 <        LONG_DELAY_MS = SHORT_DELAY_MS * 50;
216 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
217      }
218  
219      /**
220 <     * Flag set true if any threadAssert methods fail
220 >     * The first exception encountered if any threadAssertXXX method fails.
221       */
222 <    volatile boolean threadFailed;
222 >    private final AtomicReference<Throwable> threadFailure
223 >        = new AtomicReference<Throwable>(null);
224  
225      /**
226 <     * Initialize test to indicate that no thread assertions have failed
226 >     * Records an exception so that it can be rethrown later in the test
227 >     * harness thread, triggering a test case failure.  Only the first
228 >     * failure is recorded; subsequent calls to this method from within
229 >     * the same test have no effect.
230       */
231 <    public void setUp() {
231 >    public void threadRecordFailure(Throwable t) {
232 >        threadFailure.compareAndSet(null, t);
233 >    }
234 >
235 >    public void setUp() {
236          setDelays();
92        threadFailed = false;  
237      }
238  
239      /**
240 <     * Trigger test case failure if any thread assertions have failed
240 >     * Triggers test case failure if any thread assertions have failed,
241 >     * by rethrowing, in the test harness thread, any exception recorded
242 >     * earlier by threadRecordFailure.
243       */
244 <    public void tearDown() {
245 <        assertFalse(threadFailed);  
244 >    public void tearDown() throws Exception {
245 >        Throwable t = threadFailure.get();
246 >        if (t != null) {
247 >            if (t instanceof Error)
248 >                throw (Error) t;
249 >            else if (t instanceof RuntimeException)
250 >                throw (RuntimeException) t;
251 >            else if (t instanceof Exception)
252 >                throw (Exception) t;
253 >            else {
254 >                AssertionFailedError afe =
255 >                    new AssertionFailedError(t.toString());
256 >                afe.initCause(t);
257 >                throw afe;
258 >            }
259 >        }
260      }
261  
262      /**
263 <     * Fail, also setting status to indicate current testcase should fail
264 <     */
263 >     * Just like fail(reason), but additionally recording (using
264 >     * threadRecordFailure) any AssertionFailedError thrown, so that
265 >     * the current testcase will fail.
266 >     */
267      public void threadFail(String reason) {
268 <        threadFailed = true;
269 <        fail(reason);
268 >        try {
269 >            fail(reason);
270 >        } catch (AssertionFailedError t) {
271 >            threadRecordFailure(t);
272 >            fail(reason);
273 >        }
274      }
275  
276      /**
277 <     * If expression not true, set status to indicate current testcase
278 <     * should fail
279 <     */
277 >     * Just like assertTrue(b), but additionally recording (using
278 >     * threadRecordFailure) any AssertionFailedError thrown, so that
279 >     * the current testcase will fail.
280 >     */
281      public void threadAssertTrue(boolean b) {
282 <        if (!b) {
116 <            threadFailed = true;
282 >        try {
283              assertTrue(b);
284 +        } catch (AssertionFailedError t) {
285 +            threadRecordFailure(t);
286 +            throw t;
287          }
288      }
289  
290      /**
291 <     * If expression not false, set status to indicate current testcase
292 <     * should fail
293 <     */
291 >     * Just like assertFalse(b), but additionally recording (using
292 >     * threadRecordFailure) any AssertionFailedError thrown, so that
293 >     * the current testcase will fail.
294 >     */
295      public void threadAssertFalse(boolean b) {
296 <        if (b) {
127 <            threadFailed = true;
296 >        try {
297              assertFalse(b);
298 +        } catch (AssertionFailedError t) {
299 +            threadRecordFailure(t);
300 +            throw t;
301          }
302      }
303  
304      /**
305 <     * If argument not null, set status to indicate current testcase
306 <     * should fail
307 <     */
305 >     * Just like assertNull(x), but additionally recording (using
306 >     * threadRecordFailure) any AssertionFailedError thrown, so that
307 >     * the current testcase will fail.
308 >     */
309      public void threadAssertNull(Object x) {
310 <        if (x != null) {
138 <            threadFailed = true;
310 >        try {
311              assertNull(x);
312 +        } catch (AssertionFailedError t) {
313 +            threadRecordFailure(t);
314 +            throw t;
315          }
316      }
317  
318      /**
319 <     * If arguments not equal, set status to indicate current testcase
320 <     * should fail
321 <     */
319 >     * Just like assertEquals(x, y), but additionally recording (using
320 >     * threadRecordFailure) any AssertionFailedError thrown, so that
321 >     * the current testcase will fail.
322 >     */
323      public void threadAssertEquals(long x, long y) {
324 <        if (x != y) {
149 <            threadFailed = true;
324 >        try {
325              assertEquals(x, y);
326 +        } catch (AssertionFailedError t) {
327 +            threadRecordFailure(t);
328 +            throw t;
329          }
330      }
331  
332      /**
333 <     * If arguments not equal, set status to indicate current testcase
334 <     * should fail
335 <     */
333 >     * Just like assertEquals(x, y), but additionally recording (using
334 >     * threadRecordFailure) any AssertionFailedError thrown, so that
335 >     * the current testcase will fail.
336 >     */
337      public void threadAssertEquals(Object x, Object y) {
338 <        if (x != y && (x == null || !x.equals(y))) {
160 <            threadFailed = true;
338 >        try {
339              assertEquals(x, y);
340 +        } catch (AssertionFailedError t) {
341 +            threadRecordFailure(t);
342 +            throw t;
343 +        } catch (Throwable t) {
344 +            threadUnexpectedException(t);
345 +        }
346 +    }
347 +
348 +    /**
349 +     * Just like assertSame(x, y), but additionally recording (using
350 +     * threadRecordFailure) any AssertionFailedError thrown, so that
351 +     * the current testcase will fail.
352 +     */
353 +    public void threadAssertSame(Object x, Object y) {
354 +        try {
355 +            assertSame(x, y);
356 +        } catch (AssertionFailedError t) {
357 +            threadRecordFailure(t);
358 +            throw t;
359          }
360      }
361  
362      /**
363 <     * threadFail with message "should throw exception"
364 <     */
363 >     * Calls threadFail with message "should throw exception".
364 >     */
365      public void threadShouldThrow() {
366 <        threadFailed = true;
170 <        fail("should throw exception");
366 >        threadFail("should throw exception");
367      }
368  
369      /**
370 <     * threadFail with message "Unexpected exception"
370 >     * Calls threadFail with message "should throw" + exceptionName.
371       */
372 <    public void threadUnexpectedException() {
373 <        threadFailed = true;
178 <        fail("Unexpected exception");
372 >    public void threadShouldThrow(String exceptionName) {
373 >        threadFail("should throw " + exceptionName);
374      }
375  
376 +    /**
377 +     * Records the given exception using {@link #threadRecordFailure},
378 +     * then rethrows the exception, wrapping it in an
379 +     * AssertionFailedError if necessary.
380 +     */
381 +    public void threadUnexpectedException(Throwable t) {
382 +        threadRecordFailure(t);
383 +        t.printStackTrace();
384 +        if (t instanceof RuntimeException)
385 +            throw (RuntimeException) t;
386 +        else if (t instanceof Error)
387 +            throw (Error) t;
388 +        else {
389 +            AssertionFailedError afe =
390 +                new AssertionFailedError("unexpected exception: " + t);
391 +            t.initCause(t);
392 +            throw afe;
393 +        }
394 +    }
395  
396      /**
397 <     * Wait out termination of a thread pool or fail doing so
397 >     * Waits out termination of a thread pool or fails doing so.
398       */
399      public void joinPool(ExecutorService exec) {
400          try {
401              exec.shutdown();
402 <            assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
403 <        } catch(InterruptedException ie) {
404 <            fail("Unexpected exception");
402 >            assertTrue("ExecutorService did not terminate in a timely manner",
403 >                       exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
404 >        } catch (SecurityException ok) {
405 >            // Allowed in case test doesn't have privs
406 >        } catch (InterruptedException ie) {
407 >            fail("Unexpected InterruptedException");
408          }
409      }
410  
411  
412      /**
413 <     * fail with message "should throw exception"
414 <     */
413 >     * Fails with message "should throw exception".
414 >     */
415      public void shouldThrow() {
416          fail("Should throw exception");
417      }
418  
419      /**
420 <     * fail with message "Unexpected exception"
420 >     * Fails with message "should throw " + exceptionName.
421       */
422 <    public void unexpectedException() {
423 <        fail("Unexpected exception");
422 >    public void shouldThrow(String exceptionName) {
423 >        fail("Should throw " + exceptionName);
424      }
425  
209
426      /**
427       * The number of elements to place in collections, arrays, etc.
428       */
429 <    static final int SIZE = 20;
429 >    public static final int SIZE = 20;
430  
431      // Some convenient Integer constants
432  
433 <    static final Integer zero = new Integer(0);
434 <    static final Integer one = new Integer(1);
435 <    static final Integer two = new Integer(2);
436 <    static final Integer three  = new Integer(3);
437 <    static final Integer four  = new Integer(4);
438 <    static final Integer five  = new Integer(5);
439 <    static final Integer six = new Integer(6);
440 <    static final Integer seven = new Integer(7);
441 <    static final Integer eight = new Integer(8);
442 <    static final Integer nine = new Integer(9);
443 <    static final Integer m1  = new Integer(-1);
444 <    static final Integer m2  = new Integer(-2);
445 <    static final Integer m3  = new Integer(-3);
446 <    static final Integer m4 = new Integer(-4);
447 <    static final Integer m5 = new Integer(-5);
448 <    static final Integer m10 = new Integer(-10);
433 >    public static final Integer zero  = new Integer(0);
434 >    public static final Integer one   = new Integer(1);
435 >    public static final Integer two   = new Integer(2);
436 >    public static final Integer three = new Integer(3);
437 >    public static final Integer four  = new Integer(4);
438 >    public static final Integer five  = new Integer(5);
439 >    public static final Integer six   = new Integer(6);
440 >    public static final Integer seven = new Integer(7);
441 >    public static final Integer eight = new Integer(8);
442 >    public static final Integer nine  = new Integer(9);
443 >    public static final Integer m1  = new Integer(-1);
444 >    public static final Integer m2  = new Integer(-2);
445 >    public static final Integer m3  = new Integer(-3);
446 >    public static final Integer m4  = new Integer(-4);
447 >    public static final Integer m5  = new Integer(-5);
448 >    public static final Integer m6  = new Integer(-6);
449 >    public static final Integer m10 = new Integer(-10);
450  
451  
452 <    // Some convenient Runnable classes
452 >    /**
453 >     * Runs Runnable r with a security policy that permits precisely
454 >     * the specified permissions.  If there is no current security
455 >     * manager, the runnable is run twice, both with and without a
456 >     * security manager.  We require that any security manager permit
457 >     * getPolicy/setPolicy.
458 >     */
459 >    public void runWithPermissions(Runnable r, Permission... permissions) {
460 >        SecurityManager sm = System.getSecurityManager();
461 >        if (sm == null) {
462 >            r.run();
463 >            Policy savedPolicy = Policy.getPolicy();
464 >            try {
465 >                Policy.setPolicy(permissivePolicy());
466 >                System.setSecurityManager(new SecurityManager());
467 >                runWithPermissions(r, permissions);
468 >            } finally {
469 >                System.setSecurityManager(null);
470 >                Policy.setPolicy(savedPolicy);
471 >            }
472 >        } else {
473 >            Policy savedPolicy = Policy.getPolicy();
474 >            AdjustablePolicy policy = new AdjustablePolicy(permissions);
475 >            Policy.setPolicy(policy);
476  
477 <    static class NoOpRunnable implements Runnable {
478 <        public void run() {}
477 >            try {
478 >                r.run();
479 >            } finally {
480 >                policy.addPermission(new SecurityPermission("setPolicy"));
481 >                Policy.setPolicy(savedPolicy);
482 >            }
483 >        }
484      }
485  
486 <    static class NoOpCallable implements Callable {
487 <        public Object call() { return Boolean.TRUE; }
486 >    /**
487 >     * Runs a runnable without any permissions.
488 >     */
489 >    public void runWithoutPermissions(Runnable r) {
490 >        runWithPermissions(r);
491      }
492  
493 <    class ShortRunnable implements Runnable {
494 <        public void run() {
493 >    /**
494 >     * A security policy where new permissions can be dynamically added
495 >     * or all cleared.
496 >     */
497 >    public static class AdjustablePolicy extends java.security.Policy {
498 >        Permissions perms = new Permissions();
499 >        AdjustablePolicy(Permission... permissions) {
500 >            for (Permission permission : permissions)
501 >                perms.add(permission);
502 >        }
503 >        void addPermission(Permission perm) { perms.add(perm); }
504 >        void clearPermissions() { perms = new Permissions(); }
505 >        public PermissionCollection getPermissions(CodeSource cs) {
506 >            return perms;
507 >        }
508 >        public PermissionCollection getPermissions(ProtectionDomain pd) {
509 >            return perms;
510 >        }
511 >        public boolean implies(ProtectionDomain pd, Permission p) {
512 >            return perms.implies(p);
513 >        }
514 >        public void refresh() {}
515 >    }
516 >
517 >    /**
518 >     * Returns a policy containing all the permissions we ever need.
519 >     */
520 >    public static Policy permissivePolicy() {
521 >        return new AdjustablePolicy
522 >            // Permissions j.u.c. needs directly
523 >            (new RuntimePermission("modifyThread"),
524 >             new RuntimePermission("getClassLoader"),
525 >             new RuntimePermission("setContextClassLoader"),
526 >             // Permissions needed to change permissions!
527 >             new SecurityPermission("getPolicy"),
528 >             new SecurityPermission("setPolicy"),
529 >             new RuntimePermission("setSecurityManager"),
530 >             // Permissions needed by the junit test harness
531 >             new RuntimePermission("accessDeclaredMembers"),
532 >             new PropertyPermission("*", "read"),
533 >             new java.io.FilePermission("<<ALL FILES>>", "read"));
534 >    }
535 >
536 >    /**
537 >     * Sleep until the timeout has elapsed, or interrupted.
538 >     * Does <em>NOT</em> throw InterruptedException.
539 >     */
540 >    void sleepTillInterrupted(long timeoutMillis) {
541 >        try {
542 >            Thread.sleep(timeoutMillis);
543 >        } catch (InterruptedException wakeup) {}
544 >    }
545 >
546 >    /**
547 >     * Returns a new started Thread running the given runnable.
548 >     */
549 >    Thread newStartedThread(Runnable runnable) {
550 >        Thread t = new Thread(runnable);
551 >        t.start();
552 >        return t;
553 >    }
554 >
555 >    // Some convenient Runnable classes
556 >
557 >    public abstract class CheckedRunnable implements Runnable {
558 >        protected abstract void realRun() throws Throwable;
559 >
560 >        public final void run() {
561              try {
562 <                Thread.sleep(SHORT_DELAY_MS);
563 <            }
564 <            catch(Exception e) {
251 <                threadUnexpectedException();
562 >                realRun();
563 >            } catch (Throwable t) {
564 >                threadUnexpectedException(t);
565              }
566          }
567      }
568  
569 <    class ShortInterruptedRunnable implements Runnable {
570 <        public void run() {
569 >    public abstract class RunnableShouldThrow implements Runnable {
570 >        protected abstract void realRun() throws Throwable;
571 >
572 >        final Class<?> exceptionClass;
573 >
574 >        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
575 >            this.exceptionClass = exceptionClass;
576 >        }
577 >
578 >        public final void run() {
579              try {
580 <                Thread.sleep(SHORT_DELAY_MS);
581 <                threadShouldThrow();
582 <            }
583 <            catch(InterruptedException success) {
580 >                realRun();
581 >                threadShouldThrow(exceptionClass.getSimpleName());
582 >            } catch (Throwable t) {
583 >                if (! exceptionClass.isInstance(t))
584 >                    threadUnexpectedException(t);
585              }
586          }
587      }
588  
589 <    class SmallRunnable implements Runnable {
590 <        public void run() {
589 >    public abstract class ThreadShouldThrow extends Thread {
590 >        protected abstract void realRun() throws Throwable;
591 >
592 >        final Class<?> exceptionClass;
593 >
594 >        <T extends Throwable> ThreadShouldThrow(Class<T> exceptionClass) {
595 >            this.exceptionClass = exceptionClass;
596 >        }
597 >
598 >        public final void run() {
599              try {
600 <                Thread.sleep(SMALL_DELAY_MS);
601 <            }
602 <            catch(Exception e) {
603 <                threadUnexpectedException();
600 >                realRun();
601 >                threadShouldThrow(exceptionClass.getSimpleName());
602 >            } catch (Throwable t) {
603 >                if (! exceptionClass.isInstance(t))
604 >                    threadUnexpectedException(t);
605              }
606          }
607      }
608  
609 <    class SmallCallable implements Callable {
610 <        public Object call() {
609 >    public abstract class CheckedInterruptedRunnable implements Runnable {
610 >        protected abstract void realRun() throws Throwable;
611 >
612 >        public final void run() {
613              try {
614 <                Thread.sleep(SMALL_DELAY_MS);
614 >                realRun();
615 >                threadShouldThrow("InterruptedException");
616 >            } catch (InterruptedException success) {
617 >            } catch (Throwable t) {
618 >                threadUnexpectedException(t);
619              }
283            catch(Exception e) {
284                threadUnexpectedException();
285            }
286            return Boolean.TRUE;
620          }
621      }
622  
623 <    class SmallInterruptedRunnable implements Runnable {
624 <        public void run() {
623 >    public abstract class CheckedCallable<T> implements Callable<T> {
624 >        protected abstract T realCall() throws Throwable;
625 >
626 >        public final T call() {
627              try {
628 <                Thread.sleep(SMALL_DELAY_MS);
629 <                threadShouldThrow();
630 <            }
631 <            catch(InterruptedException success) {
628 >                return realCall();
629 >            } catch (Throwable t) {
630 >                threadUnexpectedException(t);
631 >                return null;
632              }
633          }
634      }
635  
636 +    public abstract class CheckedInterruptedCallable<T>
637 +        implements Callable<T> {
638 +        protected abstract T realCall() throws Throwable;
639  
640 <    class MediumRunnable implements Runnable {
303 <        public void run() {
640 >        public final T call() {
641              try {
642 <                Thread.sleep(MEDIUM_DELAY_MS);
643 <            }
644 <            catch(Exception e) {
645 <                threadUnexpectedException();
642 >                T result = realCall();
643 >                threadShouldThrow("InterruptedException");
644 >                return result;
645 >            } catch (InterruptedException success) {
646 >            } catch (Throwable t) {
647 >                threadUnexpectedException(t);
648              }
649 +            return null;
650          }
651      }
652  
653 <    class MediumInterruptedRunnable implements Runnable {
654 <        public void run() {
653 >    public static class NoOpRunnable implements Runnable {
654 >        public void run() {}
655 >    }
656 >
657 >    public static class NoOpCallable implements Callable {
658 >        public Object call() { return Boolean.TRUE; }
659 >    }
660 >
661 >    public static final String TEST_STRING = "a test string";
662 >
663 >    public static class StringTask implements Callable<String> {
664 >        public String call() { return TEST_STRING; }
665 >    }
666 >
667 >    public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
668 >        return new CheckedCallable<String>() {
669 >            public String realCall() {
670 >                try {
671 >                    latch.await();
672 >                } catch (InterruptedException quittingTime) {}
673 >                return TEST_STRING;
674 >            }};
675 >    }
676 >
677 >    public static class NPETask implements Callable<String> {
678 >        public String call() { throw new NullPointerException(); }
679 >    }
680 >
681 >    public static class CallableOne implements Callable<Integer> {
682 >        public Integer call() { return one; }
683 >    }
684 >
685 >    public class ShortRunnable extends CheckedRunnable {
686 >        protected void realRun() throws Throwable {
687 >            Thread.sleep(SHORT_DELAY_MS);
688 >        }
689 >    }
690 >
691 >    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
692 >        protected void realRun() throws InterruptedException {
693 >            Thread.sleep(SHORT_DELAY_MS);
694 >        }
695 >    }
696 >
697 >    public class SmallRunnable extends CheckedRunnable {
698 >        protected void realRun() throws Throwable {
699 >            Thread.sleep(SMALL_DELAY_MS);
700 >        }
701 >    }
702 >
703 >    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
704 >        protected void realRun() {
705              try {
706 <                Thread.sleep(MEDIUM_DELAY_MS);
707 <                threadShouldThrow();
318 <            }
319 <            catch(InterruptedException success) {
320 <            }
706 >                Thread.sleep(SMALL_DELAY_MS);
707 >            } catch (InterruptedException ok) {}
708          }
709      }
710  
711 <    class MediumPossiblyInterruptedRunnable implements Runnable {
712 <        public void run() {
711 >    public class SmallCallable extends CheckedCallable {
712 >        protected Object realCall() throws InterruptedException {
713 >            Thread.sleep(SMALL_DELAY_MS);
714 >            return Boolean.TRUE;
715 >        }
716 >    }
717 >
718 >    public class MediumRunnable extends CheckedRunnable {
719 >        protected void realRun() throws Throwable {
720 >            Thread.sleep(MEDIUM_DELAY_MS);
721 >        }
722 >    }
723 >
724 >    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
725 >        protected void realRun() throws InterruptedException {
726 >            Thread.sleep(MEDIUM_DELAY_MS);
727 >        }
728 >    }
729 >
730 >    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
731 >        protected void realRun() {
732              try {
733                  Thread.sleep(MEDIUM_DELAY_MS);
734 <            }
735 <            catch(InterruptedException success) {
736 <            }
734 >            } catch (InterruptedException ok) {}
735 >        }
736 >    }
737 >
738 >    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
739 >        protected void realRun() {
740 >            try {
741 >                Thread.sleep(LONG_DELAY_MS);
742 >            } catch (InterruptedException ok) {}
743          }
744      }
745  
746      /**
747       * For use as ThreadFactory in constructors
748       */
749 <    static class SimpleThreadFactory implements ThreadFactory{
750 <        public Thread newThread(Runnable r){
749 >    public static class SimpleThreadFactory implements ThreadFactory {
750 >        public Thread newThread(Runnable r) {
751              return new Thread(r);
752 <        }  
752 >        }
753      }
754  
755 <    static class TrackedRunnable implements Runnable {
756 <        volatile boolean done = false;
755 >    public static class TrackedShortRunnable implements Runnable {
756 >        public volatile boolean done = false;
757          public void run() {
758              try {
759                  Thread.sleep(SMALL_DELAY_MS);
760                  done = true;
761 <            } catch(Exception e){
762 <            }
761 >            } catch (InterruptedException ok) {}
762 >        }
763 >    }
764 >
765 >    public static class TrackedMediumRunnable implements Runnable {
766 >        public volatile boolean done = false;
767 >        public void run() {
768 >            try {
769 >                Thread.sleep(MEDIUM_DELAY_MS);
770 >                done = true;
771 >            } catch (InterruptedException ok) {}
772          }
773      }
774  
775 <    static class TrackedCallable implements Callable {
776 <        volatile boolean done = false;
775 >    public static class TrackedLongRunnable implements Runnable {
776 >        public volatile boolean done = false;
777 >        public void run() {
778 >            try {
779 >                Thread.sleep(LONG_DELAY_MS);
780 >                done = true;
781 >            } catch (InterruptedException ok) {}
782 >        }
783 >    }
784 >
785 >    public static class TrackedNoOpRunnable implements Runnable {
786 >        public volatile boolean done = false;
787 >        public void run() {
788 >            done = true;
789 >        }
790 >    }
791 >
792 >    public static class TrackedCallable implements Callable {
793 >        public volatile boolean done = false;
794          public Object call() {
795              try {
796                  Thread.sleep(SMALL_DELAY_MS);
797                  done = true;
798 <            } catch(Exception e){
361 <            }
798 >            } catch (InterruptedException ok) {}
799              return Boolean.TRUE;
800          }
801      }
802  
803      /**
804 +     * Analog of CheckedRunnable for RecursiveAction
805 +     */
806 +    public abstract class CheckedRecursiveAction extends RecursiveAction {
807 +        protected abstract void realCompute() throws Throwable;
808 +
809 +        public final void compute() {
810 +            try {
811 +                realCompute();
812 +            } catch (Throwable t) {
813 +                threadUnexpectedException(t);
814 +            }
815 +        }
816 +    }
817 +
818 +    /**
819 +     * Analog of CheckedCallable for RecursiveTask
820 +     */
821 +    public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
822 +        protected abstract T realCompute() throws Throwable;
823 +
824 +        public final T compute() {
825 +            try {
826 +                return realCompute();
827 +            } catch (Throwable t) {
828 +                threadUnexpectedException(t);
829 +                return null;
830 +            }
831 +        }
832 +    }
833 +
834 +    /**
835       * For use as RejectedExecutionHandler in constructors
836       */
837 <    static class NoOpREHandler implements RejectedExecutionHandler{
838 <        public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
837 >    public static class NoOpREHandler implements RejectedExecutionHandler {
838 >        public void rejectedExecution(Runnable r,
839 >                                      ThreadPoolExecutor executor) {}
840      }
841 <
373 <    
841 >
842   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines