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.13 by jsr166, Thu Nov 26 15:42:15 2009 UTC vs.
Revision 1.40 by jsr166, Sun May 15 17:32:29 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;
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 <            p = new ForkJoinPool(1, new FailingThreadFactory());
245 <            MyHandler eh = new MyHandler();
246 <            p.setUncaughtExceptionHandler(eh);
318 <            assertEquals(eh, p.getUncaughtExceptionHandler());
319 <            p.execute(new FailingTask());
320 <            Thread.sleep(MEDIUM_DELAY_MS);
321 <            assertTrue(eh.catches > 0);
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      /**
254 <     * setUncaughtExceptionHandler of null removes handler
254 >     * After invoking a single task, isQuiescent eventually becomes
255 >     * true, at which time queues are empty, threads are not active,
256 >     * the task has completed successfully, and construction
257 >     * parameters continue to hold
258       */
259 <    public void testSetUncaughtExceptionHandler2() {
260 <        ForkJoinPool p = null;
259 >    public void testisQuiescent() throws Exception {
260 >        ForkJoinPool p = new ForkJoinPool(2);
261          try {
262 <            p = new ForkJoinPool(1);
263 <            p.setUncaughtExceptionHandler(null);
264 <            assertNull(p.getUncaughtExceptionHandler());
265 <        } finally {
266 <            joinPool(p);
267 <        }
268 <    }
269 <
262 >            assertTrue(p.isQuiescent());
263 >            long startTime = System.nanoTime();
264 >            FibTask f = new FibTask(20);
265 >            p.invoke(f);
266 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
267 >                       p.getFactory());
268 >            while (! p.isQuiescent()) {
269 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
270 >                    throw new AssertionFailedError("timed out");
271 >                assertFalse(p.getAsyncMode());
272 >                assertFalse(p.isShutdown());
273 >                assertFalse(p.isTerminating());
274 >                assertFalse(p.isTerminated());
275 >                Thread.yield();
276 >            }
277  
342    /**
343     * After invoking a single task, isQuiescent is true,
344     * queues are empty, threads are not active, and
345     * construction parameters continue to hold
346     */
347    public void testisQuiescent() throws InterruptedException {
348        ForkJoinPool p = null;
349        try {
350            p = new ForkJoinPool(2);
351            p.invoke(new FibTask(20));
352            assertTrue(p.getFactory() ==
353                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
354            Thread.sleep(MEDIUM_DELAY_MS);
278              assertTrue(p.isQuiescent());
356            assertTrue(p.getMaintainsParallelism());
279              assertFalse(p.getAsyncMode());
280 <            assertTrue(p.getActiveThreadCount() == 0);
281 <            assertTrue(p.getQueuedTaskCount() == 0);
282 <            assertTrue(p.getQueuedSubmissionCount() == 0);
280 >            assertEquals(0, p.getActiveThreadCount());
281 >            assertEquals(0, p.getQueuedTaskCount());
282 >            assertEquals(0, p.getQueuedSubmissionCount());
283              assertFalse(p.hasQueuedSubmissions());
284              assertFalse(p.isShutdown());
285              assertFalse(p.isTerminating());
286              assertFalse(p.isTerminated());
287 +            assertTrue(f.isDone());
288 +            assertEquals(6765, (int) f.get());
289          } finally {
290              joinPool(p);
291          }
# Line 371 | Line 295 | public class ForkJoinPoolTest extends JS
295       * Completed submit(ForkJoinTask) returns result
296       */
297      public void testSubmitForkJoinTask() throws Throwable {
298 <        ForkJoinPool p = null;
298 >        ForkJoinPool p = new ForkJoinPool(1);
299          try {
376            p = new ForkJoinPool(1);
300              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
301 <            int r = f.get();
379 <            assertTrue(r == 21);
301 >            assertEquals(21, (int) f.get());
302          } finally {
303              joinPool(p);
304          }
# Line 386 | Line 308 | public class ForkJoinPoolTest extends JS
308       * A task submitted after shutdown is rejected
309       */
310      public void testSubmitAfterShutdown() {
311 <        ForkJoinPool p = null;
311 >        ForkJoinPool p = new ForkJoinPool(1);
312          try {
391            p = new ForkJoinPool(1);
313              p.shutdown();
314              assertTrue(p.isShutdown());
315 <            ForkJoinTask<Integer> f = p.submit(new FibTask(8));
316 <            shouldThrow();
317 <        } catch (RejectedExecutionException success) {
315 >            try {
316 >                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
317 >                shouldThrow();
318 >            } catch (RejectedExecutionException success) {}
319          } finally {
320              joinPool(p);
321          }
# Line 403 | Line 325 | public class ForkJoinPoolTest extends JS
325       * Pool maintains parallelism when using ManagedBlocker
326       */
327      public void testBlockingForkJoinTask() throws Throwable {
328 <        ForkJoinPool p = null;
328 >        ForkJoinPool p = new ForkJoinPool(4);
329          try {
408            p = new ForkJoinPool(4);
330              ReentrantLock lock = new ReentrantLock();
331              ManagedLocker locker = new ManagedLocker(lock);
332 <            ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
332 >            ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
333              p.execute(f);
334 <            assertTrue(p.getPoolSize() >= 4);
414 <            int r = f.get();
415 <            assertTrue(r ==  832040);
334 >            assertEquals(6765, (int) f.get());
335          } finally {
336              p.shutdownNow(); // don't wait out shutdown
337          }
# Line 422 | Line 341 | public class ForkJoinPoolTest extends JS
341       * pollSubmission returns unexecuted submitted task, if present
342       */
343      public void testPollSubmission() {
344 <        SubFJP p = null;
344 >        final CountDownLatch done = new CountDownLatch(1);
345 >        SubFJP p = new SubFJP();
346          try {
347 <            p = new SubFJP();
348 <            ForkJoinTask a = p.submit(new MediumRunnable());
349 <            ForkJoinTask b = p.submit(new MediumRunnable());
430 <            ForkJoinTask c = p.submit(new MediumRunnable());
347 >            ForkJoinTask a = p.submit(awaiter(done));
348 >            ForkJoinTask b = p.submit(awaiter(done));
349 >            ForkJoinTask c = p.submit(awaiter(done));
350              ForkJoinTask r = p.pollSubmission();
351              assertTrue(r == a || r == b || r == c);
352              assertFalse(r.isDone());
353          } finally {
354 +            done.countDown();
355              joinPool(p);
356          }
357      }
# Line 440 | Line 360 | public class ForkJoinPoolTest extends JS
360       * drainTasksTo transfers unexecuted submitted tasks, if present
361       */
362      public void testDrainTasksTo() {
363 <        SubFJP p = null;
363 >        final CountDownLatch done = new CountDownLatch(1);
364 >        SubFJP p = new SubFJP();
365          try {
366 <            p = new SubFJP();
367 <            ForkJoinTask a = p.submit(new MediumRunnable());
368 <            ForkJoinTask b = p.submit(new MediumRunnable());
448 <            ForkJoinTask c = p.submit(new MediumRunnable());
366 >            ForkJoinTask a = p.submit(awaiter(done));
367 >            ForkJoinTask b = p.submit(awaiter(done));
368 >            ForkJoinTask c = p.submit(awaiter(done));
369              ArrayList<ForkJoinTask> al = new ArrayList();
370              p.drainTasksTo(al);
371              assertTrue(al.size() > 0);
# Line 454 | Line 374 | public class ForkJoinPoolTest extends JS
374                  assertFalse(r.isDone());
375              }
376          } finally {
377 +            done.countDown();
378              joinPool(p);
379          }
380      }
# Line 466 | Line 387 | public class ForkJoinPoolTest extends JS
387       */
388      public void testExecuteRunnable() throws Throwable {
389          ExecutorService e = new ForkJoinPool(1);
390 <        TrackedShortRunnable task = new TrackedShortRunnable();
391 <        assertFalse(task.done);
392 <        Future<?> future = e.submit(task);
393 <        future.get();
394 <        assertTrue(task.done);
390 >        try {
391 >            TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
392 >            assertFalse(task.isDone());
393 >            Future<?> future = e.submit(task);
394 >            assertNull(future.get());
395 >            assertNull(future.get(MEDIUM_DELAY_MS, MILLISECONDS));
396 >            assertTrue(task.isDone());
397 >            assertTrue(future.isDone());
398 >            assertFalse(future.isCancelled());
399 >        } finally {
400 >            joinPool(e);
401 >        }
402      }
403  
404  
# Line 479 | Line 407 | public class ForkJoinPoolTest extends JS
407       */
408      public void testSubmitCallable() throws Throwable {
409          ExecutorService e = new ForkJoinPool(1);
410 <        Future<String> future = e.submit(new StringTask());
411 <        String result = future.get();
412 <        assertSame(TEST_STRING, result);
410 >        try {
411 >            Future<String> future = e.submit(new StringTask());
412 >            assertSame(TEST_STRING, future.get());
413 >            assertTrue(future.isDone());
414 >            assertFalse(future.isCancelled());
415 >        } finally {
416 >            joinPool(e);
417 >        }
418      }
419  
420      /**
# Line 489 | Line 422 | public class ForkJoinPoolTest extends JS
422       */
423      public void testSubmitRunnable() throws Throwable {
424          ExecutorService e = new ForkJoinPool(1);
425 <        Future<?> future = e.submit(new NoOpRunnable());
426 <        future.get();
427 <        assertTrue(future.isDone());
425 >        try {
426 >            Future<?> future = e.submit(new NoOpRunnable());
427 >            assertNull(future.get());
428 >            assertTrue(future.isDone());
429 >            assertFalse(future.isCancelled());
430 >        } finally {
431 >            joinPool(e);
432 >        }
433      }
434  
435      /**
# Line 499 | Line 437 | public class ForkJoinPoolTest extends JS
437       */
438      public void testSubmitRunnable2() throws Throwable {
439          ExecutorService e = new ForkJoinPool(1);
440 <        Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
441 <        String result = future.get();
442 <        assertSame(TEST_STRING, result);
440 >        try {
441 >            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
442 >            assertSame(TEST_STRING, future.get());
443 >            assertTrue(future.isDone());
444 >            assertFalse(future.isCancelled());
445 >        } finally {
446 >            joinPool(e);
447 >        }
448      }
449  
507
450      /**
451 <     * A submitted privileged action to completion
451 >     * A submitted privileged action runs to completion
452       */
453 <    public void testSubmitPrivilegedAction() throws Throwable {
454 <        Policy savedPolicy = null;
455 <        try {
456 <            savedPolicy = Policy.getPolicy();
457 <            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() {
453 >    public void testSubmitPrivilegedAction() throws Exception {
454 >        Runnable r = new CheckedRunnable() {
455 >            public void realRun() throws Exception {
456 >                ExecutorService e = new ForkJoinPool(1);
457 >                Future future = e.submit(Executors.callable(new PrivilegedAction() {
458                      public Object run() {
459                          return TEST_STRING;
460                      }}));
461  
462 <            Object result = future.get();
463 <            assertSame(TEST_STRING, result);
464 <        }
465 <        finally {
466 <            Policy.setPolicy(savedPolicy);
534 <        }
462 >                assertSame(TEST_STRING, future.get());
463 >            }};
464 >
465 >        runWithPermissions(r,
466 >                           new RuntimePermission("modifyThread"));
467      }
468  
469      /**
470 <     * A submitted a privileged exception action runs to completion
470 >     * A submitted privileged exception action runs to completion
471       */
472 <    public void testSubmitPrivilegedExceptionAction() throws Throwable {
473 <        Policy savedPolicy = null;
474 <        try {
475 <            savedPolicy = Policy.getPolicy();
476 <            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() {
472 >    public void testSubmitPrivilegedExceptionAction() throws Exception {
473 >        Runnable r = new CheckedRunnable() {
474 >            public void realRun() throws Exception {
475 >                ExecutorService e = new ForkJoinPool(1);
476 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
477                      public Object run() {
478                          return TEST_STRING;
479                      }}));
480  
481 <            Object result = future.get();
482 <            assertSame(TEST_STRING, result);
483 <        }
484 <        finally {
563 <            Policy.setPolicy(savedPolicy);
564 <        }
481 >                assertSame(TEST_STRING, future.get());
482 >            }};
483 >
484 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
485      }
486  
487      /**
488       * A submitted failed privileged exception action reports exception
489       */
490 <    public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
491 <        Policy savedPolicy = null;
492 <        try {
493 <            savedPolicy = Policy.getPolicy();
494 <            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() {
490 >    public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
491 >        Runnable r = new CheckedRunnable() {
492 >            public void realRun() throws Exception {
493 >                ExecutorService e = new ForkJoinPool(1);
494 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
495                      public Object run() throws Exception {
496                          throw new IndexOutOfBoundsException();
497                      }}));
498  
499 <            Object result = future.get();
500 <            shouldThrow();
501 <        } catch (ExecutionException success) {
502 <            assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
503 <        } finally {
504 <            Policy.setPolicy(savedPolicy);
505 <        }
499 >                try {
500 >                    future.get();
501 >                    shouldThrow();
502 >                } catch (ExecutionException success) {
503 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
504 >                }}};
505 >
506 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
507      }
508  
509      /**
510       * execute(null runnable) throws NullPointerException
511       */
512      public void testExecuteNullRunnable() {
513 +        ExecutorService e = new ForkJoinPool(1);
514          try {
515 <            ExecutorService e = new ForkJoinPool(1);
605 <            TrackedShortRunnable task = null;
606 <            Future<?> future = e.submit(task);
515 >            Future<?> future = e.submit((Runnable) null);
516              shouldThrow();
517 <        } catch (NullPointerException success) {}
517 >        } catch (NullPointerException success) {
518 >        } finally {
519 >            joinPool(e);
520 >        }
521      }
522  
523  
# Line 613 | Line 525 | public class ForkJoinPoolTest extends JS
525       * submit(null callable) throws NullPointerException
526       */
527      public void testSubmitNullCallable() {
528 +        ExecutorService e = new ForkJoinPool(1);
529          try {
530 <            ExecutorService e = new ForkJoinPool(1);
618 <            StringTask t = null;
619 <            Future<String> future = e.submit(t);
530 >            Future<String> future = e.submit((Callable) null);
531              shouldThrow();
532 <        } catch (NullPointerException success) {}
532 >        } catch (NullPointerException success) {
533 >        } finally {
534 >            joinPool(e);
535 >        }
536      }
537  
538  
539      /**
540 <     * Blocking on submit(callable) throws InterruptedException if
627 <     * caller interrupted.
540 >     * submit(callable).get() throws InterruptedException if interrupted
541       */
542      public void testInterruptedSubmit() throws InterruptedException {
543 <        final ForkJoinPool p = new ForkJoinPool(1);
544 <
545 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
546 <            public void realRun() throws Throwable {
547 <                p.submit(new CheckedCallable<Object>() {
548 <                    public Object realCall() throws Throwable {
549 <                        try {
550 <                            Thread.sleep(MEDIUM_DELAY_MS);
551 <                        } catch (InterruptedException ok) {
552 <                        }
553 <                        return null;
554 <                    }}).get();
555 <            }});
556 <
557 <        t.start();
558 <        Thread.sleep(SHORT_DELAY_MS);
559 <        t.interrupt();
560 <        t.join();
561 <        p.shutdownNow();
562 <        joinPool(p);
543 >        final CountDownLatch submitted    = new CountDownLatch(1);
544 >        final CountDownLatch quittingTime = new CountDownLatch(1);
545 >        final ExecutorService p = new ForkJoinPool(1);
546 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
547 >            public Void realCall() throws InterruptedException {
548 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
549 >                return null;
550 >            }};
551 >        try {
552 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
553 >                public void realRun() throws Exception {
554 >                    Future<Void> future = p.submit(awaiter);
555 >                    submitted.countDown();
556 >                    future.get();
557 >                }});
558 >            t.start();
559 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
560 >            t.interrupt();
561 >            t.join();
562 >        } finally {
563 >            quittingTime.countDown();
564 >            joinPool(p);
565 >        }
566      }
567  
568      /**
# Line 664 | Line 580 | public class ForkJoinPoolTest extends JS
580              shouldThrow();
581          } catch (ExecutionException success) {
582              assertTrue(success.getCause() instanceof ArithmeticException);
583 +        } finally {
584 +            joinPool(p);
585          }
668
669        joinPool(p);
586      }
587  
588      /**
# Line 702 | Line 618 | public class ForkJoinPoolTest extends JS
618       */
619      public void testInvokeAny3() throws Throwable {
620          ExecutorService e = new ForkJoinPool(1);
621 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
622 +        l.add(null);
623          try {
706            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
707            l.add(null);
624              e.invokeAny(l);
625              shouldThrow();
626          } catch (NullPointerException success) {
# Line 717 | Line 633 | public class ForkJoinPoolTest extends JS
633       * invokeAny(c) throws NullPointerException if c has null elements
634       */
635      public void testInvokeAny4() throws Throwable {
636 +        CountDownLatch latch = new CountDownLatch(1);
637          ExecutorService e = new ForkJoinPool(1);
638 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
639 +        l.add(latchAwaitingStringTask(latch));
640 +        l.add(null);
641          try {
722            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
723            l.add(new Callable<String>() {
724                public String call() {
725                    // The delay gives the pool a chance to notice
726                    // the null element.
727                    sleepTillInterrupted(SMALL_DELAY_MS);
728                    return "foo";
729                }});
730            l.add(null);
642              e.invokeAny(l);
643              shouldThrow();
644          } catch (NullPointerException success) {
645          } finally {
646 +            latch.countDown();
647              joinPool(e);
648          }
649      }
# Line 741 | Line 653 | public class ForkJoinPoolTest extends JS
653       */
654      public void testInvokeAny5() throws Throwable {
655          ExecutorService e = new ForkJoinPool(1);
656 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
657 +        l.add(new NPETask());
658          try {
745            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
746            l.add(new NPETask());
659              e.invokeAny(l);
660              shouldThrow();
661          } catch (ExecutionException success) {
# Line 759 | Line 671 | public class ForkJoinPoolTest extends JS
671      public void testInvokeAny6() throws Throwable {
672          ExecutorService e = new ForkJoinPool(1);
673          try {
674 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
674 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
675              l.add(new StringTask());
676              l.add(new StringTask());
677              String result = e.invokeAny(l);
# Line 802 | Line 714 | public class ForkJoinPoolTest extends JS
714       */
715      public void testInvokeAll3() throws InterruptedException {
716          ExecutorService e = new ForkJoinPool(1);
717 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
718 +        l.add(new StringTask());
719 +        l.add(null);
720          try {
806            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
807            l.add(new StringTask());
808            l.add(null);
721              e.invokeAll(l);
722              shouldThrow();
723          } catch (NullPointerException success) {
# Line 820 | Line 732 | public class ForkJoinPoolTest extends JS
732       */
733      public void testInvokeAll4() throws Throwable {
734          ExecutorService e = new ForkJoinPool(1);
735 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
736 +        l.add(new NPETask());
737 +        List<Future<String>> futures = e.invokeAll(l);
738 +        assertEquals(1, futures.size());
739          try {
740 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
825 <            l.add(new NPETask());
826 <            List<Future<String>> result = e.invokeAll(l);
827 <            assertEquals(1, result.size());
828 <            for (Future<String> future : result)
829 <                future.get();
740 >            futures.get(0).get();
741              shouldThrow();
742          } catch (ExecutionException success) {
743              assertTrue(success.getCause() instanceof NullPointerException);
# Line 841 | Line 752 | public class ForkJoinPoolTest extends JS
752      public void testInvokeAll5() throws Throwable {
753          ExecutorService e = new ForkJoinPool(1);
754          try {
755 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
755 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
756              l.add(new StringTask());
757              l.add(new StringTask());
758 <            List<Future<String>> result = e.invokeAll(l);
759 <            assertEquals(2, result.size());
760 <            for (Future<String> future : result)
758 >            List<Future<String>> futures = e.invokeAll(l);
759 >            assertEquals(2, futures.size());
760 >            for (Future<String> future : futures)
761                  assertSame(TEST_STRING, future.get());
762          } finally {
763              joinPool(e);
# Line 873 | Line 784 | public class ForkJoinPoolTest extends JS
784       */
785      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
786          ExecutorService e = new ForkJoinPool(1);
787 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
788 +        l.add(new StringTask());
789          try {
877            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
878            l.add(new StringTask());
790              e.invokeAny(l, MEDIUM_DELAY_MS, null);
791              shouldThrow();
792          } catch (NullPointerException success) {
# Line 903 | Line 814 | public class ForkJoinPoolTest extends JS
814       * timed invokeAny(c) throws NullPointerException if c has null elements
815       */
816      public void testTimedInvokeAny3() throws Throwable {
817 +        CountDownLatch latch = new CountDownLatch(1);
818          ExecutorService e = new ForkJoinPool(1);
819 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
820 +        l.add(latchAwaitingStringTask(latch));
821 +        l.add(null);
822          try {
908            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
909            l.add(new StringTask());
910            l.add(null);
823              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
824              shouldThrow();
825          } catch (NullPointerException success) {
826          } finally {
827 +            latch.countDown();
828              joinPool(e);
829          }
830      }
# Line 921 | Line 834 | public class ForkJoinPoolTest extends JS
834       */
835      public void testTimedInvokeAny4() throws Throwable {
836          ExecutorService e = new ForkJoinPool(1);
837 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
838 +        l.add(new NPETask());
839          try {
925            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
926            l.add(new NPETask());
840              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
841              shouldThrow();
842          } catch (ExecutionException success) {
# Line 939 | Line 852 | public class ForkJoinPoolTest extends JS
852      public void testTimedInvokeAny5() throws Throwable {
853          ExecutorService e = new ForkJoinPool(1);
854          try {
855 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
855 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
856              l.add(new StringTask());
857              l.add(new StringTask());
858              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 968 | Line 881 | public class ForkJoinPoolTest extends JS
881       */
882      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
883          ExecutorService e = new ForkJoinPool(1);
884 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
885 +        l.add(new StringTask());
886          try {
972            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
973            l.add(new StringTask());
887              e.invokeAll(l, MEDIUM_DELAY_MS, null);
888              shouldThrow();
889          } catch (NullPointerException success) {
# Line 999 | Line 912 | public class ForkJoinPoolTest extends JS
912       */
913      public void testTimedInvokeAll3() throws InterruptedException {
914          ExecutorService e = new ForkJoinPool(1);
915 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
916 +        l.add(new StringTask());
917 +        l.add(null);
918          try {
1003            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1004            l.add(new StringTask());
1005            l.add(null);
919              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
920              shouldThrow();
921          } catch (NullPointerException success) {
# Line 1016 | Line 929 | public class ForkJoinPoolTest extends JS
929       */
930      public void testTimedInvokeAll4() throws Throwable {
931          ExecutorService e = new ForkJoinPool(1);
932 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
933 +        l.add(new NPETask());
934 +        List<Future<String>> futures
935 +            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
936 +        assertEquals(1, futures.size());
937          try {
938 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1021 <            l.add(new NPETask());
1022 <            List<Future<String>> result
1023 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1024 <            assertEquals(1, result.size());
1025 <            for (Future<String> future : result)
1026 <                future.get();
938 >            futures.get(0).get();
939              shouldThrow();
940          } catch (ExecutionException success) {
941              assertTrue(success.getCause() instanceof NullPointerException);
# Line 1038 | Line 950 | public class ForkJoinPoolTest extends JS
950      public void testTimedInvokeAll5() throws Throwable {
951          ExecutorService e = new ForkJoinPool(1);
952          try {
953 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
953 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
954              l.add(new StringTask());
955              l.add(new StringTask());
956 <            List<Future<String>> result
956 >            List<Future<String>> futures
957                  = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
958 <            assertEquals(2, result.size());
959 <            for (Future<String> future : result)
958 >            assertEquals(2, futures.size());
959 >            for (Future<String> future : futures)
960                  assertSame(TEST_STRING, future.get());
961          } finally {
962              joinPool(e);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines