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.19 by dl, Sun Feb 28 13:35:22 2010 UTC vs.
Revision 1.31 by jsr166, Sat Oct 9 19:46:42 2010 UTC

# Line 4 | Line 4
4   * http://creativecommons.org/licenses/publicdomain
5   */
6  
7
7   import junit.framework.*;
8 < import java.util.*;
9 < import java.util.concurrent.*;
8 > import java.util.ArrayList;
9 > import java.util.Collection;
10 > 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;
15 > import java.util.concurrent.Callable;
16 > import java.util.concurrent.Future;
17 > import java.util.concurrent.ExecutionException;
18 > import java.util.concurrent.CancellationException;
19 > import java.util.concurrent.RejectedExecutionException;
20 > import java.util.concurrent.ForkJoinPool;
21 > import java.util.concurrent.ForkJoinTask;
22 > import java.util.concurrent.ForkJoinWorkerThread;
23 > import java.util.concurrent.RecursiveTask;
24 > import java.util.concurrent.TimeUnit;
25 > import java.util.concurrent.locks.ReentrantLock;
26   import static java.util.concurrent.TimeUnit.MILLISECONDS;
27 < import java.util.concurrent.locks.*;
28 < import java.security.*;
27 > import java.security.AccessControlException;
28 > import java.security.Policy;
29 > import java.security.PrivilegedAction;
30 > import java.security.PrivilegedExceptionAction;
31  
32   public class ForkJoinPoolTest extends JSR166TestCase {
33      public static void main(String[] args) {
34 <        junit.textui.TestRunner.run (suite());
34 >        junit.textui.TestRunner.run(suite());
35      }
36 +
37      public static Test suite() {
38          return new TestSuite(ForkJoinPoolTest.class);
39      }
# Line 39 | Line 57 | public class ForkJoinPoolTest extends JS
57      // Some classes to test extension and factory methods
58  
59      static class MyHandler implements Thread.UncaughtExceptionHandler {
60 <        int catches = 0;
60 >        volatile int catches = 0;
61          public void uncaughtException(Thread t, Throwable e) {
62              ++catches;
63          }
# Line 48 | Line 66 | public class ForkJoinPoolTest extends JS
66      // to test handlers
67      static class FailingFJWSubclass extends ForkJoinWorkerThread {
68          public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
69 <        protected void onStart() { throw new Error(); }
69 >        protected void onStart() { super.onStart(); throw new Error(); }
70      }
71  
72      static class FailingThreadFactory
73              implements ForkJoinPool.ForkJoinWorkerThreadFactory {
74 <        int calls = 0;
74 >        volatile int calls = 0;
75          public ForkJoinWorkerThread newThread(ForkJoinPool p) {
76              if (++calls > 1) return null;
77              return new FailingFJWSubclass(p);
# Line 142 | Line 160 | public class ForkJoinPoolTest extends JS
160       * tasks, and quiescent running state.
161       */
162      public void testDefaultInitialState() {
163 <        ForkJoinPool p = null;
163 >        ForkJoinPool p = new ForkJoinPool(1);
164          try {
165 <            p = new ForkJoinPool(1);
166 <            assertTrue(p.getFactory() ==
149 <                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
165 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
166 >                       p.getFactory());
167              assertTrue(p.isQuiescent());
151            assertTrue(p.getMaintainsParallelism());
168              assertFalse(p.getAsyncMode());
169 <            assertTrue(p.getActiveThreadCount() == 0);
170 <            assertTrue(p.getStealCount() == 0);
171 <            assertTrue(p.getQueuedTaskCount() == 0);
172 <            assertTrue(p.getQueuedSubmissionCount() == 0);
169 >            assertEquals(0, p.getActiveThreadCount());
170 >            assertEquals(0, p.getStealCount());
171 >            assertEquals(0, p.getQueuedTaskCount());
172 >            assertEquals(0, p.getQueuedSubmissionCount());
173              assertFalse(p.hasQueuedSubmissions());
174              assertFalse(p.isShutdown());
175              assertFalse(p.isTerminating());
# Line 178 | Line 194 | public class ForkJoinPoolTest extends JS
194       */
195      public void testConstructor2() {
196          try {
197 <            new ForkJoinPool(1, null);
197 >            new ForkJoinPool(1, null, null, false);
198              shouldThrow();
199          } catch (NullPointerException success) {}
200      }
# Line 188 | Line 204 | public class ForkJoinPoolTest extends JS
204       * getParallelism returns size set in constructor
205       */
206      public void testGetParallelism() {
207 <        ForkJoinPool p = null;
192 <        try {
193 <            p = new ForkJoinPool(1);
194 <            assertTrue(p.getParallelism() == 1);
195 <        } finally {
196 <            joinPool(p);
197 <        }
198 <    }
199 <
200 <    /**
201 <     * setParallelism changes reported parallelism level.
202 <     */
203 <    public void testSetParallelism() {
204 <        ForkJoinPool p = null;
205 <        try {
206 <            p = new ForkJoinPool(1);
207 <            assertTrue(p.getParallelism() == 1);
208 <            p.setParallelism(2);
209 <            assertTrue(p.getParallelism() == 2);
210 <        } finally {
211 <            joinPool(p);
212 <        }
213 <    }
214 <
215 <    /**
216 <     * setParallelism with argument <= 0 throws exception
217 <     */
218 <    public void testSetParallelism2() {
219 <        ForkJoinPool p = null;
207 >        ForkJoinPool p = new ForkJoinPool(1);
208          try {
209 <            p = new ForkJoinPool(1);
222 <            assertTrue(p.getParallelism() == 1);
223 <            p.setParallelism(-2);
224 <            shouldThrow();
225 <        } catch (IllegalArgumentException success) {
209 >            assertEquals(1, p.getParallelism());
210          } finally {
211              joinPool(p);
212          }
# Line 232 | Line 216 | public class ForkJoinPoolTest extends JS
216       * getPoolSize returns number of started workers.
217       */
218      public void testGetPoolSize() {
219 <        ForkJoinPool p = null;
219 >        ForkJoinPool p = new ForkJoinPool(1);
220          try {
221 <            p = new ForkJoinPool(1);
238 <            assertTrue(p.getActiveThreadCount() == 0);
221 >            assertEquals(0, p.getActiveThreadCount());
222              Future<String> future = p.submit(new StringTask());
223 <            assertTrue(p.getPoolSize() == 1);
241 <
242 <        } finally {
243 <            joinPool(p);
244 <        }
245 <    }
246 <
247 <    /**
248 <     * setMaximumPoolSize changes size reported by getMaximumPoolSize.
249 <     */
250 <    public void testSetMaximumPoolSize() {
251 <        ForkJoinPool p = null;
252 <        try {
253 <            p = new ForkJoinPool(1);
254 <            p.setMaximumPoolSize(2);
255 <            assertTrue(p.getMaximumPoolSize() == 2);
256 <        } finally {
257 <            joinPool(p);
258 <        }
259 <    }
260 <
261 <    /**
262 <     * setMaximumPoolSize with argument <= 0 throws exception
263 <     */
264 <    public void testSetMaximumPoolSize2() {
265 <        ForkJoinPool p = null;
266 <        try {
267 <            p = new ForkJoinPool(1);
268 <            p.setMaximumPoolSize(-2);
269 <            shouldThrow();
270 <        } catch (IllegalArgumentException success) {
271 <        } finally {
272 <            joinPool(p);
273 <        }
274 <    }
275 <
276 <    /**
277 <     * setMaintainsParallelism changes policy reported by
278 <     * getMaintainsParallelism.
279 <     */
280 <    public void testSetMaintainsParallelism() {
281 <        ForkJoinPool p = null;
282 <        try {
283 <            p = new ForkJoinPool(1);
284 <            p.setMaintainsParallelism(false);
285 <            assertFalse(p.getMaintainsParallelism());
286 <        } finally {
287 <            joinPool(p);
288 <        }
289 <    }
290 <
291 <    /**
292 <     * setAsyncMode changes policy reported by
293 <     * getAsyncMode.
294 <     */
295 <    public void testSetAsyncMode() {
296 <        ForkJoinPool p = null;
297 <        try {
298 <            p = new ForkJoinPool(1);
299 <            p.setAsyncMode(true);
300 <            assertTrue(p.getAsyncMode());
223 >            assertEquals(1, p.getPoolSize());
224          } finally {
225              joinPool(p);
226          }
# Line 310 | Line 233 | public class ForkJoinPoolTest extends JS
233       * performs its defined action
234       */
235      public void testSetUncaughtExceptionHandler() throws InterruptedException {
236 <        ForkJoinPool p = null;
237 <        try {
238 <            p = new ForkJoinPool(1, new FailingThreadFactory());
239 <            MyHandler eh = new MyHandler();
240 <            p.setUncaughtExceptionHandler(eh);
241 <            assertEquals(eh, p.getUncaughtExceptionHandler());
242 <            p.execute(new FailingTask());
243 <            Thread.sleep(MEDIUM_DELAY_MS);
244 <            assertTrue(eh.catches > 0);
236 >        final CountDownLatch uehInvoked = new CountDownLatch(1);
237 >        final Thread.UncaughtExceptionHandler eh =
238 >            new Thread.UncaughtExceptionHandler() {
239 >                public void uncaughtException(Thread t, Throwable e) {
240 >                    uehInvoked.countDown();
241 >                }};
242 >        ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
243 >                                          eh, false);
244 >        try {
245 >            assertSame(eh, p.getUncaughtExceptionHandler());
246 >            p.execute(new FibTask(8));
247 >            assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
248          } finally {
249 <            p.shutdownNow();
249 >            p.shutdownNow(); // failure might have prevented processing task
250              joinPool(p);
251          }
252      }
253  
254      /**
329     * setUncaughtExceptionHandler of null removes handler
330     */
331    public void testSetUncaughtExceptionHandler2() {
332        ForkJoinPool p = null;
333        try {
334            p = new ForkJoinPool(1);
335            p.setUncaughtExceptionHandler(null);
336            assertNull(p.getUncaughtExceptionHandler());
337        } finally {
338            joinPool(p);
339        }
340    }
341
342
343    /**
255       * After invoking a single task, isQuiescent is true,
256       * queues are empty, threads are not active, and
257       * construction parameters continue to hold
258       */
259      public void testisQuiescent() throws InterruptedException {
260 <        ForkJoinPool p = null;
260 >        ForkJoinPool p = new ForkJoinPool(2);
261          try {
262 <            p = new ForkJoinPool(2);
262 >            assertTrue(p.isQuiescent());
263              p.invoke(new FibTask(20));
264 <            assertTrue(p.getFactory() ==
265 <                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
266 <            Thread.sleep(MEDIUM_DELAY_MS);
264 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
265 >                       p.getFactory());
266 >            Thread.sleep(SMALL_DELAY_MS);
267              assertTrue(p.isQuiescent());
357            assertTrue(p.getMaintainsParallelism());
268              assertFalse(p.getAsyncMode());
269 <            assertTrue(p.getActiveThreadCount() == 0);
270 <            assertTrue(p.getQueuedTaskCount() == 0);
271 <            assertTrue(p.getQueuedSubmissionCount() == 0);
269 >            assertEquals(0, p.getActiveThreadCount());
270 >            assertEquals(0, p.getQueuedTaskCount());
271 >            assertEquals(0, p.getQueuedSubmissionCount());
272              assertFalse(p.hasQueuedSubmissions());
273              assertFalse(p.isShutdown());
274              assertFalse(p.isTerminating());
# Line 372 | Line 282 | public class ForkJoinPoolTest extends JS
282       * Completed submit(ForkJoinTask) returns result
283       */
284      public void testSubmitForkJoinTask() throws Throwable {
285 <        ForkJoinPool p = null;
285 >        ForkJoinPool p = new ForkJoinPool(1);
286          try {
377            p = new ForkJoinPool(1);
287              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
288 <            int r = f.get();
380 <            assertTrue(r == 21);
288 >            assertEquals(21, (int) f.get());
289          } finally {
290              joinPool(p);
291          }
# Line 387 | Line 295 | public class ForkJoinPoolTest extends JS
295       * A task submitted after shutdown is rejected
296       */
297      public void testSubmitAfterShutdown() {
298 <        ForkJoinPool p = null;
298 >        ForkJoinPool p = new ForkJoinPool(1);
299          try {
392            p = new ForkJoinPool(1);
300              p.shutdown();
301              assertTrue(p.isShutdown());
302 <            ForkJoinTask<Integer> f = p.submit(new FibTask(8));
303 <            shouldThrow();
304 <        } catch (RejectedExecutionException success) {
302 >            try {
303 >                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
304 >                shouldThrow();
305 >            } catch (RejectedExecutionException success) {}
306          } finally {
307              joinPool(p);
308          }
# Line 404 | Line 312 | public class ForkJoinPoolTest extends JS
312       * Pool maintains parallelism when using ManagedBlocker
313       */
314      public void testBlockingForkJoinTask() throws Throwable {
315 <        ForkJoinPool p = null;
315 >        ForkJoinPool p = new ForkJoinPool(4);
316          try {
409            p = new ForkJoinPool(4);
317              ReentrantLock lock = new ReentrantLock();
318              ManagedLocker locker = new ManagedLocker(lock);
319              ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
320              p.execute(f);
321 <            assertTrue(p.getPoolSize() >= 4);
415 <            int r = f.get();
416 <            assertTrue(r == 832040);
321 >            assertEquals(832040, (int) f.get());
322          } finally {
323              p.shutdownNow(); // don't wait out shutdown
324          }
# Line 423 | Line 328 | public class ForkJoinPoolTest extends JS
328       * pollSubmission returns unexecuted submitted task, if present
329       */
330      public void testPollSubmission() {
331 <        SubFJP p = null;
331 >        SubFJP p = new SubFJP();
332          try {
428            p = new SubFJP();
333              ForkJoinTask a = p.submit(new MediumRunnable());
334              ForkJoinTask b = p.submit(new MediumRunnable());
335              ForkJoinTask c = p.submit(new MediumRunnable());
# Line 441 | Line 345 | public class ForkJoinPoolTest extends JS
345       * drainTasksTo transfers unexecuted submitted tasks, if present
346       */
347      public void testDrainTasksTo() {
348 <        SubFJP p = null;
348 >        SubFJP p = new SubFJP();
349          try {
446            p = new SubFJP();
350              ForkJoinTask a = p.submit(new MediumRunnable());
351              ForkJoinTask b = p.submit(new MediumRunnable());
352              ForkJoinTask c = p.submit(new MediumRunnable());
# Line 467 | Line 370 | public class ForkJoinPoolTest extends JS
370       */
371      public void testExecuteRunnable() throws Throwable {
372          ExecutorService e = new ForkJoinPool(1);
373 <        TrackedShortRunnable task = new TrackedShortRunnable();
374 <        assertFalse(task.done);
375 <        Future<?> future = e.submit(task);
376 <        future.get();
377 <        assertTrue(task.done);
373 >        try {
374 >            TrackedShortRunnable task = new TrackedShortRunnable();
375 >            assertFalse(task.done);
376 >            Future<?> future = e.submit(task);
377 >            future.get();
378 >            assertTrue(task.done);
379 >        } finally {
380 >            joinPool(e);
381 >        }
382      }
383  
384  
# Line 480 | Line 387 | public class ForkJoinPoolTest extends JS
387       */
388      public void testSubmitCallable() throws Throwable {
389          ExecutorService e = new ForkJoinPool(1);
390 <        Future<String> future = e.submit(new StringTask());
391 <        String result = future.get();
392 <        assertSame(TEST_STRING, result);
390 >        try {
391 >            Future<String> future = e.submit(new StringTask());
392 >            String result = future.get();
393 >            assertSame(TEST_STRING, result);
394 >        } finally {
395 >            joinPool(e);
396 >        }
397      }
398  
399      /**
# Line 490 | Line 401 | public class ForkJoinPoolTest extends JS
401       */
402      public void testSubmitRunnable() throws Throwable {
403          ExecutorService e = new ForkJoinPool(1);
404 <        Future<?> future = e.submit(new NoOpRunnable());
405 <        future.get();
406 <        assertTrue(future.isDone());
404 >        try {
405 >            Future<?> future = e.submit(new NoOpRunnable());
406 >            future.get();
407 >            assertTrue(future.isDone());
408 >        } finally {
409 >            joinPool(e);
410 >        }
411      }
412  
413      /**
# Line 500 | Line 415 | public class ForkJoinPoolTest extends JS
415       */
416      public void testSubmitRunnable2() throws Throwable {
417          ExecutorService e = new ForkJoinPool(1);
418 <        Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
419 <        String result = future.get();
420 <        assertSame(TEST_STRING, result);
418 >        try {
419 >            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
420 >            String result = future.get();
421 >            assertSame(TEST_STRING, result);
422 >        } finally {
423 >            joinPool(e);
424 >        }
425      }
426  
427 +
428      /**
429 <     * A submitted privileged action runs to completion
429 >     * A submitted privileged action to completion
430       */
431      public void testSubmitPrivilegedAction() throws Throwable {
432 <        Runnable r = new CheckedRunnable() {
433 <            public void realRun() throws Exception {
434 <                ExecutorService e = new ForkJoinPool(1);
432 >        Policy savedPolicy = null;
433 >        try {
434 >            savedPolicy = Policy.getPolicy();
435 >            AdjustablePolicy policy = new AdjustablePolicy();
436 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
437 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
438 >            Policy.setPolicy(policy);
439 >        } catch (AccessControlException ok) {
440 >            return;
441 >        }
442 >
443 >        try {
444 >            ExecutorService e = new ForkJoinPool(1);
445 >            try {
446                  Future future = e.submit(Executors.callable(new PrivilegedAction() {
447                      public Object run() {
448                          return TEST_STRING;
# Line 519 | Line 450 | public class ForkJoinPoolTest extends JS
450  
451                  Object result = future.get();
452                  assertSame(TEST_STRING, result);
453 <            }};
454 <
455 <        runWithPermissions(r, new RuntimePermission("modifyThread"));
453 >            } finally {
454 >                joinPool(e);
455 >            }
456 >        } finally {
457 >            Policy.setPolicy(savedPolicy);
458 >        }
459      }
460  
461      /**
462 <     * A submitted privileged exception action runs to completion
462 >     * A submitted a privileged exception action runs to completion
463       */
464      public void testSubmitPrivilegedExceptionAction() throws Throwable {
465 <        Runnable r = new CheckedRunnable() {
466 <            public void realRun() throws Exception {
467 <                ExecutorService e = new ForkJoinPool(1);
465 >        Policy savedPolicy = null;
466 >        try {
467 >            savedPolicy = Policy.getPolicy();
468 >            AdjustablePolicy policy = new AdjustablePolicy();
469 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
470 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
471 >            Policy.setPolicy(policy);
472 >        } catch (AccessControlException ok) {
473 >            return;
474 >        }
475 >
476 >        try {
477 >            ExecutorService e = new ForkJoinPool(1);
478 >            try {
479                  Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
480                      public Object run() {
481                          return TEST_STRING;
# Line 538 | Line 483 | public class ForkJoinPoolTest extends JS
483  
484                  Object result = future.get();
485                  assertSame(TEST_STRING, result);
486 <            }};
487 <
488 <        runWithPermissions(r, new RuntimePermission("modifyThread"));
486 >            } finally {
487 >                joinPool(e);
488 >            }
489 >        } finally {
490 >            Policy.setPolicy(savedPolicy);
491 >        }
492      }
493  
494      /**
495       * A submitted failed privileged exception action reports exception
496       */
497      public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
498 <        Runnable r = new CheckedRunnable() {
499 <            public void realRun() throws Exception {
500 <                ExecutorService e = new ForkJoinPool(1);
498 >        Policy savedPolicy = null;
499 >        try {
500 >            savedPolicy = Policy.getPolicy();
501 >            AdjustablePolicy policy = new AdjustablePolicy();
502 >            policy.addPermission(new RuntimePermission("getContextClassLoader"));
503 >            policy.addPermission(new RuntimePermission("setContextClassLoader"));
504 >            Policy.setPolicy(policy);
505 >        } catch (AccessControlException ok) {
506 >            return;
507 >        }
508 >
509 >        try {
510 >            ExecutorService e = new ForkJoinPool(1);
511 >            try {
512                  Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
513                      public Object run() throws Exception {
514                          throw new IndexOutOfBoundsException();
515                      }}));
516  
517 <                try {
518 <                    Object result = future.get();
519 <                    shouldThrow();
520 <                } catch (ExecutionException success) {
521 <                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
522 <                }}};
523 <
524 <        runWithPermissions(r, new RuntimePermission("modifyThread"));
517 >                Object result = future.get();
518 >                shouldThrow();
519 >            } catch (ExecutionException success) {
520 >                assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
521 >            } finally {
522 >                joinPool(e);
523 >            }
524 >        } finally {
525 >            Policy.setPolicy(savedPolicy);
526 >        }
527      }
528  
529      /**
530       * execute(null runnable) throws NullPointerException
531       */
532      public void testExecuteNullRunnable() {
533 +        ExecutorService e = new ForkJoinPool(1);
534          try {
535 <            ExecutorService e = new ForkJoinPool(1);
574 <            TrackedShortRunnable task = null;
575 <            Future<?> future = e.submit(task);
535 >            Future<?> future = e.submit((Runnable) null);
536              shouldThrow();
537 <        } catch (NullPointerException success) {}
537 >        } catch (NullPointerException success) {
538 >        } finally {
539 >            joinPool(e);
540 >        }
541      }
542  
543  
# Line 582 | Line 545 | public class ForkJoinPoolTest extends JS
545       * submit(null callable) throws NullPointerException
546       */
547      public void testSubmitNullCallable() {
548 +        ExecutorService e = new ForkJoinPool(1);
549          try {
550 <            ExecutorService e = new ForkJoinPool(1);
587 <            StringTask t = null;
588 <            Future<String> future = e.submit(t);
550 >            Future<String> future = e.submit((Callable) null);
551              shouldThrow();
552 <        } catch (NullPointerException success) {}
552 >        } catch (NullPointerException success) {
553 >        } finally {
554 >            joinPool(e);
555 >        }
556      }
557  
558  
559      /**
560 <     * Blocking on submit(callable) throws InterruptedException if
596 <     * caller interrupted.
560 >     * submit(callable).get() throws InterruptedException if interrupted
561       */
562      public void testInterruptedSubmit() throws InterruptedException {
563 <        final ForkJoinPool p = new ForkJoinPool(1);
564 <
565 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
566 <            public void realRun() throws Throwable {
567 <                p.submit(new CheckedCallable<Object>() {
568 <                    public Object realCall() throws Throwable {
569 <                        try {
570 <                            Thread.sleep(MEDIUM_DELAY_MS);
571 <                        } catch (InterruptedException ok) {
572 <                        }
573 <                        return null;
574 <                    }}).get();
575 <            }});
576 <
577 <        t.start();
578 <        Thread.sleep(SHORT_DELAY_MS);
579 <        t.interrupt();
580 <        t.join();
581 <        p.shutdownNow();
582 <        joinPool(p);
563 >        final CountDownLatch submitted    = new CountDownLatch(1);
564 >        final CountDownLatch quittingTime = new CountDownLatch(1);
565 >        final ExecutorService p = new ForkJoinPool(1);
566 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
567 >            public Void realCall() throws InterruptedException {
568 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
569 >                return null;
570 >            }};
571 >        try {
572 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
573 >                public void realRun() throws Exception {
574 >                    Future<Void> future = p.submit(awaiter);
575 >                    submitted.countDown();
576 >                    future.get();
577 >                }});
578 >            t.start();
579 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
580 >            t.interrupt();
581 >            t.join();
582 >        } finally {
583 >            quittingTime.countDown();
584 >            joinPool(p);
585 >        }
586      }
587  
588      /**
# Line 633 | Line 600 | public class ForkJoinPoolTest extends JS
600              shouldThrow();
601          } catch (ExecutionException success) {
602              assertTrue(success.getCause() instanceof ArithmeticException);
603 +        } finally {
604 +            joinPool(p);
605          }
637
638        joinPool(p);
606      }
607  
608      /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines