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.11 by jsr166, Sat Nov 21 20:02:13 2009 UTC vs.
Revision 1.39 by dl, Fri May 6 11:22:07 2011 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
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);
150 <            assertTrue(p.isQuiescent());
151 <            assertTrue(p.getMaintainsParallelism());
165 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
166 >                       p.getFactory());
167              assertFalse(p.getAsyncMode());
168 <            assertTrue(p.getActiveThreadCount() == 0);
169 <            assertTrue(p.getStealCount() == 0);
170 <            assertTrue(p.getQueuedTaskCount() == 0);
171 <            assertTrue(p.getQueuedSubmissionCount() == 0);
168 >            assertEquals(0, p.getActiveThreadCount());
169 >            assertEquals(0, p.getStealCount());
170 >            assertEquals(0, p.getQueuedTaskCount());
171 >            assertEquals(0, p.getQueuedSubmissionCount());
172              assertFalse(p.hasQueuedSubmissions());
173              assertFalse(p.isShutdown());
174              assertFalse(p.isTerminating());
# Line 178 | Line 193 | public class ForkJoinPoolTest extends JS
193       */
194      public void testConstructor2() {
195          try {
196 <            new ForkJoinPool(1, null);
196 >            new ForkJoinPool(1, null, null, false);
197              shouldThrow();
198          } catch (NullPointerException success) {}
199      }
# Line 188 | Line 203 | public class ForkJoinPoolTest extends JS
203       * getParallelism returns size set in constructor
204       */
205      public void testGetParallelism() {
206 <        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;
206 >        ForkJoinPool p = new ForkJoinPool(1);
207          try {
208 <            p = new ForkJoinPool(1);
222 <            assertTrue(p.getParallelism() == 1);
223 <            p.setParallelism(-2);
224 <            shouldThrow();
225 <        } catch (IllegalArgumentException success) {
208 >            assertEquals(1, p.getParallelism());
209          } finally {
210              joinPool(p);
211          }
# Line 232 | Line 215 | public class ForkJoinPoolTest extends JS
215       * getPoolSize returns number of started workers.
216       */
217      public void testGetPoolSize() {
218 <        ForkJoinPool p = null;
218 >        ForkJoinPool p = new ForkJoinPool(1);
219          try {
220 <            p = new ForkJoinPool(1);
238 <            assertTrue(p.getPoolSize() == 0);
220 >            assertEquals(0, p.getActiveThreadCount());
221              Future<String> future = p.submit(new StringTask());
222 <            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());
222 >            assertEquals(1, p.getPoolSize());
223          } finally {
224              joinPool(p);
225          }
# Line 310 | Line 232 | public class ForkJoinPoolTest extends JS
232       * performs its defined action
233       */
234      public void testSetUncaughtExceptionHandler() throws InterruptedException {
235 <        ForkJoinPool p = null;
236 <        try {
237 <            p = new ForkJoinPool(1, new FailingThreadFactory());
238 <            MyHandler eh = new MyHandler();
239 <            p.setUncaughtExceptionHandler(eh);
240 <            assertEquals(eh, p.getUncaughtExceptionHandler());
241 <            p.execute(new FailingTask());
242 <            Thread.sleep(MEDIUM_DELAY_MS);
243 <            assertTrue(eh.catches > 0);
235 >        final CountDownLatch uehInvoked = new CountDownLatch(1);
236 >        final Thread.UncaughtExceptionHandler eh =
237 >            new Thread.UncaughtExceptionHandler() {
238 >                public void uncaughtException(Thread t, Throwable e) {
239 >                    uehInvoked.countDown();
240 >                }};
241 >        ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
242 >                                          eh, false);
243 >        try {
244 >            assertSame(eh, p.getUncaughtExceptionHandler());
245 >            p.execute(new FibTask(8));
246 >            assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
247          } finally {
248 +            p.shutdownNow(); // failure might have prevented processing task
249              joinPool(p);
250          }
251      }
252  
253      /**
328     * setUncaughtExceptionHandler of null removes handler
329     */
330    public void testSetUncaughtExceptionHandler2() {
331        ForkJoinPool p = null;
332        try {
333            p = new ForkJoinPool(1);
334            p.setUncaughtExceptionHandler(null);
335            assertNull(p.getUncaughtExceptionHandler());
336        } finally {
337            joinPool(p);
338        }
339    }
340
341
342    /**
254       * After invoking a single task, isQuiescent is true,
255       * queues are empty, threads are not active, and
256       * construction parameters continue to hold
257       */
258      public void testisQuiescent() throws InterruptedException {
259 <        ForkJoinPool p = null;
259 >        ForkJoinPool p = new ForkJoinPool(2);
260          try {
261 <            p = new ForkJoinPool(2);
261 >            assertTrue(p.isQuiescent());
262              p.invoke(new FibTask(20));
263 <            assertTrue(p.getFactory() ==
264 <                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
265 <            Thread.sleep(MEDIUM_DELAY_MS);
263 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
264 >                       p.getFactory());
265 >            delay(SMALL_DELAY_MS);
266              assertTrue(p.isQuiescent());
356            assertTrue(p.getMaintainsParallelism());
267              assertFalse(p.getAsyncMode());
268 <            assertTrue(p.getActiveThreadCount() == 0);
269 <            assertTrue(p.getQueuedTaskCount() == 0);
270 <            assertTrue(p.getQueuedSubmissionCount() == 0);
268 >            assertEquals(0, p.getActiveThreadCount());
269 >            assertEquals(0, p.getQueuedTaskCount());
270 >            assertEquals(0, p.getQueuedSubmissionCount());
271              assertFalse(p.hasQueuedSubmissions());
272              assertFalse(p.isShutdown());
273              assertFalse(p.isTerminating());
# Line 371 | Line 281 | public class ForkJoinPoolTest extends JS
281       * Completed submit(ForkJoinTask) returns result
282       */
283      public void testSubmitForkJoinTask() throws Throwable {
284 <        ForkJoinPool p = null;
284 >        ForkJoinPool p = new ForkJoinPool(1);
285          try {
376            p = new ForkJoinPool(1);
286              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
287 <            int r = f.get();
379 <            assertTrue(r == 21);
287 >            assertEquals(21, (int) f.get());
288          } finally {
289              joinPool(p);
290          }
# Line 386 | Line 294 | public class ForkJoinPoolTest extends JS
294       * A task submitted after shutdown is rejected
295       */
296      public void testSubmitAfterShutdown() {
297 <        ForkJoinPool p = null;
297 >        ForkJoinPool p = new ForkJoinPool(1);
298          try {
391            p = new ForkJoinPool(1);
299              p.shutdown();
300              assertTrue(p.isShutdown());
301 <            ForkJoinTask<Integer> f = p.submit(new FibTask(8));
302 <            shouldThrow();
303 <        } catch (RejectedExecutionException success) {
301 >            try {
302 >                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
303 >                shouldThrow();
304 >            } catch (RejectedExecutionException success) {}
305          } finally {
306              joinPool(p);
307          }
# Line 403 | Line 311 | public class ForkJoinPoolTest extends JS
311       * Pool maintains parallelism when using ManagedBlocker
312       */
313      public void testBlockingForkJoinTask() throws Throwable {
314 <        ForkJoinPool p = null;
314 >        ForkJoinPool p = new ForkJoinPool(4);
315          try {
408            p = new ForkJoinPool(4);
316              ReentrantLock lock = new ReentrantLock();
317              ManagedLocker locker = new ManagedLocker(lock);
318 <            ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
318 >            ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
319              p.execute(f);
320 <            assertTrue(p.getPoolSize() >= 4);
414 <            int r = f.get();
415 <            assertTrue(r ==  832040);
320 >            assertEquals(6765, (int) f.get());
321          } finally {
322              p.shutdownNow(); // don't wait out shutdown
323          }
# Line 422 | Line 327 | public class ForkJoinPoolTest extends JS
327       * pollSubmission returns unexecuted submitted task, if present
328       */
329      public void testPollSubmission() {
330 <        SubFJP p = null;
330 >        final CountDownLatch done = new CountDownLatch(1);
331 >        SubFJP p = new SubFJP();
332          try {
333 <            p = new SubFJP();
334 <            ForkJoinTask a = p.submit(new MediumRunnable());
335 <            ForkJoinTask b = p.submit(new MediumRunnable());
430 <            ForkJoinTask c = p.submit(new MediumRunnable());
333 >            ForkJoinTask a = p.submit(awaiter(done));
334 >            ForkJoinTask b = p.submit(awaiter(done));
335 >            ForkJoinTask c = p.submit(awaiter(done));
336              ForkJoinTask r = p.pollSubmission();
337              assertTrue(r == a || r == b || r == c);
338              assertFalse(r.isDone());
339          } finally {
340 +            done.countDown();
341              joinPool(p);
342          }
343      }
# Line 440 | Line 346 | public class ForkJoinPoolTest extends JS
346       * drainTasksTo transfers unexecuted submitted tasks, if present
347       */
348      public void testDrainTasksTo() {
349 <        SubFJP p = null;
349 >        final CountDownLatch done = new CountDownLatch(1);
350 >        SubFJP p = new SubFJP();
351          try {
352 <            p = new SubFJP();
353 <            ForkJoinTask a = p.submit(new MediumRunnable());
354 <            ForkJoinTask b = p.submit(new MediumRunnable());
448 <            ForkJoinTask c = p.submit(new MediumRunnable());
352 >            ForkJoinTask a = p.submit(awaiter(done));
353 >            ForkJoinTask b = p.submit(awaiter(done));
354 >            ForkJoinTask c = p.submit(awaiter(done));
355              ArrayList<ForkJoinTask> al = new ArrayList();
356              p.drainTasksTo(al);
357              assertTrue(al.size() > 0);
# Line 454 | Line 360 | public class ForkJoinPoolTest extends JS
360                  assertFalse(r.isDone());
361              }
362          } finally {
363 +            done.countDown();
364              joinPool(p);
365          }
366      }
# Line 466 | Line 373 | public class ForkJoinPoolTest extends JS
373       */
374      public void testExecuteRunnable() throws Throwable {
375          ExecutorService e = new ForkJoinPool(1);
376 <        TrackedShortRunnable task = new TrackedShortRunnable();
377 <        assertFalse(task.done);
378 <        Future<?> future = e.submit(task);
379 <        future.get();
380 <        assertTrue(task.done);
376 >        try {
377 >            TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
378 >            assertFalse(task.isDone());
379 >            Future<?> future = e.submit(task);
380 >            assertNull(future.get());
381 >            assertNull(future.get(MEDIUM_DELAY_MS, MILLISECONDS));
382 >            assertTrue(task.isDone());
383 >            assertTrue(future.isDone());
384 >            assertFalse(future.isCancelled());
385 >        } finally {
386 >            joinPool(e);
387 >        }
388      }
389  
390  
# Line 479 | Line 393 | public class ForkJoinPoolTest extends JS
393       */
394      public void testSubmitCallable() throws Throwable {
395          ExecutorService e = new ForkJoinPool(1);
396 <        Future<String> future = e.submit(new StringTask());
397 <        String result = future.get();
398 <        assertSame(TEST_STRING, result);
396 >        try {
397 >            Future<String> future = e.submit(new StringTask());
398 >            assertSame(TEST_STRING, future.get());
399 >            assertTrue(future.isDone());
400 >            assertFalse(future.isCancelled());
401 >        } finally {
402 >            joinPool(e);
403 >        }
404      }
405  
406      /**
# Line 489 | Line 408 | public class ForkJoinPoolTest extends JS
408       */
409      public void testSubmitRunnable() throws Throwable {
410          ExecutorService e = new ForkJoinPool(1);
411 <        Future<?> future = e.submit(new NoOpRunnable());
412 <        future.get();
413 <        assertTrue(future.isDone());
411 >        try {
412 >            Future<?> future = e.submit(new NoOpRunnable());
413 >            assertNull(future.get());
414 >            assertTrue(future.isDone());
415 >            assertFalse(future.isCancelled());
416 >        } finally {
417 >            joinPool(e);
418 >        }
419      }
420  
421      /**
# Line 499 | Line 423 | public class ForkJoinPoolTest extends JS
423       */
424      public void testSubmitRunnable2() throws Throwable {
425          ExecutorService e = new ForkJoinPool(1);
426 <        Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
427 <        String result = future.get();
428 <        assertSame(TEST_STRING, result);
426 >        try {
427 >            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
428 >            assertSame(TEST_STRING, future.get());
429 >            assertTrue(future.isDone());
430 >            assertFalse(future.isCancelled());
431 >        } finally {
432 >            joinPool(e);
433 >        }
434      }
435  
507
436      /**
437 <     * A submitted privileged action to completion
437 >     * A submitted privileged action runs to completion
438       */
439 <    public void testSubmitPrivilegedAction() throws Throwable {
440 <        Policy savedPolicy = null;
441 <        try {
442 <            savedPolicy = Policy.getPolicy();
443 <            AdjustablePolicy policy = new AdjustablePolicy();
516 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
517 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
518 <            Policy.setPolicy(policy);
519 <        } catch (AccessControlException ok) {
520 <            return;
521 <        }
522 <        try {
523 <            ExecutorService e = new ForkJoinPool(1);
524 <            Future future = e.submit(Executors.callable(new PrivilegedAction() {
439 >    public void testSubmitPrivilegedAction() throws Exception {
440 >        Runnable r = new CheckedRunnable() {
441 >            public void realRun() throws Exception {
442 >                ExecutorService e = new ForkJoinPool(1);
443 >                Future future = e.submit(Executors.callable(new PrivilegedAction() {
444                      public Object run() {
445                          return TEST_STRING;
446                      }}));
447  
448 <            Object result = future.get();
449 <            assertSame(TEST_STRING, result);
450 <        }
451 <        finally {
452 <            Policy.setPolicy(savedPolicy);
534 <        }
448 >                assertSame(TEST_STRING, future.get());
449 >            }};
450 >
451 >        runWithPermissions(r,
452 >                           new RuntimePermission("modifyThread"));
453      }
454  
455      /**
456 <     * A submitted a privileged exception action runs to completion
456 >     * A submitted privileged exception action runs to completion
457       */
458 <    public void testSubmitPrivilegedExceptionAction() throws Throwable {
459 <        Policy savedPolicy = null;
460 <        try {
461 <            savedPolicy = Policy.getPolicy();
462 <            AdjustablePolicy policy = new AdjustablePolicy();
545 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
546 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
547 <            Policy.setPolicy(policy);
548 <        } catch (AccessControlException ok) {
549 <            return;
550 <        }
551 <
552 <        try {
553 <            ExecutorService e = new ForkJoinPool(1);
554 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
458 >    public void testSubmitPrivilegedExceptionAction() throws Exception {
459 >        Runnable r = new CheckedRunnable() {
460 >            public void realRun() throws Exception {
461 >                ExecutorService e = new ForkJoinPool(1);
462 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
463                      public Object run() {
464                          return TEST_STRING;
465                      }}));
466  
467 <            Object result = future.get();
468 <            assertSame(TEST_STRING, result);
469 <        }
470 <        finally {
563 <            Policy.setPolicy(savedPolicy);
564 <        }
467 >                assertSame(TEST_STRING, future.get());
468 >            }};
469 >
470 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
471      }
472  
473      /**
474       * A submitted failed privileged exception action reports exception
475       */
476 <    public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
477 <        Policy savedPolicy = null;
478 <        try {
479 <            savedPolicy = Policy.getPolicy();
480 <            AdjustablePolicy policy = new AdjustablePolicy();
575 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
576 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
577 <            Policy.setPolicy(policy);
578 <        } catch (AccessControlException ok) {
579 <            return;
580 <        }
581 <
582 <
583 <        try {
584 <            ExecutorService e = new ForkJoinPool(1);
585 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
476 >    public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
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 PrivilegedExceptionAction() {
481                      public Object run() throws Exception {
482                          throw new IndexOutOfBoundsException();
483                      }}));
484  
485 <            Object result = future.get();
486 <            shouldThrow();
487 <        } catch (ExecutionException success) {
488 <        } finally {
489 <            Policy.setPolicy(savedPolicy);
490 <        }
485 >                try {
486 >                    future.get();
487 >                    shouldThrow();
488 >                } catch (ExecutionException success) {
489 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
490 >                }}};
491 >
492 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
493      }
494  
495      /**
496       * execute(null runnable) throws NullPointerException
497       */
498      public void testExecuteNullRunnable() {
499 +        ExecutorService e = new ForkJoinPool(1);
500          try {
501 <            ExecutorService e = new ForkJoinPool(1);
604 <            TrackedShortRunnable task = null;
605 <            Future<?> future = e.submit(task);
501 >            Future<?> future = e.submit((Runnable) null);
502              shouldThrow();
503 <        } catch (NullPointerException success) {}
503 >        } catch (NullPointerException success) {
504 >        } finally {
505 >            joinPool(e);
506 >        }
507      }
508  
509  
# Line 612 | Line 511 | public class ForkJoinPoolTest extends JS
511       * submit(null callable) throws NullPointerException
512       */
513      public void testSubmitNullCallable() {
514 +        ExecutorService e = new ForkJoinPool(1);
515          try {
516 <            ExecutorService e = new ForkJoinPool(1);
617 <            StringTask t = null;
618 <            Future<String> future = e.submit(t);
516 >            Future<String> future = e.submit((Callable) null);
517              shouldThrow();
518 <        } catch (NullPointerException success) {}
518 >        } catch (NullPointerException success) {
519 >        } finally {
520 >            joinPool(e);
521 >        }
522      }
523  
524  
525      /**
526 <     * Blocking on submit(callable) throws InterruptedException if
626 <     * caller interrupted.
526 >     * submit(callable).get() throws InterruptedException if interrupted
527       */
528      public void testInterruptedSubmit() throws InterruptedException {
529 <        final ForkJoinPool p = new ForkJoinPool(1);
530 <
531 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
532 <            void realRun() throws Throwable {
533 <                p.submit(new CheckedCallable<Object>() {
534 <                    public Object realCall() throws Throwable {
535 <                        try {
536 <                            Thread.sleep(MEDIUM_DELAY_MS);
537 <                        } catch (InterruptedException ok) {
538 <                        }
539 <                        return null;
540 <                    }}).get();
541 <            }});
542 <
543 <        t.start();
544 <        Thread.sleep(SHORT_DELAY_MS);
545 <        t.interrupt();
546 <        t.join();
547 <        p.shutdownNow();
548 <        joinPool(p);
529 >        final CountDownLatch submitted    = new CountDownLatch(1);
530 >        final CountDownLatch quittingTime = new CountDownLatch(1);
531 >        final ExecutorService p = new ForkJoinPool(1);
532 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
533 >            public Void realCall() throws InterruptedException {
534 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
535 >                return null;
536 >            }};
537 >        try {
538 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
539 >                public void realRun() throws Exception {
540 >                    Future<Void> future = p.submit(awaiter);
541 >                    submitted.countDown();
542 >                    future.get();
543 >                }});
544 >            t.start();
545 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
546 >            t.interrupt();
547 >            t.join();
548 >        } finally {
549 >            quittingTime.countDown();
550 >            joinPool(p);
551 >        }
552      }
553  
554      /**
# Line 661 | Line 564 | public class ForkJoinPoolTest extends JS
564                      return Boolean.TRUE;
565                  }}).get();
566              shouldThrow();
567 <        } catch (ExecutionException success) {}
568 <
569 <        joinPool(p);
567 >        } catch (ExecutionException success) {
568 >            assertTrue(success.getCause() instanceof ArithmeticException);
569 >        } finally {
570 >            joinPool(p);
571 >        }
572      }
573  
574      /**
# Line 699 | Line 604 | public class ForkJoinPoolTest extends JS
604       */
605      public void testInvokeAny3() throws Throwable {
606          ExecutorService e = new ForkJoinPool(1);
607 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
608 +        l.add(null);
609          try {
703            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
704            l.add(null);
610              e.invokeAny(l);
611              shouldThrow();
612          } catch (NullPointerException success) {
# Line 714 | Line 619 | public class ForkJoinPoolTest extends JS
619       * invokeAny(c) throws NullPointerException if c has null elements
620       */
621      public void testInvokeAny4() throws Throwable {
622 +        CountDownLatch latch = new CountDownLatch(1);
623          ExecutorService e = new ForkJoinPool(1);
624 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
625 +        l.add(latchAwaitingStringTask(latch));
626 +        l.add(null);
627          try {
719            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
720            l.add(new Callable<String>() {
721                public String call() {
722                    // The delay gives the pool a chance to notice
723                    // the null element.
724                    sleepTillInterrupted(SMALL_DELAY_MS);
725                    return "foo";
726                }});
727            l.add(null);
628              e.invokeAny(l);
629              shouldThrow();
630          } catch (NullPointerException success) {
631          } finally {
632 +            latch.countDown();
633              joinPool(e);
634          }
635      }
# Line 738 | Line 639 | public class ForkJoinPoolTest extends JS
639       */
640      public void testInvokeAny5() throws Throwable {
641          ExecutorService e = new ForkJoinPool(1);
642 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
643 +        l.add(new NPETask());
644          try {
742            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
743            l.add(new NPETask());
645              e.invokeAny(l);
646              shouldThrow();
647          } catch (ExecutionException success) {
648 +            assertTrue(success.getCause() instanceof NullPointerException);
649          } finally {
650              joinPool(e);
651          }
# Line 755 | Line 657 | public class ForkJoinPoolTest extends JS
657      public void testInvokeAny6() throws Throwable {
658          ExecutorService e = new ForkJoinPool(1);
659          try {
660 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
660 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
661              l.add(new StringTask());
662              l.add(new StringTask());
663              String result = e.invokeAny(l);
# Line 798 | Line 700 | public class ForkJoinPoolTest extends JS
700       */
701      public void testInvokeAll3() throws InterruptedException {
702          ExecutorService e = new ForkJoinPool(1);
703 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
704 +        l.add(new StringTask());
705 +        l.add(null);
706          try {
802            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
803            l.add(new StringTask());
804            l.add(null);
707              e.invokeAll(l);
708              shouldThrow();
709          } catch (NullPointerException success) {
# Line 816 | Line 718 | public class ForkJoinPoolTest extends JS
718       */
719      public void testInvokeAll4() throws Throwable {
720          ExecutorService e = new ForkJoinPool(1);
721 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
722 +        l.add(new NPETask());
723 +        List<Future<String>> futures = e.invokeAll(l);
724 +        assertEquals(1, futures.size());
725          try {
726 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
821 <            l.add(new NPETask());
822 <            List<Future<String>> result = e.invokeAll(l);
823 <            assertEquals(1, result.size());
824 <            for (Future<String> future : result)
825 <                future.get();
726 >            futures.get(0).get();
727              shouldThrow();
728          } catch (ExecutionException success) {
729 +            assertTrue(success.getCause() instanceof NullPointerException);
730          } finally {
731              joinPool(e);
732          }
# Line 836 | Line 738 | public class ForkJoinPoolTest extends JS
738      public void testInvokeAll5() throws Throwable {
739          ExecutorService e = new ForkJoinPool(1);
740          try {
741 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
741 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
742              l.add(new StringTask());
743              l.add(new StringTask());
744 <            List<Future<String>> result = e.invokeAll(l);
745 <            assertEquals(2, result.size());
746 <            for (Future<String> future : result)
744 >            List<Future<String>> futures = e.invokeAll(l);
745 >            assertEquals(2, futures.size());
746 >            for (Future<String> future : futures)
747                  assertSame(TEST_STRING, future.get());
748          } finally {
749              joinPool(e);
# Line 868 | Line 770 | public class ForkJoinPoolTest extends JS
770       */
771      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
772          ExecutorService e = new ForkJoinPool(1);
773 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
774 +        l.add(new StringTask());
775          try {
872            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
873            l.add(new StringTask());
776              e.invokeAny(l, MEDIUM_DELAY_MS, null);
777              shouldThrow();
778          } catch (NullPointerException success) {
# Line 898 | Line 800 | public class ForkJoinPoolTest extends JS
800       * timed invokeAny(c) throws NullPointerException if c has null elements
801       */
802      public void testTimedInvokeAny3() throws Throwable {
803 +        CountDownLatch latch = new CountDownLatch(1);
804          ExecutorService e = new ForkJoinPool(1);
805 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
806 +        l.add(latchAwaitingStringTask(latch));
807 +        l.add(null);
808          try {
903            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
904            l.add(new StringTask());
905            l.add(null);
809              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
810              shouldThrow();
811          } catch (NullPointerException success) {
812          } finally {
813 +            latch.countDown();
814              joinPool(e);
815          }
816      }
# Line 916 | Line 820 | public class ForkJoinPoolTest extends JS
820       */
821      public void testTimedInvokeAny4() throws Throwable {
822          ExecutorService e = new ForkJoinPool(1);
823 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
824 +        l.add(new NPETask());
825          try {
920            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
921            l.add(new NPETask());
826              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
827              shouldThrow();
828          } catch (ExecutionException success) {
# Line 934 | Line 838 | public class ForkJoinPoolTest extends JS
838      public void testTimedInvokeAny5() throws Throwable {
839          ExecutorService e = new ForkJoinPool(1);
840          try {
841 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
841 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
842              l.add(new StringTask());
843              l.add(new StringTask());
844              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 963 | Line 867 | public class ForkJoinPoolTest extends JS
867       */
868      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
869          ExecutorService e = new ForkJoinPool(1);
870 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
871 +        l.add(new StringTask());
872          try {
967            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
968            l.add(new StringTask());
873              e.invokeAll(l, MEDIUM_DELAY_MS, null);
874              shouldThrow();
875          } catch (NullPointerException success) {
# Line 994 | Line 898 | public class ForkJoinPoolTest extends JS
898       */
899      public void testTimedInvokeAll3() throws InterruptedException {
900          ExecutorService e = new ForkJoinPool(1);
901 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
902 +        l.add(new StringTask());
903 +        l.add(null);
904          try {
998            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
999            l.add(new StringTask());
1000            l.add(null);
905              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
906              shouldThrow();
907          } catch (NullPointerException success) {
# Line 1011 | Line 915 | public class ForkJoinPoolTest extends JS
915       */
916      public void testTimedInvokeAll4() throws Throwable {
917          ExecutorService e = new ForkJoinPool(1);
918 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
919 +        l.add(new NPETask());
920 +        List<Future<String>> futures
921 +            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
922 +        assertEquals(1, futures.size());
923          try {
924 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1016 <            l.add(new NPETask());
1017 <            List<Future<String>> result
1018 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1019 <            assertEquals(1, result.size());
1020 <            for (Future<String> future : result)
1021 <                future.get();
924 >            futures.get(0).get();
925              shouldThrow();
926          } catch (ExecutionException success) {
927 +            assertTrue(success.getCause() instanceof NullPointerException);
928          } finally {
929              joinPool(e);
930          }
# Line 1032 | Line 936 | public class ForkJoinPoolTest extends JS
936      public void testTimedInvokeAll5() throws Throwable {
937          ExecutorService e = new ForkJoinPool(1);
938          try {
939 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
939 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
940              l.add(new StringTask());
941              l.add(new StringTask());
942 <            List<Future<String>> result
942 >            List<Future<String>> futures
943                  = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
944 <            assertEquals(2, result.size());
945 <            for (Future<String> future : result)
944 >            assertEquals(2, futures.size());
945 >            for (Future<String> future : futures)
946                  assertSame(TEST_STRING, future.get());
947          } finally {
948              joinPool(e);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines