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.39 by dl, Fri May 6 11:22:07 2011 UTC vs.
Revision 1.80 by jsr166, Wed Jan 27 01:57:24 2021 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/publicdomain/zero/1.0/
5   */
6  
7 < import junit.framework.*;
7 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
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.Collections;
15   import java.util.List;
11 import java.util.concurrent.Executors;
12 import java.util.concurrent.ExecutorService;
13 import java.util.concurrent.AbstractExecutorService;
14 import java.util.concurrent.CountDownLatch;
16   import java.util.concurrent.Callable;
17 < import java.util.concurrent.Future;
17 > import java.util.concurrent.CountDownLatch;
18   import java.util.concurrent.ExecutionException;
19 < import java.util.concurrent.CancellationException;
20 < import java.util.concurrent.RejectedExecutionException;
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.TimeUnit;
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 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
31 < import java.security.AccessControlException;
32 < import java.security.Policy;
29 < import java.security.PrivilegedAction;
30 < import java.security.PrivilegedExceptionAction;
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 56 | 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 {
60 <        volatile int catches = 0;
61 <        public void uncaughtException(Thread t, Throwable e) {
62 <            ++catches;
63 <        }
64 <    }
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() { super.onStart(); throw new Error(); }
66 >        protected void onStart() { super.onStart(); throw new MyError(); }
67      }
68  
69      static class FailingThreadFactory
70              implements ForkJoinPool.ForkJoinWorkerThreadFactory {
71 <        volatile int calls = 0;
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 106 | 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;
110              FibTask f1 = new FibTask(n - 1);
111              f1.fork();
112 <            return (new FibTask(n - 2)).compute() + f1.join();
112 >            return new FibTask(n - 2).compute() + f1.join();
113          }
114      }
115  
# Line 134 | 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 161 | Line 158 | public class ForkJoinPoolTest extends JS
158       */
159      public void testDefaultInitialState() {
160          ForkJoinPool p = new ForkJoinPool(1);
161 <        try {
161 >        try (PoolCleaner cleaner = cleaner(p)) {
162              assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
163                         p.getFactory());
164              assertFalse(p.getAsyncMode());
# Line 173 | Line 170 | public class ForkJoinPoolTest extends JS
170              assertFalse(p.isShutdown());
171              assertFalse(p.isTerminating());
172              assertFalse(p.isTerminated());
176        } finally {
177            joinPool(p);
173          }
174      }
175  
# Line 198 | Line 193 | public class ForkJoinPoolTest extends JS
193          } catch (NullPointerException success) {}
194      }
195  
201
196      /**
197       * getParallelism returns size set in constructor
198       */
199      public void testGetParallelism() {
200          ForkJoinPool p = new ForkJoinPool(1);
201 <        try {
201 >        try (PoolCleaner cleaner = cleaner(p)) {
202              assertEquals(1, p.getParallelism());
209        } finally {
210            joinPool(p);
203          }
204      }
205  
# Line 215 | Line 207 | public class ForkJoinPoolTest extends JS
207       * getPoolSize returns number of started workers.
208       */
209      public void testGetPoolSize() {
210 <        ForkJoinPool p = new ForkJoinPool(1);
211 <        try {
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 <            Future<String> future = p.submit(new StringTask());
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 <        } finally {
226 <            joinPool(p);
225 >            assertEquals(1, p.getActiveThreadCount());
226 >            done.countDown();
227 >        }
228 >        assertEquals(0, p.getPoolSize());
229 >        assertEquals(0, p.getActiveThreadCount());
230 >    }
231 >
232 >    /**
233 >     * awaitTermination on a non-shutdown pool times out
234 >     */
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 233 | Line 266 | public class ForkJoinPoolTest extends JS
266       */
267      public void testSetUncaughtExceptionHandler() throws InterruptedException {
268          final CountDownLatch uehInvoked = new CountDownLatch(1);
269 <        final Thread.UncaughtExceptionHandler eh =
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 <                                          eh, false);
278 <        try {
279 <            assertSame(eh, p.getUncaughtExceptionHandler());
280 <            p.execute(new FibTask(8));
281 <            assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
282 <        } finally {
283 <            p.shutdownNow(); // failure might have prevented processing task
284 <            joinPool(p);
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 <     * After invoking a single task, isQuiescent is true,
291 <     * queues are empty, threads are not active, and
292 <     * construction parameters continue to hold
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 InterruptedException {
295 >    public void testIsQuiescent() throws Exception {
296          ForkJoinPool p = new ForkJoinPool(2);
297 <        try {
297 >        try (PoolCleaner cleaner = cleaner(p)) {
298              assertTrue(p.isQuiescent());
299 <            p.invoke(new FibTask(20));
299 >            long startTime = System.nanoTime();
300 >            FibTask f = new FibTask(20);
301 >            p.invoke(f);
302              assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
303                         p.getFactory());
304 <            delay(SMALL_DELAY_MS);
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 >
314              assertTrue(p.isQuiescent());
315              assertFalse(p.getAsyncMode());
268            assertEquals(0, p.getActiveThreadCount());
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 <        } finally {
326 <            joinPool(p);
325 >            assertTrue(f.isDone());
326 >            assertEquals(6765, (int) f.get());
327 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
328          }
329      }
330  
# Line 282 | Line 333 | public class ForkJoinPoolTest extends JS
333       */
334      public void testSubmitForkJoinTask() throws Throwable {
335          ForkJoinPool p = new ForkJoinPool(1);
336 <        try {
336 >        try (PoolCleaner cleaner = cleaner(p)) {
337              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
338              assertEquals(21, (int) f.get());
288        } finally {
289            joinPool(p);
339          }
340      }
341  
# Line 295 | Line 344 | public class ForkJoinPoolTest extends JS
344       */
345      public void testSubmitAfterShutdown() {
346          ForkJoinPool p = new ForkJoinPool(1);
347 <        try {
347 >        try (PoolCleaner cleaner = cleaner(p)) {
348              p.shutdown();
349              assertTrue(p.isShutdown());
350              try {
351 <                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
351 >                ForkJoinTask<Integer> unused = p.submit(new FibTask(8));
352                  shouldThrow();
353              } catch (RejectedExecutionException success) {}
305        } finally {
306            joinPool(p);
354          }
355      }
356  
# Line 329 | Line 376 | public class ForkJoinPoolTest extends JS
376      public void testPollSubmission() {
377          final CountDownLatch done = new CountDownLatch(1);
378          SubFJP p = new SubFJP();
379 <        try {
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();
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());
339        } finally {
386              done.countDown();
341            joinPool(p);
387          }
388      }
389  
# Line 348 | Line 393 | public class ForkJoinPoolTest extends JS
393      public void testDrainTasksTo() {
394          final CountDownLatch done = new CountDownLatch(1);
395          SubFJP p = new SubFJP();
396 <        try {
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();
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);
403 <            for (ForkJoinTask r : al) {
403 >            for (ForkJoinTask<?> r : al) {
404                  assertTrue(r == a || r == b || r == c);
405                  assertFalse(r.isDone());
406              }
362        } finally {
407              done.countDown();
364            joinPool(p);
408          }
409      }
410  
368
411      // FJ Versions of AbstractExecutorService tests
412  
413      /**
# Line 373 | Line 415 | public class ForkJoinPoolTest extends JS
415       */
416      public void testExecuteRunnable() throws Throwable {
417          ExecutorService e = new ForkJoinPool(1);
418 <        try {
419 <            TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
420 <            assertFalse(task.isDone());
421 <            Future<?> future = e.submit(task);
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(MEDIUM_DELAY_MS, MILLISECONDS));
426 <            assertTrue(task.isDone());
425 >            assertNull(future.get(randomExpiredTimeout(), randomTimeUnit()));
426 >            assertTrue(done.get());
427              assertTrue(future.isDone());
428              assertFalse(future.isCancelled());
385        } finally {
386            joinPool(e);
429          }
430      }
431  
390
432      /**
433       * Completed submit(callable) returns result
434       */
435      public void testSubmitCallable() throws Throwable {
436          ExecutorService e = new ForkJoinPool(1);
437 <        try {
437 >        try (PoolCleaner cleaner = cleaner(e)) {
438              Future<String> future = e.submit(new StringTask());
439              assertSame(TEST_STRING, future.get());
440              assertTrue(future.isDone());
441              assertFalse(future.isCancelled());
401        } finally {
402            joinPool(e);
442          }
443      }
444  
# Line 408 | Line 447 | public class ForkJoinPoolTest extends JS
447       */
448      public void testSubmitRunnable() throws Throwable {
449          ExecutorService e = new ForkJoinPool(1);
450 <        try {
450 >        try (PoolCleaner cleaner = cleaner(e)) {
451              Future<?> future = e.submit(new NoOpRunnable());
452              assertNull(future.get());
453              assertTrue(future.isDone());
454              assertFalse(future.isCancelled());
416        } finally {
417            joinPool(e);
455          }
456      }
457  
# Line 423 | Line 460 | public class ForkJoinPoolTest extends JS
460       */
461      public void testSubmitRunnable2() throws Throwable {
462          ExecutorService e = new ForkJoinPool(1);
463 <        try {
463 >        try (PoolCleaner cleaner = cleaner(e)) {
464              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
465              assertSame(TEST_STRING, future.get());
466              assertTrue(future.isDone());
467              assertFalse(future.isCancelled());
431        } finally {
432            joinPool(e);
468          }
469      }
470  
# Line 437 | Line 472 | public class ForkJoinPoolTest extends JS
472       * A submitted privileged action runs to completion
473       */
474      public void testSubmitPrivilegedAction() throws Exception {
475 +        final Callable<Object> callable = Executors.callable(new PrivilegedAction<Object>() {
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() {
445 <                        return TEST_STRING;
446 <                    }}));
447 <
478 >        public void realRun() throws Exception {
479 >            ExecutorService e = new ForkJoinPool(1);
480 >            try (PoolCleaner cleaner = cleaner(e)) {
481 >                Future<Object> future = e.submit(callable);
482                  assertSame(TEST_STRING, future.get());
483 <            }};
483 >            }
484 >        }};
485  
486 <        runWithPermissions(r,
452 <                           new RuntimePermission("modifyThread"));
486 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
487      }
488  
489      /**
490       * A submitted privileged exception action runs to completion
491       */
492      public void testSubmitPrivilegedExceptionAction() throws Exception {
493 +        final Callable<Object> callable =
494 +            Executors.callable(new PrivilegedExceptionAction<Object>() {
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() {
464 <                        return TEST_STRING;
465 <                    }}));
466 <
497 >        public void realRun() throws Exception {
498 >            ExecutorService e = new ForkJoinPool(1);
499 >            try (PoolCleaner cleaner = cleaner(e)) {
500 >                Future<Object> future = e.submit(callable);
501                  assertSame(TEST_STRING, future.get());
502 <            }};
502 >            }
503 >        }};
504  
505          runWithPermissions(r, new RuntimePermission("modifyThread"));
506      }
# Line 474 | Line 509 | public class ForkJoinPoolTest extends JS
509       * A submitted failed privileged exception action reports exception
510       */
511      public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
512 +        final Callable<Object> callable =
513 +            Executors.callable(new PrivilegedExceptionAction<Object>() {
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 {
482 <                        throw new IndexOutOfBoundsException();
483 <                    }}));
484 <
516 >        public void realRun() throws Exception {
517 >            ExecutorService e = new ForkJoinPool(1);
518 >            try (PoolCleaner cleaner = cleaner(e)) {
519 >                Future<Object> future = e.submit(callable);
520                  try {
521                      future.get();
522                      shouldThrow();
523                  } catch (ExecutionException success) {
524                      assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
525 <                }}};
525 >                }
526 >            }
527 >        }};
528  
529          runWithPermissions(r, new RuntimePermission("modifyThread"));
530      }
# Line 497 | Line 534 | public class ForkJoinPoolTest extends JS
534       */
535      public void testExecuteNullRunnable() {
536          ExecutorService e = new ForkJoinPool(1);
537 <        try {
538 <            Future<?> future = e.submit((Runnable) null);
539 <            shouldThrow();
540 <        } catch (NullPointerException success) {
541 <        } finally {
505 <            joinPool(e);
537 >        try (PoolCleaner cleaner = cleaner(e)) {
538 >            try {
539 >                Future<?> unused = e.submit((Runnable) null);
540 >                shouldThrow();
541 >            } catch (NullPointerException success) {}
542          }
543      }
544  
509
545      /**
546       * submit(null callable) throws NullPointerException
547       */
548      public void testSubmitNullCallable() {
549          ExecutorService e = new ForkJoinPool(1);
550 <        try {
551 <            Future<String> future = e.submit((Callable) null);
552 <            shouldThrow();
553 <        } catch (NullPointerException success) {
554 <        } finally {
520 <            joinPool(e);
550 >        try (PoolCleaner cleaner = cleaner(e)) {
551 >            try {
552 >                Future<String> unused = e.submit((Callable<String>) null);
553 >                shouldThrow();
554 >            } catch (NullPointerException success) {}
555          }
556      }
557  
524
558      /**
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 ExecutorService p = new ForkJoinPool(1);
532 <        final Callable<Void> awaiter = new CheckedCallable<Void>() {
564 >        final Callable<Void> awaiter = new CheckedCallable<>() {
565              public Void realCall() throws InterruptedException {
566 <                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
566 >                assertTrue(quittingTime.await(2*LONG_DELAY_MS, MILLISECONDS));
567                  return null;
568              }};
569 <        try {
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);
# Line 542 | Line 575 | public class ForkJoinPoolTest extends JS
575                      future.get();
576                  }});
577              t.start();
578 <            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
578 >            await(submitted);
579              t.interrupt();
580 <            t.join();
548 <        } finally {
549 <            quittingTime.countDown();
550 <            joinPool(p);
580 >            awaitTermination(t);
581          }
582      }
583  
# Line 557 | Line 587 | public class ForkJoinPoolTest extends JS
587       */
588      public void testSubmitEE() throws Throwable {
589          ForkJoinPool p = new ForkJoinPool(1);
590 <        try {
591 <            p.submit(new Callable() {
592 <                public Object call() {
593 <                    int i = 5/0;
594 <                    return Boolean.TRUE;
595 <                }}).get();
596 <            shouldThrow();
597 <        } catch (ExecutionException success) {
598 <            assertTrue(success.getCause() instanceof ArithmeticException);
569 <        } finally {
570 <            joinPool(p);
590 >        try (PoolCleaner cleaner = cleaner(p)) {
591 >            try {
592 >                p.submit(new Callable<Object>() {
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  
# Line 576 | Line 604 | public class ForkJoinPoolTest extends JS
604       */
605      public void testInvokeAny1() throws Throwable {
606          ExecutorService e = new ForkJoinPool(1);
607 <        try {
608 <            e.invokeAny(null);
609 <            shouldThrow();
610 <        } catch (NullPointerException success) {
611 <        } finally {
584 <            joinPool(e);
607 >        try (PoolCleaner cleaner = cleaner(e)) {
608 >            try {
609 >                e.invokeAny(null);
610 >                shouldThrow();
611 >            } catch (NullPointerException success) {}
612          }
613      }
614  
# Line 590 | Line 617 | public class ForkJoinPoolTest extends JS
617       */
618      public void testInvokeAny2() throws Throwable {
619          ExecutorService e = new ForkJoinPool(1);
620 <        try {
621 <            e.invokeAny(new ArrayList<Callable<String>>());
622 <            shouldThrow();
623 <        } catch (IllegalArgumentException success) {
624 <        } finally {
598 <            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  
# Line 604 | Line 630 | public class ForkJoinPoolTest extends JS
630       */
631      public void testInvokeAny3() throws Throwable {
632          ExecutorService e = new ForkJoinPool(1);
633 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
634 <        l.add(null);
635 <        try {
636 <            e.invokeAny(l);
637 <            shouldThrow();
638 <        } catch (NullPointerException success) {
639 <        } finally {
614 <            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  
# Line 621 | Line 646 | public class ForkJoinPoolTest extends JS
646      public void testInvokeAny4() throws Throwable {
647          CountDownLatch latch = new CountDownLatch(1);
648          ExecutorService e = new ForkJoinPool(1);
649 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
650 <        l.add(latchAwaitingStringTask(latch));
651 <        l.add(null);
652 <        try {
653 <            e.invokeAny(l);
654 <            shouldThrow();
655 <        } catch (NullPointerException success) {
656 <        } finally {
649 >        try (PoolCleaner cleaner = cleaner(e)) {
650 >            List<Callable<String>> l = new ArrayList<>();
651 >            l.add(latchAwaitingStringTask(latch));
652 >            l.add(null);
653 >            try {
654 >                e.invokeAny(l);
655 >                shouldThrow();
656 >            } catch (NullPointerException success) {}
657              latch.countDown();
633            joinPool(e);
658          }
659      }
660  
# Line 639 | Line 663 | public class ForkJoinPoolTest extends JS
663       */
664      public void testInvokeAny5() throws Throwable {
665          ExecutorService e = new ForkJoinPool(1);
666 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
667 <        l.add(new NPETask());
668 <        try {
669 <            e.invokeAny(l);
670 <            shouldThrow();
671 <        } catch (ExecutionException success) {
672 <            assertTrue(success.getCause() instanceof NullPointerException);
673 <        } finally {
674 <            joinPool(e);
666 >        try (PoolCleaner cleaner = cleaner(e)) {
667 >            List<Callable<String>> l = new ArrayList<>();
668 >            l.add(new NPETask());
669 >            try {
670 >                e.invokeAny(l);
671 >                shouldThrow();
672 >            } catch (ExecutionException success) {
673 >                assertTrue(success.getCause() instanceof NullPointerException);
674 >            }
675          }
676      }
677  
# Line 656 | Line 680 | public class ForkJoinPoolTest extends JS
680       */
681      public void testInvokeAny6() throws Throwable {
682          ExecutorService e = new ForkJoinPool(1);
683 <        try {
684 <            List<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);
665        } finally {
666            joinPool(e);
689          }
690      }
691  
# Line 672 | Line 694 | public class ForkJoinPoolTest extends JS
694       */
695      public void testInvokeAll1() throws Throwable {
696          ExecutorService e = new ForkJoinPool(1);
697 <        try {
698 <            e.invokeAll(null);
699 <            shouldThrow();
700 <        } catch (NullPointerException success) {
701 <        } finally {
680 <            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() throws InterruptedException {
709          ExecutorService e = new ForkJoinPool(1);
710 <        try {
711 <            List<Future<String>> r
712 <                = 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());
693        } finally {
694            joinPool(e);
715          }
716      }
717  
# Line 700 | Line 720 | public class ForkJoinPoolTest extends JS
720       */
721      public void testInvokeAll3() throws InterruptedException {
722          ExecutorService e = new ForkJoinPool(1);
723 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
724 <        l.add(new StringTask());
725 <        l.add(null);
726 <        try {
727 <            e.invokeAll(l);
728 <            shouldThrow();
729 <        } catch (NullPointerException success) {
730 <        } finally {
711 <            joinPool(e);
723 >        try (PoolCleaner cleaner = cleaner(e)) {
724 >            List<Callable<String>> l = new ArrayList<>();
725 >            l.add(new StringTask());
726 >            l.add(null);
727 >            try {
728 >                e.invokeAll(l);
729 >                shouldThrow();
730 >            } catch (NullPointerException success) {}
731          }
732      }
733  
# Line 718 | Line 737 | public class ForkJoinPoolTest extends JS
737       */
738      public void testInvokeAll4() throws Throwable {
739          ExecutorService e = new ForkJoinPool(1);
740 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
741 <        l.add(new NPETask());
742 <        List<Future<String>> futures = e.invokeAll(l);
743 <        assertEquals(1, futures.size());
744 <        try {
745 <            futures.get(0).get();
746 <            shouldThrow();
747 <        } catch (ExecutionException success) {
748 <            assertTrue(success.getCause() instanceof NullPointerException);
749 <        } finally {
750 <            joinPool(e);
740 >        try (PoolCleaner cleaner = cleaner(e)) {
741 >            List<Callable<String>> l = new ArrayList<>();
742 >            l.add(new NPETask());
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  
# Line 737 | Line 756 | public class ForkJoinPoolTest extends JS
756       */
757      public void testInvokeAll5() throws Throwable {
758          ExecutorService e = new ForkJoinPool(1);
759 <        try {
760 <            List<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>> futures = e.invokeAll(l);
764              assertEquals(2, futures.size());
765              for (Future<String> future : futures)
766                  assertSame(TEST_STRING, future.get());
748        } finally {
749            joinPool(e);
767          }
768      }
769  
753
770      /**
771       * timed invokeAny(null) throws NullPointerException
772       */
773      public void testTimedInvokeAny1() throws Throwable {
774          ExecutorService e = new ForkJoinPool(1);
775 <        try {
776 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
777 <            shouldThrow();
778 <        } catch (NullPointerException success) {
779 <        } finally {
764 <            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  
# Line 770 | Line 785 | public class ForkJoinPoolTest extends JS
785       */
786      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
787          ExecutorService e = new ForkJoinPool(1);
788 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
789 <        l.add(new StringTask());
790 <        try {
791 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
792 <            shouldThrow();
793 <        } catch (NullPointerException success) {
794 <        } finally {
780 <            joinPool(e);
788 >        try (PoolCleaner cleaner = cleaner(e)) {
789 >            List<Callable<String>> l = new ArrayList<>();
790 >            l.add(new StringTask());
791 >            try {
792 >                e.invokeAny(l, randomTimeout(), null);
793 >                shouldThrow();
794 >            } catch (NullPointerException success) {}
795          }
796      }
797  
# Line 786 | Line 800 | public class ForkJoinPoolTest extends JS
800       */
801      public void testTimedInvokeAny2() throws Throwable {
802          ExecutorService e = new ForkJoinPool(1);
803 <        try {
804 <            e.invokeAny(new ArrayList<Callable<String>>(),
805 <                        MEDIUM_DELAY_MS, MILLISECONDS);
806 <            shouldThrow();
807 <        } catch (IllegalArgumentException success) {
808 <        } finally {
795 <            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  
# Line 802 | Line 815 | public class ForkJoinPoolTest extends JS
815      public void testTimedInvokeAny3() throws Throwable {
816          CountDownLatch latch = new CountDownLatch(1);
817          ExecutorService e = new ForkJoinPool(1);
818 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
819 <        l.add(latchAwaitingStringTask(latch));
820 <        l.add(null);
821 <        try {
822 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
823 <            shouldThrow();
824 <        } catch (NullPointerException success) {
825 <        } finally {
818 >        try (PoolCleaner cleaner = cleaner(e)) {
819 >            List<Callable<String>> l = new ArrayList<>();
820 >            l.add(latchAwaitingStringTask(latch));
821 >            l.add(null);
822 >            try {
823 >                e.invokeAny(l, randomTimeout(), randomTimeUnit());
824 >                shouldThrow();
825 >            } catch (NullPointerException success) {}
826              latch.countDown();
814            joinPool(e);
827          }
828      }
829  
# Line 820 | Line 832 | public class ForkJoinPoolTest extends JS
832       */
833      public void testTimedInvokeAny4() throws Throwable {
834          ExecutorService e = new ForkJoinPool(1);
835 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
836 <        l.add(new NPETask());
837 <        try {
838 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
839 <            shouldThrow();
840 <        } catch (ExecutionException success) {
841 <            assertTrue(success.getCause() instanceof NullPointerException);
842 <        } finally {
843 <            joinPool(e);
835 >        try (PoolCleaner cleaner = cleaner(e)) {
836 >            long startTime = System.nanoTime();
837 >            List<Callable<String>> l = new ArrayList<>();
838 >            l.add(new NPETask());
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  
# Line 837 | Line 851 | public class ForkJoinPoolTest extends JS
851       */
852      public void testTimedInvokeAny5() throws Throwable {
853          ExecutorService e = new ForkJoinPool(1);
854 <        try {
855 <            List<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, MILLISECONDS);
859 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
860              assertSame(TEST_STRING, result);
861 <        } finally {
847 <            joinPool(e);
861 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
862          }
863      }
864  
# Line 853 | Line 867 | public class ForkJoinPoolTest extends JS
867       */
868      public void testTimedInvokeAll1() throws Throwable {
869          ExecutorService e = new ForkJoinPool(1);
870 <        try {
871 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
872 <            shouldThrow();
873 <        } catch (NullPointerException success) {
874 <        } finally {
861 <            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  
# Line 867 | Line 880 | public class ForkJoinPoolTest extends JS
880       */
881      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
882          ExecutorService e = new ForkJoinPool(1);
883 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
884 <        l.add(new StringTask());
885 <        try {
886 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
887 <            shouldThrow();
888 <        } catch (NullPointerException success) {
889 <        } finally {
877 <            joinPool(e);
883 >        try (PoolCleaner cleaner = cleaner(e)) {
884 >            List<Callable<String>> l = new ArrayList<>();
885 >            l.add(new StringTask());
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() throws InterruptedException {
897          ExecutorService e = new ForkJoinPool(1);
898 <        try {
898 >        final Collection<Callable<String>> emptyCollection
899 >            = Collections.emptyList();
900 >        try (PoolCleaner cleaner = cleaner(e)) {
901              List<Future<String>> r
902 <                = e.invokeAll(new ArrayList<Callable<String>>(),
903 <                              MEDIUM_DELAY_MS, MILLISECONDS);
902 >                = e.invokeAll(emptyCollection,
903 >                              randomTimeout(), randomTimeUnit());
904              assertTrue(r.isEmpty());
891        } finally {
892            joinPool(e);
905          }
906      }
907  
# Line 898 | Line 910 | public class ForkJoinPoolTest extends JS
910       */
911      public void testTimedInvokeAll3() throws InterruptedException {
912          ExecutorService e = new ForkJoinPool(1);
913 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
914 <        l.add(new StringTask());
915 <        l.add(null);
916 <        try {
917 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
918 <            shouldThrow();
919 <        } catch (NullPointerException success) {
920 <        } finally {
909 <            joinPool(e);
913 >        try (PoolCleaner cleaner = cleaner(e)) {
914 >            List<Callable<String>> l = new ArrayList<>();
915 >            l.add(new StringTask());
916 >            l.add(null);
917 >            try {
918 >                e.invokeAll(l, randomTimeout(), randomTimeUnit());
919 >                shouldThrow();
920 >            } catch (NullPointerException success) {}
921          }
922      }
923  
# Line 915 | Line 926 | public class ForkJoinPoolTest extends JS
926       */
927      public void testTimedInvokeAll4() throws Throwable {
928          ExecutorService e = new ForkJoinPool(1);
929 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
930 <        l.add(new NPETask());
931 <        List<Future<String>> futures
932 <            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
933 <        assertEquals(1, futures.size());
934 <        try {
935 <            futures.get(0).get();
936 <            shouldThrow();
937 <        } catch (ExecutionException success) {
938 <            assertTrue(success.getCause() instanceof NullPointerException);
939 <        } finally {
940 <            joinPool(e);
929 >        try (PoolCleaner cleaner = cleaner(e)) {
930 >            List<Callable<String>> l = new ArrayList<>();
931 >            l.add(new NPETask());
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  
# Line 934 | Line 945 | public class ForkJoinPoolTest extends JS
945       * timed invokeAll(c) returns results of all completed tasks in c
946       */
947      public void testTimedInvokeAll5() throws Throwable {
948 <        ExecutorService e = new ForkJoinPool(1);
949 <        try {
950 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
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>> futures
954 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
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());
947        } finally {
948            joinPool(e);
958          }
959      }
960  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines