--- jsr166/src/test/tck/JSR166TestCase.java 2005/10/01 17:05:38 1.29
+++ jsr166/src/test/tck/JSR166TestCase.java 2010/10/03 23:59:05 1.56
@@ -7,10 +7,17 @@
*/
import junit.framework.*;
-import java.util.*;
+import java.util.PropertyPermission;
import java.util.concurrent.*;
-import java.io.*;
-import java.security.*;
+import java.util.concurrent.atomic.AtomicReference;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import java.security.CodeSource;
+import java.security.Permission;
+import java.security.PermissionCollection;
+import java.security.Permissions;
+import java.security.Policy;
+import java.security.ProtectionDomain;
+import java.security.SecurityPermission;
/**
* Base class for JSR166 Junit TCK tests. Defines some constants,
@@ -25,19 +32,19 @@ import java.security.*;
*
All assertions in code running in generated threads must use
* the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
* #threadAssertEquals}, or {@link #threadAssertNull}, (not
- * fail, assertTrue, etc.) It is OK (but not
+ * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
* particularly recommended) for other code to use these forms too.
* Only the most typically used JUnit assertion methods are defined
* this way, but enough to live with.
*
* If you override {@link #setUp} or {@link #tearDown}, make sure
- * to invoke super.setUp and super.tearDown within
+ * to invoke {@code super.setUp} and {@code super.tearDown} within
* them. These methods are used to clear and check for thread
* assertion failures.
*
- * All delays and timeouts must use one of the constants
- * SHORT_DELAY_MS, SMALL_DELAY_MS, MEDIUM_DELAY_MS,
- * LONG_DELAY_MS. The idea here is that a SHORT is always
+ * All delays and timeouts must use one of the constants {@code
+ * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
+ * {@code LONG_DELAY_MS}. The idea here is that a SHORT is always
* discriminable from zero time, and always allows enough time for the
* small amounts of computation (creating a thread, calling a few
* methods, etc) needed to reach a timeout point. Similarly, a SMALL
@@ -47,8 +54,8 @@ import java.security.*;
* in one spot to rerun tests on slower platforms.
*
* All threads generated must be joined inside each test case
- * method (or fail to do so) before returning from the
- * method. The joinPool method can be used to do this when
+ * method (or {@code fail} to do so) before returning from the
+ * method. The {@code joinPool} method can be used to do this when
* using Executors.
*
*
@@ -80,22 +87,29 @@ import java.security.*;
* any particular package to simplify things for people integrating
* them in TCK test suites.
*
- * As a convenience, the main of this class (JSR166TestCase)
+ * As a convenience, the {@code main} of this class (JSR166TestCase)
* runs all JSR166 unit tests.
*
*
*/
public class JSR166TestCase extends TestCase {
+ private static final boolean useSecurityManager =
+ Boolean.getBoolean("jsr166.useSecurityManager");
+
/**
* Runs all JSR166 unit tests using junit.textui.TestRunner
*/
- public static void main (String[] args) {
- int iters = 1;
- if (args.length > 0)
- iters = Integer.parseInt(args[0]);
+ public static void main(String[] args) {
+ if (useSecurityManager) {
+ System.err.println("Setting a permissive security manager");
+ Policy.setPolicy(permissivePolicy());
+ System.setSecurityManager(new SecurityManager());
+ }
+ int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
+
Test s = suite();
for (int i = 0; i < iters; ++i) {
- junit.textui.TestRunner.run (s);
+ junit.textui.TestRunner.run(s);
System.gc();
System.runFinalization();
}
@@ -105,65 +119,73 @@ public class JSR166TestCase extends Test
/**
* Collects all JSR166 unit tests as one suite
*/
- public static Test suite ( ) {
+ public static Test suite() {
TestSuite suite = new TestSuite("JSR166 Unit Tests");
- suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
- suite.addTest(new TestSuite(AbstractQueueTest.class));
- suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
- suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
- suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
- suite.addTest(new TestSuite(ArrayDequeTest.class));
- suite.addTest(new TestSuite(AtomicBooleanTest.class));
- suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
- suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
- suite.addTest(new TestSuite(AtomicIntegerTest.class));
- suite.addTest(new TestSuite(AtomicLongArrayTest.class));
- suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
- suite.addTest(new TestSuite(AtomicLongTest.class));
- suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
- suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
- suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
- suite.addTest(new TestSuite(AtomicReferenceTest.class));
- suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
- suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
- suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
- suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
- suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
- suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
- suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
- suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
- suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
- suite.addTest(new TestSuite(CountDownLatchTest.class));
- suite.addTest(new TestSuite(CyclicBarrierTest.class));
- suite.addTest(new TestSuite(DelayQueueTest.class));
- suite.addTest(new TestSuite(EntryTest.class));
- suite.addTest(new TestSuite(ExchangerTest.class));
- suite.addTest(new TestSuite(ExecutorsTest.class));
- suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
- suite.addTest(new TestSuite(FutureTaskTest.class));
- suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
- suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
- suite.addTest(new TestSuite(LinkedListTest.class));
- suite.addTest(new TestSuite(LockSupportTest.class));
- suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
- suite.addTest(new TestSuite(PriorityQueueTest.class));
- suite.addTest(new TestSuite(ReentrantLockTest.class));
- suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
- suite.addTest(new TestSuite(ScheduledExecutorTest.class));
- suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
- suite.addTest(new TestSuite(SemaphoreTest.class));
- suite.addTest(new TestSuite(SynchronousQueueTest.class));
- suite.addTest(new TestSuite(SystemTest.class));
- suite.addTest(new TestSuite(ThreadLocalTest.class));
- suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
- suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
- suite.addTest(new TestSuite(ThreadTest.class));
- suite.addTest(new TestSuite(TimeUnitTest.class));
- suite.addTest(new TestSuite(TreeMapTest.class));
- suite.addTest(new TestSuite(TreeSetTest.class));
- suite.addTest(new TestSuite(TreeSubMapTest.class));
- suite.addTest(new TestSuite(TreeSubSetTest.class));
+ suite.addTest(ForkJoinPoolTest.suite());
+ suite.addTest(ForkJoinTaskTest.suite());
+ suite.addTest(RecursiveActionTest.suite());
+ suite.addTest(RecursiveTaskTest.suite());
+ suite.addTest(LinkedTransferQueueTest.suite());
+ suite.addTest(PhaserTest.suite());
+ suite.addTest(ThreadLocalRandomTest.suite());
+ suite.addTest(AbstractExecutorServiceTest.suite());
+ suite.addTest(AbstractQueueTest.suite());
+ suite.addTest(AbstractQueuedSynchronizerTest.suite());
+ suite.addTest(AbstractQueuedLongSynchronizerTest.suite());
+ suite.addTest(ArrayBlockingQueueTest.suite());
+ suite.addTest(ArrayDequeTest.suite());
+ suite.addTest(AtomicBooleanTest.suite());
+ suite.addTest(AtomicIntegerArrayTest.suite());
+ suite.addTest(AtomicIntegerFieldUpdaterTest.suite());
+ suite.addTest(AtomicIntegerTest.suite());
+ suite.addTest(AtomicLongArrayTest.suite());
+ suite.addTest(AtomicLongFieldUpdaterTest.suite());
+ suite.addTest(AtomicLongTest.suite());
+ suite.addTest(AtomicMarkableReferenceTest.suite());
+ suite.addTest(AtomicReferenceArrayTest.suite());
+ suite.addTest(AtomicReferenceFieldUpdaterTest.suite());
+ suite.addTest(AtomicReferenceTest.suite());
+ suite.addTest(AtomicStampedReferenceTest.suite());
+ suite.addTest(ConcurrentHashMapTest.suite());
+ suite.addTest(ConcurrentLinkedDequeTest.suite());
+ suite.addTest(ConcurrentLinkedQueueTest.suite());
+ suite.addTest(ConcurrentSkipListMapTest.suite());
+ suite.addTest(ConcurrentSkipListSubMapTest.suite());
+ suite.addTest(ConcurrentSkipListSetTest.suite());
+ suite.addTest(ConcurrentSkipListSubSetTest.suite());
+ suite.addTest(CopyOnWriteArrayListTest.suite());
+ suite.addTest(CopyOnWriteArraySetTest.suite());
+ suite.addTest(CountDownLatchTest.suite());
+ suite.addTest(CyclicBarrierTest.suite());
+ suite.addTest(DelayQueueTest.suite());
+ suite.addTest(EntryTest.suite());
+ suite.addTest(ExchangerTest.suite());
+ suite.addTest(ExecutorsTest.suite());
+ suite.addTest(ExecutorCompletionServiceTest.suite());
+ suite.addTest(FutureTaskTest.suite());
+ suite.addTest(LinkedBlockingDequeTest.suite());
+ suite.addTest(LinkedBlockingQueueTest.suite());
+ suite.addTest(LinkedListTest.suite());
+ suite.addTest(LockSupportTest.suite());
+ suite.addTest(PriorityBlockingQueueTest.suite());
+ suite.addTest(PriorityQueueTest.suite());
+ suite.addTest(ReentrantLockTest.suite());
+ suite.addTest(ReentrantReadWriteLockTest.suite());
+ suite.addTest(ScheduledExecutorTest.suite());
+ suite.addTest(ScheduledExecutorSubclassTest.suite());
+ suite.addTest(SemaphoreTest.suite());
+ suite.addTest(SynchronousQueueTest.suite());
+ suite.addTest(SystemTest.suite());
+ suite.addTest(ThreadLocalTest.suite());
+ suite.addTest(ThreadPoolExecutorTest.suite());
+ suite.addTest(ThreadPoolExecutorSubclassTest.suite());
+ suite.addTest(ThreadTest.suite());
+ suite.addTest(TimeUnitTest.suite());
+ suite.addTest(TreeMapTest.suite());
+ suite.addTest(TreeSetTest.suite());
+ suite.addTest(TreeSubMapTest.suite());
+ suite.addTest(TreeSubSetTest.suite());
return suite;
}
@@ -187,391 +209,641 @@ public class JSR166TestCase extends Test
/**
* Sets delays as multiples of SHORT_DELAY.
*/
- protected void setDelays() {
+ protected void setDelays() {
SHORT_DELAY_MS = getShortDelay();
- SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
+ SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
- LONG_DELAY_MS = SHORT_DELAY_MS * 50;
+ LONG_DELAY_MS = SHORT_DELAY_MS * 50;
}
/**
- * Flag set true if any threadAssert methods fail
+ * The first exception encountered if any threadAssertXXX method fails.
*/
- volatile boolean threadFailed;
+ private final AtomicReference threadFailure
+ = new AtomicReference(null);
/**
- * Initializes test to indicate that no thread assertions have failed
+ * Records an exception so that it can be rethrown later in the test
+ * harness thread, triggering a test case failure. Only the first
+ * failure is recorded; subsequent calls to this method from within
+ * the same test have no effect.
*/
+ public void threadRecordFailure(Throwable t) {
+ threadFailure.compareAndSet(null, t);
+ }
+
public void setUp() {
setDelays();
- threadFailed = false;
}
/**
- * Triggers test case failure if any thread assertions have failed
- */
- public void tearDown() {
- assertFalse(threadFailed);
+ * Triggers test case failure if any thread assertions have failed,
+ * by rethrowing, in the test harness thread, any exception recorded
+ * earlier by threadRecordFailure.
+ */
+ public void tearDown() throws Exception {
+ Throwable t = threadFailure.get();
+ if (t != null) {
+ if (t instanceof Error)
+ throw (Error) t;
+ else if (t instanceof RuntimeException)
+ throw (RuntimeException) t;
+ else if (t instanceof Exception)
+ throw (Exception) t;
+ else
+ throw new AssertionError(t);
+ }
}
/**
- * Fail, also setting status to indicate current testcase should fail
+ * Just like fail(reason), but additionally recording (using
+ * threadRecordFailure) any AssertionError thrown, so that the current
+ * testcase will fail.
*/
public void threadFail(String reason) {
- threadFailed = true;
- fail(reason);
+ try {
+ fail(reason);
+ } catch (Throwable t) {
+ threadRecordFailure(t);
+ fail(reason);
+ }
}
/**
- * If expression not true, set status to indicate current testcase
- * should fail
+ * Just like assertTrue(b), but additionally recording (using
+ * threadRecordFailure) any AssertionError thrown, so that the current
+ * testcase will fail.
*/
public void threadAssertTrue(boolean b) {
- if (!b) {
- threadFailed = true;
+ try {
assertTrue(b);
+ } catch (AssertionError t) {
+ threadRecordFailure(t);
+ throw t;
}
}
/**
- * If expression not false, set status to indicate current testcase
- * should fail
+ * Just like assertFalse(b), but additionally recording (using
+ * threadRecordFailure) any AssertionError thrown, so that the
+ * current testcase will fail.
*/
public void threadAssertFalse(boolean b) {
- if (b) {
- threadFailed = true;
+ try {
assertFalse(b);
+ } catch (AssertionError t) {
+ threadRecordFailure(t);
+ throw t;
}
}
/**
- * If argument not null, set status to indicate current testcase
- * should fail
+ * Just like assertNull(x), but additionally recording (using
+ * threadRecordFailure) any AssertionError thrown, so that the
+ * current testcase will fail.
*/
public void threadAssertNull(Object x) {
- if (x != null) {
- threadFailed = true;
+ try {
assertNull(x);
+ } catch (AssertionError t) {
+ threadRecordFailure(t);
+ throw t;
}
}
/**
- * If arguments not equal, set status to indicate current testcase
- * should fail
+ * Just like assertEquals(x, y), but additionally recording (using
+ * threadRecordFailure) any AssertionError thrown, so that the
+ * current testcase will fail.
*/
public void threadAssertEquals(long x, long y) {
- if (x != y) {
- threadFailed = true;
+ try {
assertEquals(x, y);
+ } catch (AssertionError t) {
+ threadRecordFailure(t);
+ throw t;
}
}
/**
- * If arguments not equal, set status to indicate current testcase
- * should fail
+ * Just like assertEquals(x, y), but additionally recording (using
+ * threadRecordFailure) any AssertionError thrown, so that the
+ * current testcase will fail.
*/
public void threadAssertEquals(Object x, Object y) {
- if (x != y && (x == null || !x.equals(y))) {
- threadFailed = true;
+ try {
assertEquals(x, y);
+ } catch (AssertionError t) {
+ threadRecordFailure(t);
+ throw t;
+ }
+ }
+
+ /**
+ * Just like assertSame(x, y), but additionally recording (using
+ * threadRecordFailure) any AssertionError thrown, so that the
+ * current testcase will fail.
+ */
+ public void threadAssertSame(Object x, Object y) {
+ try {
+ assertSame(x, y);
+ } catch (AssertionError t) {
+ threadRecordFailure(t);
+ throw t;
}
}
/**
- * threadFail with message "should throw exception"
+ * Calls threadFail with message "should throw exception".
*/
public void threadShouldThrow() {
- threadFailed = true;
- fail("should throw exception");
+ threadFail("should throw exception");
}
/**
- * threadFail with message "Unexpected exception"
+ * Calls threadFail with message "should throw" + exceptionName.
*/
- public void threadUnexpectedException() {
- threadFailed = true;
- fail("Unexpected exception");
+ public void threadShouldThrow(String exceptionName) {
+ threadFail("should throw " + exceptionName);
}
+ /**
+ * Calls threadFail with message "Unexpected exception" + ex.
+ */
+ public void threadUnexpectedException(Throwable t) {
+ threadRecordFailure(t);
+ t.printStackTrace();
+ // Rethrow, wrapping in an AssertionError if necessary
+ if (t instanceof RuntimeException)
+ throw (RuntimeException) t;
+ else if (t instanceof Error)
+ throw (Error) t;
+ else {
+ AssertionError ae = new AssertionError("unexpected exception: " + t);
+ t.initCause(t);
+ throw ae;
+ }
+ }
/**
- * Wait out termination of a thread pool or fail doing so
+ * Waits out termination of a thread pool or fails doing so.
*/
public void joinPool(ExecutorService exec) {
try {
exec.shutdown();
- assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
- } catch(SecurityException ok) {
+ assertTrue("ExecutorService did not terminate in a timely manner",
+ exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
+ } catch (SecurityException ok) {
// Allowed in case test doesn't have privs
- } catch(InterruptedException ie) {
- fail("Unexpected exception");
+ } catch (InterruptedException ie) {
+ fail("Unexpected InterruptedException");
}
}
/**
- * fail with message "should throw exception"
+ * Fails with message "should throw exception".
*/
public void shouldThrow() {
fail("Should throw exception");
}
/**
- * fail with message "Unexpected exception"
+ * Fails with message "should throw " + exceptionName.
+ */
+ public void shouldThrow(String exceptionName) {
+ fail("Should throw " + exceptionName);
+ }
+
+ /**
+ * Fails with message "Unexpected exception: " + ex.
*/
- public void unexpectedException() {
- fail("Unexpected exception");
+ public void unexpectedException(Throwable ex) {
+ ex.printStackTrace();
+ fail("Unexpected exception: " + ex);
}
/**
* The number of elements to place in collections, arrays, etc.
*/
- static final int SIZE = 20;
+ public static final int SIZE = 20;
// Some convenient Integer constants
- static final Integer zero = new Integer(0);
- static final Integer one = new Integer(1);
- static final Integer two = new Integer(2);
- static final Integer three = new Integer(3);
- static final Integer four = new Integer(4);
- static final Integer five = new Integer(5);
- static final Integer six = new Integer(6);
- static final Integer seven = new Integer(7);
- static final Integer eight = new Integer(8);
- static final Integer nine = new Integer(9);
- static final Integer m1 = new Integer(-1);
- static final Integer m2 = new Integer(-2);
- static final Integer m3 = new Integer(-3);
- static final Integer m4 = new Integer(-4);
- static final Integer m5 = new Integer(-5);
- static final Integer m10 = new Integer(-10);
+ public static final Integer zero = new Integer(0);
+ public static final Integer one = new Integer(1);
+ public static final Integer two = new Integer(2);
+ public static final Integer three = new Integer(3);
+ public static final Integer four = new Integer(4);
+ public static final Integer five = new Integer(5);
+ public static final Integer six = new Integer(6);
+ public static final Integer seven = new Integer(7);
+ public static final Integer eight = new Integer(8);
+ public static final Integer nine = new Integer(9);
+ public static final Integer m1 = new Integer(-1);
+ public static final Integer m2 = new Integer(-2);
+ public static final Integer m3 = new Integer(-3);
+ public static final Integer m4 = new Integer(-4);
+ public static final Integer m5 = new Integer(-5);
+ public static final Integer m6 = new Integer(-6);
+ public static final Integer m10 = new Integer(-10);
+
+
+ /**
+ * Runs Runnable r with a security policy that permits precisely
+ * the specified permissions. If there is no current security
+ * manager, the runnable is run twice, both with and without a
+ * security manager. We require that any security manager permit
+ * getPolicy/setPolicy.
+ */
+ public void runWithPermissions(Runnable r, Permission... permissions) {
+ SecurityManager sm = System.getSecurityManager();
+ if (sm == null) {
+ r.run();
+ Policy savedPolicy = Policy.getPolicy();
+ try {
+ Policy.setPolicy(permissivePolicy());
+ System.setSecurityManager(new SecurityManager());
+ runWithPermissions(r, permissions);
+ } finally {
+ System.setSecurityManager(null);
+ Policy.setPolicy(savedPolicy);
+ }
+ } else {
+ Policy savedPolicy = Policy.getPolicy();
+ AdjustablePolicy policy = new AdjustablePolicy(permissions);
+ Policy.setPolicy(policy);
+
+ try {
+ r.run();
+ } finally {
+ policy.addPermission(new SecurityPermission("setPolicy"));
+ Policy.setPolicy(savedPolicy);
+ }
+ }
+ }
+ /**
+ * Runs a runnable without any permissions.
+ */
+ public void runWithoutPermissions(Runnable r) {
+ runWithPermissions(r);
+ }
/**
* A security policy where new permissions can be dynamically added
* or all cleared.
*/
- static class AdjustablePolicy extends java.security.Policy {
+ public static class AdjustablePolicy extends java.security.Policy {
Permissions perms = new Permissions();
- AdjustablePolicy() { }
+ AdjustablePolicy(Permission... permissions) {
+ for (Permission permission : permissions)
+ perms.add(permission);
+ }
void addPermission(Permission perm) { perms.add(perm); }
void clearPermissions() { perms = new Permissions(); }
- public PermissionCollection getPermissions(CodeSource cs) {
- return perms;
- }
- public PermissionCollection getPermissions(ProtectionDomain pd) {
- return perms;
- }
- public boolean implies(ProtectionDomain pd, Permission p) {
- return perms.implies(p);
- }
- public void refresh() {}
+ public PermissionCollection getPermissions(CodeSource cs) {
+ return perms;
+ }
+ public PermissionCollection getPermissions(ProtectionDomain pd) {
+ return perms;
+ }
+ public boolean implies(ProtectionDomain pd, Permission p) {
+ return perms.implies(p);
+ }
+ public void refresh() {}
}
+ /**
+ * Returns a policy containing all the permissions we ever need.
+ */
+ public static Policy permissivePolicy() {
+ return new AdjustablePolicy
+ // Permissions j.u.c. needs directly
+ (new RuntimePermission("modifyThread"),
+ new RuntimePermission("getClassLoader"),
+ new RuntimePermission("setContextClassLoader"),
+ // Permissions needed to change permissions!
+ new SecurityPermission("getPolicy"),
+ new SecurityPermission("setPolicy"),
+ new RuntimePermission("setSecurityManager"),
+ // Permissions needed by the junit test harness
+ new RuntimePermission("accessDeclaredMembers"),
+ new PropertyPermission("*", "read"),
+ new java.io.FilePermission("<>", "read"));
+ }
- // Some convenient Runnable classes
-
- static class NoOpRunnable implements Runnable {
- public void run() {}
+ /**
+ * Sleep until the timeout has elapsed, or interrupted.
+ * Does NOT throw InterruptedException.
+ */
+ void sleepTillInterrupted(long timeoutMillis) {
+ try {
+ Thread.sleep(timeoutMillis);
+ } catch (InterruptedException wakeup) {}
}
- static class NoOpCallable implements Callable {
- public Object call() { return Boolean.TRUE; }
+ /**
+ * Returns a new started Thread running the given runnable.
+ */
+ Thread newStartedThread(Runnable runnable) {
+ Thread t = new Thread(runnable);
+ t.start();
+ return t;
}
- static final String TEST_STRING = "a test string";
+ // Some convenient Runnable classes
- static class StringTask implements Callable {
- public String call() { return TEST_STRING; }
- }
+ public abstract class CheckedRunnable implements Runnable {
+ protected abstract void realRun() throws Throwable;
- static class NPETask implements Callable {
- public String call() { throw new NullPointerException(); }
+ public final void run() {
+ try {
+ realRun();
+ } catch (Throwable t) {
+ threadUnexpectedException(t);
+ }
+ }
}
- static class CallableOne implements Callable {
- public Integer call() { return one; }
- }
+ public abstract class RunnableShouldThrow implements Runnable {
+ protected abstract void realRun() throws Throwable;
- class ShortRunnable implements Runnable {
- public void run() {
+ final Class> exceptionClass;
+
+ RunnableShouldThrow(Class exceptionClass) {
+ this.exceptionClass = exceptionClass;
+ }
+
+ public final void run() {
try {
- Thread.sleep(SHORT_DELAY_MS);
- }
- catch(Exception e) {
- threadUnexpectedException();
+ realRun();
+ threadShouldThrow(exceptionClass.getSimpleName());
+ } catch (Throwable t) {
+ if (! exceptionClass.isInstance(t))
+ threadUnexpectedException(t);
}
}
}
- class ShortInterruptedRunnable implements Runnable {
- public void run() {
+ public abstract class ThreadShouldThrow extends Thread {
+ protected abstract void realRun() throws Throwable;
+
+ final Class> exceptionClass;
+
+ ThreadShouldThrow(Class exceptionClass) {
+ this.exceptionClass = exceptionClass;
+ }
+
+ public final void run() {
try {
- Thread.sleep(SHORT_DELAY_MS);
- threadShouldThrow();
- }
- catch(InterruptedException success) {
+ realRun();
+ threadShouldThrow(exceptionClass.getSimpleName());
+ } catch (Throwable t) {
+ if (! exceptionClass.isInstance(t))
+ threadUnexpectedException(t);
}
}
}
- class SmallRunnable implements Runnable {
- public void run() {
+ public abstract class CheckedInterruptedRunnable implements Runnable {
+ protected abstract void realRun() throws Throwable;
+
+ public final void run() {
try {
- Thread.sleep(SMALL_DELAY_MS);
- }
- catch(Exception e) {
- threadUnexpectedException();
+ realRun();
+ threadShouldThrow("InterruptedException");
+ } catch (InterruptedException success) {
+ } catch (Throwable t) {
+ threadUnexpectedException(t);
}
}
}
- class SmallPossiblyInterruptedRunnable implements Runnable {
- public void run() {
+ public abstract class CheckedCallable implements Callable {
+ protected abstract T realCall() throws Throwable;
+
+ public final T call() {
try {
- Thread.sleep(SMALL_DELAY_MS);
- }
- catch(Exception e) {
+ return realCall();
+ } catch (Throwable t) {
+ threadUnexpectedException(t);
+ return null;
}
}
}
- class SmallCallable implements Callable {
- public Object call() {
+ public abstract class CheckedInterruptedCallable
+ implements Callable {
+ protected abstract T realCall() throws Throwable;
+
+ public final T call() {
try {
- Thread.sleep(SMALL_DELAY_MS);
+ T result = realCall();
+ threadShouldThrow("InterruptedException");
+ return result;
+ } catch (InterruptedException success) {
+ } catch (Throwable t) {
+ threadUnexpectedException(t);
}
- catch(Exception e) {
- threadUnexpectedException();
- }
- return Boolean.TRUE;
+ return null;
}
}
- class SmallInterruptedRunnable implements Runnable {
- public void run() {
+ public static class NoOpRunnable implements Runnable {
+ public void run() {}
+ }
+
+ public static class NoOpCallable implements Callable {
+ public Object call() { return Boolean.TRUE; }
+ }
+
+ public static final String TEST_STRING = "a test string";
+
+ public static class StringTask implements Callable {
+ public String call() { return TEST_STRING; }
+ }
+
+ public Callable latchAwaitingStringTask(final CountDownLatch latch) {
+ return new CheckedCallable() {
+ public String realCall() {
+ try {
+ latch.await();
+ } catch (InterruptedException quittingTime) {}
+ return TEST_STRING;
+ }};
+ }
+
+ public static class NPETask implements Callable {
+ public String call() { throw new NullPointerException(); }
+ }
+
+ public static class CallableOne implements Callable {
+ public Integer call() { return one; }
+ }
+
+ public class ShortRunnable extends CheckedRunnable {
+ protected void realRun() throws Throwable {
+ Thread.sleep(SHORT_DELAY_MS);
+ }
+ }
+
+ public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
+ protected void realRun() throws InterruptedException {
+ Thread.sleep(SHORT_DELAY_MS);
+ }
+ }
+
+ public class SmallRunnable extends CheckedRunnable {
+ protected void realRun() throws Throwable {
+ Thread.sleep(SMALL_DELAY_MS);
+ }
+ }
+
+ public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
+ protected void realRun() {
try {
Thread.sleep(SMALL_DELAY_MS);
- threadShouldThrow();
- }
- catch(InterruptedException success) {
- }
+ } catch (InterruptedException ok) {}
}
}
+ public class SmallCallable extends CheckedCallable {
+ protected Object realCall() throws InterruptedException {
+ Thread.sleep(SMALL_DELAY_MS);
+ return Boolean.TRUE;
+ }
+ }
- class MediumRunnable implements Runnable {
- public void run() {
- try {
- Thread.sleep(MEDIUM_DELAY_MS);
- }
- catch(Exception e) {
- threadUnexpectedException();
- }
+ public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
+ protected void realRun() throws InterruptedException {
+ Thread.sleep(SMALL_DELAY_MS);
}
}
- class MediumInterruptedRunnable implements Runnable {
- public void run() {
- try {
- Thread.sleep(MEDIUM_DELAY_MS);
- threadShouldThrow();
- }
- catch(InterruptedException success) {
- }
+ public class MediumRunnable extends CheckedRunnable {
+ protected void realRun() throws Throwable {
+ Thread.sleep(MEDIUM_DELAY_MS);
}
}
- class MediumPossiblyInterruptedRunnable implements Runnable {
- public void run() {
+ public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
+ protected void realRun() throws InterruptedException {
+ Thread.sleep(MEDIUM_DELAY_MS);
+ }
+ }
+
+ public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
+ protected void realRun() {
try {
Thread.sleep(MEDIUM_DELAY_MS);
- }
- catch(InterruptedException success) {
- }
+ } catch (InterruptedException ok) {}
}
}
- class LongPossiblyInterruptedRunnable implements Runnable {
- public void run() {
+ public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
+ protected void realRun() {
try {
Thread.sleep(LONG_DELAY_MS);
- }
- catch(InterruptedException success) {
- }
+ } catch (InterruptedException ok) {}
}
}
/**
* For use as ThreadFactory in constructors
*/
- static class SimpleThreadFactory implements ThreadFactory{
- public Thread newThread(Runnable r){
+ public static class SimpleThreadFactory implements ThreadFactory {
+ public Thread newThread(Runnable r) {
return new Thread(r);
}
}
- static class TrackedShortRunnable implements Runnable {
- volatile boolean done = false;
+ public static class TrackedShortRunnable implements Runnable {
+ public volatile boolean done = false;
public void run() {
try {
Thread.sleep(SMALL_DELAY_MS);
done = true;
- } catch(Exception e){
- }
+ } catch (InterruptedException ok) {}
}
}
- static class TrackedMediumRunnable implements Runnable {
- volatile boolean done = false;
+ public static class TrackedMediumRunnable implements Runnable {
+ public volatile boolean done = false;
public void run() {
try {
Thread.sleep(MEDIUM_DELAY_MS);
done = true;
- } catch(Exception e){
- }
+ } catch (InterruptedException ok) {}
}
}
- static class TrackedLongRunnable implements Runnable {
- volatile boolean done = false;
+ public static class TrackedLongRunnable implements Runnable {
+ public volatile boolean done = false;
public void run() {
try {
Thread.sleep(LONG_DELAY_MS);
done = true;
- } catch(Exception e){
- }
+ } catch (InterruptedException ok) {}
}
}
- static class TrackedNoOpRunnable implements Runnable {
- volatile boolean done = false;
+ public static class TrackedNoOpRunnable implements Runnable {
+ public volatile boolean done = false;
public void run() {
done = true;
}
}
- static class TrackedCallable implements Callable {
- volatile boolean done = false;
+ public static class TrackedCallable implements Callable {
+ public volatile boolean done = false;
public Object call() {
try {
Thread.sleep(SMALL_DELAY_MS);
done = true;
- } catch(Exception e){
- }
+ } catch (InterruptedException ok) {}
return Boolean.TRUE;
}
}
+ /**
+ * Analog of CheckedRunnable for RecursiveAction
+ */
+ public abstract class CheckedRecursiveAction extends RecursiveAction {
+ protected abstract void realCompute() throws Throwable;
+
+ public final void compute() {
+ try {
+ realCompute();
+ } catch (Throwable t) {
+ threadUnexpectedException(t);
+ }
+ }
+ }
/**
- * For use as RejectedExecutionHandler in constructors
+ * Analog of CheckedCallable for RecursiveTask
*/
- static class NoOpREHandler implements RejectedExecutionHandler{
- public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
+ public abstract class CheckedRecursiveTask extends RecursiveTask {
+ protected abstract T realCompute() throws Throwable;
+
+ public final T compute() {
+ try {
+ return realCompute();
+ } catch (Throwable t) {
+ threadUnexpectedException(t);
+ return null;
+ }
+ }
}
+ /**
+ * For use as RejectedExecutionHandler in constructors
+ */
+ public static class NoOpREHandler implements RejectedExecutionHandler {
+ public void rejectedExecution(Runnable r,
+ ThreadPoolExecutor executor) {}
+ }
}