ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ForkJoinPoolTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ForkJoinPoolTest.java (file contents):
Revision 1.6 by jsr166, Mon Aug 3 22:08:07 2009 UTC vs.
Revision 1.63 by jsr166, Sun Oct 4 08:27:41 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7
8 import junit.framework.*;
9 import java.util.*;
10 import java.util.concurrent.*;
7   import static java.util.concurrent.TimeUnit.MILLISECONDS;
8 < import java.util.concurrent.locks.*;
9 < import java.security.*;
8 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
9 >
10 > import java.security.PrivilegedAction;
11 > import java.security.PrivilegedExceptionAction;
12 > import java.util.ArrayList;
13 > import java.util.Collection;
14 > import java.util.List;
15 > import java.util.concurrent.Callable;
16 > import java.util.concurrent.CountDownLatch;
17 > import java.util.concurrent.ExecutionException;
18 > import java.util.concurrent.Executors;
19 > import java.util.concurrent.ExecutorService;
20 > import java.util.concurrent.ForkJoinPool;
21 > import java.util.concurrent.ForkJoinTask;
22 > import java.util.concurrent.ForkJoinWorkerThread;
23 > import java.util.concurrent.Future;
24 > import java.util.concurrent.RecursiveTask;
25 > import java.util.concurrent.RejectedExecutionException;
26 > import java.util.concurrent.atomic.AtomicBoolean;
27 > import java.util.concurrent.locks.ReentrantLock;
28 >
29 > import junit.framework.AssertionFailedError;
30 > import junit.framework.Test;
31 > import junit.framework.TestSuite;
32  
33   public class ForkJoinPoolTest extends JSR166TestCase {
34      public static void main(String[] args) {
35 <        junit.textui.TestRunner.run (suite());
35 >        main(suite(), args);
36      }
37 +
38      public static Test suite() {
39          return new TestSuite(ForkJoinPoolTest.class);
40      }
41  
42 <    /**
42 >    /*
43       * Testing coverage notes:
44       *
45       * 1. shutdown and related methods are tested via super.joinPool.
# Line 39 | Line 58 | public class ForkJoinPoolTest extends JS
58      // Some classes to test extension and factory methods
59  
60      static class MyHandler implements Thread.UncaughtExceptionHandler {
61 <        int catches = 0;
61 >        volatile int catches = 0;
62          public void uncaughtException(Thread t, Throwable e) {
63              ++catches;
64          }
# Line 48 | Line 67 | public class ForkJoinPoolTest extends JS
67      // to test handlers
68      static class FailingFJWSubclass extends ForkJoinWorkerThread {
69          public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
70 <        protected void onStart() { throw new Error(); }
70 >        protected void onStart() { super.onStart(); throw new Error(); }
71      }
72  
73      static class FailingThreadFactory
74              implements ForkJoinPool.ForkJoinWorkerThreadFactory {
75 <        int calls = 0;
75 >        volatile int calls = 0;
76          public ForkJoinWorkerThread newThread(ForkJoinPool p) {
77              if (++calls > 1) return null;
78              return new FailingFJWSubclass(p);
# Line 88 | Line 107 | public class ForkJoinPoolTest extends JS
107      static final class FibTask extends RecursiveTask<Integer> {
108          final int number;
109          FibTask(int n) { number = n; }
110 <        public Integer compute() {
110 >        protected Integer compute() {
111              int n = number;
112              if (n <= 1)
113                  return n;
# Line 116 | Line 135 | public class ForkJoinPoolTest extends JS
135              this.locker = locker;
136              this.lock = lock;
137          }
138 <        public Integer compute() {
138 >        protected Integer compute() {
139              int n;
140              LockingFibTask f1 = null;
141              LockingFibTask f2 = null;
# Line 142 | Line 161 | public class ForkJoinPoolTest extends JS
161       * tasks, and quiescent running state.
162       */
163      public void testDefaultInitialState() {
164 <        ForkJoinPool p = null;
165 <        try {
166 <            p = new ForkJoinPool(1);
167 <            assertTrue(p.getFactory() ==
149 <                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
150 <            assertTrue(p.isQuiescent());
151 <            assertTrue(p.getMaintainsParallelism());
164 >        ForkJoinPool p = new ForkJoinPool(1);
165 >        try (PoolCleaner cleaner = cleaner(p)) {
166 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
167 >                       p.getFactory());
168              assertFalse(p.getAsyncMode());
169 <            assertTrue(p.getActiveThreadCount() == 0);
170 <            assertTrue(p.getStealCount() == 0);
171 <            assertTrue(p.getQueuedTaskCount() == 0);
172 <            assertTrue(p.getQueuedSubmissionCount() == 0);
169 >            assertEquals(0, p.getActiveThreadCount());
170 >            assertEquals(0, p.getStealCount());
171 >            assertEquals(0, p.getQueuedTaskCount());
172 >            assertEquals(0, p.getQueuedSubmissionCount());
173              assertFalse(p.hasQueuedSubmissions());
174              assertFalse(p.isShutdown());
175              assertFalse(p.isTerminating());
176              assertFalse(p.isTerminated());
161        } finally {
162            joinPool(p);
177          }
178      }
179  
# Line 170 | Line 184 | public class ForkJoinPoolTest extends JS
184          try {
185              new ForkJoinPool(-1);
186              shouldThrow();
187 <        }
174 <        catch (IllegalArgumentException success) {}
187 >        } catch (IllegalArgumentException success) {}
188      }
189  
190      /**
# Line 179 | Line 192 | public class ForkJoinPoolTest extends JS
192       */
193      public void testConstructor2() {
194          try {
195 <            new ForkJoinPool(1, null);
195 >            new ForkJoinPool(1, null, null, false);
196              shouldThrow();
197 <        } catch (NullPointerException success) {
185 <        }
197 >        } catch (NullPointerException success) {}
198      }
199  
188
200      /**
201       * getParallelism returns size set in constructor
202       */
203      public void testGetParallelism() {
204 <        ForkJoinPool p = null;
205 <        try {
206 <            p = new ForkJoinPool(1);
196 <            assertTrue(p.getParallelism() == 1);
197 <        } finally {
198 <            joinPool(p);
199 <        }
200 <    }
201 <
202 <    /**
203 <     * setParallelism changes reported parallelism level.
204 <     */
205 <    public void testSetParallelism() {
206 <        ForkJoinPool p = null;
207 <        try {
208 <            p = new ForkJoinPool(1);
209 <            assertTrue(p.getParallelism() == 1);
210 <            p.setParallelism(2);
211 <            assertTrue(p.getParallelism() == 2);
212 <        } finally {
213 <            joinPool(p);
214 <        }
215 <    }
216 <
217 <    /**
218 <     * setParallelism with argument <= 0 throws exception
219 <     */
220 <    public void testSetParallelism2() {
221 <        ForkJoinPool p = null;
222 <        try {
223 <            p = new ForkJoinPool(1);
224 <            assertTrue(p.getParallelism() == 1);
225 <            p.setParallelism(-2);
226 <            shouldThrow();
227 <        } catch (IllegalArgumentException success) {
228 <        } finally {
229 <            joinPool(p);
204 >        ForkJoinPool p = new ForkJoinPool(1);
205 >        try (PoolCleaner cleaner = cleaner(p)) {
206 >            assertEquals(1, p.getParallelism());
207          }
208      }
209  
# Line 234 | Line 211 | public class ForkJoinPoolTest extends JS
211       * getPoolSize returns number of started workers.
212       */
213      public void testGetPoolSize() {
214 <        ForkJoinPool p = null;
215 <        try {
216 <            p = new ForkJoinPool(1);
240 <            assertTrue(p.getPoolSize() == 0);
214 >        ForkJoinPool p = new ForkJoinPool(1);
215 >        try (PoolCleaner cleaner = cleaner(p)) {
216 >            assertEquals(0, p.getActiveThreadCount());
217              Future<String> future = p.submit(new StringTask());
218 <            assertTrue(p.getPoolSize() == 1);
243 <
244 <        } finally {
245 <            joinPool(p);
246 <        }
247 <    }
248 <
249 <    /**
250 <     * setMaximumPoolSize changes size reported by getMaximumPoolSize.
251 <     */
252 <    public void testSetMaximumPoolSize() {
253 <        ForkJoinPool p = null;
254 <        try {
255 <            p = new ForkJoinPool(1);
256 <            p.setMaximumPoolSize(2);
257 <            assertTrue(p.getMaximumPoolSize() == 2);
258 <        } finally {
259 <            joinPool(p);
260 <        }
261 <    }
262 <
263 <    /**
264 <     * setMaximumPoolSize with argument <= 0 throws exception
265 <     */
266 <    public void testSetMaximumPoolSize2() {
267 <        ForkJoinPool p = null;
268 <        try {
269 <            p = new ForkJoinPool(1);
270 <            p.setMaximumPoolSize(-2);
271 <            shouldThrow();
272 <        } catch (IllegalArgumentException success) {
273 <        } finally {
274 <            joinPool(p);
275 <        }
276 <    }
277 <
278 <    /**
279 <     * setMaintainsParallelism changes policy reported by
280 <     * getMaintainsParallelism.
281 <     */
282 <    public void testSetMaintainsParallelism() {
283 <        ForkJoinPool p = null;
284 <        try {
285 <            p = new ForkJoinPool(1);
286 <            p.setMaintainsParallelism(false);
287 <            assertFalse(p.getMaintainsParallelism());
288 <        } finally {
289 <            joinPool(p);
218 >            assertEquals(1, p.getPoolSize());
219          }
220      }
221  
222      /**
223 <     * setAsyncMode changes policy reported by
295 <     * getAsyncMode.
223 >     * awaitTermination on a non-shutdown pool times out
224       */
225 <    public void testSetAsyncMode() {
226 <        ForkJoinPool p = null;
227 <        try {
228 <            p = new ForkJoinPool(1);
229 <            p.setAsyncMode(true);
230 <            assertTrue(p.getAsyncMode());
231 <        } finally {
232 <            joinPool(p);
225 >    public void testAwaitTermination_timesOut() throws InterruptedException {
226 >        ForkJoinPool p = new ForkJoinPool(1);
227 >        try (PoolCleaner cleaner = cleaner(p)) {
228 >            assertFalse(p.isTerminated());
229 >            assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
230 >            assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
231 >            assertFalse(p.awaitTermination(-1L, NANOSECONDS));
232 >            assertFalse(p.awaitTermination(-1L, MILLISECONDS));
233 >            assertFalse(p.awaitTermination(0L, NANOSECONDS));
234 >            assertFalse(p.awaitTermination(0L, MILLISECONDS));
235 >            long timeoutNanos = 999999L;
236 >            long startTime = System.nanoTime();
237 >            assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
238 >            assertTrue(System.nanoTime() - startTime >= timeoutNanos);
239 >            assertFalse(p.isTerminated());
240 >            startTime = System.nanoTime();
241 >            long timeoutMillis = timeoutMillis();
242 >            assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
243 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
244 >            assertFalse(p.isTerminated());
245 >            p.shutdown();
246 >            assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
247 >            assertTrue(p.isTerminated());
248          }
249      }
250  
# Line 312 | Line 255 | public class ForkJoinPoolTest extends JS
255       * performs its defined action
256       */
257      public void testSetUncaughtExceptionHandler() throws InterruptedException {
258 <        ForkJoinPool p = null;
259 <        try {
260 <            p = new ForkJoinPool(1, new FailingThreadFactory());
261 <            MyHandler eh = new MyHandler();
262 <            p.setUncaughtExceptionHandler(eh);
263 <            assertEquals(eh, p.getUncaughtExceptionHandler());
264 <            p.execute(new FailingTask());
265 <            Thread.sleep(MEDIUM_DELAY_MS);
266 <            assertTrue(eh.catches > 0);
258 >        final CountDownLatch uehInvoked = new CountDownLatch(1);
259 >        final Thread.UncaughtExceptionHandler eh =
260 >            new Thread.UncaughtExceptionHandler() {
261 >                public void uncaughtException(Thread t, Throwable e) {
262 >                    uehInvoked.countDown();
263 >                }};
264 >        ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
265 >                                          eh, false);
266 >        try {
267 >            assertSame(eh, p.getUncaughtExceptionHandler());
268 >            try {
269 >                p.execute(new FibTask(8));
270 >                assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
271 >            } catch (RejectedExecutionException ok) {
272 >            }
273          } finally {
274 +            p.shutdownNow(); // failure might have prevented processing task
275              joinPool(p);
276          }
277      }
278  
279      /**
280 <     * setUncaughtExceptionHandler of null removes handler
280 >     * After invoking a single task, isQuiescent eventually becomes
281 >     * true, at which time queues are empty, threads are not active,
282 >     * the task has completed successfully, and construction
283 >     * parameters continue to hold
284       */
285 <    public void testSetUncaughtExceptionHandler2() {
286 <        ForkJoinPool p = null;
287 <        try {
288 <            p = new ForkJoinPool(1);
289 <            p.setUncaughtExceptionHandler(null);
290 <            assertNull(p.getUncaughtExceptionHandler());
291 <        } finally {
292 <            joinPool(p);
293 <        }
294 <    }
295 <
285 >    public void testIsQuiescent() throws Exception {
286 >        ForkJoinPool p = new ForkJoinPool(2);
287 >        try (PoolCleaner cleaner = cleaner(p)) {
288 >            assertTrue(p.isQuiescent());
289 >            long startTime = System.nanoTime();
290 >            FibTask f = new FibTask(20);
291 >            p.invoke(f);
292 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
293 >                       p.getFactory());
294 >            while (! p.isQuiescent()) {
295 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
296 >                    throw new AssertionFailedError("timed out");
297 >                assertFalse(p.getAsyncMode());
298 >                assertFalse(p.isShutdown());
299 >                assertFalse(p.isTerminating());
300 >                assertFalse(p.isTerminated());
301 >                Thread.yield();
302 >            }
303  
344    /**
345     * After invoking a single task, isQuiescent is true,
346     * queues are empty, threads are not active, and
347     * construction parameters continue to hold
348     */
349    public void testisQuiescent() throws InterruptedException {
350        ForkJoinPool p = null;
351        try {
352            p = new ForkJoinPool(2);
353            p.invoke(new FibTask(20));
354            assertTrue(p.getFactory() ==
355                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
356            Thread.sleep(MEDIUM_DELAY_MS);
304              assertTrue(p.isQuiescent());
358            assertTrue(p.getMaintainsParallelism());
305              assertFalse(p.getAsyncMode());
306 <            assertTrue(p.getActiveThreadCount() == 0);
307 <            assertTrue(p.getQueuedTaskCount() == 0);
308 <            assertTrue(p.getQueuedSubmissionCount() == 0);
306 >            assertEquals(0, p.getActiveThreadCount());
307 >            assertEquals(0, p.getQueuedTaskCount());
308 >            assertEquals(0, p.getQueuedSubmissionCount());
309              assertFalse(p.hasQueuedSubmissions());
310              assertFalse(p.isShutdown());
311              assertFalse(p.isTerminating());
312              assertFalse(p.isTerminated());
313 <        } finally {
314 <            joinPool(p);
313 >            assertTrue(f.isDone());
314 >            assertEquals(6765, (int) f.get());
315          }
316      }
317  
# Line 373 | Line 319 | public class ForkJoinPoolTest extends JS
319       * Completed submit(ForkJoinTask) returns result
320       */
321      public void testSubmitForkJoinTask() throws Throwable {
322 <        ForkJoinPool p = null;
323 <        try {
378 <            p = new ForkJoinPool(1);
322 >        ForkJoinPool p = new ForkJoinPool(1);
323 >        try (PoolCleaner cleaner = cleaner(p)) {
324              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
325 <            int r = f.get();
381 <            assertTrue(r == 21);
382 <        } finally {
383 <            joinPool(p);
325 >            assertEquals(21, (int) f.get());
326          }
327      }
328  
# Line 388 | Line 330 | public class ForkJoinPoolTest extends JS
330       * A task submitted after shutdown is rejected
331       */
332      public void testSubmitAfterShutdown() {
333 <        ForkJoinPool p = null;
334 <        try {
393 <            p = new ForkJoinPool(1);
333 >        ForkJoinPool p = new ForkJoinPool(1);
334 >        try (PoolCleaner cleaner = cleaner(p)) {
335              p.shutdown();
336              assertTrue(p.isShutdown());
337 <            ForkJoinTask<Integer> f = p.submit(new FibTask(8));
338 <            shouldThrow();
339 <        } catch (RejectedExecutionException success) {
340 <        } finally {
400 <            joinPool(p);
337 >            try {
338 >                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
339 >                shouldThrow();
340 >            } catch (RejectedExecutionException success) {}
341          }
342      }
343  
# Line 405 | Line 345 | public class ForkJoinPoolTest extends JS
345       * Pool maintains parallelism when using ManagedBlocker
346       */
347      public void testBlockingForkJoinTask() throws Throwable {
348 <        ForkJoinPool p = null;
348 >        ForkJoinPool p = new ForkJoinPool(4);
349          try {
410            p = new ForkJoinPool(4);
350              ReentrantLock lock = new ReentrantLock();
351              ManagedLocker locker = new ManagedLocker(lock);
352 <            ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
352 >            ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
353              p.execute(f);
354 <            assertTrue(p.getPoolSize() >= 4);
416 <            int r = f.get();
417 <            assertTrue(r ==  832040);
354 >            assertEquals(6765, (int) f.get());
355          } finally {
356 <            joinPool(p);
356 >            p.shutdownNow(); // don't wait out shutdown
357          }
358      }
359  
# Line 424 | Line 361 | public class ForkJoinPoolTest extends JS
361       * pollSubmission returns unexecuted submitted task, if present
362       */
363      public void testPollSubmission() {
364 <        SubFJP p = null;
365 <        try {
366 <            p = new SubFJP();
367 <            ForkJoinTask a = p.submit(new MediumRunnable());
368 <            ForkJoinTask b = p.submit(new MediumRunnable());
369 <            ForkJoinTask c = p.submit(new MediumRunnable());
364 >        final CountDownLatch done = new CountDownLatch(1);
365 >        SubFJP p = new SubFJP();
366 >        try (PoolCleaner cleaner = cleaner(p)) {
367 >            ForkJoinTask a = p.submit(awaiter(done));
368 >            ForkJoinTask b = p.submit(awaiter(done));
369 >            ForkJoinTask c = p.submit(awaiter(done));
370              ForkJoinTask r = p.pollSubmission();
371              assertTrue(r == a || r == b || r == c);
372              assertFalse(r.isDone());
373 <        } finally {
437 <            joinPool(p);
373 >            done.countDown();
374          }
375      }
376  
# Line 442 | Line 378 | public class ForkJoinPoolTest extends JS
378       * drainTasksTo transfers unexecuted submitted tasks, if present
379       */
380      public void testDrainTasksTo() {
381 <        SubFJP p = null;
382 <        try {
383 <            p = new SubFJP();
384 <            ForkJoinTask a = p.submit(new MediumRunnable());
385 <            ForkJoinTask b = p.submit(new MediumRunnable());
386 <            ForkJoinTask c = p.submit(new MediumRunnable());
381 >        final CountDownLatch done = new CountDownLatch(1);
382 >        SubFJP p = new SubFJP();
383 >        try (PoolCleaner cleaner = cleaner(p)) {
384 >            ForkJoinTask a = p.submit(awaiter(done));
385 >            ForkJoinTask b = p.submit(awaiter(done));
386 >            ForkJoinTask c = p.submit(awaiter(done));
387              ArrayList<ForkJoinTask> al = new ArrayList();
388              p.drainTasksTo(al);
389              assertTrue(al.size() > 0);
# Line 455 | Line 391 | public class ForkJoinPoolTest extends JS
391                  assertTrue(r == a || r == b || r == c);
392                  assertFalse(r.isDone());
393              }
394 <        } finally {
459 <            joinPool(p);
394 >            done.countDown();
395          }
396      }
397  
463
398      // FJ Versions of AbstractExecutorService tests
399  
400      /**
# Line 468 | Line 402 | public class ForkJoinPoolTest extends JS
402       */
403      public void testExecuteRunnable() throws Throwable {
404          ExecutorService e = new ForkJoinPool(1);
405 <        TrackedShortRunnable task = new TrackedShortRunnable();
406 <        assertFalse(task.done);
407 <        Future<?> future = e.submit(task);
408 <        future.get();
409 <        assertTrue(task.done);
405 >        try (PoolCleaner cleaner = cleaner(e)) {
406 >            final AtomicBoolean done = new AtomicBoolean(false);
407 >            Future<?> future = e.submit(new CheckedRunnable() {
408 >                public void realRun() {
409 >                    done.set(true);
410 >                }});
411 >            assertNull(future.get());
412 >            assertNull(future.get(0, MILLISECONDS));
413 >            assertTrue(done.get());
414 >            assertTrue(future.isDone());
415 >            assertFalse(future.isCancelled());
416 >        }
417      }
418  
478
419      /**
420       * Completed submit(callable) returns result
421       */
422      public void testSubmitCallable() throws Throwable {
423          ExecutorService e = new ForkJoinPool(1);
424 <        Future<String> future = e.submit(new StringTask());
425 <        String result = future.get();
426 <        assertSame(TEST_STRING, result);
424 >        try (PoolCleaner cleaner = cleaner(e)) {
425 >            Future<String> future = e.submit(new StringTask());
426 >            assertSame(TEST_STRING, future.get());
427 >            assertTrue(future.isDone());
428 >            assertFalse(future.isCancelled());
429 >        }
430      }
431  
432      /**
# Line 491 | Line 434 | public class ForkJoinPoolTest extends JS
434       */
435      public void testSubmitRunnable() throws Throwable {
436          ExecutorService e = new ForkJoinPool(1);
437 <        Future<?> future = e.submit(new NoOpRunnable());
438 <        future.get();
439 <        assertTrue(future.isDone());
437 >        try (PoolCleaner cleaner = cleaner(e)) {
438 >            Future<?> future = e.submit(new NoOpRunnable());
439 >            assertNull(future.get());
440 >            assertTrue(future.isDone());
441 >            assertFalse(future.isCancelled());
442 >        }
443      }
444  
445      /**
# Line 501 | Line 447 | public class ForkJoinPoolTest extends JS
447       */
448      public void testSubmitRunnable2() throws Throwable {
449          ExecutorService e = new ForkJoinPool(1);
450 <        Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
451 <        String result = future.get();
452 <        assertSame(TEST_STRING, result);
450 >        try (PoolCleaner cleaner = cleaner(e)) {
451 >            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
452 >            assertSame(TEST_STRING, future.get());
453 >            assertTrue(future.isDone());
454 >            assertFalse(future.isCancelled());
455 >        }
456      }
457  
509
458      /**
459 <     * A submitted privileged action to completion
459 >     * A submitted privileged action runs to completion
460       */
461 <    public void testSubmitPrivilegedAction() throws Throwable {
462 <        Policy savedPolicy = null;
463 <        try {
464 <            savedPolicy = Policy.getPolicy();
465 <            AdjustablePolicy policy = new AdjustablePolicy();
518 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
519 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
520 <            Policy.setPolicy(policy);
521 <        } catch (AccessControlException ok) {
522 <            return;
523 <        }
524 <        try {
461 >    public void testSubmitPrivilegedAction() throws Exception {
462 >        final Callable callable = Executors.callable(new PrivilegedAction() {
463 >                public Object run() { return TEST_STRING; }});
464 >        Runnable r = new CheckedRunnable() {
465 >        public void realRun() throws Exception {
466              ExecutorService e = new ForkJoinPool(1);
467 <            Future future = e.submit(Executors.callable(new PrivilegedAction() {
468 <                    public Object run() {
469 <                        return TEST_STRING;
470 <                    }}));
467 >            try (PoolCleaner cleaner = cleaner(e)) {
468 >                Future future = e.submit(callable);
469 >                assertSame(TEST_STRING, future.get());
470 >            }
471 >        }};
472  
473 <            Object result = future.get();
532 <            assertSame(TEST_STRING, result);
533 <        }
534 <        finally {
535 <            Policy.setPolicy(savedPolicy);
536 <        }
473 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
474      }
475  
476      /**
477 <     * A submitted a privileged exception action runs to completion
477 >     * A submitted privileged exception action runs to completion
478       */
479 <    public void testSubmitPrivilegedExceptionAction() throws Throwable {
480 <        Policy savedPolicy = null;
481 <        try {
482 <            savedPolicy = Policy.getPolicy();
483 <            AdjustablePolicy policy = new AdjustablePolicy();
484 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
548 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
549 <            Policy.setPolicy(policy);
550 <        } catch (AccessControlException ok) {
551 <            return;
552 <        }
553 <
554 <        try {
479 >    public void testSubmitPrivilegedExceptionAction() throws Exception {
480 >        final Callable callable =
481 >            Executors.callable(new PrivilegedExceptionAction() {
482 >                public Object run() { return TEST_STRING; }});
483 >        Runnable r = new CheckedRunnable() {
484 >        public void realRun() throws Exception {
485              ExecutorService e = new ForkJoinPool(1);
486 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
487 <                    public Object run() {
488 <                        return TEST_STRING;
489 <                    }}));
486 >            try (PoolCleaner cleaner = cleaner(e)) {
487 >                Future future = e.submit(callable);
488 >                assertSame(TEST_STRING, future.get());
489 >            }
490 >        }};
491  
492 <            Object result = future.get();
562 <            assertSame(TEST_STRING, result);
563 <        }
564 <        finally {
565 <            Policy.setPolicy(savedPolicy);
566 <        }
492 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
493      }
494  
495      /**
496       * A submitted failed privileged exception action reports exception
497       */
498 <    public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
499 <        Policy savedPolicy = null;
500 <        try {
501 <            savedPolicy = Policy.getPolicy();
502 <            AdjustablePolicy policy = new AdjustablePolicy();
503 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
578 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
579 <            Policy.setPolicy(policy);
580 <        } catch (AccessControlException ok) {
581 <            return;
582 <        }
583 <
584 <
585 <        try {
498 >    public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
499 >        final Callable callable =
500 >            Executors.callable(new PrivilegedExceptionAction() {
501 >                public Object run() { throw new IndexOutOfBoundsException(); }});
502 >        Runnable r = new CheckedRunnable() {
503 >        public void realRun() throws Exception {
504              ExecutorService e = new ForkJoinPool(1);
505 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
506 <                    public Object run() throws Exception {
507 <                        throw new IndexOutOfBoundsException();
508 <                    }}));
505 >            try (PoolCleaner cleaner = cleaner(e)) {
506 >                Future future = e.submit(callable);
507 >                try {
508 >                    future.get();
509 >                    shouldThrow();
510 >                } catch (ExecutionException success) {
511 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
512 >                }
513 >            }
514 >        }};
515  
516 <            Object result = future.get();
593 <            shouldThrow();
594 <        } catch (ExecutionException success) {
595 <        } finally {
596 <            Policy.setPolicy(savedPolicy);
597 <        }
516 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
517      }
518  
519      /**
520       * execute(null runnable) throws NullPointerException
521       */
522      public void testExecuteNullRunnable() {
523 <        try {
524 <            ExecutorService e = new ForkJoinPool(1);
525 <            TrackedShortRunnable task = null;
526 <            Future<?> future = e.submit(task);
527 <            shouldThrow();
528 <        } catch (NullPointerException success) {
523 >        ExecutorService e = new ForkJoinPool(1);
524 >        try (PoolCleaner cleaner = cleaner(e)) {
525 >            try {
526 >                Future<?> future = e.submit((Runnable) null);
527 >                shouldThrow();
528 >            } catch (NullPointerException success) {}
529          }
530      }
531  
613
532      /**
533       * submit(null callable) throws NullPointerException
534       */
535      public void testSubmitNullCallable() {
536 <        try {
537 <            ExecutorService e = new ForkJoinPool(1);
538 <            StringTask t = null;
539 <            Future<String> future = e.submit(t);
540 <            shouldThrow();
541 <        } catch (NullPointerException success) {
536 >        ExecutorService e = new ForkJoinPool(1);
537 >        try (PoolCleaner cleaner = cleaner(e)) {
538 >            try {
539 >                Future<String> future = e.submit((Callable) null);
540 >                shouldThrow();
541 >            } catch (NullPointerException success) {}
542          }
543      }
544  
627
545      /**
546 <     * Blocking on submit(callable) throws InterruptedException if
630 <     * caller interrupted.
546 >     * submit(callable).get() throws InterruptedException if interrupted
547       */
548      public void testInterruptedSubmit() throws InterruptedException {
549 <        final ForkJoinPool p = new ForkJoinPool(1);
550 <
551 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
552 <            void realRun() throws Throwable {
553 <                p.submit(new CheckedCallable<Object>() {
554 <                    public Object realCall() throws Throwable {
555 <                        Thread.sleep(MEDIUM_DELAY_MS);
556 <                        return null;
557 <                    }}).get();
558 <            }});
559 <
560 <        t.start();
561 <        Thread.sleep(SHORT_DELAY_MS);
562 <        t.interrupt();
563 <        joinPool(p);
549 >        final CountDownLatch submitted    = new CountDownLatch(1);
550 >        final CountDownLatch quittingTime = new CountDownLatch(1);
551 >        final ExecutorService p = new ForkJoinPool(1);
552 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
553 >            public Void realCall() throws InterruptedException {
554 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
555 >                return null;
556 >            }};
557 >        try {
558 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
559 >                public void realRun() throws Exception {
560 >                    Future<Void> future = p.submit(awaiter);
561 >                    submitted.countDown();
562 >                    future.get();
563 >                }});
564 >            t.start();
565 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
566 >            t.interrupt();
567 >            t.join();
568 >        } finally {
569 >            quittingTime.countDown();
570 >            joinPool(p);
571 >        }
572      }
573  
574      /**
# Line 653 | Line 577 | public class ForkJoinPoolTest extends JS
577       */
578      public void testSubmitEE() throws Throwable {
579          ForkJoinPool p = new ForkJoinPool(1);
580 <
581 <        try {
582 <            Callable c = new Callable() {
583 <                    public Object call() {
584 <                        int i = 5/0;
585 <                        return Boolean.TRUE;
586 <                    }
587 <                };
664 <
665 <            for (int i = 0; i < 5; i++) {
666 <                p.submit(c).get();
580 >        try (PoolCleaner cleaner = cleaner(p)) {
581 >            try {
582 >                p.submit(new Callable() {
583 >                        public Object call() { throw new ArithmeticException(); }})
584 >                    .get();
585 >                shouldThrow();
586 >            } catch (ExecutionException success) {
587 >                assertTrue(success.getCause() instanceof ArithmeticException);
588              }
668            shouldThrow();
669        } catch (ExecutionException success) {
589          }
671        joinPool(p);
590      }
591  
592      /**
# Line 676 | Line 594 | public class ForkJoinPoolTest extends JS
594       */
595      public void testInvokeAny1() throws Throwable {
596          ExecutorService e = new ForkJoinPool(1);
597 <        try {
598 <            e.invokeAny(null);
599 <            shouldThrow();
600 <        } catch (NullPointerException success) {
601 <        } finally {
684 <            joinPool(e);
597 >        try (PoolCleaner cleaner = cleaner(e)) {
598 >            try {
599 >                e.invokeAny(null);
600 >                shouldThrow();
601 >            } catch (NullPointerException success) {}
602          }
603      }
604  
# Line 690 | Line 607 | public class ForkJoinPoolTest extends JS
607       */
608      public void testInvokeAny2() throws Throwable {
609          ExecutorService e = new ForkJoinPool(1);
610 <        try {
611 <            e.invokeAny(new ArrayList<Callable<String>>());
612 <            shouldThrow();
613 <        } catch (IllegalArgumentException success) {
614 <        } finally {
698 <            joinPool(e);
610 >        try (PoolCleaner cleaner = cleaner(e)) {
611 >            try {
612 >                e.invokeAny(new ArrayList<Callable<String>>());
613 >                shouldThrow();
614 >            } catch (IllegalArgumentException success) {}
615          }
616      }
617  
618      /**
619 <     * invokeAny(c) throws NullPointerException if c has null elements
619 >     * invokeAny(c) throws NullPointerException if c has a single null element
620       */
621      public void testInvokeAny3() throws Throwable {
622          ExecutorService e = new ForkJoinPool(1);
623 <        try {
624 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
709 <            l.add(new StringTask());
623 >        try (PoolCleaner cleaner = cleaner(e)) {
624 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
625              l.add(null);
626 <            e.invokeAny(l);
627 <            shouldThrow();
628 <        } catch (NullPointerException success) {
629 <        } finally {
715 <            joinPool(e);
626 >            try {
627 >                e.invokeAny(l);
628 >                shouldThrow();
629 >            } catch (NullPointerException success) {}
630          }
631      }
632  
633      /**
634 <     * invokeAny(c) throws ExecutionException if no task in c completes
634 >     * invokeAny(c) throws NullPointerException if c has null elements
635       */
636      public void testInvokeAny4() throws Throwable {
637 +        CountDownLatch latch = new CountDownLatch(1);
638          ExecutorService e = new ForkJoinPool(1);
639 <        try {
640 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
639 >        try (PoolCleaner cleaner = cleaner(e)) {
640 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
641 >            l.add(latchAwaitingStringTask(latch));
642 >            l.add(null);
643 >            try {
644 >                e.invokeAny(l);
645 >                shouldThrow();
646 >            } catch (NullPointerException success) {}
647 >            latch.countDown();
648 >        }
649 >    }
650 >
651 >    /**
652 >     * invokeAny(c) throws ExecutionException if no task in c completes
653 >     */
654 >    public void testInvokeAny5() throws Throwable {
655 >        ExecutorService e = new ForkJoinPool(1);
656 >        try (PoolCleaner cleaner = cleaner(e)) {
657 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
658              l.add(new NPETask());
659 <            e.invokeAny(l);
660 <            shouldThrow();
661 <        } catch (ExecutionException success) {
662 <        } finally {
663 <            joinPool(e);
659 >            try {
660 >                e.invokeAny(l);
661 >                shouldThrow();
662 >            } catch (ExecutionException success) {
663 >                assertTrue(success.getCause() instanceof NullPointerException);
664 >            }
665          }
666      }
667  
668      /**
669       * invokeAny(c) returns result of some task in c if at least one completes
670       */
671 <    public void testInvokeAny5() throws Throwable {
671 >    public void testInvokeAny6() throws Throwable {
672          ExecutorService e = new ForkJoinPool(1);
673 <        try {
674 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
673 >        try (PoolCleaner cleaner = cleaner(e)) {
674 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
675              l.add(new StringTask());
676              l.add(new StringTask());
677              String result = e.invokeAny(l);
678              assertSame(TEST_STRING, result);
746        } finally {
747            joinPool(e);
679          }
680      }
681  
# Line 753 | Line 684 | public class ForkJoinPoolTest extends JS
684       */
685      public void testInvokeAll1() throws Throwable {
686          ExecutorService e = new ForkJoinPool(1);
687 <        try {
688 <            e.invokeAll(null);
689 <            shouldThrow();
690 <        } catch (NullPointerException success) {
691 <        } finally {
761 <            joinPool(e);
687 >        try (PoolCleaner cleaner = cleaner(e)) {
688 >            try {
689 >                e.invokeAll(null);
690 >                shouldThrow();
691 >            } catch (NullPointerException success) {}
692          }
693      }
694  
# Line 767 | Line 697 | public class ForkJoinPoolTest extends JS
697       */
698      public void testInvokeAll2() throws InterruptedException {
699          ExecutorService e = new ForkJoinPool(1);
700 <        try {
700 >        try (PoolCleaner cleaner = cleaner(e)) {
701              List<Future<String>> r
702                  = e.invokeAll(new ArrayList<Callable<String>>());
703              assertTrue(r.isEmpty());
774        } finally {
775            joinPool(e);
704          }
705      }
706  
# Line 781 | Line 709 | public class ForkJoinPoolTest extends JS
709       */
710      public void testInvokeAll3() throws InterruptedException {
711          ExecutorService e = new ForkJoinPool(1);
712 <        try {
713 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
712 >        try (PoolCleaner cleaner = cleaner(e)) {
713 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
714              l.add(new StringTask());
715              l.add(null);
716 <            e.invokeAll(l);
717 <            shouldThrow();
718 <        } catch (NullPointerException success) {
719 <        } finally {
792 <            joinPool(e);
716 >            try {
717 >                e.invokeAll(l);
718 >                shouldThrow();
719 >            } catch (NullPointerException success) {}
720          }
721      }
722  
# Line 799 | Line 726 | public class ForkJoinPoolTest extends JS
726       */
727      public void testInvokeAll4() throws Throwable {
728          ExecutorService e = new ForkJoinPool(1);
729 <        try {
730 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
729 >        try (PoolCleaner cleaner = cleaner(e)) {
730 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
731              l.add(new NPETask());
732 <            List<Future<String>> result = e.invokeAll(l);
733 <            assertEquals(1, result.size());
734 <            for (Future<String> future : result)
735 <                future.get();
736 <            shouldThrow();
737 <        } catch (ExecutionException success) {
738 <        } finally {
739 <            joinPool(e);
732 >            List<Future<String>> futures = e.invokeAll(l);
733 >            assertEquals(1, futures.size());
734 >            try {
735 >                futures.get(0).get();
736 >                shouldThrow();
737 >            } catch (ExecutionException success) {
738 >                assertTrue(success.getCause() instanceof NullPointerException);
739 >            }
740          }
741      }
742  
# Line 818 | Line 745 | public class ForkJoinPoolTest extends JS
745       */
746      public void testInvokeAll5() throws Throwable {
747          ExecutorService e = new ForkJoinPool(1);
748 <        try {
749 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
748 >        try (PoolCleaner cleaner = cleaner(e)) {
749 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
750              l.add(new StringTask());
751              l.add(new StringTask());
752 <            List<Future<String>> result = e.invokeAll(l);
753 <            assertEquals(2, result.size());
754 <            for (Future<String> future : result)
752 >            List<Future<String>> futures = e.invokeAll(l);
753 >            assertEquals(2, futures.size());
754 >            for (Future<String> future : futures)
755                  assertSame(TEST_STRING, future.get());
829        } finally {
830            joinPool(e);
756          }
757      }
758  
834
759      /**
760       * timed invokeAny(null) throws NullPointerException
761       */
762      public void testTimedInvokeAny1() throws Throwable {
763          ExecutorService e = new ForkJoinPool(1);
764 <        try {
765 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
766 <            shouldThrow();
767 <        } catch (NullPointerException success) {
768 <        } finally {
845 <            joinPool(e);
764 >        try (PoolCleaner cleaner = cleaner(e)) {
765 >            try {
766 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
767 >                shouldThrow();
768 >            } catch (NullPointerException success) {}
769          }
770      }
771  
# Line 851 | Line 774 | public class ForkJoinPoolTest extends JS
774       */
775      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
776          ExecutorService e = new ForkJoinPool(1);
777 <        try {
778 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
777 >        try (PoolCleaner cleaner = cleaner(e)) {
778 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
779              l.add(new StringTask());
780 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
781 <            shouldThrow();
782 <        } catch (NullPointerException success) {
783 <        } finally {
861 <            joinPool(e);
780 >            try {
781 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
782 >                shouldThrow();
783 >            } catch (NullPointerException success) {}
784          }
785      }
786  
# Line 867 | Line 789 | public class ForkJoinPoolTest extends JS
789       */
790      public void testTimedInvokeAny2() throws Throwable {
791          ExecutorService e = new ForkJoinPool(1);
792 <        try {
793 <            e.invokeAny(new ArrayList<Callable<String>>(),
794 <                        MEDIUM_DELAY_MS, MILLISECONDS);
795 <            shouldThrow();
796 <        } catch (IllegalArgumentException success) {
797 <        } finally {
876 <            joinPool(e);
792 >        try (PoolCleaner cleaner = cleaner(e)) {
793 >            try {
794 >                e.invokeAny(new ArrayList<Callable<String>>(),
795 >                            MEDIUM_DELAY_MS, MILLISECONDS);
796 >                shouldThrow();
797 >            } catch (IllegalArgumentException success) {}
798          }
799      }
800  
# Line 881 | Line 802 | public class ForkJoinPoolTest extends JS
802       * timed invokeAny(c) throws NullPointerException if c has null elements
803       */
804      public void testTimedInvokeAny3() throws Throwable {
805 +        CountDownLatch latch = new CountDownLatch(1);
806          ExecutorService e = new ForkJoinPool(1);
807 <        try {
808 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
809 <            l.add(new StringTask());
807 >        try (PoolCleaner cleaner = cleaner(e)) {
808 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
809 >            l.add(latchAwaitingStringTask(latch));
810              l.add(null);
811 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
812 <            shouldThrow();
813 <        } catch (NullPointerException success) {
814 <        } finally {
815 <            joinPool(e);
811 >            try {
812 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
813 >                shouldThrow();
814 >            } catch (NullPointerException success) {}
815 >            latch.countDown();
816          }
817      }
818  
# Line 899 | Line 821 | public class ForkJoinPoolTest extends JS
821       */
822      public void testTimedInvokeAny4() throws Throwable {
823          ExecutorService e = new ForkJoinPool(1);
824 <        try {
825 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
824 >        try (PoolCleaner cleaner = cleaner(e)) {
825 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
826              l.add(new NPETask());
827 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
828 <            shouldThrow();
829 <        } catch (ExecutionException success) {
830 <        } finally {
831 <            joinPool(e);
827 >            try {
828 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
829 >                shouldThrow();
830 >            } catch (ExecutionException success) {
831 >                assertTrue(success.getCause() instanceof NullPointerException);
832 >            }
833          }
834      }
835  
# Line 915 | Line 838 | public class ForkJoinPoolTest extends JS
838       */
839      public void testTimedInvokeAny5() throws Throwable {
840          ExecutorService e = new ForkJoinPool(1);
841 <        try {
842 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
841 >        try (PoolCleaner cleaner = cleaner(e)) {
842 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
843              l.add(new StringTask());
844              l.add(new StringTask());
845              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
846              assertSame(TEST_STRING, result);
924        } finally {
925            joinPool(e);
847          }
848      }
849  
# Line 931 | Line 852 | public class ForkJoinPoolTest extends JS
852       */
853      public void testTimedInvokeAll1() throws Throwable {
854          ExecutorService e = new ForkJoinPool(1);
855 <        try {
856 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
857 <            shouldThrow();
858 <        } catch (NullPointerException success) {
859 <        } finally {
939 <            joinPool(e);
855 >        try (PoolCleaner cleaner = cleaner(e)) {
856 >            try {
857 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
858 >                shouldThrow();
859 >            } catch (NullPointerException success) {}
860          }
861      }
862  
# Line 945 | Line 865 | public class ForkJoinPoolTest extends JS
865       */
866      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
867          ExecutorService e = new ForkJoinPool(1);
868 <        try {
869 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
868 >        try (PoolCleaner cleaner = cleaner(e)) {
869 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
870              l.add(new StringTask());
871 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
872 <            shouldThrow();
873 <        } catch (NullPointerException success) {
874 <        } finally {
955 <            joinPool(e);
871 >            try {
872 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
873 >                shouldThrow();
874 >            } catch (NullPointerException success) {}
875          }
876      }
877  
# Line 961 | Line 880 | public class ForkJoinPoolTest extends JS
880       */
881      public void testTimedInvokeAll2() throws InterruptedException {
882          ExecutorService e = new ForkJoinPool(1);
883 <        try {
883 >        try (PoolCleaner cleaner = cleaner(e)) {
884              List<Future<String>> r
885                  = e.invokeAll(new ArrayList<Callable<String>>(),
886                                MEDIUM_DELAY_MS, MILLISECONDS);
887              assertTrue(r.isEmpty());
969        } finally {
970            joinPool(e);
888          }
889      }
890  
# Line 976 | Line 893 | public class ForkJoinPoolTest extends JS
893       */
894      public void testTimedInvokeAll3() throws InterruptedException {
895          ExecutorService e = new ForkJoinPool(1);
896 <        try {
897 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
896 >        try (PoolCleaner cleaner = cleaner(e)) {
897 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
898              l.add(new StringTask());
899              l.add(null);
900 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
901 <            shouldThrow();
902 <        } catch (NullPointerException success) {
903 <        } finally {
987 <            joinPool(e);
900 >            try {
901 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
902 >                shouldThrow();
903 >            } catch (NullPointerException success) {}
904          }
905      }
906  
# Line 993 | Line 909 | public class ForkJoinPoolTest extends JS
909       */
910      public void testTimedInvokeAll4() throws Throwable {
911          ExecutorService e = new ForkJoinPool(1);
912 <        try {
913 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
912 >        try (PoolCleaner cleaner = cleaner(e)) {
913 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
914              l.add(new NPETask());
915 <            List<Future<String>> result
916 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
917 <            assertEquals(1, result.size());
918 <            for (Future<String> future : result)
919 <                future.get();
920 <            shouldThrow();
921 <        } catch (ExecutionException success) {
922 <        } finally {
923 <            joinPool(e);
915 >            List<Future<String>> futures
916 >                = e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
917 >            assertEquals(1, futures.size());
918 >            try {
919 >                futures.get(0).get();
920 >                shouldThrow();
921 >            } catch (ExecutionException success) {
922 >                assertTrue(success.getCause() instanceof NullPointerException);
923 >            }
924          }
925      }
926  
# Line 1012 | Line 928 | public class ForkJoinPoolTest extends JS
928       * timed invokeAll(c) returns results of all completed tasks in c
929       */
930      public void testTimedInvokeAll5() throws Throwable {
931 <        ExecutorService e = new ForkJoinPool(1);
932 <        try {
933 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
931 >        ForkJoinPool e = new ForkJoinPool(1);
932 >        try (PoolCleaner cleaner = cleaner(e)) {
933 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
934              l.add(new StringTask());
935              l.add(new StringTask());
936 <            List<Future<String>> result
937 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
938 <            assertEquals(2, result.size());
939 <            for (Future<String> future : result)
936 >            List<Future<String>> futures
937 >                = e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
938 >            assertEquals(2, futures.size());
939 >            for (Future<String> future : futures)
940                  assertSame(TEST_STRING, future.get());
1025        } finally {
1026            joinPool(e);
941          }
942      }
943  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines