--- jsr166/src/test/tck/ExecutorCompletionServiceTest.java	2005/07/08 20:00:10	1.4
+++ jsr166/src/test/tck/ExecutorCompletionServiceTest.java	2009/11/16 05:30:07	1.8
@@ -2,20 +2,21 @@
  * 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.*;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.*;
 import java.math.BigInteger;
 import java.security.*;
 
-public class ExecutorCompletionServiceTest extends JSR166TestCase{
+public class ExecutorCompletionServiceTest extends JSR166TestCase {
     public static void main(String[] args) {
-        junit.textui.TestRunner.run (suite());  
+        junit.textui.TestRunner.run (suite());
     }
     public static Test suite() {
         return new TestSuite(ExecutorCompletionServiceTest.class);
@@ -24,7 +25,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * Creating a new ECS with null Executor throw NPE
-     */ 
+     */
     public void testConstructorNPE() {
         try {
             ExecutorCompletionService ecs = new ExecutorCompletionService(null);
@@ -35,7 +36,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * Creating a new ECS with null queue throw NPE
-     */ 
+     */
     public void testConstructorNPE2() {
         try {
             ExecutorService e = Executors.newCachedThreadPool();
@@ -47,7 +48,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * Submitting a null callable throws NPE
-     */ 
+     */
     public void testSubmitNPE() {
         ExecutorService e = Executors.newCachedThreadPool();
         ExecutorCompletionService ecs = new ExecutorCompletionService(e);
@@ -63,7 +64,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * Submitting a null runnable throws NPE
-     */ 
+     */
     public void testSubmitNPE2() {
         ExecutorService e = Executors.newCachedThreadPool();
         ExecutorCompletionService ecs = new ExecutorCompletionService(e);
@@ -79,7 +80,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * A taken submitted task is completed
-     */ 
+     */
     public void testTake() {
         ExecutorService e = Executors.newCachedThreadPool();
         ExecutorCompletionService ecs = new ExecutorCompletionService(e);
@@ -97,7 +98,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * Take returns the same future object returned by submit
-     */ 
+     */
     public void testTake2() {
         ExecutorService e = Executors.newCachedThreadPool();
         ExecutorCompletionService ecs = new ExecutorCompletionService(e);
@@ -115,7 +116,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * If poll returns non-null, the returned task is completed
-     */ 
+     */
     public void testPoll1() {
         ExecutorService e = Executors.newCachedThreadPool();
         ExecutorCompletionService ecs = new ExecutorCompletionService(e);
@@ -140,7 +141,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * If timed poll returns non-null, the returned task is completed
-     */ 
+     */
     public void testPoll2() {
         ExecutorService e = Executors.newCachedThreadPool();
         ExecutorCompletionService ecs = new ExecutorCompletionService(e);
@@ -149,7 +150,7 @@ public class ExecutorCompletionServiceTe
             Callable c = new StringTask();
             ecs.submit(c);
             Future f = ecs.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
-            if (f != null) 
+            if (f != null)
                 assertTrue(f.isDone());
         } catch (Exception ex) {
             unexpectedException();
@@ -213,8 +214,8 @@ public class ExecutorCompletionServiceTe
              new ExecutorCompletionService<String>(e);
          try {
              assertNull(ecs.poll());
-             Callable<String> c = new StringTask();
-             Future f1 = ecs.submit(c);
+             Runnable r = new NoOpRunnable();
+             Future f1 = ecs.submit(r, null);
              assertTrue("submit must return MyRunnableFuture",
                         f1 instanceof MyRunnableFuture);
              Future f2 = ecs.take();