--- jsr166/src/test/tck/JSR166TestCase.java 2009/11/20 00:58:01 1.40
+++ jsr166/src/test/tck/JSR166TestCase.java 2010/09/13 23:19:31 1.52
@@ -26,19 +26,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
@@ -48,8 +48,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.
*
*
@@ -81,22 +81,30 @@ 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) {
+ 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 = 1;
if (args.length > 0)
iters = 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();
}
@@ -106,7 +114,7 @@ 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(ForkJoinPoolTest.class));
@@ -135,6 +143,7 @@ public class JSR166TestCase extends Test
suite.addTest(new TestSuite(AtomicReferenceTest.class));
suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
+ suite.addTest(new TestSuite(ConcurrentLinkedDequeTest.class));
suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
@@ -195,7 +204,7 @@ 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;
MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
@@ -286,6 +295,17 @@ public class JSR166TestCase extends Test
}
/**
+ * If arguments not identical, set status to indicate current testcase
+ * should fail
+ */
+ public void threadAssertSame(Object x, Object y) {
+ if (x != y) {
+ threadFailed = true;
+ assertSame(x, y);
+ }
+ }
+
+ /**
* threadFail with message "should throw exception"
*/
public void threadShouldThrow() {
@@ -328,7 +348,7 @@ public class JSR166TestCase extends Test
} catch (SecurityException ok) {
// Allowed in case test doesn't have privs
} catch (InterruptedException ie) {
- fail("Unexpected exception");
+ fail("Unexpected InterruptedException");
}
}
@@ -366,48 +386,111 @@ public class JSR166TestCase extends Test
/**
* 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 m6 = new Integer(-6);
- 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"));
}
/**
@@ -417,8 +500,7 @@ public class JSR166TestCase extends Test
void sleepTillInterrupted(long timeoutMillis) {
try {
Thread.sleep(timeoutMillis);
- } catch (InterruptedException wakeup) {
- }
+ } catch (InterruptedException wakeup) {}
}
/**
@@ -432,8 +514,8 @@ public class JSR166TestCase extends Test
// Some convenient Runnable classes
- abstract class CheckedRunnable implements Runnable {
- abstract void realRun() throws Throwable;
+ public abstract class CheckedRunnable implements Runnable {
+ protected abstract void realRun() throws Throwable;
public final void run() {
try {
@@ -444,8 +526,8 @@ public class JSR166TestCase extends Test
}
}
- abstract class RunnableShouldThrow implements Runnable {
- abstract void realRun() throws Throwable;
+ public abstract class RunnableShouldThrow implements Runnable {
+ protected abstract void realRun() throws Throwable;
final Class> exceptionClass;
@@ -457,7 +539,6 @@ public class JSR166TestCase extends Test
try {
realRun();
threadShouldThrow(exceptionClass.getSimpleName());
- } catch (InterruptedException success) {
} catch (Throwable t) {
if (! exceptionClass.isInstance(t))
threadUnexpectedException(t);
@@ -465,8 +546,8 @@ public class JSR166TestCase extends Test
}
}
- abstract class ThreadShouldThrow extends Thread {
- abstract void realRun() throws Throwable;
+ public abstract class ThreadShouldThrow extends Thread {
+ protected abstract void realRun() throws Throwable;
final Class> exceptionClass;
@@ -478,7 +559,6 @@ public class JSR166TestCase extends Test
try {
realRun();
threadShouldThrow(exceptionClass.getSimpleName());
- } catch (InterruptedException success) {
} catch (Throwable t) {
if (! exceptionClass.isInstance(t))
threadUnexpectedException(t);
@@ -486,8 +566,8 @@ public class JSR166TestCase extends Test
}
}
- abstract class CheckedInterruptedRunnable implements Runnable {
- abstract void realRun() throws Throwable;
+ public abstract class CheckedInterruptedRunnable implements Runnable {
+ protected abstract void realRun() throws Throwable;
public final void run() {
try {
@@ -500,8 +580,8 @@ public class JSR166TestCase extends Test
}
}
- abstract class CheckedCallable implements Callable {
- abstract T realCall() throws Throwable;
+ public abstract class CheckedCallable implements Callable {
+ protected abstract T realCall() throws Throwable;
public final T call() {
try {
@@ -513,8 +593,8 @@ public class JSR166TestCase extends Test
}
}
- abstract class CheckedInterruptedCallable implements Callable {
- abstract T realCall() throws Throwable;
+ public abstract class CheckedInterruptedCallable implements Callable {
+ protected abstract T realCall() throws Throwable;
public final T call() {
try {
@@ -529,158 +609,158 @@ public class JSR166TestCase extends Test
}
}
- static class NoOpRunnable implements Runnable {
+ public static class NoOpRunnable implements Runnable {
public void run() {}
}
- static class NoOpCallable implements Callable {
+ public static class NoOpCallable implements Callable {
public Object call() { return Boolean.TRUE; }
}
- static final String TEST_STRING = "a test string";
+ public static final String TEST_STRING = "a test string";
- static class StringTask implements Callable {
+ public static class StringTask implements Callable {
public String call() { return TEST_STRING; }
}
- static class NPETask implements Callable {
+ 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(); }
}
- static class CallableOne implements Callable {
+ public static class CallableOne implements Callable {
public Integer call() { return one; }
}
- class ShortRunnable extends CheckedRunnable {
- void realRun() throws Throwable {
+ public class ShortRunnable extends CheckedRunnable {
+ protected void realRun() throws Throwable {
Thread.sleep(SHORT_DELAY_MS);
}
}
- class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
- void realRun() throws InterruptedException {
+ public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
+ protected void realRun() throws InterruptedException {
Thread.sleep(SHORT_DELAY_MS);
}
}
- class SmallRunnable extends CheckedRunnable {
- void realRun() throws Throwable {
+ public class SmallRunnable extends CheckedRunnable {
+ protected void realRun() throws Throwable {
Thread.sleep(SMALL_DELAY_MS);
}
}
- class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
- void realRun() {
+ public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
+ protected void realRun() {
try {
Thread.sleep(SMALL_DELAY_MS);
- }
- catch (InterruptedException ok) {
- }
+ } catch (InterruptedException ok) {}
}
}
- class SmallCallable extends CheckedCallable {
- Object realCall() throws Throwable {
+ public class SmallCallable extends CheckedCallable {
+ protected Object realCall() throws InterruptedException {
Thread.sleep(SMALL_DELAY_MS);
return Boolean.TRUE;
}
}
- class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
- void realRun() throws InterruptedException {
+ public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
+ protected void realRun() throws InterruptedException {
Thread.sleep(SMALL_DELAY_MS);
}
}
- class MediumRunnable extends CheckedRunnable {
- void realRun() throws Throwable {
+ public class MediumRunnable extends CheckedRunnable {
+ protected void realRun() throws Throwable {
Thread.sleep(MEDIUM_DELAY_MS);
}
}
- class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
- void realRun() throws InterruptedException {
+ public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
+ protected void realRun() throws InterruptedException {
Thread.sleep(MEDIUM_DELAY_MS);
}
}
- class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
- void realRun() {
+ public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
+ protected void realRun() {
try {
Thread.sleep(MEDIUM_DELAY_MS);
- }
- catch (InterruptedException ok) {
- }
+ } catch (InterruptedException ok) {}
}
}
- class LongPossiblyInterruptedRunnable extends CheckedRunnable {
- void realRun() {
+ public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
+ protected void realRun() {
try {
Thread.sleep(LONG_DELAY_MS);
- }
- catch (InterruptedException ok) {
- }
+ } catch (InterruptedException ok) {}
}
}
/**
* For use as ThreadFactory in constructors
*/
- static class SimpleThreadFactory implements ThreadFactory {
+ 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 (InterruptedException ok) {
- }
+ } 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 (InterruptedException ok) {
- }
+ } 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 (InterruptedException ok) {
- }
+ } 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 (InterruptedException ok) {
- }
+ } catch (InterruptedException ok) {}
return Boolean.TRUE;
}
}
@@ -689,7 +769,7 @@ public class JSR166TestCase extends Test
/**
* For use as RejectedExecutionHandler in constructors
*/
- static class NoOpREHandler implements RejectedExecutionHandler {
+ public static class NoOpREHandler implements RejectedExecutionHandler {
public void rejectedExecution(Runnable r,
ThreadPoolExecutor executor) {}
}