--- jsr166/src/test/tck/ExecutorsTest.java	2017/05/29 22:44:26	1.49
+++ jsr166/src/test/tck/ExecutorsTest.java	2020/02/01 16:45:50	1.52
@@ -63,7 +63,7 @@ public class ExecutorsTest extends JSR16
      */
     public void testNewCachedThreadPool3() {
         try {
-            ExecutorService e = Executors.newCachedThreadPool(null);
+            ExecutorService unused = Executors.newCachedThreadPool(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -97,7 +97,7 @@ public class ExecutorsTest extends JSR16
      */
     public void testNewSingleThreadExecutor3() {
         try {
-            ExecutorService e = Executors.newSingleThreadExecutor(null);
+            ExecutorService unused = Executors.newSingleThreadExecutor(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -145,7 +145,7 @@ public class ExecutorsTest extends JSR16
      */
     public void testNewFixedThreadPool3() {
         try {
-            ExecutorService e = Executors.newFixedThreadPool(2, null);
+            ExecutorService unused = Executors.newFixedThreadPool(2, null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -155,7 +155,7 @@ public class ExecutorsTest extends JSR16
      */
     public void testNewFixedThreadPool4() {
         try {
-            ExecutorService e = Executors.newFixedThreadPool(0);
+            ExecutorService unused = Executors.newFixedThreadPool(0);
             shouldThrow();
         } catch (IllegalArgumentException success) {}
     }
@@ -177,7 +177,8 @@ public class ExecutorsTest extends JSR16
      */
     public void testUnconfigurableExecutorServiceNPE() {
         try {
-            ExecutorService e = Executors.unconfigurableExecutorService(null);
+            ExecutorService unused =
+                Executors.unconfigurableExecutorService(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -187,7 +188,8 @@ public class ExecutorsTest extends JSR16
      */
     public void testUnconfigurableScheduledExecutorServiceNPE() {
         try {
-            ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
+            ExecutorService unused =
+                Executors.unconfigurableScheduledExecutorService(null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -277,9 +279,12 @@ public class ExecutorsTest extends JSR16
             Executors.newScheduledThreadPool(2),
         };
 
-        final Runnable sleeper = new CheckedInterruptedRunnable() {
+        final Runnable sleeper = new CheckedRunnable() {
             public void realRun() throws InterruptedException {
-                delay(LONG_DELAY_MS);
+                try {
+                    delay(LONG_DELAY_MS);
+                } catch(InterruptedException OK) {
+                }
             }};
 
         List<Thread> threads = new ArrayList<>();
@@ -293,6 +298,8 @@ public class ExecutorsTest extends JSR16
         for (Thread thread : threads)
             awaitTermination(thread);
         for (ExecutorService executor : executors)
+            executor.shutdownNow(); // assumes shutdownNow interrupts threads
+        for (ExecutorService executor : executors)
             joinPool(executor);
     }
 
@@ -551,7 +558,7 @@ public class ExecutorsTest extends JSR16
      */
     public void testCallableNPE1() {
         try {
-            Callable c = Executors.callable((Runnable) null);
+            Callable unused = Executors.callable((Runnable) null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -561,7 +568,7 @@ public class ExecutorsTest extends JSR16
      */
     public void testCallableNPE2() {
         try {
-            Callable c = Executors.callable((Runnable) null, one);
+            Callable unused = Executors.callable((Runnable) null, one);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -571,7 +578,7 @@ public class ExecutorsTest extends JSR16
      */
     public void testCallableNPE3() {
         try {
-            Callable c = Executors.callable((PrivilegedAction) null);
+            Callable unused = Executors.callable((PrivilegedAction) null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
@@ -581,9 +588,61 @@ public class ExecutorsTest extends JSR16
      */
     public void testCallableNPE4() {
         try {
-            Callable c = Executors.callable((PrivilegedExceptionAction) null);
+            Callable unused = Executors.callable((PrivilegedExceptionAction) null);
             shouldThrow();
         } catch (NullPointerException success) {}
     }
 
+    /**
+     * callable(runnable, x).toString() contains toString of wrapped task
+     */
+    public void testCallable_withResult_toString() {
+        if (testImplementationDetails) {
+            Runnable r = () -> {};
+            Callable<String> c = Executors.callable(r, "");
+            assertEquals(
+                identityString(c) + "[Wrapped task = " + r.toString() + "]",
+                c.toString());
+        }
+    }
+
+    /**
+     * callable(runnable).toString() contains toString of wrapped task
+     */
+    public void testCallable_toString() {
+        if (testImplementationDetails) {
+            Runnable r = () -> {};
+            Callable<Object> c = Executors.callable(r);
+            assertEquals(
+                identityString(c) + "[Wrapped task = " + r.toString() + "]",
+                c.toString());
+        }
+    }
+
+    /**
+     * privilegedCallable(callable).toString() contains toString of wrapped task
+     */
+    public void testPrivilegedCallable_toString() {
+        if (testImplementationDetails) {
+            Callable<String> c = () -> "";
+            Callable<String> priv = Executors.privilegedCallable(c);
+            assertEquals(
+                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
+                priv.toString());
+        }
+    }
+
+    /**
+     * privilegedCallableUsingCurrentClassLoader(callable).toString()
+     * contains toString of wrapped task
+     */
+    public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
+        if (testImplementationDetails) {
+            Callable<String> c = () -> "";
+            Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
+            assertEquals(
+                identityString(priv) + "[Wrapped task = " + c.toString() + "]",
+                priv.toString());
+        }
+    }
 }