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.6 by jsr166, Mon Aug 3 22:08:07 2009 UTC vs.
Revision 1.49 by jsr166, Sat Feb 16 20:50:29 2013 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.atomic.AtomicBoolean;
26 > import java.util.concurrent.locks.ReentrantLock;
27   import static java.util.concurrent.TimeUnit.MILLISECONDS;
28 < import java.util.concurrent.locks.*;
29 < import java.security.*;
28 > import java.security.AccessControlException;
29 > import java.security.Policy;
30 > import java.security.PrivilegedAction;
31 > import java.security.PrivilegedExceptionAction;
32  
33   public class ForkJoinPoolTest extends JSR166TestCase {
34      public static void main(String[] args) {
35 <        junit.textui.TestRunner.run (suite());
35 >        junit.textui.TestRunner.run(suite());
36      }
37 +
38      public static Test suite() {
39          return new TestSuite(ForkJoinPoolTest.class);
40      }
41  
42 <    /**
42 >    /*
43       * Testing coverage notes:
44       *
45       * 1. shutdown and related methods are tested via super.joinPool.
# Line 39 | Line 58 | public class ForkJoinPoolTest extends JS
58      // Some classes to test extension and factory methods
59  
60      static class MyHandler implements Thread.UncaughtExceptionHandler {
61 <        int catches = 0;
61 >        volatile int catches = 0;
62          public void uncaughtException(Thread t, Throwable e) {
63              ++catches;
64          }
# Line 48 | Line 67 | public class ForkJoinPoolTest extends JS
67      // to test handlers
68      static class FailingFJWSubclass extends ForkJoinWorkerThread {
69          public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
70 <        protected void onStart() { throw new Error(); }
70 >        protected void onStart() { super.onStart(); throw new Error(); }
71      }
72  
73      static class FailingThreadFactory
74              implements ForkJoinPool.ForkJoinWorkerThreadFactory {
75 <        int calls = 0;
75 >        volatile int calls = 0;
76          public ForkJoinWorkerThread newThread(ForkJoinPool p) {
77              if (++calls > 1) return null;
78              return new FailingFJWSubclass(p);
# Line 142 | Line 161 | public class ForkJoinPoolTest extends JS
161       * tasks, and quiescent running state.
162       */
163      public void testDefaultInitialState() {
164 <        ForkJoinPool p = null;
164 >        ForkJoinPool p = new ForkJoinPool(1);
165          try {
166 <            p = new ForkJoinPool(1);
167 <            assertTrue(p.getFactory() ==
149 <                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
150 <            assertTrue(p.isQuiescent());
151 <            assertTrue(p.getMaintainsParallelism());
166 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
167 >                       p.getFactory());
168              assertFalse(p.getAsyncMode());
169 <            assertTrue(p.getActiveThreadCount() == 0);
170 <            assertTrue(p.getStealCount() == 0);
171 <            assertTrue(p.getQueuedTaskCount() == 0);
172 <            assertTrue(p.getQueuedSubmissionCount() == 0);
169 >            assertEquals(0, p.getActiveThreadCount());
170 >            assertEquals(0, p.getStealCount());
171 >            assertEquals(0, p.getQueuedTaskCount());
172 >            assertEquals(0, p.getQueuedSubmissionCount());
173              assertFalse(p.hasQueuedSubmissions());
174              assertFalse(p.isShutdown());
175              assertFalse(p.isTerminating());
# Line 170 | Line 186 | public class ForkJoinPoolTest extends JS
186          try {
187              new ForkJoinPool(-1);
188              shouldThrow();
189 <        }
174 <        catch (IllegalArgumentException success) {}
189 >        } catch (IllegalArgumentException success) {}
190      }
191  
192      /**
# Line 179 | Line 194 | public class ForkJoinPoolTest extends JS
194       */
195      public void testConstructor2() {
196          try {
197 <            new ForkJoinPool(1, null);
197 >            new ForkJoinPool(1, null, null, false);
198              shouldThrow();
199 <        } catch (NullPointerException success) {
185 <        }
199 >        } catch (NullPointerException success) {}
200      }
201  
188
202      /**
203       * getParallelism returns size set in constructor
204       */
205      public void testGetParallelism() {
206 <        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;
206 >        ForkJoinPool p = new ForkJoinPool(1);
207          try {
208 <            p = new ForkJoinPool(1);
224 <            assertTrue(p.getParallelism() == 1);
225 <            p.setParallelism(-2);
226 <            shouldThrow();
227 <        } catch (IllegalArgumentException success) {
208 >            assertEquals(1, p.getParallelism());
209          } finally {
210              joinPool(p);
211          }
# Line 234 | 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);
240 <            assertTrue(p.getPoolSize() == 0);
220 >            assertEquals(0, p.getActiveThreadCount());
221              Future<String> future = p.submit(new StringTask());
222 <            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());
222 >            assertEquals(1, p.getPoolSize());
223          } finally {
224              joinPool(p);
225          }
# Line 312 | 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 >            try {
246 >                p.execute(new FibTask(8));
247 >                assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
248 >            } catch (RejectedExecutionException ok) {
249 >            }
250          } finally {
251 +            p.shutdownNow(); // failure might have prevented processing task
252              joinPool(p);
253          }
254      }
255  
256      /**
257 <     * setUncaughtExceptionHandler of null removes handler
257 >     * After invoking a single task, isQuiescent eventually becomes
258 >     * true, at which time queues are empty, threads are not active,
259 >     * the task has completed successfully, and construction
260 >     * parameters continue to hold
261       */
262 <    public void testSetUncaughtExceptionHandler2() {
263 <        ForkJoinPool p = null;
262 >    public void testIsQuiescent() throws Exception {
263 >        ForkJoinPool p = new ForkJoinPool(2);
264          try {
265 <            p = new ForkJoinPool(1);
266 <            p.setUncaughtExceptionHandler(null);
267 <            assertNull(p.getUncaughtExceptionHandler());
268 <        } finally {
269 <            joinPool(p);
270 <        }
271 <    }
272 <
265 >            assertTrue(p.isQuiescent());
266 >            long startTime = System.nanoTime();
267 >            FibTask f = new FibTask(20);
268 >            p.invoke(f);
269 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
270 >                       p.getFactory());
271 >            while (! p.isQuiescent()) {
272 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
273 >                    throw new AssertionFailedError("timed out");
274 >                assertFalse(p.getAsyncMode());
275 >                assertFalse(p.isShutdown());
276 >                assertFalse(p.isTerminating());
277 >                assertFalse(p.isTerminated());
278 >                Thread.yield();
279 >            }
280  
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);
281              assertTrue(p.isQuiescent());
358            assertTrue(p.getMaintainsParallelism());
282              assertFalse(p.getAsyncMode());
283 <            assertTrue(p.getActiveThreadCount() == 0);
284 <            assertTrue(p.getQueuedTaskCount() == 0);
285 <            assertTrue(p.getQueuedSubmissionCount() == 0);
283 >            assertEquals(0, p.getActiveThreadCount());
284 >            assertEquals(0, p.getQueuedTaskCount());
285 >            assertEquals(0, p.getQueuedSubmissionCount());
286              assertFalse(p.hasQueuedSubmissions());
287              assertFalse(p.isShutdown());
288              assertFalse(p.isTerminating());
289              assertFalse(p.isTerminated());
290 +            assertTrue(f.isDone());
291 +            assertEquals(6765, (int) f.get());
292          } finally {
293              joinPool(p);
294          }
# Line 373 | Line 298 | public class ForkJoinPoolTest extends JS
298       * Completed submit(ForkJoinTask) returns result
299       */
300      public void testSubmitForkJoinTask() throws Throwable {
301 <        ForkJoinPool p = null;
301 >        ForkJoinPool p = new ForkJoinPool(1);
302          try {
378            p = new ForkJoinPool(1);
303              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
304 <            int r = f.get();
381 <            assertTrue(r == 21);
304 >            assertEquals(21, (int) f.get());
305          } finally {
306              joinPool(p);
307          }
# Line 388 | Line 311 | public class ForkJoinPoolTest extends JS
311       * A task submitted after shutdown is rejected
312       */
313      public void testSubmitAfterShutdown() {
314 <        ForkJoinPool p = null;
314 >        ForkJoinPool p = new ForkJoinPool(1);
315          try {
393            p = new ForkJoinPool(1);
316              p.shutdown();
317              assertTrue(p.isShutdown());
318 <            ForkJoinTask<Integer> f = p.submit(new FibTask(8));
319 <            shouldThrow();
320 <        } catch (RejectedExecutionException success) {
318 >            try {
319 >                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
320 >                shouldThrow();
321 >            } catch (RejectedExecutionException success) {}
322          } finally {
323              joinPool(p);
324          }
# Line 405 | Line 328 | public class ForkJoinPoolTest extends JS
328       * Pool maintains parallelism when using ManagedBlocker
329       */
330      public void testBlockingForkJoinTask() throws Throwable {
331 <        ForkJoinPool p = null;
331 >        ForkJoinPool p = new ForkJoinPool(4);
332          try {
410            p = new ForkJoinPool(4);
333              ReentrantLock lock = new ReentrantLock();
334              ManagedLocker locker = new ManagedLocker(lock);
335 <            ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
335 >            ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
336              p.execute(f);
337 <            assertTrue(p.getPoolSize() >= 4);
416 <            int r = f.get();
417 <            assertTrue(r ==  832040);
337 >            assertEquals(6765, (int) f.get());
338          } finally {
339 <            joinPool(p);
339 >            p.shutdownNow(); // don't wait out shutdown
340          }
341      }
342  
# Line 424 | Line 344 | public class ForkJoinPoolTest extends JS
344       * pollSubmission returns unexecuted submitted task, if present
345       */
346      public void testPollSubmission() {
347 <        SubFJP p = null;
347 >        final CountDownLatch done = new CountDownLatch(1);
348 >        SubFJP p = new SubFJP();
349          try {
350 <            p = new SubFJP();
351 <            ForkJoinTask a = p.submit(new MediumRunnable());
352 <            ForkJoinTask b = p.submit(new MediumRunnable());
432 <            ForkJoinTask c = p.submit(new MediumRunnable());
350 >            ForkJoinTask a = p.submit(awaiter(done));
351 >            ForkJoinTask b = p.submit(awaiter(done));
352 >            ForkJoinTask c = p.submit(awaiter(done));
353              ForkJoinTask r = p.pollSubmission();
354              assertTrue(r == a || r == b || r == c);
355              assertFalse(r.isDone());
356          } finally {
357 +            done.countDown();
358              joinPool(p);
359          }
360      }
# Line 442 | Line 363 | public class ForkJoinPoolTest extends JS
363       * drainTasksTo transfers unexecuted submitted tasks, if present
364       */
365      public void testDrainTasksTo() {
366 <        SubFJP p = null;
366 >        final CountDownLatch done = new CountDownLatch(1);
367 >        SubFJP p = new SubFJP();
368          try {
369 <            p = new SubFJP();
370 <            ForkJoinTask a = p.submit(new MediumRunnable());
371 <            ForkJoinTask b = p.submit(new MediumRunnable());
450 <            ForkJoinTask c = p.submit(new MediumRunnable());
369 >            ForkJoinTask a = p.submit(awaiter(done));
370 >            ForkJoinTask b = p.submit(awaiter(done));
371 >            ForkJoinTask c = p.submit(awaiter(done));
372              ArrayList<ForkJoinTask> al = new ArrayList();
373              p.drainTasksTo(al);
374              assertTrue(al.size() > 0);
# Line 456 | Line 377 | public class ForkJoinPoolTest extends JS
377                  assertFalse(r.isDone());
378              }
379          } finally {
380 +            done.countDown();
381              joinPool(p);
382          }
383      }
384  
463
385      // FJ Versions of AbstractExecutorService tests
386  
387      /**
# Line 468 | Line 389 | public class ForkJoinPoolTest extends JS
389       */
390      public void testExecuteRunnable() throws Throwable {
391          ExecutorService e = new ForkJoinPool(1);
392 <        TrackedShortRunnable task = new TrackedShortRunnable();
393 <        assertFalse(task.done);
394 <        Future<?> future = e.submit(task);
395 <        future.get();
396 <        assertTrue(task.done);
392 >        try {
393 >            final AtomicBoolean done = new AtomicBoolean(false);
394 >            CheckedRunnable task = new CheckedRunnable() {
395 >                public void realRun() {
396 >                    done.set(true);
397 >                }};
398 >            Future<?> future = e.submit(task);
399 >            assertNull(future.get());
400 >            assertNull(future.get(0, MILLISECONDS));
401 >            assertTrue(done.get());
402 >            assertTrue(future.isDone());
403 >            assertFalse(future.isCancelled());
404 >        } finally {
405 >            joinPool(e);
406 >        }
407      }
408  
478
409      /**
410       * Completed submit(callable) returns result
411       */
412      public void testSubmitCallable() throws Throwable {
413          ExecutorService e = new ForkJoinPool(1);
414 <        Future<String> future = e.submit(new StringTask());
415 <        String result = future.get();
416 <        assertSame(TEST_STRING, result);
414 >        try {
415 >            Future<String> future = e.submit(new StringTask());
416 >            assertSame(TEST_STRING, future.get());
417 >            assertTrue(future.isDone());
418 >            assertFalse(future.isCancelled());
419 >        } finally {
420 >            joinPool(e);
421 >        }
422      }
423  
424      /**
# Line 491 | Line 426 | public class ForkJoinPoolTest extends JS
426       */
427      public void testSubmitRunnable() throws Throwable {
428          ExecutorService e = new ForkJoinPool(1);
429 <        Future<?> future = e.submit(new NoOpRunnable());
430 <        future.get();
431 <        assertTrue(future.isDone());
429 >        try {
430 >            Future<?> future = e.submit(new NoOpRunnable());
431 >            assertNull(future.get());
432 >            assertTrue(future.isDone());
433 >            assertFalse(future.isCancelled());
434 >        } finally {
435 >            joinPool(e);
436 >        }
437      }
438  
439      /**
# Line 501 | Line 441 | public class ForkJoinPoolTest extends JS
441       */
442      public void testSubmitRunnable2() throws Throwable {
443          ExecutorService e = new ForkJoinPool(1);
444 <        Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
445 <        String result = future.get();
446 <        assertSame(TEST_STRING, result);
444 >        try {
445 >            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
446 >            assertSame(TEST_STRING, future.get());
447 >            assertTrue(future.isDone());
448 >            assertFalse(future.isCancelled());
449 >        } finally {
450 >            joinPool(e);
451 >        }
452      }
453  
509
454      /**
455 <     * A submitted privileged action to completion
455 >     * A submitted privileged action runs to completion
456       */
457 <    public void testSubmitPrivilegedAction() throws Throwable {
458 <        Policy savedPolicy = null;
459 <        try {
460 <            savedPolicy = Policy.getPolicy();
461 <            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 {
457 >    public void testSubmitPrivilegedAction() throws Exception {
458 >        final Callable callable = Executors.callable(new PrivilegedAction() {
459 >                public Object run() { return TEST_STRING; }});
460 >        Runnable r = new CheckedRunnable() {
461 >        public void realRun() throws Exception {
462              ExecutorService e = new ForkJoinPool(1);
463 <            Future future = e.submit(Executors.callable(new PrivilegedAction() {
464 <                    public Object run() {
465 <                        return TEST_STRING;
466 <                    }}));
463 >            try {
464 >                Future future = e.submit(callable);
465 >                assertSame(TEST_STRING, future.get());
466 >            } finally {
467 >                joinPool(e);
468 >            }
469 >        }};
470  
471 <            Object result = future.get();
532 <            assertSame(TEST_STRING, result);
533 <        }
534 <        finally {
535 <            Policy.setPolicy(savedPolicy);
536 <        }
471 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
472      }
473  
474      /**
475 <     * A submitted a privileged exception action runs to completion
475 >     * A submitted privileged exception action runs to completion
476       */
477 <    public void testSubmitPrivilegedExceptionAction() throws Throwable {
478 <        Policy savedPolicy = null;
479 <        try {
480 <            savedPolicy = Policy.getPolicy();
481 <            AdjustablePolicy policy = new AdjustablePolicy();
482 <            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 {
477 >    public void testSubmitPrivilegedExceptionAction() throws Exception {
478 >        final Callable callable =
479 >            Executors.callable(new PrivilegedExceptionAction() {
480 >                public Object run() { return TEST_STRING; }});
481 >        Runnable r = new CheckedRunnable() {
482 >        public void realRun() throws Exception {
483              ExecutorService e = new ForkJoinPool(1);
484 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
485 <                    public Object run() {
486 <                        return TEST_STRING;
487 <                    }}));
484 >            try {
485 >                Future future = e.submit(callable);
486 >                assertSame(TEST_STRING, future.get());
487 >            } finally {
488 >                joinPool(e);
489 >            }
490 >        }};
491  
492 <            Object result = future.get();
562 <            assertSame(TEST_STRING, result);
563 <        }
564 <        finally {
565 <            Policy.setPolicy(savedPolicy);
566 <        }
492 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
493      }
494  
495      /**
496       * A submitted failed privileged exception action reports exception
497       */
498 <    public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
499 <        Policy savedPolicy = null;
500 <        try {
501 <            savedPolicy = Policy.getPolicy();
502 <            AdjustablePolicy policy = new AdjustablePolicy();
503 <            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 {
498 >    public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
499 >        final Callable callable =
500 >            Executors.callable(new PrivilegedExceptionAction() {
501 >                public Object run() { throw new IndexOutOfBoundsException(); }});
502 >        Runnable r = new CheckedRunnable() {
503 >        public void realRun() throws Exception {
504              ExecutorService e = new ForkJoinPool(1);
505 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
506 <                    public Object run() throws Exception {
507 <                        throw new IndexOutOfBoundsException();
508 <                    }}));
505 >            try {
506 >                Future future = e.submit(callable);
507 >                try {
508 >                    future.get();
509 >                    shouldThrow();
510 >                } catch (ExecutionException success) {
511 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
512 >                }
513 >            } finally {
514 >                joinPool(e);
515 >            }
516 >        }};
517  
518 <            Object result = future.get();
593 <            shouldThrow();
594 <        } catch (ExecutionException success) {
595 <        } finally {
596 <            Policy.setPolicy(savedPolicy);
597 <        }
518 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
519      }
520  
521      /**
522       * execute(null runnable) throws NullPointerException
523       */
524      public void testExecuteNullRunnable() {
525 +        ExecutorService e = new ForkJoinPool(1);
526          try {
527 <            ExecutorService e = new ForkJoinPool(1);
606 <            TrackedShortRunnable task = null;
607 <            Future<?> future = e.submit(task);
527 >            Future<?> future = e.submit((Runnable) null);
528              shouldThrow();
529          } catch (NullPointerException success) {
530 +        } finally {
531 +            joinPool(e);
532          }
533      }
534  
613
535      /**
536       * submit(null callable) throws NullPointerException
537       */
538      public void testSubmitNullCallable() {
539 +        ExecutorService e = new ForkJoinPool(1);
540          try {
541 <            ExecutorService e = new ForkJoinPool(1);
620 <            StringTask t = null;
621 <            Future<String> future = e.submit(t);
541 >            Future<String> future = e.submit((Callable) null);
542              shouldThrow();
543          } catch (NullPointerException success) {
544 +        } finally {
545 +            joinPool(e);
546          }
547      }
548  
627
549      /**
550 <     * Blocking on submit(callable) throws InterruptedException if
630 <     * caller interrupted.
550 >     * submit(callable).get() throws InterruptedException if interrupted
551       */
552      public void testInterruptedSubmit() throws InterruptedException {
553 <        final ForkJoinPool p = new ForkJoinPool(1);
554 <
555 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
556 <            void realRun() throws Throwable {
557 <                p.submit(new CheckedCallable<Object>() {
558 <                    public Object realCall() throws Throwable {
559 <                        Thread.sleep(MEDIUM_DELAY_MS);
560 <                        return null;
561 <                    }}).get();
562 <            }});
563 <
564 <        t.start();
565 <        Thread.sleep(SHORT_DELAY_MS);
566 <        t.interrupt();
567 <        joinPool(p);
553 >        final CountDownLatch submitted    = new CountDownLatch(1);
554 >        final CountDownLatch quittingTime = new CountDownLatch(1);
555 >        final ExecutorService p = new ForkJoinPool(1);
556 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
557 >            public Void realCall() throws InterruptedException {
558 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
559 >                return null;
560 >            }};
561 >        try {
562 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
563 >                public void realRun() throws Exception {
564 >                    Future<Void> future = p.submit(awaiter);
565 >                    submitted.countDown();
566 >                    future.get();
567 >                }});
568 >            t.start();
569 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
570 >            t.interrupt();
571 >            t.join();
572 >        } finally {
573 >            quittingTime.countDown();
574 >            joinPool(p);
575 >        }
576      }
577  
578      /**
# Line 653 | Line 581 | public class ForkJoinPoolTest extends JS
581       */
582      public void testSubmitEE() throws Throwable {
583          ForkJoinPool p = new ForkJoinPool(1);
656
584          try {
585 <            Callable c = new Callable() {
586 <                    public Object call() {
587 <                        int i = 5/0;
661 <                        return Boolean.TRUE;
662 <                    }
663 <                };
664 <
665 <            for (int i = 0; i < 5; i++) {
666 <                p.submit(c).get();
667 <            }
585 >            p.submit(new Callable() {
586 >                public Object call() { throw new ArithmeticException(); }})
587 >                .get();
588              shouldThrow();
589          } catch (ExecutionException success) {
590 +            assertTrue(success.getCause() instanceof ArithmeticException);
591 +        } finally {
592 +            joinPool(p);
593          }
671        joinPool(p);
594      }
595  
596      /**
# Line 700 | Line 622 | public class ForkJoinPoolTest extends JS
622      }
623  
624      /**
625 <     * invokeAny(c) throws NullPointerException if c has null elements
625 >     * invokeAny(c) throws NullPointerException if c has a single null element
626       */
627      public void testInvokeAny3() throws Throwable {
628          ExecutorService e = new ForkJoinPool(1);
629 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
630 +        l.add(null);
631          try {
708            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
709            l.add(new StringTask());
710            l.add(null);
632              e.invokeAny(l);
633              shouldThrow();
634          } catch (NullPointerException success) {
# Line 717 | Line 638 | public class ForkJoinPoolTest extends JS
638      }
639  
640      /**
641 <     * invokeAny(c) throws ExecutionException if no task in c completes
641 >     * invokeAny(c) throws NullPointerException if c has null elements
642       */
643      public void testInvokeAny4() throws Throwable {
644 +        CountDownLatch latch = new CountDownLatch(1);
645          ExecutorService e = new ForkJoinPool(1);
646 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
647 +        l.add(latchAwaitingStringTask(latch));
648 +        l.add(null);
649 +        try {
650 +            e.invokeAny(l);
651 +            shouldThrow();
652 +        } catch (NullPointerException success) {
653 +        } finally {
654 +            latch.countDown();
655 +            joinPool(e);
656 +        }
657 +    }
658 +
659 +    /**
660 +     * invokeAny(c) throws ExecutionException if no task in c completes
661 +     */
662 +    public void testInvokeAny5() throws Throwable {
663 +        ExecutorService e = new ForkJoinPool(1);
664 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
665 +        l.add(new NPETask());
666          try {
725            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
726            l.add(new NPETask());
667              e.invokeAny(l);
668              shouldThrow();
669          } catch (ExecutionException success) {
670 +            assertTrue(success.getCause() instanceof NullPointerException);
671          } finally {
672              joinPool(e);
673          }
# Line 735 | Line 676 | public class ForkJoinPoolTest extends JS
676      /**
677       * invokeAny(c) returns result of some task in c if at least one completes
678       */
679 <    public void testInvokeAny5() throws Throwable {
679 >    public void testInvokeAny6() throws Throwable {
680          ExecutorService e = new ForkJoinPool(1);
681          try {
682 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
682 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
683              l.add(new StringTask());
684              l.add(new StringTask());
685              String result = e.invokeAny(l);
# Line 781 | Line 722 | public class ForkJoinPoolTest extends JS
722       */
723      public void testInvokeAll3() throws InterruptedException {
724          ExecutorService e = new ForkJoinPool(1);
725 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
726 +        l.add(new StringTask());
727 +        l.add(null);
728          try {
785            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
786            l.add(new StringTask());
787            l.add(null);
729              e.invokeAll(l);
730              shouldThrow();
731          } catch (NullPointerException success) {
# Line 799 | Line 740 | public class ForkJoinPoolTest extends JS
740       */
741      public void testInvokeAll4() throws Throwable {
742          ExecutorService e = new ForkJoinPool(1);
743 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
744 +        l.add(new NPETask());
745 +        List<Future<String>> futures = e.invokeAll(l);
746 +        assertEquals(1, futures.size());
747          try {
748 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
804 <            l.add(new NPETask());
805 <            List<Future<String>> result = e.invokeAll(l);
806 <            assertEquals(1, result.size());
807 <            for (Future<String> future : result)
808 <                future.get();
748 >            futures.get(0).get();
749              shouldThrow();
750          } catch (ExecutionException success) {
751 +            assertTrue(success.getCause() instanceof NullPointerException);
752          } finally {
753              joinPool(e);
754          }
# Line 819 | Line 760 | public class ForkJoinPoolTest extends JS
760      public void testInvokeAll5() throws Throwable {
761          ExecutorService e = new ForkJoinPool(1);
762          try {
763 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
763 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
764              l.add(new StringTask());
765              l.add(new StringTask());
766 <            List<Future<String>> result = e.invokeAll(l);
767 <            assertEquals(2, result.size());
768 <            for (Future<String> future : result)
766 >            List<Future<String>> futures = e.invokeAll(l);
767 >            assertEquals(2, futures.size());
768 >            for (Future<String> future : futures)
769                  assertSame(TEST_STRING, future.get());
770          } finally {
771              joinPool(e);
772          }
773      }
774  
834
775      /**
776       * timed invokeAny(null) throws NullPointerException
777       */
# Line 851 | Line 791 | public class ForkJoinPoolTest extends JS
791       */
792      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
793          ExecutorService e = new ForkJoinPool(1);
794 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
795 +        l.add(new StringTask());
796          try {
855            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
856            l.add(new StringTask());
797              e.invokeAny(l, MEDIUM_DELAY_MS, null);
798              shouldThrow();
799          } catch (NullPointerException success) {
# Line 881 | Line 821 | public class ForkJoinPoolTest extends JS
821       * timed invokeAny(c) throws NullPointerException if c has null elements
822       */
823      public void testTimedInvokeAny3() throws Throwable {
824 +        CountDownLatch latch = new CountDownLatch(1);
825          ExecutorService e = new ForkJoinPool(1);
826 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
827 +        l.add(latchAwaitingStringTask(latch));
828 +        l.add(null);
829          try {
886            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
887            l.add(new StringTask());
888            l.add(null);
830              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
831              shouldThrow();
832          } catch (NullPointerException success) {
833          } finally {
834 +            latch.countDown();
835              joinPool(e);
836          }
837      }
# Line 899 | Line 841 | public class ForkJoinPoolTest extends JS
841       */
842      public void testTimedInvokeAny4() throws Throwable {
843          ExecutorService e = new ForkJoinPool(1);
844 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
845 +        l.add(new NPETask());
846          try {
903            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
904            l.add(new NPETask());
847              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
848              shouldThrow();
849          } catch (ExecutionException success) {
850 +            assertTrue(success.getCause() instanceof NullPointerException);
851          } finally {
852              joinPool(e);
853          }
# Line 916 | Line 859 | public class ForkJoinPoolTest extends JS
859      public void testTimedInvokeAny5() throws Throwable {
860          ExecutorService e = new ForkJoinPool(1);
861          try {
862 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
862 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
863              l.add(new StringTask());
864              l.add(new StringTask());
865              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 945 | Line 888 | public class ForkJoinPoolTest extends JS
888       */
889      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
890          ExecutorService e = new ForkJoinPool(1);
891 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
892 +        l.add(new StringTask());
893          try {
949            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
950            l.add(new StringTask());
894              e.invokeAll(l, MEDIUM_DELAY_MS, null);
895              shouldThrow();
896          } catch (NullPointerException success) {
# Line 976 | Line 919 | public class ForkJoinPoolTest extends JS
919       */
920      public void testTimedInvokeAll3() throws InterruptedException {
921          ExecutorService e = new ForkJoinPool(1);
922 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
923 +        l.add(new StringTask());
924 +        l.add(null);
925          try {
980            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
981            l.add(new StringTask());
982            l.add(null);
926              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
927              shouldThrow();
928          } catch (NullPointerException success) {
# Line 993 | Line 936 | public class ForkJoinPoolTest extends JS
936       */
937      public void testTimedInvokeAll4() throws Throwable {
938          ExecutorService e = new ForkJoinPool(1);
939 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
940 +        l.add(new NPETask());
941 +        List<Future<String>> futures
942 +            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
943 +        assertEquals(1, futures.size());
944          try {
945 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
998 <            l.add(new NPETask());
999 <            List<Future<String>> result
1000 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1001 <            assertEquals(1, result.size());
1002 <            for (Future<String> future : result)
1003 <                future.get();
945 >            futures.get(0).get();
946              shouldThrow();
947          } catch (ExecutionException success) {
948 +            assertTrue(success.getCause() instanceof NullPointerException);
949          } finally {
950              joinPool(e);
951          }
# Line 1014 | Line 957 | public class ForkJoinPoolTest extends JS
957      public void testTimedInvokeAll5() throws Throwable {
958          ExecutorService e = new ForkJoinPool(1);
959          try {
960 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
960 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
961              l.add(new StringTask());
962              l.add(new StringTask());
963 <            List<Future<String>> result
963 >            List<Future<String>> futures
964                  = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
965 <            assertEquals(2, result.size());
966 <            for (Future<String> future : result)
965 >            assertEquals(2, futures.size());
966 >            for (Future<String> future : futures)
967                  assertSame(TEST_STRING, future.get());
968          } finally {
969              joinPool(e);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines