--- jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2015/10/06 05:30:44	1.91
+++ jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java	2015/10/06 16:39:06	1.93
@@ -248,13 +248,13 @@ public class ThreadPoolExecutorSubclassT
      * thread becomes active
      */
     public void testGetActiveCount() throws InterruptedException {
+        final CountDownLatch done = new CountDownLatch(1);
         final ThreadPoolExecutor p =
             new CustomTPE(2, 2,
                           LONG_DELAY_MS, MILLISECONDS,
                           new ArrayBlockingQueue<Runnable>(10));
-        try (PoolCleaner cleaner = cleaner(p)) {
+        try (PoolCleaner cleaner = cleaner(p, done)) {
             final CountDownLatch threadStarted = new CountDownLatch(1);
-            final CountDownLatch done = new CountDownLatch(1);
             assertEquals(0, p.getActiveCount());
             p.execute(new CheckedRunnable() {
                 public void realRun() throws InterruptedException {
@@ -264,7 +264,6 @@ public class ThreadPoolExecutorSubclassT
                 }});
             await(threadStarted);
             assertEquals(1, p.getActiveCount());
-            done.countDown();
         }
     }
 
@@ -652,14 +651,14 @@ public class ThreadPoolExecutorSubclassT
      * getQueue returns the work queue, which contains queued tasks
      */
     public void testGetQueue() throws InterruptedException {
+        final CountDownLatch done = new CountDownLatch(1);
         final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
         final ThreadPoolExecutor p =
             new CustomTPE(1, 1,
                           LONG_DELAY_MS, MILLISECONDS,
                           q);
-        try (PoolCleaner cleaner = cleaner(p)) {
+        try (PoolCleaner cleaner = cleaner(p, done)) {
             final CountDownLatch threadStarted = new CountDownLatch(1);
-            final CountDownLatch done = new CountDownLatch(1);
             FutureTask[] tasks = new FutureTask[5];
             for (int i = 0; i < tasks.length; i++) {
                 Callable task = new CheckedCallable<Boolean>() {
@@ -677,7 +676,6 @@ public class ThreadPoolExecutorSubclassT
             assertFalse(q.contains(tasks[0]));
             assertTrue(q.contains(tasks[tasks.length - 1]));
             assertEquals(tasks.length - 1, q.size());
-            done.countDown();
         }
     }
 
@@ -685,15 +683,15 @@ public class ThreadPoolExecutorSubclassT
      * remove(task) removes queued task, and fails to remove active task
      */
     public void testRemove() throws InterruptedException {
+        final CountDownLatch done = new CountDownLatch(1);
         BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
         final ThreadPoolExecutor p =
             new CustomTPE(1, 1,
                           LONG_DELAY_MS, MILLISECONDS,
                           q);
-        try (PoolCleaner cleaner = cleaner(p)) {
+        try (PoolCleaner cleaner = cleaner(p, done)) {
             Runnable[] tasks = new Runnable[6];
             final CountDownLatch threadStarted = new CountDownLatch(1);
-            final CountDownLatch done = new CountDownLatch(1);
             for (int i = 0; i < tasks.length; i++) {
                 tasks[i] = new CheckedRunnable() {
                     public void realRun() throws InterruptedException {
@@ -712,7 +710,6 @@ public class ThreadPoolExecutorSubclassT
             assertTrue(q.contains(tasks[3]));
             assertTrue(p.remove(tasks[3]));
             assertFalse(q.contains(tasks[3]));
-            done.countDown();
         }
     }
 
@@ -1136,12 +1133,12 @@ public class ThreadPoolExecutorSubclassT
      * execute throws RejectedExecutionException if saturated.
      */
     public void testSaturatedExecute() {
+        final CountDownLatch done = new CountDownLatch(1);
         final ThreadPoolExecutor p =
             new CustomTPE(1, 1,
                           LONG_DELAY_MS, MILLISECONDS,
                           new ArrayBlockingQueue<Runnable>(1));
-        try (PoolCleaner cleaner = cleaner(p)) {
-            final CountDownLatch done = new CountDownLatch(1);
+        try (PoolCleaner cleaner = cleaner(p, done)) {
             Runnable task = new CheckedRunnable() {
                 public void realRun() throws InterruptedException {
                     await(done);
@@ -1155,7 +1152,6 @@ public class ThreadPoolExecutorSubclassT
                 } catch (RejectedExecutionException success) {}
                 assertTrue(p.getTaskCount() <= 2);
             }
-            done.countDown();
         }
     }
 
@@ -1163,13 +1159,13 @@ public class ThreadPoolExecutorSubclassT
      * executor using CallerRunsPolicy runs task if saturated.
      */
     public void testSaturatedExecute2() {
+        final CountDownLatch done = new CountDownLatch(1);
         final ThreadPoolExecutor p =
             new CustomTPE(1, 1,
                           LONG_DELAY_MS, MILLISECONDS,
                           new ArrayBlockingQueue<Runnable>(1),
                           new CustomTPE.CallerRunsPolicy());
-        try (PoolCleaner cleaner = cleaner(p)) {
-            final CountDownLatch done = new CountDownLatch(1);
+        try (PoolCleaner cleaner = cleaner(p, done)) {
             Runnable blocker = new CheckedRunnable() {
                 public void realRun() throws InterruptedException {
                     await(done);
@@ -1183,7 +1179,6 @@ public class ThreadPoolExecutorSubclassT
             for (int i = 1; i < tasks.length; i++)
                 assertTrue(tasks[i].done);
             assertFalse(tasks[0].done); // waiting in queue
-            done.countDown();
         }
     }
 
@@ -1194,20 +1189,19 @@ public class ThreadPoolExecutorSubclassT
         final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
         for (int i = 0; i < tasks.length; ++i)
             tasks[i] = new TrackedNoOpRunnable();
+        final CountDownLatch done = new CountDownLatch(1);
         final ThreadPoolExecutor p =
             new CustomTPE(1, 1,
                           LONG_DELAY_MS, MILLISECONDS,
                           new ArrayBlockingQueue<Runnable>(1),
                           new CustomTPE.DiscardPolicy());
-        try (PoolCleaner cleaner = cleaner(p)) {
-            final CountDownLatch done = new CountDownLatch(1);
+        try (PoolCleaner cleaner = cleaner(p, done)) {
             p.execute(awaiter(done));
 
             for (TrackedNoOpRunnable task : tasks)
                 p.execute(task);
             for (int i = 1; i < tasks.length; i++)
                 assertFalse(tasks[i].done);
-            done.countDown();
         }
         for (int i = 1; i < tasks.length; i++)
             assertFalse(tasks[i].done);
@@ -1227,7 +1221,7 @@ public class ThreadPoolExecutorSubclassT
                           LONG_DELAY_MS, MILLISECONDS,
                           new ArrayBlockingQueue<Runnable>(1),
                           new CustomTPE.DiscardOldestPolicy());
-        try (PoolCleaner cleaner = cleaner(p)) {
+        try (PoolCleaner cleaner = cleaner(p, done)) {
             assertEquals(LatchAwaiter.NEW, r1.state);
             assertEquals(LatchAwaiter.NEW, r2.state);
             assertEquals(LatchAwaiter.NEW, r3.state);
@@ -1237,7 +1231,6 @@ public class ThreadPoolExecutorSubclassT
             p.execute(r3);
             assertFalse(p.getQueue().contains(r2));
             assertTrue(p.getQueue().contains(r3));
-            done.countDown();
         }
         assertEquals(LatchAwaiter.DONE, r1.state);
         assertEquals(LatchAwaiter.NEW, r2.state);
@@ -1875,19 +1868,25 @@ public class ThreadPoolExecutorSubclassT
      * timed invokeAll(c) cancels tasks not completed by timeout
      */
     public void testTimedInvokeAll6() throws Exception {
-        final ExecutorService e =
-            new CustomTPE(2, 2,
-                          LONG_DELAY_MS, MILLISECONDS,
-                          new ArrayBlockingQueue<Runnable>(10));
-        try (PoolCleaner cleaner = cleaner(e)) {
-            for (long timeout = timeoutMillis();;) {
+        for (long timeout = timeoutMillis();;) {
+            final CountDownLatch done = new CountDownLatch(1);
+            final Callable<String> waiter = new CheckedCallable<String>() {
+                public String realCall() {
+                    try { done.await(LONG_DELAY_MS, MILLISECONDS); }
+                    catch (InterruptedException ok) {}
+                    return "1"; }};
+            final ExecutorService p =
+                new CustomTPE(2, 2,
+                              LONG_DELAY_MS, MILLISECONDS,
+                              new ArrayBlockingQueue<Runnable>(10));
+            try (PoolCleaner cleaner = cleaner(p, done)) {
                 List<Callable<String>> tasks = new ArrayList<>();
                 tasks.add(new StringTask("0"));
-                tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
+                tasks.add(waiter);
                 tasks.add(new StringTask("2"));
                 long startTime = System.nanoTime();
                 List<Future<String>> futures =
-                    e.invokeAll(tasks, timeout, MILLISECONDS);
+                    p.invokeAll(tasks, timeout, MILLISECONDS);
                 assertEquals(tasks.size(), futures.size());
                 assertTrue(millisElapsedSince(startTime) >= timeout);
                 for (Future future : futures)
@@ -1996,13 +1995,13 @@ public class ThreadPoolExecutorSubclassT
      * (in part, a test of CustomTPE itself)
      */
     public void testGet_cancelled() throws Exception {
+        final CountDownLatch done = new CountDownLatch(1);
         final ExecutorService e =
             new CustomTPE(1, 1,
                           LONG_DELAY_MS, MILLISECONDS,
                           new LinkedBlockingQueue<Runnable>());
-        try (PoolCleaner cleaner = cleaner(e)) {
+        try (PoolCleaner cleaner = cleaner(e, done)) {
             final CountDownLatch blockerStarted = new CountDownLatch(1);
-            final CountDownLatch done = new CountDownLatch(1);
             final List<Future<?>> futures = new ArrayList<>();
             for (int i = 0; i < 2; i++) {
                 Runnable r = new CheckedRunnable() { public void realRun()
@@ -2026,7 +2025,6 @@ public class ThreadPoolExecutorSubclassT
                 assertTrue(future.isCancelled());
                 assertTrue(future.isDone());
             }
-            done.countDown();
         }
     }