--- jsr166/src/test/tck/ForkJoinTask8Test.java	2013/07/22 18:01:03	1.3
+++ jsr166/src/test/tck/ForkJoinTask8Test.java	2015/02/07 17:49:11	1.10
@@ -3,19 +3,19 @@
  * Expert Group and released to the public domain, as explained at
  * http://creativecommons.org/publicdomain/zero/1.0/
  */
+
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static java.util.concurrent.TimeUnit.SECONDS;
+
+import java.util.HashSet;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.CancellationException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
-import java.util.concurrent.ForkJoinWorkerThread;
 import java.util.concurrent.RecursiveAction;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.SECONDS;
-import java.util.HashSet;
-import junit.framework.*;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
 
 public class ForkJoinTask8Test extends JSR166TestCase {
 
@@ -180,7 +180,6 @@ public class ForkJoinTask8Test extends J
         } catch (Throwable fail) { threadUnexpectedException(fail); }
     }
 
-
     public static final class FJException extends RuntimeException {
         FJException() { super(); }
     }
@@ -722,18 +721,22 @@ public class ForkJoinTask8Test extends J
     }
 
     /**
-     * invokeAll(tasks) with any null task throws NPE
+     * invokeAll(tasks) with any null task throws NullPointerException
      */
-    public void testInvokeAllNPE() {
+    public void testInvokeAllNullTask() {
         RecursiveAction a = new CheckedRecursiveAction() {
             protected void realCompute() {
                 AsyncFib f = new AsyncFib(8);
                 AsyncFib g = new AsyncFib(9);
-                AsyncFib h = null;
-                try {
-                    invokeAll(f, g, h);
-                    shouldThrow();
-                } catch (NullPointerException success) {}
+                AsyncFib nul = null;
+                Runnable[] throwingActions = {
+                    () -> invokeAll(nul),
+                    () -> invokeAll(nul, nul),
+                    () -> invokeAll(f, g, nul),
+                    () -> invokeAll(f, nul, g),
+                    () -> invokeAll(nul, f, g),
+                };
+                assertThrows(NullPointerException.class, throwingActions);
             }};
         testInvokeOnPool(mainPool(), a);
     }
@@ -793,7 +796,7 @@ public class ForkJoinTask8Test extends J
     }
 
     /**
-     * invokeAll(collection)  throws exception if any task does
+     * invokeAll(collection) throws exception if any task does
      */
     public void testAbnormalInvokeAllCollection() {
         RecursiveAction a = new CheckedRecursiveAction() {
@@ -1370,7 +1373,7 @@ public class ForkJoinTask8Test extends J
     }
 
     /**
-     * invokeAll(collection)  throws exception if any task does
+     * invokeAll(collection) throws exception if any task does
      */
     public void testAbnormalInvokeAllCollectionSingleton() {
         RecursiveAction a = new CheckedRecursiveAction() {