--- jsr166/src/test/tck/JSR166TestCase.java	2003/10/25 16:02:13	1.7
+++ jsr166/src/test/tck/JSR166TestCase.java	2003/12/27 19:26:43	1.13
@@ -1,8 +1,9 @@
 /*
- * Written by members of JCP JSR-166 Expert Group and released to the
- * public domain. Use, modify, and redistribute this code in any way
- * without acknowledgement. Other contributors include Andrew Wright,
- * Jeffrey Hayes, Pat Fischer, Mike Judd.
+ * 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. 
  */
 
 import junit.framework.*;
@@ -98,6 +99,7 @@ public class JSR166TestCase extends Test
     public static Test suite ( ) {
         TestSuite suite = new TestSuite("JSR166 Unit Tests");
         
+        suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
         suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
         suite.addTest(new TestSuite(AtomicBooleanTest.class)); 
         suite.addTest(new TestSuite(AtomicIntegerArrayTest.class)); 
@@ -111,7 +113,6 @@ public class JSR166TestCase extends Test
         suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class)); 
         suite.addTest(new TestSuite(AtomicReferenceTest.class)); 
         suite.addTest(new TestSuite(AtomicStampedReferenceTest.class)); 
-        suite.addTest(new TestSuite(CancellableTaskTest.class));
         suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
         suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
         suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
@@ -121,14 +122,13 @@ public class JSR166TestCase extends Test
         suite.addTest(new TestSuite(DelayQueueTest.class));
         suite.addTest(new TestSuite(ExchangerTest.class));
         suite.addTest(new TestSuite(ExecutorsTest.class));
-        suite.addTest(new TestSuite(FairSemaphoreTest.class));
+        suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
         suite.addTest(new TestSuite(FutureTaskTest.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(PrivilegedFutureTaskTest.class));
         suite.addTest(new TestSuite(ReentrantLockTest.class));
         suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
         suite.addTest(new TestSuite(ScheduledExecutorTest.class));
@@ -354,6 +354,20 @@ public class JSR166TestCase extends Test
         public Object call() { return Boolean.TRUE; }
     }
 
+    static final String TEST_STRING = "a test string";
+
+    static class StringTask implements Callable<String> {
+        public String call() { return TEST_STRING; }
+    }
+
+    static class NPETask implements Callable<String> {
+        public String call() { throw new NullPointerException(); }
+    }
+
+    static class CallableOne implements Callable<Integer> {
+        public Integer call() { return one; }
+    }
+
     class ShortRunnable implements Runnable {
         public void run() {
             try {
@@ -450,6 +464,16 @@ public class JSR166TestCase extends Test
             }
             catch(InterruptedException success) {
             }
+        }
+    }
+
+    class LongPossiblyInterruptedRunnable implements Runnable {
+        public void run() {
+            try {
+                Thread.sleep(LONG_DELAY_MS);
+            }
+            catch(InterruptedException success) {
+            }
         }
     }