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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines