--- jsr166/src/test/tck/AbstractExecutorServiceTest.java	2017/05/29 22:44:26	1.46
+++ jsr166/src/test/tck/AbstractExecutorServiceTest.java	2017/07/16 18:05:47	1.47
@@ -166,25 +166,25 @@ public class AbstractExecutorServiceTest
     }
 
     /**
-     * execute(null runnable) throws NPE
+     * Submitting null tasks throws NullPointerException.
      */
-    public void testExecuteNullRunnable() {
-        ExecutorService e = new DirectExecutorService();
-        try {
-            e.submit((Runnable) null);
-            shouldThrow();
-        } catch (NullPointerException success) {}
-    }
-
-    /**
-     * submit(null callable) throws NPE
-     */
-    public void testSubmitNullCallable() {
-        ExecutorService e = new DirectExecutorService();
-        try {
-            e.submit((Callable) null);
-            shouldThrow();
-        } catch (NullPointerException success) {}
+    @SuppressWarnings("FutureReturnValueIgnored")
+    public void testNullTaskSubmission() throws Exception {
+        final ExecutorService e = new DirectExecutorService();
+        try (PoolCleaner cleaner = cleaner(e)) {
+            try {
+                e.execute((Runnable) null);
+                shouldThrow();
+            } catch (NullPointerException success) {}
+            try {
+                e.submit((Runnable) null);
+                shouldThrow();
+            } catch (NullPointerException success) {}
+            try {
+                e.submit((Callable) null);
+                shouldThrow();
+            } catch (NullPointerException success) {}
+        }
     }
 
     /**