--- jsr166/src/test/tck/JSR166TestCase.java 2004/01/07 20:49:53 1.17
+++ jsr166/src/test/tck/JSR166TestCase.java 2006/04/20 20:35:00 1.30
@@ -2,8 +2,8 @@
* Written by Doug Lea with assistance from members of JCP JSR-166
* Expert Group and released to the public domain, as explained at
* http://creativecommons.org/licenses/publicdomain
- * Other contributors include Andrew Wright, Jeffrey Hayes,
- * Pat Fisher, Mike Judd.
+ * Other contributors include Andrew Wright, Jeffrey Hayes,
+ * Pat Fisher, Mike Judd.
*/
import junit.framework.*;
@@ -17,20 +17,20 @@ import java.security.*;
* utility methods and classes, as well as a simple framework for
* helping to make sure that assertions failing in generated threads
* cause the associated test that generated them to itself fail (which
- * JUnit doe not otherwise arrange). The rules for creating such
+ * JUnit does not otherwise arrange). The rules for creating such
* tests are:
*
*
*
* - All assertions in code running in generated threads must use
- * the forms {@link threadFail} , {@link threadAssertTrue} {@link
- * threadAssertEquals}, or {@link threadAssertNull}, (not
+ * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
+ * #threadAssertEquals}, or {@link #threadAssertNull}, (not
* fail, 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
+ *
- If you override {@link #setUp} or {@link #tearDown}, make sure
* to invoke super.setUp and super.tearDown within
* them. These methods are used to clear and check for thread
* assertion failures.
@@ -44,7 +44,7 @@ import java.security.*;
* is always discriminable as larger than SHORT and smaller than
* MEDIUM. And so on. These constants are set to conservative values,
* but even so, if there is ever any doubt, they can all be increased
- * in one spot to rerun tests on slower platforms
+ * 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
@@ -63,7 +63,7 @@ import java.security.*;
* "normal" behaviors differ significantly. And sometimes testcases
* cover multiple methods when they cannot be tested in
* isolation.
- *
+ *
* - The documentation style for testcases is to provide as javadoc
* a simple sentence or two describing the property that the testcase
* method purports to test. The javadocs do not say anything about how
@@ -88,48 +88,61 @@ import java.security.*;
public class JSR166TestCase extends TestCase {
/**
* Runs all JSR166 unit tests using junit.textui.TestRunner
- */
+ */
public static void main (String[] args) {
int iters = 1;
- if (args.length > 0)
+ if (args.length > 0)
iters = Integer.parseInt(args[0]);
Test s = suite();
- for (int i = 0; i < iters; ++i)
+ for (int i = 0; i < iters; ++i) {
junit.textui.TestRunner.run (s);
+ System.gc();
+ System.runFinalization();
+ }
+ System.exit(0);
}
/**
* Collects all JSR166 unit tests as one 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(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(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));
@@ -138,14 +151,20 @@ public class JSR166TestCase extends Test
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));
+
return suite;
}
@@ -157,16 +176,16 @@ public class JSR166TestCase extends Test
/**
- * Return the shortest timed delay. This could
+ * Returns the shortest timed delay. This could
* be reimplemented to use for example a Property.
- */
+ */
protected long getShortDelay() {
- return 10;
+ return 50;
}
/**
- * Set delays as multiples of SHORT_DELAY.
+ * Sets delays as multiples of SHORT_DELAY.
*/
protected void setDelays() {
SHORT_DELAY_MS = getShortDelay();
@@ -181,23 +200,23 @@ public class JSR166TestCase extends Test
volatile boolean threadFailed;
/**
- * Initialize test to indicate that no thread assertions have failed
+ * Initializes test to indicate that no thread assertions have failed
*/
- public void setUp() {
+ public void setUp() {
setDelays();
- threadFailed = false;
+ threadFailed = false;
}
/**
- * Trigger test case failure if any thread assertions have failed
+ * Triggers test case failure if any thread assertions have failed
*/
- public void tearDown() {
- assertFalse(threadFailed);
+ public void tearDown() {
+ assertFalse(threadFailed);
}
/**
* Fail, also setting status to indicate current testcase should fail
- */
+ */
public void threadFail(String reason) {
threadFailed = true;
fail(reason);
@@ -206,7 +225,7 @@ public class JSR166TestCase extends Test
/**
* If expression not true, set status to indicate current testcase
* should fail
- */
+ */
public void threadAssertTrue(boolean b) {
if (!b) {
threadFailed = true;
@@ -217,7 +236,7 @@ public class JSR166TestCase extends Test
/**
* If expression not false, set status to indicate current testcase
* should fail
- */
+ */
public void threadAssertFalse(boolean b) {
if (b) {
threadFailed = true;
@@ -228,7 +247,7 @@ public class JSR166TestCase extends Test
/**
* If argument not null, set status to indicate current testcase
* should fail
- */
+ */
public void threadAssertNull(Object x) {
if (x != null) {
threadFailed = true;
@@ -239,7 +258,7 @@ public class JSR166TestCase extends Test
/**
* If arguments not equal, set status to indicate current testcase
* should fail
- */
+ */
public void threadAssertEquals(long x, long y) {
if (x != y) {
threadFailed = true;
@@ -250,7 +269,7 @@ public class JSR166TestCase extends Test
/**
* If arguments not equal, set status to indicate current testcase
* should fail
- */
+ */
public void threadAssertEquals(Object x, Object y) {
if (x != y && (x == null || !x.equals(y))) {
threadFailed = true;
@@ -260,7 +279,7 @@ public class JSR166TestCase extends Test
/**
* threadFail with message "should throw exception"
- */
+ */
public void threadShouldThrow() {
threadFailed = true;
fail("should throw exception");
@@ -282,6 +301,8 @@ public class JSR166TestCase extends Test
try {
exec.shutdown();
assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
+ } catch(SecurityException ok) {
+ // Allowed in case test doesn't have privs
} catch(InterruptedException ie) {
fail("Unexpected exception");
}
@@ -290,7 +311,7 @@ public class JSR166TestCase extends Test
/**
* fail with message "should throw exception"
- */
+ */
public void shouldThrow() {
fail("Should throw exception");
}
@@ -325,6 +346,7 @@ public class JSR166TestCase extends Test
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);
@@ -489,7 +511,7 @@ public class JSR166TestCase extends Test
static class SimpleThreadFactory implements ThreadFactory{
public Thread newThread(Runnable r){
return new Thread(r);
- }
+ }
}
static class TrackedShortRunnable implements Runnable {
@@ -549,8 +571,8 @@ public class JSR166TestCase extends Test
* For use as RejectedExecutionHandler in constructors
*/
static class NoOpREHandler implements RejectedExecutionHandler{
- public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
+ public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
}
-
-
+
+
}