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.53 by jsr166, Wed Dec 31 16:44:01 2014 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.CountDownLatch;
14 > import java.util.concurrent.Callable;
15 > import java.util.concurrent.Future;
16 > import java.util.concurrent.ExecutionException;
17 > import java.util.concurrent.RejectedExecutionException;
18 > import java.util.concurrent.ForkJoinPool;
19 > import java.util.concurrent.ForkJoinTask;
20 > import java.util.concurrent.ForkJoinWorkerThread;
21 > import java.util.concurrent.RecursiveTask;
22 > import java.util.concurrent.atomic.AtomicBoolean;
23 > import java.util.concurrent.locks.ReentrantLock;
24   import static java.util.concurrent.TimeUnit.MILLISECONDS;
25 < import java.util.concurrent.locks.*;
26 < import java.security.*;
25 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
26 > import java.security.PrivilegedAction;
27 > import java.security.PrivilegedExceptionAction;
28  
29   public class ForkJoinPoolTest extends JSR166TestCase {
30      public static void main(String[] args) {
31 <        junit.textui.TestRunner.run (suite());
31 >        junit.textui.TestRunner.run(suite());
32      }
33 +
34      public static Test suite() {
35          return new TestSuite(ForkJoinPoolTest.class);
36      }
37  
38 <    /**
38 >    /*
39       * Testing coverage notes:
40       *
41       * 1. shutdown and related methods are tested via super.joinPool.
# Line 39 | Line 54 | public class ForkJoinPoolTest extends JS
54      // Some classes to test extension and factory methods
55  
56      static class MyHandler implements Thread.UncaughtExceptionHandler {
57 <        int catches = 0;
57 >        volatile int catches = 0;
58          public void uncaughtException(Thread t, Throwable e) {
59              ++catches;
60          }
# Line 48 | Line 63 | public class ForkJoinPoolTest extends JS
63      // to test handlers
64      static class FailingFJWSubclass extends ForkJoinWorkerThread {
65          public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
66 <        protected void onStart() { throw new Error(); }
66 >        protected void onStart() { super.onStart(); throw new Error(); }
67      }
68  
69      static class FailingThreadFactory
70              implements ForkJoinPool.ForkJoinWorkerThreadFactory {
71 <        int calls = 0;
71 >        volatile int calls = 0;
72          public ForkJoinWorkerThread newThread(ForkJoinPool p) {
73              if (++calls > 1) return null;
74              return new FailingFJWSubclass(p);
# Line 88 | Line 103 | public class ForkJoinPoolTest extends JS
103      static final class FibTask extends RecursiveTask<Integer> {
104          final int number;
105          FibTask(int n) { number = n; }
106 <        public Integer compute() {
106 >        protected Integer compute() {
107              int n = number;
108              if (n <= 1)
109                  return n;
# Line 116 | Line 131 | public class ForkJoinPoolTest extends JS
131              this.locker = locker;
132              this.lock = lock;
133          }
134 <        public Integer compute() {
134 >        protected Integer compute() {
135              int n;
136              LockingFibTask f1 = null;
137              LockingFibTask f2 = null;
# Line 142 | Line 157 | public class ForkJoinPoolTest extends JS
157       * tasks, and quiescent running state.
158       */
159      public void testDefaultInitialState() {
160 <        ForkJoinPool p = null;
160 >        ForkJoinPool p = new ForkJoinPool(1);
161          try {
162 <            p = new ForkJoinPool(1);
163 <            assertTrue(p.getFactory() ==
149 <                       ForkJoinPool.defaultForkJoinWorkerThreadFactory);
150 <            assertTrue(p.isQuiescent());
151 <            assertTrue(p.getMaintainsParallelism());
162 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
163 >                       p.getFactory());
164              assertFalse(p.getAsyncMode());
165 <            assertTrue(p.getActiveThreadCount() == 0);
166 <            assertTrue(p.getStealCount() == 0);
167 <            assertTrue(p.getQueuedTaskCount() == 0);
168 <            assertTrue(p.getQueuedSubmissionCount() == 0);
165 >            assertEquals(0, p.getActiveThreadCount());
166 >            assertEquals(0, p.getStealCount());
167 >            assertEquals(0, p.getQueuedTaskCount());
168 >            assertEquals(0, p.getQueuedSubmissionCount());
169              assertFalse(p.hasQueuedSubmissions());
170              assertFalse(p.isShutdown());
171              assertFalse(p.isTerminating());
# Line 170 | Line 182 | public class ForkJoinPoolTest extends JS
182          try {
183              new ForkJoinPool(-1);
184              shouldThrow();
185 <        }
174 <        catch (IllegalArgumentException success) {}
185 >        } catch (IllegalArgumentException success) {}
186      }
187  
188      /**
# Line 179 | Line 190 | public class ForkJoinPoolTest extends JS
190       */
191      public void testConstructor2() {
192          try {
193 <            new ForkJoinPool(1, null);
193 >            new ForkJoinPool(1, null, null, false);
194              shouldThrow();
195 <        } catch (NullPointerException success) {
185 <        }
195 >        } catch (NullPointerException success) {}
196      }
197  
188
198      /**
199       * getParallelism returns size set in constructor
200       */
201      public void testGetParallelism() {
202 <        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;
202 >        ForkJoinPool p = new ForkJoinPool(1);
203          try {
204 <            p = new ForkJoinPool(1);
224 <            assertTrue(p.getParallelism() == 1);
225 <            p.setParallelism(-2);
226 <            shouldThrow();
227 <        } catch (IllegalArgumentException success) {
204 >            assertEquals(1, p.getParallelism());
205          } finally {
206              joinPool(p);
207          }
# Line 234 | Line 211 | public class ForkJoinPoolTest extends JS
211       * getPoolSize returns number of started workers.
212       */
213      public void testGetPoolSize() {
214 <        ForkJoinPool p = null;
214 >        ForkJoinPool p = new ForkJoinPool(1);
215          try {
216 <            p = new ForkJoinPool(1);
240 <            assertTrue(p.getPoolSize() == 0);
216 >            assertEquals(0, p.getActiveThreadCount());
217              Future<String> future = p.submit(new StringTask());
218 <            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) {
218 >            assertEquals(1, p.getPoolSize());
219          } finally {
220              joinPool(p);
221          }
222      }
223  
224      /**
225 <     * setMaintainsParallelism changes policy reported by
280 <     * getMaintainsParallelism.
225 >     * awaitTermination on a non-shutdown pool times out
226       */
227 <    public void testSetMaintainsParallelism() {
228 <        ForkJoinPool p = null;
229 <        try {
230 <            p = new ForkJoinPool(1);
231 <            p.setMaintainsParallelism(false);
232 <            assertFalse(p.getMaintainsParallelism());
233 <        } finally {
234 <            joinPool(p);
235 <        }
236 <    }
237 <
238 <    /**
239 <     * setAsyncMode changes policy reported by
240 <     * getAsyncMode.
241 <     */
242 <    public void testSetAsyncMode() {
243 <        ForkJoinPool p = null;
244 <        try {
245 <            p = new ForkJoinPool(1);
246 <            p.setAsyncMode(true);
247 <            assertTrue(p.getAsyncMode());
248 <        } finally {
304 <            joinPool(p);
305 <        }
227 >    public void testAwaitTermination_timesOut() throws InterruptedException {
228 >        ForkJoinPool p = new ForkJoinPool(1);
229 >        assertFalse(p.isTerminated());
230 >        assertFalse(p.awaitTermination(Long.MIN_VALUE, NANOSECONDS));
231 >        assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
232 >        assertFalse(p.awaitTermination(-1L, NANOSECONDS));
233 >        assertFalse(p.awaitTermination(-1L, MILLISECONDS));
234 >        assertFalse(p.awaitTermination(0L, NANOSECONDS));
235 >        assertFalse(p.awaitTermination(0L, MILLISECONDS));
236 >        long timeoutNanos = 999999L;
237 >        long startTime = System.nanoTime();
238 >        assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
239 >        assertTrue(System.nanoTime() - startTime >= timeoutNanos);
240 >        assertFalse(p.isTerminated());
241 >        startTime = System.nanoTime();
242 >        long timeoutMillis = timeoutMillis();
243 >        assertFalse(p.awaitTermination(timeoutMillis, MILLISECONDS));
244 >        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
245 >        assertFalse(p.isTerminated());
246 >        p.shutdown();
247 >        assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
248 >        assertTrue(p.isTerminated());
249      }
250  
251      /**
# Line 312 | Line 255 | public class ForkJoinPoolTest extends JS
255       * performs its defined action
256       */
257      public void testSetUncaughtExceptionHandler() throws InterruptedException {
258 <        ForkJoinPool p = null;
259 <        try {
260 <            p = new ForkJoinPool(1, new FailingThreadFactory());
261 <            MyHandler eh = new MyHandler();
262 <            p.setUncaughtExceptionHandler(eh);
263 <            assertEquals(eh, p.getUncaughtExceptionHandler());
264 <            p.execute(new FailingTask());
265 <            Thread.sleep(MEDIUM_DELAY_MS);
266 <            assertTrue(eh.catches > 0);
258 >        final CountDownLatch uehInvoked = new CountDownLatch(1);
259 >        final Thread.UncaughtExceptionHandler eh =
260 >            new Thread.UncaughtExceptionHandler() {
261 >                public void uncaughtException(Thread t, Throwable e) {
262 >                    uehInvoked.countDown();
263 >                }};
264 >        ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
265 >                                          eh, false);
266 >        try {
267 >            assertSame(eh, p.getUncaughtExceptionHandler());
268 >            try {
269 >                p.execute(new FibTask(8));
270 >                assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
271 >            } catch (RejectedExecutionException ok) {
272 >            }
273          } finally {
274 +            p.shutdownNow(); // failure might have prevented processing task
275              joinPool(p);
276          }
277      }
278  
279      /**
280 <     * setUncaughtExceptionHandler of null removes handler
280 >     * After invoking a single task, isQuiescent eventually becomes
281 >     * true, at which time queues are empty, threads are not active,
282 >     * the task has completed successfully, and construction
283 >     * parameters continue to hold
284       */
285 <    public void testSetUncaughtExceptionHandler2() {
286 <        ForkJoinPool p = null;
285 >    public void testIsQuiescent() throws Exception {
286 >        ForkJoinPool p = new ForkJoinPool(2);
287          try {
288 <            p = new ForkJoinPool(1);
289 <            p.setUncaughtExceptionHandler(null);
290 <            assertNull(p.getUncaughtExceptionHandler());
291 <        } finally {
292 <            joinPool(p);
293 <        }
294 <    }
295 <
288 >            assertTrue(p.isQuiescent());
289 >            long startTime = System.nanoTime();
290 >            FibTask f = new FibTask(20);
291 >            p.invoke(f);
292 >            assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
293 >                       p.getFactory());
294 >            while (! p.isQuiescent()) {
295 >                if (millisElapsedSince(startTime) > LONG_DELAY_MS)
296 >                    throw new AssertionFailedError("timed out");
297 >                assertFalse(p.getAsyncMode());
298 >                assertFalse(p.isShutdown());
299 >                assertFalse(p.isTerminating());
300 >                assertFalse(p.isTerminated());
301 >                Thread.yield();
302 >            }
303  
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);
304              assertTrue(p.isQuiescent());
358            assertTrue(p.getMaintainsParallelism());
305              assertFalse(p.getAsyncMode());
306 <            assertTrue(p.getActiveThreadCount() == 0);
307 <            assertTrue(p.getQueuedTaskCount() == 0);
308 <            assertTrue(p.getQueuedSubmissionCount() == 0);
306 >            assertEquals(0, p.getActiveThreadCount());
307 >            assertEquals(0, p.getQueuedTaskCount());
308 >            assertEquals(0, p.getQueuedSubmissionCount());
309              assertFalse(p.hasQueuedSubmissions());
310              assertFalse(p.isShutdown());
311              assertFalse(p.isTerminating());
312              assertFalse(p.isTerminated());
313 +            assertTrue(f.isDone());
314 +            assertEquals(6765, (int) f.get());
315          } finally {
316              joinPool(p);
317          }
# Line 373 | Line 321 | public class ForkJoinPoolTest extends JS
321       * Completed submit(ForkJoinTask) returns result
322       */
323      public void testSubmitForkJoinTask() throws Throwable {
324 <        ForkJoinPool p = null;
324 >        ForkJoinPool p = new ForkJoinPool(1);
325          try {
378            p = new ForkJoinPool(1);
326              ForkJoinTask<Integer> f = p.submit(new FibTask(8));
327 <            int r = f.get();
381 <            assertTrue(r == 21);
327 >            assertEquals(21, (int) f.get());
328          } finally {
329              joinPool(p);
330          }
# Line 388 | Line 334 | public class ForkJoinPoolTest extends JS
334       * A task submitted after shutdown is rejected
335       */
336      public void testSubmitAfterShutdown() {
337 <        ForkJoinPool p = null;
337 >        ForkJoinPool p = new ForkJoinPool(1);
338          try {
393            p = new ForkJoinPool(1);
339              p.shutdown();
340              assertTrue(p.isShutdown());
341 <            ForkJoinTask<Integer> f = p.submit(new FibTask(8));
342 <            shouldThrow();
343 <        } catch (RejectedExecutionException success) {
341 >            try {
342 >                ForkJoinTask<Integer> f = p.submit(new FibTask(8));
343 >                shouldThrow();
344 >            } catch (RejectedExecutionException success) {}
345          } finally {
346              joinPool(p);
347          }
# Line 405 | Line 351 | public class ForkJoinPoolTest extends JS
351       * Pool maintains parallelism when using ManagedBlocker
352       */
353      public void testBlockingForkJoinTask() throws Throwable {
354 <        ForkJoinPool p = null;
354 >        ForkJoinPool p = new ForkJoinPool(4);
355          try {
410            p = new ForkJoinPool(4);
356              ReentrantLock lock = new ReentrantLock();
357              ManagedLocker locker = new ManagedLocker(lock);
358 <            ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
358 >            ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
359              p.execute(f);
360 <            assertTrue(p.getPoolSize() >= 4);
416 <            int r = f.get();
417 <            assertTrue(r ==  832040);
360 >            assertEquals(6765, (int) f.get());
361          } finally {
362 <            joinPool(p);
362 >            p.shutdownNow(); // don't wait out shutdown
363          }
364      }
365  
# Line 424 | Line 367 | public class ForkJoinPoolTest extends JS
367       * pollSubmission returns unexecuted submitted task, if present
368       */
369      public void testPollSubmission() {
370 <        SubFJP p = null;
370 >        final CountDownLatch done = new CountDownLatch(1);
371 >        SubFJP p = new SubFJP();
372          try {
373 <            p = new SubFJP();
374 <            ForkJoinTask a = p.submit(new MediumRunnable());
375 <            ForkJoinTask b = p.submit(new MediumRunnable());
432 <            ForkJoinTask c = p.submit(new MediumRunnable());
373 >            ForkJoinTask a = p.submit(awaiter(done));
374 >            ForkJoinTask b = p.submit(awaiter(done));
375 >            ForkJoinTask c = p.submit(awaiter(done));
376              ForkJoinTask r = p.pollSubmission();
377              assertTrue(r == a || r == b || r == c);
378              assertFalse(r.isDone());
379          } finally {
380 +            done.countDown();
381              joinPool(p);
382          }
383      }
# Line 442 | Line 386 | public class ForkJoinPoolTest extends JS
386       * drainTasksTo transfers unexecuted submitted tasks, if present
387       */
388      public void testDrainTasksTo() {
389 <        SubFJP p = null;
389 >        final CountDownLatch done = new CountDownLatch(1);
390 >        SubFJP p = new SubFJP();
391          try {
392 <            p = new SubFJP();
393 <            ForkJoinTask a = p.submit(new MediumRunnable());
394 <            ForkJoinTask b = p.submit(new MediumRunnable());
450 <            ForkJoinTask c = p.submit(new MediumRunnable());
392 >            ForkJoinTask a = p.submit(awaiter(done));
393 >            ForkJoinTask b = p.submit(awaiter(done));
394 >            ForkJoinTask c = p.submit(awaiter(done));
395              ArrayList<ForkJoinTask> al = new ArrayList();
396              p.drainTasksTo(al);
397              assertTrue(al.size() > 0);
# Line 456 | Line 400 | public class ForkJoinPoolTest extends JS
400                  assertFalse(r.isDone());
401              }
402          } finally {
403 +            done.countDown();
404              joinPool(p);
405          }
406      }
407  
463
408      // FJ Versions of AbstractExecutorService tests
409  
410      /**
# Line 468 | Line 412 | public class ForkJoinPoolTest extends JS
412       */
413      public void testExecuteRunnable() throws Throwable {
414          ExecutorService e = new ForkJoinPool(1);
415 <        TrackedShortRunnable task = new TrackedShortRunnable();
416 <        assertFalse(task.done);
417 <        Future<?> future = e.submit(task);
418 <        future.get();
419 <        assertTrue(task.done);
415 >        try {
416 >            final AtomicBoolean done = new AtomicBoolean(false);
417 >            Future<?> future = e.submit(new CheckedRunnable() {
418 >                public void realRun() {
419 >                    done.set(true);
420 >                }});
421 >            assertNull(future.get());
422 >            assertNull(future.get(0, MILLISECONDS));
423 >            assertTrue(done.get());
424 >            assertTrue(future.isDone());
425 >            assertFalse(future.isCancelled());
426 >        } finally {
427 >            joinPool(e);
428 >        }
429      }
430  
478
431      /**
432       * Completed submit(callable) returns result
433       */
434      public void testSubmitCallable() throws Throwable {
435          ExecutorService e = new ForkJoinPool(1);
436 <        Future<String> future = e.submit(new StringTask());
437 <        String result = future.get();
438 <        assertSame(TEST_STRING, result);
436 >        try {
437 >            Future<String> future = e.submit(new StringTask());
438 >            assertSame(TEST_STRING, future.get());
439 >            assertTrue(future.isDone());
440 >            assertFalse(future.isCancelled());
441 >        } finally {
442 >            joinPool(e);
443 >        }
444      }
445  
446      /**
# Line 491 | Line 448 | public class ForkJoinPoolTest extends JS
448       */
449      public void testSubmitRunnable() throws Throwable {
450          ExecutorService e = new ForkJoinPool(1);
451 <        Future<?> future = e.submit(new NoOpRunnable());
452 <        future.get();
453 <        assertTrue(future.isDone());
451 >        try {
452 >            Future<?> future = e.submit(new NoOpRunnable());
453 >            assertNull(future.get());
454 >            assertTrue(future.isDone());
455 >            assertFalse(future.isCancelled());
456 >        } finally {
457 >            joinPool(e);
458 >        }
459      }
460  
461      /**
# Line 501 | Line 463 | public class ForkJoinPoolTest extends JS
463       */
464      public void testSubmitRunnable2() throws Throwable {
465          ExecutorService e = new ForkJoinPool(1);
466 <        Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
467 <        String result = future.get();
468 <        assertSame(TEST_STRING, result);
466 >        try {
467 >            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
468 >            assertSame(TEST_STRING, future.get());
469 >            assertTrue(future.isDone());
470 >            assertFalse(future.isCancelled());
471 >        } finally {
472 >            joinPool(e);
473 >        }
474      }
475  
509
476      /**
477 <     * A submitted privileged action to completion
477 >     * A submitted privileged action runs to completion
478       */
479 <    public void testSubmitPrivilegedAction() throws Throwable {
480 <        Policy savedPolicy = null;
481 <        try {
482 <            savedPolicy = Policy.getPolicy();
483 <            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 {
479 >    public void testSubmitPrivilegedAction() throws Exception {
480 >        final Callable callable = Executors.callable(new PrivilegedAction() {
481 >                public Object run() { return TEST_STRING; }});
482 >        Runnable r = new CheckedRunnable() {
483 >        public void realRun() throws Exception {
484              ExecutorService e = new ForkJoinPool(1);
485 <            Future future = e.submit(Executors.callable(new PrivilegedAction() {
486 <                    public Object run() {
487 <                        return TEST_STRING;
488 <                    }}));
485 >            try {
486 >                Future future = e.submit(callable);
487 >                assertSame(TEST_STRING, future.get());
488 >            } finally {
489 >                joinPool(e);
490 >            }
491 >        }};
492  
493 <            Object result = future.get();
532 <            assertSame(TEST_STRING, result);
533 <        }
534 <        finally {
535 <            Policy.setPolicy(savedPolicy);
536 <        }
493 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
494      }
495  
496      /**
497 <     * A submitted a privileged exception action runs to completion
497 >     * A submitted privileged exception action runs to completion
498       */
499 <    public void testSubmitPrivilegedExceptionAction() throws Throwable {
500 <        Policy savedPolicy = null;
501 <        try {
502 <            savedPolicy = Policy.getPolicy();
503 <            AdjustablePolicy policy = new AdjustablePolicy();
504 <            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 {
499 >    public void testSubmitPrivilegedExceptionAction() throws Exception {
500 >        final Callable callable =
501 >            Executors.callable(new PrivilegedExceptionAction() {
502 >                public Object run() { return TEST_STRING; }});
503 >        Runnable r = new CheckedRunnable() {
504 >        public void realRun() throws Exception {
505              ExecutorService e = new ForkJoinPool(1);
506 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
507 <                    public Object run() {
508 <                        return TEST_STRING;
509 <                    }}));
506 >            try {
507 >                Future future = e.submit(callable);
508 >                assertSame(TEST_STRING, future.get());
509 >            } finally {
510 >                joinPool(e);
511 >            }
512 >        }};
513  
514 <            Object result = future.get();
562 <            assertSame(TEST_STRING, result);
563 <        }
564 <        finally {
565 <            Policy.setPolicy(savedPolicy);
566 <        }
514 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
515      }
516  
517      /**
518       * A submitted failed privileged exception action reports exception
519       */
520 <    public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
521 <        Policy savedPolicy = null;
522 <        try {
523 <            savedPolicy = Policy.getPolicy();
524 <            AdjustablePolicy policy = new AdjustablePolicy();
525 <            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 {
520 >    public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
521 >        final Callable callable =
522 >            Executors.callable(new PrivilegedExceptionAction() {
523 >                public Object run() { throw new IndexOutOfBoundsException(); }});
524 >        Runnable r = new CheckedRunnable() {
525 >        public void realRun() throws Exception {
526              ExecutorService e = new ForkJoinPool(1);
527 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
528 <                    public Object run() throws Exception {
529 <                        throw new IndexOutOfBoundsException();
530 <                    }}));
527 >            try {
528 >                Future future = e.submit(callable);
529 >                try {
530 >                    future.get();
531 >                    shouldThrow();
532 >                } catch (ExecutionException success) {
533 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
534 >                }
535 >            } finally {
536 >                joinPool(e);
537 >            }
538 >        }};
539  
540 <            Object result = future.get();
593 <            shouldThrow();
594 <        } catch (ExecutionException success) {
595 <        } finally {
596 <            Policy.setPolicy(savedPolicy);
597 <        }
540 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
541      }
542  
543      /**
544       * execute(null runnable) throws NullPointerException
545       */
546      public void testExecuteNullRunnable() {
547 +        ExecutorService e = new ForkJoinPool(1);
548          try {
549 <            ExecutorService e = new ForkJoinPool(1);
606 <            TrackedShortRunnable task = null;
607 <            Future<?> future = e.submit(task);
549 >            Future<?> future = e.submit((Runnable) null);
550              shouldThrow();
551          } catch (NullPointerException success) {
552 +        } finally {
553 +            joinPool(e);
554          }
555      }
556  
613
557      /**
558       * submit(null callable) throws NullPointerException
559       */
560      public void testSubmitNullCallable() {
561 +        ExecutorService e = new ForkJoinPool(1);
562          try {
563 <            ExecutorService e = new ForkJoinPool(1);
620 <            StringTask t = null;
621 <            Future<String> future = e.submit(t);
563 >            Future<String> future = e.submit((Callable) null);
564              shouldThrow();
565          } catch (NullPointerException success) {
566 +        } finally {
567 +            joinPool(e);
568          }
569      }
570  
627
571      /**
572 <     * Blocking on submit(callable) throws InterruptedException if
630 <     * caller interrupted.
572 >     * submit(callable).get() throws InterruptedException if interrupted
573       */
574      public void testInterruptedSubmit() throws InterruptedException {
575 <        final ForkJoinPool p = new ForkJoinPool(1);
576 <
577 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
578 <            void realRun() throws Throwable {
579 <                p.submit(new CheckedCallable<Object>() {
580 <                    public Object realCall() throws Throwable {
581 <                        Thread.sleep(MEDIUM_DELAY_MS);
582 <                        return null;
583 <                    }}).get();
584 <            }});
585 <
586 <        t.start();
587 <        Thread.sleep(SHORT_DELAY_MS);
588 <        t.interrupt();
589 <        joinPool(p);
575 >        final CountDownLatch submitted    = new CountDownLatch(1);
576 >        final CountDownLatch quittingTime = new CountDownLatch(1);
577 >        final ExecutorService p = new ForkJoinPool(1);
578 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
579 >            public Void realCall() throws InterruptedException {
580 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
581 >                return null;
582 >            }};
583 >        try {
584 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
585 >                public void realRun() throws Exception {
586 >                    Future<Void> future = p.submit(awaiter);
587 >                    submitted.countDown();
588 >                    future.get();
589 >                }});
590 >            t.start();
591 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
592 >            t.interrupt();
593 >            t.join();
594 >        } finally {
595 >            quittingTime.countDown();
596 >            joinPool(p);
597 >        }
598      }
599  
600      /**
# Line 653 | Line 603 | public class ForkJoinPoolTest extends JS
603       */
604      public void testSubmitEE() throws Throwable {
605          ForkJoinPool p = new ForkJoinPool(1);
656
606          try {
607 <            Callable c = new Callable() {
608 <                    public Object call() {
609 <                        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 <            }
607 >            p.submit(new Callable() {
608 >                public Object call() { throw new ArithmeticException(); }})
609 >                .get();
610              shouldThrow();
611          } catch (ExecutionException success) {
612 +            assertTrue(success.getCause() instanceof ArithmeticException);
613 +        } finally {
614 +            joinPool(p);
615          }
671        joinPool(p);
616      }
617  
618      /**
# Line 700 | Line 644 | public class ForkJoinPoolTest extends JS
644      }
645  
646      /**
647 <     * invokeAny(c) throws NullPointerException if c has null elements
647 >     * invokeAny(c) throws NullPointerException if c has a single null element
648       */
649      public void testInvokeAny3() throws Throwable {
650          ExecutorService e = new ForkJoinPool(1);
651 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
652 +        l.add(null);
653          try {
708            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
709            l.add(new StringTask());
710            l.add(null);
654              e.invokeAny(l);
655              shouldThrow();
656          } catch (NullPointerException success) {
# Line 717 | Line 660 | public class ForkJoinPoolTest extends JS
660      }
661  
662      /**
663 <     * invokeAny(c) throws ExecutionException if no task in c completes
663 >     * invokeAny(c) throws NullPointerException if c has null elements
664       */
665      public void testInvokeAny4() throws Throwable {
666 +        CountDownLatch latch = new CountDownLatch(1);
667          ExecutorService e = new ForkJoinPool(1);
668 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
669 +        l.add(latchAwaitingStringTask(latch));
670 +        l.add(null);
671 +        try {
672 +            e.invokeAny(l);
673 +            shouldThrow();
674 +        } catch (NullPointerException success) {
675 +        } finally {
676 +            latch.countDown();
677 +            joinPool(e);
678 +        }
679 +    }
680 +
681 +    /**
682 +     * invokeAny(c) throws ExecutionException if no task in c completes
683 +     */
684 +    public void testInvokeAny5() throws Throwable {
685 +        ExecutorService e = new ForkJoinPool(1);
686 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
687 +        l.add(new NPETask());
688          try {
725            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
726            l.add(new NPETask());
689              e.invokeAny(l);
690              shouldThrow();
691          } catch (ExecutionException success) {
692 +            assertTrue(success.getCause() instanceof NullPointerException);
693          } finally {
694              joinPool(e);
695          }
# Line 735 | Line 698 | public class ForkJoinPoolTest extends JS
698      /**
699       * invokeAny(c) returns result of some task in c if at least one completes
700       */
701 <    public void testInvokeAny5() throws Throwable {
701 >    public void testInvokeAny6() throws Throwable {
702          ExecutorService e = new ForkJoinPool(1);
703          try {
704 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
704 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
705              l.add(new StringTask());
706              l.add(new StringTask());
707              String result = e.invokeAny(l);
# Line 781 | Line 744 | public class ForkJoinPoolTest extends JS
744       */
745      public void testInvokeAll3() throws InterruptedException {
746          ExecutorService e = new ForkJoinPool(1);
747 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
748 +        l.add(new StringTask());
749 +        l.add(null);
750          try {
785            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
786            l.add(new StringTask());
787            l.add(null);
751              e.invokeAll(l);
752              shouldThrow();
753          } catch (NullPointerException success) {
# Line 799 | Line 762 | public class ForkJoinPoolTest extends JS
762       */
763      public void testInvokeAll4() throws Throwable {
764          ExecutorService e = new ForkJoinPool(1);
765 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
766 +        l.add(new NPETask());
767 +        List<Future<String>> futures = e.invokeAll(l);
768 +        assertEquals(1, futures.size());
769          try {
770 <            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();
770 >            futures.get(0).get();
771              shouldThrow();
772          } catch (ExecutionException success) {
773 +            assertTrue(success.getCause() instanceof NullPointerException);
774          } finally {
775              joinPool(e);
776          }
# Line 819 | Line 782 | public class ForkJoinPoolTest extends JS
782      public void testInvokeAll5() throws Throwable {
783          ExecutorService e = new ForkJoinPool(1);
784          try {
785 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
785 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
786              l.add(new StringTask());
787              l.add(new StringTask());
788 <            List<Future<String>> result = e.invokeAll(l);
789 <            assertEquals(2, result.size());
790 <            for (Future<String> future : result)
788 >            List<Future<String>> futures = e.invokeAll(l);
789 >            assertEquals(2, futures.size());
790 >            for (Future<String> future : futures)
791                  assertSame(TEST_STRING, future.get());
792          } finally {
793              joinPool(e);
794          }
795      }
796  
834
797      /**
798       * timed invokeAny(null) throws NullPointerException
799       */
# Line 851 | Line 813 | public class ForkJoinPoolTest extends JS
813       */
814      public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
815          ExecutorService e = new ForkJoinPool(1);
816 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
817 +        l.add(new StringTask());
818          try {
855            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
856            l.add(new StringTask());
819              e.invokeAny(l, MEDIUM_DELAY_MS, null);
820              shouldThrow();
821          } catch (NullPointerException success) {
# Line 881 | Line 843 | public class ForkJoinPoolTest extends JS
843       * timed invokeAny(c) throws NullPointerException if c has null elements
844       */
845      public void testTimedInvokeAny3() throws Throwable {
846 +        CountDownLatch latch = new CountDownLatch(1);
847          ExecutorService e = new ForkJoinPool(1);
848 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
849 +        l.add(latchAwaitingStringTask(latch));
850 +        l.add(null);
851          try {
886            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
887            l.add(new StringTask());
888            l.add(null);
852              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
853              shouldThrow();
854          } catch (NullPointerException success) {
855          } finally {
856 +            latch.countDown();
857              joinPool(e);
858          }
859      }
# Line 899 | Line 863 | public class ForkJoinPoolTest extends JS
863       */
864      public void testTimedInvokeAny4() throws Throwable {
865          ExecutorService e = new ForkJoinPool(1);
866 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
867 +        l.add(new NPETask());
868          try {
903            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
904            l.add(new NPETask());
869              e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
870              shouldThrow();
871          } catch (ExecutionException success) {
872 +            assertTrue(success.getCause() instanceof NullPointerException);
873          } finally {
874              joinPool(e);
875          }
# Line 916 | Line 881 | public class ForkJoinPoolTest extends JS
881      public void testTimedInvokeAny5() throws Throwable {
882          ExecutorService e = new ForkJoinPool(1);
883          try {
884 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
884 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
885              l.add(new StringTask());
886              l.add(new StringTask());
887              String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
# Line 945 | Line 910 | public class ForkJoinPoolTest extends JS
910       */
911      public void testTimedInvokeAllNullTimeUnit() throws Throwable {
912          ExecutorService e = new ForkJoinPool(1);
913 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
914 +        l.add(new StringTask());
915          try {
949            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
950            l.add(new StringTask());
916              e.invokeAll(l, MEDIUM_DELAY_MS, null);
917              shouldThrow();
918          } catch (NullPointerException success) {
# Line 976 | Line 941 | public class ForkJoinPoolTest extends JS
941       */
942      public void testTimedInvokeAll3() throws InterruptedException {
943          ExecutorService e = new ForkJoinPool(1);
944 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
945 +        l.add(new StringTask());
946 +        l.add(null);
947          try {
980            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
981            l.add(new StringTask());
982            l.add(null);
948              e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
949              shouldThrow();
950          } catch (NullPointerException success) {
# Line 993 | Line 958 | public class ForkJoinPoolTest extends JS
958       */
959      public void testTimedInvokeAll4() throws Throwable {
960          ExecutorService e = new ForkJoinPool(1);
961 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
962 +        l.add(new NPETask());
963 +        List<Future<String>> futures
964 +            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
965 +        assertEquals(1, futures.size());
966          try {
967 <            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();
967 >            futures.get(0).get();
968              shouldThrow();
969          } catch (ExecutionException success) {
970 +            assertTrue(success.getCause() instanceof NullPointerException);
971          } finally {
972              joinPool(e);
973          }
# Line 1014 | Line 979 | public class ForkJoinPoolTest extends JS
979      public void testTimedInvokeAll5() throws Throwable {
980          ExecutorService e = new ForkJoinPool(1);
981          try {
982 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
982 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
983              l.add(new StringTask());
984              l.add(new StringTask());
985 <            List<Future<String>> result
985 >            List<Future<String>> futures
986                  = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
987 <            assertEquals(2, result.size());
988 <            for (Future<String> future : result)
987 >            assertEquals(2, futures.size());
988 >            for (Future<String> future : futures)
989                  assertSame(TEST_STRING, future.get());
990          } finally {
991              joinPool(e);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines