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.9 by jsr166, Wed Aug 5 00:49:40 2009 UTC vs.
Revision 1.41 by jsr166, Fri May 27 19:42:42 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 170 | Line 185 | public class ForkJoinPoolTest extends JS
185          try {
186              new ForkJoinPool(-1);
187              shouldThrow();
188 <        }
174 <        catch (IllegalArgumentException success) {}
188 >        } catch (IllegalArgumentException success) {}
189      }
190  
191      /**
# Line 179 | 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) {
185 <        }
198 >        } catch (NullPointerException success) {}
199      }
200  
188
201      /**
202       * getParallelism returns size set in constructor
203       */
204      public void testGetParallelism() {
205 <        ForkJoinPool p = null;
194 <        try {
195 <            p = new ForkJoinPool(1);
196 <            assertTrue(p.getParallelism() == 1);
197 <        } finally {
198 <            joinPool(p);
199 <        }
200 <    }
201 <
202 <    /**
203 <     * setParallelism changes reported parallelism level.
204 <     */
205 <    public void testSetParallelism() {
206 <        ForkJoinPool p = null;
207 <        try {
208 <            p = new ForkJoinPool(1);
209 <            assertTrue(p.getParallelism() == 1);
210 <            p.setParallelism(2);
211 <            assertTrue(p.getParallelism() == 2);
212 <        } finally {
213 <            joinPool(p);
214 <        }
215 <    }
216 <
217 <    /**
218 <     * setParallelism with argument <= 0 throws exception
219 <     */
220 <    public void testSetParallelism2() {
221 <        ForkJoinPool p = null;
205 >        ForkJoinPool p = new ForkJoinPool(1);
206          try {
207 <            p = new ForkJoinPool(1);
224 <            assertTrue(p.getParallelism() == 1);
225 <            p.setParallelism(-2);
226 <            shouldThrow();
227 <        } catch (IllegalArgumentException success) {
207 >            assertEquals(1, p.getParallelism());
208          } finally {
209              joinPool(p);
210          }
# Line 234 | Line 214 | public class ForkJoinPoolTest extends JS
214       * getPoolSize returns number of started workers.
215       */
216      public void testGetPoolSize() {
217 <        ForkJoinPool p = null;
217 >        ForkJoinPool p = new ForkJoinPool(1);
218          try {
219 <            p = new ForkJoinPool(1);
240 <            assertTrue(p.getPoolSize() == 0);
219 >            assertEquals(0, p.getActiveThreadCount());
220              Future<String> future = p.submit(new StringTask());
221 <            assertTrue(p.getPoolSize() == 1);
243 <
244 <        } finally {
245 <            joinPool(p);
246 <        }
247 <    }
248 <
249 <    /**
250 <     * setMaximumPoolSize changes size reported by getMaximumPoolSize.
251 <     */
252 <    public void testSetMaximumPoolSize() {
253 <        ForkJoinPool p = null;
254 <        try {
255 <            p = new ForkJoinPool(1);
256 <            p.setMaximumPoolSize(2);
257 <            assertTrue(p.getMaximumPoolSize() == 2);
258 <        } finally {
259 <            joinPool(p);
260 <        }
261 <    }
262 <
263 <    /**
264 <     * setMaximumPoolSize with argument <= 0 throws exception
265 <     */
266 <    public void testSetMaximumPoolSize2() {
267 <        ForkJoinPool p = null;
268 <        try {
269 <            p = new ForkJoinPool(1);
270 <            p.setMaximumPoolSize(-2);
271 <            shouldThrow();
272 <        } catch (IllegalArgumentException success) {
273 <        } finally {
274 <            joinPool(p);
275 <        }
276 <    }
277 <
278 <    /**
279 <     * setMaintainsParallelism changes policy reported by
280 <     * getMaintainsParallelism.
281 <     */
282 <    public void testSetMaintainsParallelism() {
283 <        ForkJoinPool p = null;
284 <        try {
285 <            p = new ForkJoinPool(1);
286 <            p.setMaintainsParallelism(false);
287 <            assertFalse(p.getMaintainsParallelism());
288 <        } finally {
289 <            joinPool(p);
290 <        }
291 <    }
292 <
293 <    /**
294 <     * setAsyncMode changes policy reported by
295 <     * getAsyncMode.
296 <     */
297 <    public void testSetAsyncMode() {
298 <        ForkJoinPool p = null;
299 <        try {
300 <            p = new ForkJoinPool(1);
301 <            p.setAsyncMode(true);
302 <            assertTrue(p.getAsyncMode());
221 >            assertEquals(1, p.getPoolSize());
222          } finally {
223              joinPool(p);
224          }
# Line 312 | Line 231 | public class ForkJoinPoolTest extends JS
231       * performs its defined action
232       */
233      public void testSetUncaughtExceptionHandler() throws InterruptedException {
234 <        ForkJoinPool p = null;
234 >        final CountDownLatch uehInvoked = new CountDownLatch(1);
235 >        final Thread.UncaughtExceptionHandler eh =
236 >            new Thread.UncaughtExceptionHandler() {
237 >                public void uncaughtException(Thread t, Throwable e) {
238 >                    uehInvoked.countDown();
239 >                }};
240 >        ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
241 >                                          eh, false);
242          try {
243 <            p = new ForkJoinPool(1, new FailingThreadFactory());
244 <            MyHandler eh = new MyHandler();
245 <            p.setUncaughtExceptionHandler(eh);
320 <            assertEquals(eh, p.getUncaughtExceptionHandler());
321 <            p.execute(new FailingTask());
322 <            Thread.sleep(MEDIUM_DELAY_MS);
323 <            assertTrue(eh.catches > 0);
243 >            assertSame(eh, p.getUncaughtExceptionHandler());
244 >            p.execute(new FibTask(8));
245 >            assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
246          } finally {
247 +            p.shutdownNow(); // failure might have prevented processing task
248              joinPool(p);
249          }
250      }
251  
252      /**
253 <     * setUncaughtExceptionHandler of null removes handler
253 >     * After invoking a single task, isQuiescent eventually becomes
254 >     * true, at which time queues are empty, threads are not active,
255 >     * the task has completed successfully, and construction
256 >     * parameters continue to hold
257       */
258 <    public void testSetUncaughtExceptionHandler2() {
259 <        ForkJoinPool p = null;
258 >    public void testisQuiescent() throws Exception {
259 >        ForkJoinPool p = new ForkJoinPool(2);
260          try {
261 <            p = new ForkJoinPool(1);
262 <            p.setUncaughtExceptionHandler(null);
263 <            assertNull(p.getUncaughtExceptionHandler());
264 <        } finally {
265 <            joinPool(p);
266 <        }
267 <    }
268 <
261 >            assertTrue(p.isQuiescent());
262 >            long startTime = System.nanoTime();
263 >            FibTask f = new FibTask(20);
264 >            p.invoke(f);
265 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
266 >                       p.getFactory());
267 >            while (! p.isQuiescent()) {
268 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
269 >                    throw new AssertionFailedError("timed out");
270 >                assertFalse(p.getAsyncMode());
271 >                assertFalse(p.isShutdown());
272 >                assertFalse(p.isTerminating());
273 >                assertFalse(p.isTerminated());
274 >                Thread.yield();
275 >            }
276  
344    /**
345     * After invoking a single task, isQuiescent is true,
346     * queues are empty, threads are not active, and
347     * construction parameters continue to hold
348     */
349    public void testisQuiescent() throws InterruptedException {
350        ForkJoinPool p = null;
351        try {
352            p = new ForkJoinPool(2);
353            p.invoke(new FibTask(20));
354            assertTrue(p.getFactory() ==
355                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
356            Thread.sleep(MEDIUM_DELAY_MS);
277              assertTrue(p.isQuiescent());
358            assertTrue(p.getMaintainsParallelism());
278              assertFalse(p.getAsyncMode());
279 <            assertTrue(p.getActiveThreadCount() == 0);
280 <            assertTrue(p.getQueuedTaskCount() == 0);
281 <            assertTrue(p.getQueuedSubmissionCount() == 0);
279 >            assertEquals(0, p.getActiveThreadCount());
280 >            assertEquals(0, p.getQueuedTaskCount());
281 >            assertEquals(0, p.getQueuedSubmissionCount());
282              assertFalse(p.hasQueuedSubmissions());
283              assertFalse(p.isShutdown());
284              assertFalse(p.isTerminating());
285              assertFalse(p.isTerminated());
286 +            assertTrue(f.isDone());
287 +            assertEquals(6765, (int) f.get());
288          } finally {
289              joinPool(p);
290          }
# Line 373 | Line 294 | public class ForkJoinPoolTest extends JS
294       * Completed submit(ForkJoinTask) returns result
295       */
296      public void testSubmitForkJoinTask() throws Throwable {
297 <        ForkJoinPool p = null;
297 >        ForkJoinPool p = new ForkJoinPool(1);
298          try {
378            p = new ForkJoinPool(1);
299              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
300 <            int r = f.get();
381 <            assertTrue(r == 21);
300 >            assertEquals(21, (int) f.get());
301          } finally {
302              joinPool(p);
303          }
# Line 388 | Line 307 | public class ForkJoinPoolTest extends JS
307       * A task submitted after shutdown is rejected
308       */
309      public void testSubmitAfterShutdown() {
310 <        ForkJoinPool p = null;
310 >        ForkJoinPool p = new ForkJoinPool(1);
311          try {
393            p = new ForkJoinPool(1);
312              p.shutdown();
313              assertTrue(p.isShutdown());
314 <            ForkJoinTask<Integer> f = p.submit(new FibTask(8));
315 <            shouldThrow();
316 <        } catch (RejectedExecutionException success) {
314 >            try {
315 >                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
316 >                shouldThrow();
317 >            } catch (RejectedExecutionException success) {}
318          } finally {
319              joinPool(p);
320          }
# Line 405 | Line 324 | public class ForkJoinPoolTest extends JS
324       * Pool maintains parallelism when using ManagedBlocker
325       */
326      public void testBlockingForkJoinTask() throws Throwable {
327 <        ForkJoinPool p = null;
327 >        ForkJoinPool p = new ForkJoinPool(4);
328          try {
410            p = new ForkJoinPool(4);
329              ReentrantLock lock = new ReentrantLock();
330              ManagedLocker locker = new ManagedLocker(lock);
331 <            ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
331 >            ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
332              p.execute(f);
333 <            assertTrue(p.getPoolSize() >= 4);
416 <            int r = f.get();
417 <            assertTrue(r ==  832040);
333 >            assertEquals(6765, (int) f.get());
334          } finally {
335              p.shutdownNow(); // don't wait out shutdown
336          }
# Line 424 | Line 340 | public class ForkJoinPoolTest extends JS
340       * pollSubmission returns unexecuted submitted task, if present
341       */
342      public void testPollSubmission() {
343 <        SubFJP p = null;
343 >        final CountDownLatch done = new CountDownLatch(1);
344 >        SubFJP p = new SubFJP();
345          try {
346 <            p = new SubFJP();
347 <            ForkJoinTask a = p.submit(new MediumRunnable());
348 <            ForkJoinTask b = p.submit(new MediumRunnable());
432 <            ForkJoinTask c = p.submit(new MediumRunnable());
346 >            ForkJoinTask a = p.submit(awaiter(done));
347 >            ForkJoinTask b = p.submit(awaiter(done));
348 >            ForkJoinTask c = p.submit(awaiter(done));
349              ForkJoinTask r = p.pollSubmission();
350              assertTrue(r == a || r == b || r == c);
351              assertFalse(r.isDone());
352          } finally {
353 +            done.countDown();
354              joinPool(p);
355          }
356      }
# Line 442 | Line 359 | public class ForkJoinPoolTest extends JS
359       * drainTasksTo transfers unexecuted submitted tasks, if present
360       */
361      public void testDrainTasksTo() {
362 <        SubFJP p = null;
362 >        final CountDownLatch done = new CountDownLatch(1);
363 >        SubFJP p = new SubFJP();
364          try {
365 <            p = new SubFJP();
366 <            ForkJoinTask a = p.submit(new MediumRunnable());
367 <            ForkJoinTask b = p.submit(new MediumRunnable());
450 <            ForkJoinTask c = p.submit(new MediumRunnable());
365 >            ForkJoinTask a = p.submit(awaiter(done));
366 >            ForkJoinTask b = p.submit(awaiter(done));
367 >            ForkJoinTask c = p.submit(awaiter(done));
368              ArrayList<ForkJoinTask> al = new ArrayList();
369              p.drainTasksTo(al);
370              assertTrue(al.size() > 0);
# Line 456 | Line 373 | public class ForkJoinPoolTest extends JS
373                  assertFalse(r.isDone());
374              }
375          } finally {
376 +            done.countDown();
377              joinPool(p);
378          }
379      }
380  
463
381      // FJ Versions of AbstractExecutorService tests
382  
383      /**
# Line 468 | Line 385 | public class ForkJoinPoolTest extends JS
385       */
386      public void testExecuteRunnable() throws Throwable {
387          ExecutorService e = new ForkJoinPool(1);
388 <        TrackedShortRunnable task = new TrackedShortRunnable();
389 <        assertFalse(task.done);
390 <        Future<?> future = e.submit(task);
391 <        future.get();
392 <        assertTrue(task.done);
388 >        try {
389 >            TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
390 >            assertFalse(task.isDone());
391 >            Future<?> future = e.submit(task);
392 >            assertNull(future.get());
393 >            assertNull(future.get(MEDIUM_DELAY_MS, MILLISECONDS));
394 >            assertTrue(task.isDone());
395 >            assertTrue(future.isDone());
396 >            assertFalse(future.isCancelled());
397 >        } finally {
398 >            joinPool(e);
399 >        }
400      }
401  
478
402      /**
403       * Completed submit(callable) returns result
404       */
405      public void testSubmitCallable() throws Throwable {
406          ExecutorService e = new ForkJoinPool(1);
407 <        Future<String> future = e.submit(new StringTask());
408 <        String result = future.get();
409 <        assertSame(TEST_STRING, result);
407 >        try {
408 >            Future<String> future = e.submit(new StringTask());
409 >            assertSame(TEST_STRING, future.get());
410 >            assertTrue(future.isDone());
411 >            assertFalse(future.isCancelled());
412 >        } finally {
413 >            joinPool(e);
414 >        }
415      }
416  
417      /**
# Line 491 | Line 419 | public class ForkJoinPoolTest extends JS
419       */
420      public void testSubmitRunnable() throws Throwable {
421          ExecutorService e = new ForkJoinPool(1);
422 <        Future<?> future = e.submit(new NoOpRunnable());
423 <        future.get();
424 <        assertTrue(future.isDone());
422 >        try {
423 >            Future<?> future = e.submit(new NoOpRunnable());
424 >            assertNull(future.get());
425 >            assertTrue(future.isDone());
426 >            assertFalse(future.isCancelled());
427 >        } finally {
428 >            joinPool(e);
429 >        }
430      }
431  
432      /**
# Line 501 | Line 434 | public class ForkJoinPoolTest extends JS
434       */
435      public void testSubmitRunnable2() throws Throwable {
436          ExecutorService e = new ForkJoinPool(1);
437 <        Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
438 <        String result = future.get();
439 <        assertSame(TEST_STRING, result);
437 >        try {
438 >            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
439 >            assertSame(TEST_STRING, future.get());
440 >            assertTrue(future.isDone());
441 >            assertFalse(future.isCancelled());
442 >        } finally {
443 >            joinPool(e);
444 >        }
445      }
446  
509
447      /**
448 <     * A submitted privileged action to completion
448 >     * A submitted privileged action runs to completion
449       */
450 <    public void testSubmitPrivilegedAction() throws Throwable {
451 <        Policy savedPolicy = null;
452 <        try {
453 <            savedPolicy = Policy.getPolicy();
454 <            AdjustablePolicy policy = new AdjustablePolicy();
518 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
519 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
520 <            Policy.setPolicy(policy);
521 <        } catch (AccessControlException ok) {
522 <            return;
523 <        }
524 <        try {
525 <            ExecutorService e = new ForkJoinPool(1);
526 <            Future future = e.submit(Executors.callable(new PrivilegedAction() {
450 >    public void testSubmitPrivilegedAction() throws Exception {
451 >        Runnable r = new CheckedRunnable() {
452 >            public void realRun() throws Exception {
453 >                ExecutorService e = new ForkJoinPool(1);
454 >                Future future = e.submit(Executors.callable(new PrivilegedAction() {
455                      public Object run() {
456                          return TEST_STRING;
457                      }}));
458  
459 <            Object result = future.get();
460 <            assertSame(TEST_STRING, result);
461 <        }
462 <        finally {
463 <            Policy.setPolicy(savedPolicy);
536 <        }
459 >                assertSame(TEST_STRING, future.get());
460 >            }};
461 >
462 >        runWithPermissions(r,
463 >                           new RuntimePermission("modifyThread"));
464      }
465  
466      /**
467 <     * A submitted a privileged exception action runs to completion
467 >     * A submitted privileged exception action runs to completion
468       */
469 <    public void testSubmitPrivilegedExceptionAction() throws Throwable {
470 <        Policy savedPolicy = null;
471 <        try {
472 <            savedPolicy = Policy.getPolicy();
473 <            AdjustablePolicy policy = new AdjustablePolicy();
547 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
548 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
549 <            Policy.setPolicy(policy);
550 <        } catch (AccessControlException ok) {
551 <            return;
552 <        }
553 <
554 <        try {
555 <            ExecutorService e = new ForkJoinPool(1);
556 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
469 >    public void testSubmitPrivilegedExceptionAction() throws Exception {
470 >        Runnable r = new CheckedRunnable() {
471 >            public void realRun() throws Exception {
472 >                ExecutorService e = new ForkJoinPool(1);
473 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
474                      public Object run() {
475                          return TEST_STRING;
476                      }}));
477  
478 <            Object result = future.get();
479 <            assertSame(TEST_STRING, result);
480 <        }
481 <        finally {
565 <            Policy.setPolicy(savedPolicy);
566 <        }
478 >                assertSame(TEST_STRING, future.get());
479 >            }};
480 >
481 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
482      }
483  
484      /**
485       * A submitted failed privileged exception action reports exception
486       */
487 <    public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
488 <        Policy savedPolicy = null;
489 <        try {
490 <            savedPolicy = Policy.getPolicy();
491 <            AdjustablePolicy policy = new AdjustablePolicy();
577 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
578 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
579 <            Policy.setPolicy(policy);
580 <        } catch (AccessControlException ok) {
581 <            return;
582 <        }
583 <
584 <
585 <        try {
586 <            ExecutorService e = new ForkJoinPool(1);
587 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
487 >    public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
488 >        Runnable r = new CheckedRunnable() {
489 >            public void realRun() throws Exception {
490 >                ExecutorService e = new ForkJoinPool(1);
491 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
492                      public Object run() throws Exception {
493                          throw new IndexOutOfBoundsException();
494                      }}));
495  
496 <            Object result = future.get();
497 <            shouldThrow();
498 <        } catch (ExecutionException success) {
499 <        } finally {
500 <            Policy.setPolicy(savedPolicy);
501 <        }
496 >                try {
497 >                    future.get();
498 >                    shouldThrow();
499 >                } catch (ExecutionException success) {
500 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
501 >                }}};
502 >
503 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
504      }
505  
506      /**
507       * execute(null runnable) throws NullPointerException
508       */
509      public void testExecuteNullRunnable() {
510 +        ExecutorService e = new ForkJoinPool(1);
511          try {
512 <            ExecutorService e = new ForkJoinPool(1);
606 <            TrackedShortRunnable task = null;
607 <            Future<?> future = e.submit(task);
512 >            Future<?> future = e.submit((Runnable) null);
513              shouldThrow();
514          } catch (NullPointerException success) {
515 +        } finally {
516 +            joinPool(e);
517          }
518      }
519  
613
520      /**
521       * submit(null callable) throws NullPointerException
522       */
523      public void testSubmitNullCallable() {
524 +        ExecutorService e = new ForkJoinPool(1);
525          try {
526 <            ExecutorService e = new ForkJoinPool(1);
620 <            StringTask t = null;
621 <            Future<String> future = e.submit(t);
526 >            Future<String> future = e.submit((Callable) null);
527              shouldThrow();
528          } catch (NullPointerException success) {
529 +        } finally {
530 +            joinPool(e);
531          }
532      }
533  
627
534      /**
535 <     * Blocking on submit(callable) throws InterruptedException if
630 <     * caller interrupted.
535 >     * submit(callable).get() throws InterruptedException if interrupted
536       */
537      public void testInterruptedSubmit() throws InterruptedException {
538 <        final ForkJoinPool p = new ForkJoinPool(1);
539 <
540 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
541 <            void realRun() throws Throwable {
542 <                p.submit(new CheckedCallable<Object>() {
543 <                    public Object realCall() throws Throwable {
544 <                        try {
545 <                            Thread.sleep(MEDIUM_DELAY_MS);
546 <                        } catch (InterruptedException ok) {
547 <                        }
548 <                        return null;
549 <                    }}).get();
550 <            }});
551 <
552 <        t.start();
553 <        Thread.sleep(SHORT_DELAY_MS);
554 <        t.interrupt();
555 <        t.join();
556 <        p.shutdownNow();
557 <        joinPool(p);
538 >        final CountDownLatch submitted    = new CountDownLatch(1);
539 >        final CountDownLatch quittingTime = new CountDownLatch(1);
540 >        final ExecutorService p = new ForkJoinPool(1);
541 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
542 >            public Void realCall() throws InterruptedException {
543 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
544 >                return null;
545 >            }};
546 >        try {
547 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
548 >                public void realRun() throws Exception {
549 >                    Future<Void> future = p.submit(awaiter);
550 >                    submitted.countDown();
551 >                    future.get();
552 >                }});
553 >            t.start();
554 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
555 >            t.interrupt();
556 >            t.join();
557 >        } finally {
558 >            quittingTime.countDown();
559 >            joinPool(p);
560 >        }
561      }
562  
563      /**
# Line 666 | Line 574 | public class ForkJoinPoolTest extends JS
574                  }}).get();
575              shouldThrow();
576          } catch (ExecutionException success) {
577 +            assertTrue(success.getCause() instanceof ArithmeticException);
578 +        } finally {
579 +            joinPool(p);
580          }
670        joinPool(p);
581      }
582  
583      /**
# Line 703 | Line 613 | public class ForkJoinPoolTest extends JS
613       */
614      public void testInvokeAny3() throws Throwable {
615          ExecutorService e = new ForkJoinPool(1);
616 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
617 +        l.add(null);
618          try {
707            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
708            l.add(null);
619              e.invokeAny(l);
620              shouldThrow();
621          } catch (NullPointerException success) {
# Line 718 | Line 628 | public class ForkJoinPoolTest extends JS
628       * invokeAny(c) throws NullPointerException if c has null elements
629       */
630      public void testInvokeAny4() throws Throwable {
631 +        CountDownLatch latch = new CountDownLatch(1);
632          ExecutorService e = new ForkJoinPool(1);
633 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
634 +        l.add(latchAwaitingStringTask(latch));
635 +        l.add(null);
636          try {
723            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
724            l.add(new Callable<String>() {
725                public String call() {
726                    // The delay gives the pool a chance to notice
727                    // the null element.
728                    sleepTillInterrupted(SMALL_DELAY_MS);
729                    return "foo";
730                }});
731            l.add(null);
637              e.invokeAny(l);
638              shouldThrow();
639          } catch (NullPointerException success) {
640          } finally {
641 +            latch.countDown();
642              joinPool(e);
643          }
644      }
# Line 742 | Line 648 | public class ForkJoinPoolTest extends JS
648       */
649      public void testInvokeAny5() throws Throwable {
650          ExecutorService e = new ForkJoinPool(1);
651 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
652 +        l.add(new NPETask());
653          try {
746            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
747            l.add(new NPETask());
654              e.invokeAny(l);
655              shouldThrow();
656          } catch (ExecutionException success) {
657 +            assertTrue(success.getCause() instanceof NullPointerException);
658          } finally {
659              joinPool(e);
660          }
# Line 759 | Line 666 | public class ForkJoinPoolTest extends JS
666      public void testInvokeAny6() throws Throwable {
667          ExecutorService e = new ForkJoinPool(1);
668          try {
669 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
669 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
670              l.add(new StringTask());
671              l.add(new StringTask());
672              String result = e.invokeAny(l);
# Line 802 | Line 709 | public class ForkJoinPoolTest extends JS
709       */
710      public void testInvokeAll3() throws InterruptedException {
711          ExecutorService e = new ForkJoinPool(1);
712 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
713 +        l.add(new StringTask());
714 +        l.add(null);
715          try {
806            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
807            l.add(new StringTask());
808            l.add(null);
716              e.invokeAll(l);
717              shouldThrow();
718          } catch (NullPointerException success) {
# Line 820 | Line 727 | public class ForkJoinPoolTest extends JS
727       */
728      public void testInvokeAll4() throws Throwable {
729          ExecutorService e = new ForkJoinPool(1);
730 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
731 +        l.add(new NPETask());
732 +        List<Future<String>> futures = e.invokeAll(l);
733 +        assertEquals(1, futures.size());
734          try {
735 <            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();
735 >            futures.get(0).get();
736              shouldThrow();
737          } catch (ExecutionException success) {
738 +            assertTrue(success.getCause() instanceof NullPointerException);
739          } finally {
740              joinPool(e);
741          }
# Line 840 | Line 747 | public class ForkJoinPoolTest extends JS
747      public void testInvokeAll5() throws Throwable {
748          ExecutorService e = new ForkJoinPool(1);
749          try {
750 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
750 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
751              l.add(new StringTask());
752              l.add(new StringTask());
753 <            List<Future<String>> result = e.invokeAll(l);
754 <            assertEquals(2, result.size());
755 <            for (Future<String> future : result)
753 >            List<Future<String>> futures = e.invokeAll(l);
754 >            assertEquals(2, futures.size());
755 >            for (Future<String> future : futures)
756                  assertSame(TEST_STRING, future.get());
757          } finally {
758              joinPool(e);
759          }
760      }
761  
855
762      /**
763       * timed invokeAny(null) throws NullPointerException
764       */
# Line 872 | Line 778 | public class ForkJoinPoolTest extends JS
778       */
779      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
780          ExecutorService e = new ForkJoinPool(1);
781 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
782 +        l.add(new StringTask());
783          try {
876            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
877            l.add(new StringTask());
784              e.invokeAny(l, MEDIUM_DELAY_MS, null);
785              shouldThrow();
786          } catch (NullPointerException success) {
# Line 902 | Line 808 | public class ForkJoinPoolTest extends JS
808       * timed invokeAny(c) throws NullPointerException if c has null elements
809       */
810      public void testTimedInvokeAny3() throws Throwable {
811 +        CountDownLatch latch = new CountDownLatch(1);
812          ExecutorService e = new ForkJoinPool(1);
813 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
814 +        l.add(latchAwaitingStringTask(latch));
815 +        l.add(null);
816          try {
907            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
908            l.add(new StringTask());
909            l.add(null);
817              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
818              shouldThrow();
819          } catch (NullPointerException success) {
820          } finally {
821 +            latch.countDown();
822              joinPool(e);
823          }
824      }
# Line 920 | Line 828 | public class ForkJoinPoolTest extends JS
828       */
829      public void testTimedInvokeAny4() throws Throwable {
830          ExecutorService e = new ForkJoinPool(1);
831 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
832 +        l.add(new NPETask());
833          try {
924            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
925            l.add(new NPETask());
834              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
835              shouldThrow();
836          } catch (ExecutionException success) {
837 +            assertTrue(success.getCause() instanceof NullPointerException);
838          } finally {
839              joinPool(e);
840          }
# Line 937 | Line 846 | public class ForkJoinPoolTest extends JS
846      public void testTimedInvokeAny5() throws Throwable {
847          ExecutorService e = new ForkJoinPool(1);
848          try {
849 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
849 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
850              l.add(new StringTask());
851              l.add(new StringTask());
852              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 966 | Line 875 | public class ForkJoinPoolTest extends JS
875       */
876      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
877          ExecutorService e = new ForkJoinPool(1);
878 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
879 +        l.add(new StringTask());
880          try {
970            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
971            l.add(new StringTask());
881              e.invokeAll(l, MEDIUM_DELAY_MS, null);
882              shouldThrow();
883          } catch (NullPointerException success) {
# Line 997 | Line 906 | public class ForkJoinPoolTest extends JS
906       */
907      public void testTimedInvokeAll3() throws InterruptedException {
908          ExecutorService e = new ForkJoinPool(1);
909 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
910 +        l.add(new StringTask());
911 +        l.add(null);
912          try {
1001            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1002            l.add(new StringTask());
1003            l.add(null);
913              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
914              shouldThrow();
915          } catch (NullPointerException success) {
# Line 1014 | Line 923 | public class ForkJoinPoolTest extends JS
923       */
924      public void testTimedInvokeAll4() throws Throwable {
925          ExecutorService e = new ForkJoinPool(1);
926 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
927 +        l.add(new NPETask());
928 +        List<Future<String>> futures
929 +            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
930 +        assertEquals(1, futures.size());
931          try {
932 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1019 <            l.add(new NPETask());
1020 <            List<Future<String>> result
1021 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1022 <            assertEquals(1, result.size());
1023 <            for (Future<String> future : result)
1024 <                future.get();
932 >            futures.get(0).get();
933              shouldThrow();
934          } catch (ExecutionException success) {
935 +            assertTrue(success.getCause() instanceof NullPointerException);
936          } finally {
937              joinPool(e);
938          }
# Line 1035 | Line 944 | public class ForkJoinPoolTest extends JS
944      public void testTimedInvokeAll5() throws Throwable {
945          ExecutorService e = new ForkJoinPool(1);
946          try {
947 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
947 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
948              l.add(new StringTask());
949              l.add(new StringTask());
950 <            List<Future<String>> result
950 >            List<Future<String>> futures
951                  = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
952 <            assertEquals(2, result.size());
953 <            for (Future<String> future : result)
952 >            assertEquals(2, futures.size());
953 >            for (Future<String> future : futures)
954                  assertSame(TEST_STRING, future.get());
955          } finally {
956              joinPool(e);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines