--- jsr166/src/test/tck/CompletableFutureTest.java	2015/01/07 07:59:20	1.99
+++ jsr166/src/test/tck/CompletableFutureTest.java	2015/04/25 04:55:30	1.102
@@ -34,7 +34,7 @@ import junit.framework.TestSuite;
 public class CompletableFutureTest extends JSR166TestCase {
 
     public static void main(String[] args) {
-        junit.textui.TestRunner.run(suite());
+        main(suite(), args);
     }
     public static Test suite() {
         return new TestSuite(CompletableFutureTest.class);
@@ -273,8 +273,9 @@ public class CompletableFutureTest exten
     {
         CompletableFuture<Integer> f = new CompletableFuture<>();
         checkIncomplete(f);
-        assertTrue(f.cancel(true));
-        assertTrue(f.cancel(true));
+        assertTrue(f.cancel(mayInterruptIfRunning));
+        assertTrue(f.cancel(mayInterruptIfRunning));
+        assertTrue(f.cancel(!mayInterruptIfRunning));
         checkCancelled(f);
     }}
 
@@ -546,7 +547,6 @@ public class CompletableFutureTest exten
         }
     }
 
-
     class CompletableFutureInc extends CheckedIntegerAction
         implements Function<Integer, CompletableFuture<Integer>>
     {
@@ -907,7 +907,6 @@ public class CompletableFutureTest exten
 
     public void testExceptionally_exceptionalCompletionActionFailed() {
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
     {
         final AtomicInteger a = new AtomicInteger(0);
         final CFException ex1 = new CFException();
@@ -961,7 +960,6 @@ public class CompletableFutureTest exten
     public void testWhenComplete_exceptionalCompletion() {
         for (ExecutionMode m : ExecutionMode.values())
         for (boolean createIncomplete : new boolean[] { true, false })
-        for (Integer v1 : new Integer[] { 1, null })
     {
         final AtomicInteger a = new AtomicInteger(0);
         final CFException ex = new CFException();
@@ -1046,7 +1044,6 @@ public class CompletableFutureTest exten
     public void testWhenComplete_actionFailedSourceFailed() {
         for (boolean createIncomplete : new boolean[] { true, false })
         for (ExecutionMode m : ExecutionMode.values())
-        for (Integer v1 : new Integer[] { 1, null })
     {
         final AtomicInteger a = new AtomicInteger(0);
         final CFException ex1 = new CFException();
@@ -3213,7 +3210,6 @@ public class CompletableFutureTest exten
         CompletableFuture<Integer> f = new CompletableFuture<>();
         CompletableFuture<Integer> g = new CompletableFuture<>();
         CompletableFuture<Integer> nullFuture = (CompletableFuture<Integer>)null;
-        CompletableFuture<?> h;
         ThreadExecutor exec = new ThreadExecutor();
 
         Runnable[] throwingActions = {