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.10 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.52 by jsr166, Wed Sep 25 07:39:17 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 static java.util.concurrent.TimeUnit.NANOSECONDS;
29 > import java.security.AccessControlException;
30 > import java.security.Policy;
31 > import java.security.PrivilegedAction;
32 > import java.security.PrivilegedExceptionAction;
33  
34   public class ForkJoinPoolTest extends JSR166TestCase {
35      public static void main(String[] args) {
36 <        junit.textui.TestRunner.run (suite());
36 >        junit.textui.TestRunner.run(suite());
37      }
38 +
39      public static Test suite() {
40          return new TestSuite(ForkJoinPoolTest.class);
41      }
42  
43 <    /**
43 >    /*
44       * Testing coverage notes:
45       *
46       * 1. shutdown and related methods are tested via super.joinPool.
# Line 39 | Line 59 | public class ForkJoinPoolTest extends JS
59      // Some classes to test extension and factory methods
60  
61      static class MyHandler implements Thread.UncaughtExceptionHandler {
62 <        int catches = 0;
62 >        volatile int catches = 0;
63          public void uncaughtException(Thread t, Throwable e) {
64              ++catches;
65          }
# Line 48 | Line 68 | public class ForkJoinPoolTest extends JS
68      // to test handlers
69      static class FailingFJWSubclass extends ForkJoinWorkerThread {
70          public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
71 <        protected void onStart() { throw new Error(); }
71 >        protected void onStart() { super.onStart(); throw new Error(); }
72      }
73  
74      static class FailingThreadFactory
75              implements ForkJoinPool.ForkJoinWorkerThreadFactory {
76 <        int calls = 0;
76 >        volatile int calls = 0;
77          public ForkJoinWorkerThread newThread(ForkJoinPool p) {
78              if (++calls > 1) return null;
79              return new FailingFJWSubclass(p);
# Line 88 | Line 108 | public class ForkJoinPoolTest extends JS
108      static final class FibTask extends RecursiveTask<Integer> {
109          final int number;
110          FibTask(int n) { number = n; }
111 <        public Integer compute() {
111 >        protected Integer compute() {
112              int n = number;
113              if (n <= 1)
114                  return n;
# Line 116 | Line 136 | public class ForkJoinPoolTest extends JS
136              this.locker = locker;
137              this.lock = lock;
138          }
139 <        public Integer compute() {
139 >        protected Integer compute() {
140              int n;
141              LockingFibTask f1 = null;
142              LockingFibTask f2 = null;
# Line 142 | Line 162 | public class ForkJoinPoolTest extends JS
162       * tasks, and quiescent running state.
163       */
164      public void testDefaultInitialState() {
165 <        ForkJoinPool p = null;
165 >        ForkJoinPool p = new ForkJoinPool(1);
166          try {
167 <            p = new ForkJoinPool(1);
168 <            assertTrue(p.getFactory() ==
149 <                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
150 <            assertTrue(p.isQuiescent());
151 <            assertTrue(p.getMaintainsParallelism());
167 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
168 >                       p.getFactory());
169              assertFalse(p.getAsyncMode());
170 <            assertTrue(p.getActiveThreadCount() == 0);
171 <            assertTrue(p.getStealCount() == 0);
172 <            assertTrue(p.getQueuedTaskCount() == 0);
173 <            assertTrue(p.getQueuedSubmissionCount() == 0);
170 >            assertEquals(0, p.getActiveThreadCount());
171 >            assertEquals(0, p.getStealCount());
172 >            assertEquals(0, p.getQueuedTaskCount());
173 >            assertEquals(0, p.getQueuedSubmissionCount());
174              assertFalse(p.hasQueuedSubmissions());
175              assertFalse(p.isShutdown());
176              assertFalse(p.isTerminating());
# Line 178 | Line 195 | public class ForkJoinPoolTest extends JS
195       */
196      public void testConstructor2() {
197          try {
198 <            new ForkJoinPool(1, null);
198 >            new ForkJoinPool(1, null, null, false);
199              shouldThrow();
200          } catch (NullPointerException success) {}
201      }
202  
186
203      /**
204       * getParallelism returns size set in constructor
205       */
206      public void testGetParallelism() {
207 <        ForkJoinPool p = null;
192 <        try {
193 <            p = new ForkJoinPool(1);
194 <            assertTrue(p.getParallelism() == 1);
195 <        } finally {
196 <            joinPool(p);
197 <        }
198 <    }
199 <
200 <    /**
201 <     * setParallelism changes reported parallelism level.
202 <     */
203 <    public void testSetParallelism() {
204 <        ForkJoinPool p = null;
205 <        try {
206 <            p = new ForkJoinPool(1);
207 <            assertTrue(p.getParallelism() == 1);
208 <            p.setParallelism(2);
209 <            assertTrue(p.getParallelism() == 2);
210 <        } finally {
211 <            joinPool(p);
212 <        }
213 <    }
214 <
215 <    /**
216 <     * setParallelism with argument <= 0 throws exception
217 <     */
218 <    public void testSetParallelism2() {
219 <        ForkJoinPool p = null;
207 >        ForkJoinPool p = new ForkJoinPool(1);
208          try {
209 <            p = new ForkJoinPool(1);
222 <            assertTrue(p.getParallelism() == 1);
223 <            p.setParallelism(-2);
224 <            shouldThrow();
225 <        } catch (IllegalArgumentException success) {
209 >            assertEquals(1, p.getParallelism());
210          } finally {
211              joinPool(p);
212          }
# Line 232 | Line 216 | public class ForkJoinPoolTest extends JS
216       * getPoolSize returns number of started workers.
217       */
218      public void testGetPoolSize() {
219 <        ForkJoinPool p = null;
219 >        ForkJoinPool p = new ForkJoinPool(1);
220          try {
221 <            p = new ForkJoinPool(1);
238 <            assertTrue(p.getPoolSize() == 0);
221 >            assertEquals(0, p.getActiveThreadCount());
222              Future<String> future = p.submit(new StringTask());
223 <            assertTrue(p.getPoolSize() == 1);
241 <
223 >            assertEquals(1, p.getPoolSize());
224          } finally {
225              joinPool(p);
226          }
227      }
228  
229      /**
230 <     * setMaximumPoolSize changes size reported by getMaximumPoolSize.
230 >     * awaitTermination on a non-shutdown pool times out
231       */
232 <    public void testSetMaximumPoolSize() {
233 <        ForkJoinPool p = null;
234 <        try {
235 <            p = new ForkJoinPool(1);
236 <            p.setMaximumPoolSize(2);
237 <            assertTrue(p.getMaximumPoolSize() == 2);
238 <        } finally {
239 <            joinPool(p);
240 <        }
241 <    }
242 <
243 <    /**
244 <     * setMaximumPoolSize with argument <= 0 throws exception
245 <     */
246 <    public void testSetMaximumPoolSize2() {
247 <        ForkJoinPool p = null;
248 <        try {
249 <            p = new ForkJoinPool(1);
250 <            p.setMaximumPoolSize(-2);
251 <            shouldThrow();
252 <        } catch (IllegalArgumentException success) {
253 <        } 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());
301 <        } finally {
302 <            joinPool(p);
303 <        }
232 >    public void testAwaitTermination_timesOut() throws InterruptedException {
233 >        ForkJoinPool p = new ForkJoinPool(1);
234 >        assertFalse(p.isTerminated());
235 >        assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
236 >        assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
237 >        assertFalse(p.awaitTermination(-1L, NANOSECONDS));
238 >        assertFalse(p.awaitTermination(-1L, MILLISECONDS));
239 >        assertFalse(p.awaitTermination(0L, NANOSECONDS));
240 >        assertFalse(p.awaitTermination(0L, MILLISECONDS));
241 >        long timeoutNanos = 999999L;
242 >        long startTime = System.nanoTime();
243 >        assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
244 >        assertTrue(System.nanoTime() - startTime >= timeoutNanos);
245 >        assertFalse(p.isTerminated());
246 >        startTime = System.nanoTime();
247 >        long timeoutMillis = timeoutMillis();
248 >        assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
249 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
250 >        assertFalse(p.isTerminated());
251 >        p.shutdown();
252 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
253 >        assertTrue(p.isTerminated());
254      }
255  
256      /**
# Line 310 | Line 260 | public class ForkJoinPoolTest extends JS
260       * performs its defined action
261       */
262      public void testSetUncaughtExceptionHandler() throws InterruptedException {
263 <        ForkJoinPool p = null;
264 <        try {
265 <            p = new ForkJoinPool(1, new FailingThreadFactory());
266 <            MyHandler eh = new MyHandler();
267 <            p.setUncaughtExceptionHandler(eh);
268 <            assertEquals(eh, p.getUncaughtExceptionHandler());
269 <            p.execute(new FailingTask());
270 <            Thread.sleep(MEDIUM_DELAY_MS);
271 <            assertTrue(eh.catches > 0);
263 >        final CountDownLatch uehInvoked = new CountDownLatch(1);
264 >        final Thread.UncaughtExceptionHandler eh =
265 >            new Thread.UncaughtExceptionHandler() {
266 >                public void uncaughtException(Thread t, Throwable e) {
267 >                    uehInvoked.countDown();
268 >                }};
269 >        ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
270 >                                          eh, false);
271 >        try {
272 >            assertSame(eh, p.getUncaughtExceptionHandler());
273 >            try {
274 >                p.execute(new FibTask(8));
275 >                assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
276 >            } catch (RejectedExecutionException ok) {
277 >            }
278          } finally {
279 +            p.shutdownNow(); // failure might have prevented processing task
280              joinPool(p);
281          }
282      }
283  
284      /**
285 <     * setUncaughtExceptionHandler of null removes handler
285 >     * After invoking a single task, isQuiescent eventually becomes
286 >     * true, at which time queues are empty, threads are not active,
287 >     * the task has completed successfully, and construction
288 >     * parameters continue to hold
289       */
290 <    public void testSetUncaughtExceptionHandler2() {
291 <        ForkJoinPool p = null;
290 >    public void testIsQuiescent() throws Exception {
291 >        ForkJoinPool p = new ForkJoinPool(2);
292          try {
293 <            p = new ForkJoinPool(1);
294 <            p.setUncaughtExceptionHandler(null);
295 <            assertNull(p.getUncaughtExceptionHandler());
296 <        } finally {
297 <            joinPool(p);
298 <        }
299 <    }
300 <
293 >            assertTrue(p.isQuiescent());
294 >            long startTime = System.nanoTime();
295 >            FibTask f = new FibTask(20);
296 >            p.invoke(f);
297 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
298 >                       p.getFactory());
299 >            while (! p.isQuiescent()) {
300 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
301 >                    throw new AssertionFailedError("timed out");
302 >                assertFalse(p.getAsyncMode());
303 >                assertFalse(p.isShutdown());
304 >                assertFalse(p.isTerminating());
305 >                assertFalse(p.isTerminated());
306 >                Thread.yield();
307 >            }
308  
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);
309              assertTrue(p.isQuiescent());
356            assertTrue(p.getMaintainsParallelism());
310              assertFalse(p.getAsyncMode());
311 <            assertTrue(p.getActiveThreadCount() == 0);
312 <            assertTrue(p.getQueuedTaskCount() == 0);
313 <            assertTrue(p.getQueuedSubmissionCount() == 0);
311 >            assertEquals(0, p.getActiveThreadCount());
312 >            assertEquals(0, p.getQueuedTaskCount());
313 >            assertEquals(0, p.getQueuedSubmissionCount());
314              assertFalse(p.hasQueuedSubmissions());
315              assertFalse(p.isShutdown());
316              assertFalse(p.isTerminating());
317              assertFalse(p.isTerminated());
318 +            assertTrue(f.isDone());
319 +            assertEquals(6765, (int) f.get());
320          } finally {
321              joinPool(p);
322          }
# Line 371 | Line 326 | public class ForkJoinPoolTest extends JS
326       * Completed submit(ForkJoinTask) returns result
327       */
328      public void testSubmitForkJoinTask() throws Throwable {
329 <        ForkJoinPool p = null;
329 >        ForkJoinPool p = new ForkJoinPool(1);
330          try {
376            p = new ForkJoinPool(1);
331              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
332 <            int r = f.get();
379 <            assertTrue(r == 21);
332 >            assertEquals(21, (int) f.get());
333          } finally {
334              joinPool(p);
335          }
# Line 386 | Line 339 | public class ForkJoinPoolTest extends JS
339       * A task submitted after shutdown is rejected
340       */
341      public void testSubmitAfterShutdown() {
342 <        ForkJoinPool p = null;
342 >        ForkJoinPool p = new ForkJoinPool(1);
343          try {
391            p = new ForkJoinPool(1);
344              p.shutdown();
345              assertTrue(p.isShutdown());
346 <            ForkJoinTask<Integer> f = p.submit(new FibTask(8));
347 <            shouldThrow();
348 <        } catch (RejectedExecutionException success) {
346 >            try {
347 >                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
348 >                shouldThrow();
349 >            } catch (RejectedExecutionException success) {}
350          } finally {
351              joinPool(p);
352          }
# Line 403 | Line 356 | public class ForkJoinPoolTest extends JS
356       * Pool maintains parallelism when using ManagedBlocker
357       */
358      public void testBlockingForkJoinTask() throws Throwable {
359 <        ForkJoinPool p = null;
359 >        ForkJoinPool p = new ForkJoinPool(4);
360          try {
408            p = new ForkJoinPool(4);
361              ReentrantLock lock = new ReentrantLock();
362              ManagedLocker locker = new ManagedLocker(lock);
363 <            ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
363 >            ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
364              p.execute(f);
365 <            assertTrue(p.getPoolSize() >= 4);
414 <            int r = f.get();
415 <            assertTrue(r ==  832040);
365 >            assertEquals(6765, (int) f.get());
366          } finally {
367              p.shutdownNow(); // don't wait out shutdown
368          }
# Line 422 | Line 372 | public class ForkJoinPoolTest extends JS
372       * pollSubmission returns unexecuted submitted task, if present
373       */
374      public void testPollSubmission() {
375 <        SubFJP p = null;
375 >        final CountDownLatch done = new CountDownLatch(1);
376 >        SubFJP p = new SubFJP();
377          try {
378 <            p = new SubFJP();
379 <            ForkJoinTask a = p.submit(new MediumRunnable());
380 <            ForkJoinTask b = p.submit(new MediumRunnable());
430 <            ForkJoinTask c = p.submit(new MediumRunnable());
378 >            ForkJoinTask a = p.submit(awaiter(done));
379 >            ForkJoinTask b = p.submit(awaiter(done));
380 >            ForkJoinTask c = p.submit(awaiter(done));
381              ForkJoinTask r = p.pollSubmission();
382              assertTrue(r == a || r == b || r == c);
383              assertFalse(r.isDone());
384          } finally {
385 +            done.countDown();
386              joinPool(p);
387          }
388      }
# Line 440 | Line 391 | public class ForkJoinPoolTest extends JS
391       * drainTasksTo transfers unexecuted submitted tasks, if present
392       */
393      public void testDrainTasksTo() {
394 <        SubFJP p = null;
394 >        final CountDownLatch done = new CountDownLatch(1);
395 >        SubFJP p = new SubFJP();
396          try {
397 <            p = new SubFJP();
398 <            ForkJoinTask a = p.submit(new MediumRunnable());
399 <            ForkJoinTask b = p.submit(new MediumRunnable());
448 <            ForkJoinTask c = p.submit(new MediumRunnable());
397 >            ForkJoinTask a = p.submit(awaiter(done));
398 >            ForkJoinTask b = p.submit(awaiter(done));
399 >            ForkJoinTask c = p.submit(awaiter(done));
400              ArrayList<ForkJoinTask> al = new ArrayList();
401              p.drainTasksTo(al);
402              assertTrue(al.size() > 0);
# Line 454 | Line 405 | public class ForkJoinPoolTest extends JS
405                  assertFalse(r.isDone());
406              }
407          } finally {
408 +            done.countDown();
409              joinPool(p);
410          }
411      }
412  
461
413      // FJ Versions of AbstractExecutorService tests
414  
415      /**
# Line 466 | Line 417 | public class ForkJoinPoolTest extends JS
417       */
418      public void testExecuteRunnable() throws Throwable {
419          ExecutorService e = new ForkJoinPool(1);
420 <        TrackedShortRunnable task = new TrackedShortRunnable();
421 <        assertFalse(task.done);
422 <        Future<?> future = e.submit(task);
423 <        future.get();
424 <        assertTrue(task.done);
420 >        try {
421 >            final AtomicBoolean done = new AtomicBoolean(false);
422 >            Future<?> future = e.submit(new CheckedRunnable() {
423 >                public void realRun() {
424 >                    done.set(true);
425 >                }});
426 >            assertNull(future.get());
427 >            assertNull(future.get(0, MILLISECONDS));
428 >            assertTrue(done.get());
429 >            assertTrue(future.isDone());
430 >            assertFalse(future.isCancelled());
431 >        } finally {
432 >            joinPool(e);
433 >        }
434      }
435  
476
436      /**
437       * Completed submit(callable) returns result
438       */
439      public void testSubmitCallable() throws Throwable {
440          ExecutorService e = new ForkJoinPool(1);
441 <        Future<String> future = e.submit(new StringTask());
442 <        String result = future.get();
443 <        assertSame(TEST_STRING, result);
441 >        try {
442 >            Future<String> future = e.submit(new StringTask());
443 >            assertSame(TEST_STRING, future.get());
444 >            assertTrue(future.isDone());
445 >            assertFalse(future.isCancelled());
446 >        } finally {
447 >            joinPool(e);
448 >        }
449      }
450  
451      /**
# Line 489 | Line 453 | public class ForkJoinPoolTest extends JS
453       */
454      public void testSubmitRunnable() throws Throwable {
455          ExecutorService e = new ForkJoinPool(1);
456 <        Future<?> future = e.submit(new NoOpRunnable());
457 <        future.get();
458 <        assertTrue(future.isDone());
456 >        try {
457 >            Future<?> future = e.submit(new NoOpRunnable());
458 >            assertNull(future.get());
459 >            assertTrue(future.isDone());
460 >            assertFalse(future.isCancelled());
461 >        } finally {
462 >            joinPool(e);
463 >        }
464      }
465  
466      /**
# Line 499 | Line 468 | public class ForkJoinPoolTest extends JS
468       */
469      public void testSubmitRunnable2() throws Throwable {
470          ExecutorService e = new ForkJoinPool(1);
471 <        Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
472 <        String result = future.get();
473 <        assertSame(TEST_STRING, result);
471 >        try {
472 >            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
473 >            assertSame(TEST_STRING, future.get());
474 >            assertTrue(future.isDone());
475 >            assertFalse(future.isCancelled());
476 >        } finally {
477 >            joinPool(e);
478 >        }
479      }
480  
507
481      /**
482 <     * A submitted privileged action to completion
482 >     * A submitted privileged action runs to completion
483       */
484 <    public void testSubmitPrivilegedAction() throws Throwable {
485 <        Policy savedPolicy = null;
486 <        try {
487 <            savedPolicy = Policy.getPolicy();
488 <            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 {
484 >    public void testSubmitPrivilegedAction() throws Exception {
485 >        final Callable callable = Executors.callable(new PrivilegedAction() {
486 >                public Object run() { return TEST_STRING; }});
487 >        Runnable r = new CheckedRunnable() {
488 >        public void realRun() throws Exception {
489              ExecutorService e = new ForkJoinPool(1);
490 <            Future future = e.submit(Executors.callable(new PrivilegedAction() {
491 <                    public Object run() {
492 <                        return TEST_STRING;
493 <                    }}));
490 >            try {
491 >                Future future = e.submit(callable);
492 >                assertSame(TEST_STRING, future.get());
493 >            } finally {
494 >                joinPool(e);
495 >            }
496 >        }};
497  
498 <            Object result = future.get();
530 <            assertSame(TEST_STRING, result);
531 <        }
532 <        finally {
533 <            Policy.setPolicy(savedPolicy);
534 <        }
498 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
499      }
500  
501      /**
502 <     * A submitted a privileged exception action runs to completion
502 >     * A submitted privileged exception action runs to completion
503       */
504 <    public void testSubmitPrivilegedExceptionAction() throws Throwable {
505 <        Policy savedPolicy = null;
506 <        try {
507 <            savedPolicy = Policy.getPolicy();
508 <            AdjustablePolicy policy = new AdjustablePolicy();
509 <            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 {
504 >    public void testSubmitPrivilegedExceptionAction() throws Exception {
505 >        final Callable callable =
506 >            Executors.callable(new PrivilegedExceptionAction() {
507 >                public Object run() { return TEST_STRING; }});
508 >        Runnable r = new CheckedRunnable() {
509 >        public void realRun() throws Exception {
510              ExecutorService e = new ForkJoinPool(1);
511 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
512 <                    public Object run() {
513 <                        return TEST_STRING;
514 <                    }}));
511 >            try {
512 >                Future future = e.submit(callable);
513 >                assertSame(TEST_STRING, future.get());
514 >            } finally {
515 >                joinPool(e);
516 >            }
517 >        }};
518  
519 <            Object result = future.get();
560 <            assertSame(TEST_STRING, result);
561 <        }
562 <        finally {
563 <            Policy.setPolicy(savedPolicy);
564 <        }
519 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
520      }
521  
522      /**
523       * A submitted failed privileged exception action reports exception
524       */
525 <    public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
526 <        Policy savedPolicy = null;
527 <        try {
528 <            savedPolicy = Policy.getPolicy();
529 <            AdjustablePolicy policy = new AdjustablePolicy();
530 <            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 {
525 >    public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
526 >        final Callable callable =
527 >            Executors.callable(new PrivilegedExceptionAction() {
528 >                public Object run() { throw new IndexOutOfBoundsException(); }});
529 >        Runnable r = new CheckedRunnable() {
530 >        public void realRun() throws Exception {
531              ExecutorService e = new ForkJoinPool(1);
532 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
533 <                    public Object run() throws Exception {
534 <                        throw new IndexOutOfBoundsException();
535 <                    }}));
532 >            try {
533 >                Future future = e.submit(callable);
534 >                try {
535 >                    future.get();
536 >                    shouldThrow();
537 >                } catch (ExecutionException success) {
538 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
539 >                }
540 >            } finally {
541 >                joinPool(e);
542 >            }
543 >        }};
544  
545 <            Object result = future.get();
591 <            shouldThrow();
592 <        } catch (ExecutionException success) {
593 <        } finally {
594 <            Policy.setPolicy(savedPolicy);
595 <        }
545 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
546      }
547  
548      /**
549       * execute(null runnable) throws NullPointerException
550       */
551      public void testExecuteNullRunnable() {
552 +        ExecutorService e = new ForkJoinPool(1);
553          try {
554 <            ExecutorService e = new ForkJoinPool(1);
604 <            TrackedShortRunnable task = null;
605 <            Future<?> future = e.submit(task);
554 >            Future<?> future = e.submit((Runnable) null);
555              shouldThrow();
556 <        } catch (NullPointerException success) {}
556 >        } catch (NullPointerException success) {
557 >        } finally {
558 >            joinPool(e);
559 >        }
560      }
561  
610
562      /**
563       * submit(null callable) throws NullPointerException
564       */
565      public void testSubmitNullCallable() {
566 +        ExecutorService e = new ForkJoinPool(1);
567          try {
568 <            ExecutorService e = new ForkJoinPool(1);
617 <            StringTask t = null;
618 <            Future<String> future = e.submit(t);
568 >            Future<String> future = e.submit((Callable) null);
569              shouldThrow();
570 <        } catch (NullPointerException success) {}
570 >        } catch (NullPointerException success) {
571 >        } finally {
572 >            joinPool(e);
573 >        }
574      }
575  
623
576      /**
577 <     * Blocking on submit(callable) throws InterruptedException if
626 <     * caller interrupted.
577 >     * submit(callable).get() throws InterruptedException if interrupted
578       */
579      public void testInterruptedSubmit() throws InterruptedException {
580 <        final ForkJoinPool p = new ForkJoinPool(1);
581 <
582 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
583 <            void realRun() throws Throwable {
584 <                p.submit(new CheckedCallable<Object>() {
585 <                    public Object realCall() throws Throwable {
586 <                        try {
587 <                            Thread.sleep(MEDIUM_DELAY_MS);
588 <                        } catch (InterruptedException ok) {
589 <                        }
590 <                        return null;
591 <                    }}).get();
592 <            }});
593 <
594 <        t.start();
595 <        Thread.sleep(SHORT_DELAY_MS);
596 <        t.interrupt();
597 <        t.join();
598 <        p.shutdownNow();
599 <        joinPool(p);
580 >        final CountDownLatch submitted    = new CountDownLatch(1);
581 >        final CountDownLatch quittingTime = new CountDownLatch(1);
582 >        final ExecutorService p = new ForkJoinPool(1);
583 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
584 >            public Void realCall() throws InterruptedException {
585 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
586 >                return null;
587 >            }};
588 >        try {
589 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
590 >                public void realRun() throws Exception {
591 >                    Future<Void> future = p.submit(awaiter);
592 >                    submitted.countDown();
593 >                    future.get();
594 >                }});
595 >            t.start();
596 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
597 >            t.interrupt();
598 >            t.join();
599 >        } finally {
600 >            quittingTime.countDown();
601 >            joinPool(p);
602 >        }
603      }
604  
605      /**
# Line 656 | Line 610 | public class ForkJoinPoolTest extends JS
610          ForkJoinPool p = new ForkJoinPool(1);
611          try {
612              p.submit(new Callable() {
613 <                public Object call() {
614 <                    int i = 5/0;
661 <                    return Boolean.TRUE;
662 <                }}).get();
613 >                public Object call() { throw new ArithmeticException(); }})
614 >                .get();
615              shouldThrow();
616 <        } catch (ExecutionException success) {}
617 <
618 <        joinPool(p);
616 >        } catch (ExecutionException success) {
617 >            assertTrue(success.getCause() instanceof ArithmeticException);
618 >        } finally {
619 >            joinPool(p);
620 >        }
621      }
622  
623      /**
# Line 699 | Line 653 | public class ForkJoinPoolTest extends JS
653       */
654      public void testInvokeAny3() throws Throwable {
655          ExecutorService e = new ForkJoinPool(1);
656 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
657 +        l.add(null);
658          try {
703            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
704            l.add(null);
659              e.invokeAny(l);
660              shouldThrow();
661          } catch (NullPointerException success) {
# Line 714 | Line 668 | public class ForkJoinPoolTest extends JS
668       * invokeAny(c) throws NullPointerException if c has null elements
669       */
670      public void testInvokeAny4() throws Throwable {
671 +        CountDownLatch latch = new CountDownLatch(1);
672          ExecutorService e = new ForkJoinPool(1);
673 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
674 +        l.add(latchAwaitingStringTask(latch));
675 +        l.add(null);
676          try {
719            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
720            l.add(new Callable<String>() {
721                public String call() {
722                    // The delay gives the pool a chance to notice
723                    // the null element.
724                    sleepTillInterrupted(SMALL_DELAY_MS);
725                    return "foo";
726                }});
727            l.add(null);
677              e.invokeAny(l);
678              shouldThrow();
679          } catch (NullPointerException success) {
680          } finally {
681 +            latch.countDown();
682              joinPool(e);
683          }
684      }
# Line 738 | Line 688 | public class ForkJoinPoolTest extends JS
688       */
689      public void testInvokeAny5() throws Throwable {
690          ExecutorService e = new ForkJoinPool(1);
691 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
692 +        l.add(new NPETask());
693          try {
742            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
743            l.add(new NPETask());
694              e.invokeAny(l);
695              shouldThrow();
696          } catch (ExecutionException success) {
697 +            assertTrue(success.getCause() instanceof NullPointerException);
698          } finally {
699              joinPool(e);
700          }
# Line 755 | Line 706 | public class ForkJoinPoolTest extends JS
706      public void testInvokeAny6() throws Throwable {
707          ExecutorService e = new ForkJoinPool(1);
708          try {
709 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
709 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
710              l.add(new StringTask());
711              l.add(new StringTask());
712              String result = e.invokeAny(l);
# Line 798 | Line 749 | public class ForkJoinPoolTest extends JS
749       */
750      public void testInvokeAll3() throws InterruptedException {
751          ExecutorService e = new ForkJoinPool(1);
752 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
753 +        l.add(new StringTask());
754 +        l.add(null);
755          try {
802            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
803            l.add(new StringTask());
804            l.add(null);
756              e.invokeAll(l);
757              shouldThrow();
758          } catch (NullPointerException success) {
# Line 816 | Line 767 | public class ForkJoinPoolTest extends JS
767       */
768      public void testInvokeAll4() throws Throwable {
769          ExecutorService e = new ForkJoinPool(1);
770 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
771 +        l.add(new NPETask());
772 +        List<Future<String>> futures = e.invokeAll(l);
773 +        assertEquals(1, futures.size());
774          try {
775 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
821 <            l.add(new NPETask());
822 <            List<Future<String>> result = e.invokeAll(l);
823 <            assertEquals(1, result.size());
824 <            for (Future<String> future : result)
825 <                future.get();
775 >            futures.get(0).get();
776              shouldThrow();
777          } catch (ExecutionException success) {
778 +            assertTrue(success.getCause() instanceof NullPointerException);
779          } finally {
780              joinPool(e);
781          }
# Line 836 | Line 787 | public class ForkJoinPoolTest extends JS
787      public void testInvokeAll5() throws Throwable {
788          ExecutorService e = new ForkJoinPool(1);
789          try {
790 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
790 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
791              l.add(new StringTask());
792              l.add(new StringTask());
793 <            List<Future<String>> result = e.invokeAll(l);
794 <            assertEquals(2, result.size());
795 <            for (Future<String> future : result)
793 >            List<Future<String>> futures = e.invokeAll(l);
794 >            assertEquals(2, futures.size());
795 >            for (Future<String> future : futures)
796                  assertSame(TEST_STRING, future.get());
797          } finally {
798              joinPool(e);
799          }
800      }
801  
851
802      /**
803       * timed invokeAny(null) throws NullPointerException
804       */
# Line 868 | Line 818 | public class ForkJoinPoolTest extends JS
818       */
819      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
820          ExecutorService e = new ForkJoinPool(1);
821 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
822 +        l.add(new StringTask());
823          try {
872            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
873            l.add(new StringTask());
824              e.invokeAny(l, MEDIUM_DELAY_MS, null);
825              shouldThrow();
826          } catch (NullPointerException success) {
# Line 898 | Line 848 | public class ForkJoinPoolTest extends JS
848       * timed invokeAny(c) throws NullPointerException if c has null elements
849       */
850      public void testTimedInvokeAny3() throws Throwable {
851 +        CountDownLatch latch = new CountDownLatch(1);
852          ExecutorService e = new ForkJoinPool(1);
853 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
854 +        l.add(latchAwaitingStringTask(latch));
855 +        l.add(null);
856          try {
903            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
904            l.add(new StringTask());
905            l.add(null);
857              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
858              shouldThrow();
859          } catch (NullPointerException success) {
860          } finally {
861 +            latch.countDown();
862              joinPool(e);
863          }
864      }
# Line 916 | Line 868 | public class ForkJoinPoolTest extends JS
868       */
869      public void testTimedInvokeAny4() throws Throwable {
870          ExecutorService e = new ForkJoinPool(1);
871 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
872 +        l.add(new NPETask());
873          try {
920            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
921            l.add(new NPETask());
874              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
875              shouldThrow();
876          } catch (ExecutionException success) {
877 +            assertTrue(success.getCause() instanceof NullPointerException);
878          } finally {
879              joinPool(e);
880          }
# Line 933 | Line 886 | public class ForkJoinPoolTest extends JS
886      public void testTimedInvokeAny5() throws Throwable {
887          ExecutorService e = new ForkJoinPool(1);
888          try {
889 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
889 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
890              l.add(new StringTask());
891              l.add(new StringTask());
892              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 962 | Line 915 | public class ForkJoinPoolTest extends JS
915       */
916      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
917          ExecutorService e = new ForkJoinPool(1);
918 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
919 +        l.add(new StringTask());
920          try {
966            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
967            l.add(new StringTask());
921              e.invokeAll(l, MEDIUM_DELAY_MS, null);
922              shouldThrow();
923          } catch (NullPointerException success) {
# Line 993 | Line 946 | public class ForkJoinPoolTest extends JS
946       */
947      public void testTimedInvokeAll3() throws InterruptedException {
948          ExecutorService e = new ForkJoinPool(1);
949 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
950 +        l.add(new StringTask());
951 +        l.add(null);
952          try {
997            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
998            l.add(new StringTask());
999            l.add(null);
953              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
954              shouldThrow();
955          } catch (NullPointerException success) {
# Line 1010 | Line 963 | public class ForkJoinPoolTest extends JS
963       */
964      public void testTimedInvokeAll4() throws Throwable {
965          ExecutorService e = new ForkJoinPool(1);
966 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
967 +        l.add(new NPETask());
968 +        List<Future<String>> futures
969 +            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
970 +        assertEquals(1, futures.size());
971          try {
972 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1015 <            l.add(new NPETask());
1016 <            List<Future<String>> result
1017 <                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1018 <            assertEquals(1, result.size());
1019 <            for (Future<String> future : result)
1020 <                future.get();
972 >            futures.get(0).get();
973              shouldThrow();
974          } catch (ExecutionException success) {
975 +            assertTrue(success.getCause() instanceof NullPointerException);
976          } finally {
977              joinPool(e);
978          }
# Line 1031 | Line 984 | public class ForkJoinPoolTest extends JS
984      public void testTimedInvokeAll5() throws Throwable {
985          ExecutorService e = new ForkJoinPool(1);
986          try {
987 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
987 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
988              l.add(new StringTask());
989              l.add(new StringTask());
990 <            List<Future<String>> result
990 >            List<Future<String>> futures
991                  = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
992 <            assertEquals(2, result.size());
993 <            for (Future<String> future : result)
992 >            assertEquals(2, futures.size());
993 >            for (Future<String> future : futures)
994                  assertSame(TEST_STRING, future.get());
995          } finally {
996              joinPool(e);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines