--- jsr166/src/test/tck/ExecutorCompletionServiceTest.java	2005/08/05 19:15:48	1.6
+++ jsr166/src/test/tck/ExecutorCompletionServiceTest.java	2009/11/21 02:33:20	1.9
@@ -2,21 +2,22 @@
  * 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 static java.util.concurrent.TimeUnit.MILLISECONDS;
 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);
@@ -25,7 +26,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * Creating a new ECS with null Executor throw NPE
-     */ 
+     */
     public void testConstructorNPE() {
         try {
             ExecutorCompletionService ecs = new ExecutorCompletionService(null);
@@ -36,7 +37,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * Creating a new ECS with null queue throw NPE
-     */ 
+     */
     public void testConstructorNPE2() {
         try {
             ExecutorService e = Executors.newCachedThreadPool();
@@ -48,7 +49,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * Submitting a null callable throws NPE
-     */ 
+     */
     public void testSubmitNPE() {
         ExecutorService e = Executors.newCachedThreadPool();
         ExecutorCompletionService ecs = new ExecutorCompletionService(e);
@@ -64,7 +65,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * Submitting a null runnable throws NPE
-     */ 
+     */
     public void testSubmitNPE2() {
         ExecutorService e = Executors.newCachedThreadPool();
         ExecutorCompletionService ecs = new ExecutorCompletionService(e);
@@ -80,7 +81,7 @@ public class ExecutorCompletionServiceTe
 
     /**
      * A taken submitted task is completed
-     */ 
+     */
     public void testTake() {
         ExecutorService e = Executors.newCachedThreadPool();
         ExecutorCompletionService ecs = new ExecutorCompletionService(e);
@@ -98,7 +99,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);
@@ -116,7 +117,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);
@@ -141,7 +142,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,8 +150,8 @@ public class ExecutorCompletionServiceTe
             assertNull(ecs.poll());
             Callable c = new StringTask();
             ecs.submit(c);
-            Future f = ecs.poll(SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
-            if (f != null) 
+            Future f = ecs.poll(SHORT_DELAY_MS, MILLISECONDS);
+            if (f != null)
                 assertTrue(f.isDone());
         } catch (Exception ex) {
             unexpectedException();