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.1 by dl, Fri Jul 31 23:02:49 2009 UTC vs.
Revision 1.47 by jsr166, Mon Jan 14 22:05:39 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.*;
10 < import java.util.concurrent.locks.*;
11 < import java.security.*;
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.security.AccessControlException;
29 > import java.security.Policy;
30 > import java.security.PrivilegedAction;
31 > import java.security.PrivilegedExceptionAction;
32  
33 < public class ForkJoinPoolTest extends JSR166TestCase{
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      }
# Line 25 | Line 45 | public class ForkJoinPoolTest extends JS
45       * 1. shutdown and related methods are tested via super.joinPool.
46       *
47       * 2. newTaskFor and adapters are tested in submit/invoke tests
48 <     *
48 >     *
49       * 3. We cannot portably test monitoring methods such as
50       * getStealCount() since they rely ultimately on random task
51       * stealing that may cause tasks not to be stolen/propagated
52       * across threads, especially on uniprocessors.
53 <     *
53 >     *
54       * 4. There are no independently testable ForkJoinWorkerThread
55       * methods, but they are covered here and in task tests.
56       */
# Line 38 | 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 47 | 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 implements ForkJoinPool.ForkJoinWorkerThreadFactory {
74 <        int calls = 0;
75 <        public ForkJoinWorkerThread newThread(ForkJoinPool p){
73 >    static class FailingThreadFactory
74 >            implements ForkJoinPool.ForkJoinWorkerThreadFactory {
75 >        volatile int calls = 0;
76 >        public ForkJoinWorkerThread newThread(ForkJoinPool p) {
77              if (++calls > 1) return null;
78              return new FailingFJWSubclass(p);
79 <        }  
79 >        }
80      }
81  
82 <    static class SubFJP extends ForkJoinPool { // to expose protected
82 >    static class SubFJP extends ForkJoinPool { // to expose protected
83          SubFJP() { super(1); }
84          public int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
85              return super.drainTasksTo(c);
# Line 83 | Line 104 | public class ForkJoinPoolTest extends JS
104      }
105  
106      // A simple recursive task for testing
107 <    static final class FibTask extends RecursiveTask<Integer> {
107 >    static final class FibTask extends RecursiveTask<Integer> {
108          final int number;
109          FibTask(int n) { number = n; }
110          public Integer compute() {
# Line 97 | Line 118 | public class ForkJoinPoolTest extends JS
118      }
119  
120      // A failing task for testing
121 <    static final class FailingTask extends ForkJoinTask<Void> {
121 >    static final class FailingTask extends ForkJoinTask<Void> {
122          public final Void getRawResult() { return null; }
123          protected final void setRawResult(Void mustBeNull) { }
124          protected final boolean exec() { throw new Error(); }
# Line 105 | Line 126 | public class ForkJoinPoolTest extends JS
126      }
127  
128      // Fib needlessly using locking to test ManagedBlockers
129 <    static final class LockingFibTask extends RecursiveTask<Integer> {
129 >    static final class LockingFibTask extends RecursiveTask<Integer> {
130          final int number;
131          final ManagedLocker locker;
132          final ReentrantLock lock;
133 <        LockingFibTask(int n, ManagedLocker locker, ReentrantLock lock) {
134 <            number = n;
133 >        LockingFibTask(int n, ManagedLocker locker, ReentrantLock lock) {
134 >            number = n;
135              this.locker = locker;
136              this.lock = lock;
137          }
# Line 119 | Line 140 | public class ForkJoinPoolTest extends JS
140              LockingFibTask f1 = null;
141              LockingFibTask f2 = null;
142              locker.block();
143 <            n = number;
143 >            n = number;
144              if (n > 1) {
145                  f1 = new LockingFibTask(n - 1, locker, lock);
146                  f2 = new LockingFibTask(n - 2, locker, lock);
# Line 134 | Line 155 | public class ForkJoinPoolTest extends JS
155          }
156      }
157  
158 <    /**
159 <     * Succesfully constructed pool reports default factory,
158 >    /**
159 >     * Successfully constructed pool reports default factory,
160       * parallelism and async mode policies, no active threads or
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() == ForkJoinPool.defaultForkJoinWorkerThreadFactory);
147 <            assertTrue(p.isQuiescent());
148 <            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 160 | Line 179 | public class ForkJoinPoolTest extends JS
179          }
180      }
181  
182 <    /**
183 <     * Constructor throws if size argument is less than zero
182 >    /**
183 >     * Constructor throws if size argument is less than zero
184       */
185      public void testConstructor1() {
186          try {
187              new ForkJoinPool(-1);
188              shouldThrow();
189 <        }
171 <        catch (IllegalArgumentException success){}
189 >        } catch (IllegalArgumentException success) {}
190      }
191  
192 <    /**
193 <     * Constructor throws if factory argument is null
192 >    /**
193 >     * Constructor throws if factory argument is null
194       */
195      public void testConstructor2() {
196          try {
197 <            new ForkJoinPool(1, null);
197 >            new ForkJoinPool(1, null, null, false);
198              shouldThrow();
199 <        }
182 <        catch (NullPointerException success){}  
199 >        } catch (NullPointerException success) {}
200      }
201  
202 <
203 <    /**
187 <     * getParallelism returns size set in constructor
202 >    /**
203 >     * getParallelism returns size set in constructor
204       */
205      public void testGetParallelism() {
206 <        ForkJoinPool p = null;
191 <        try {
192 <            p = new ForkJoinPool(1);
193 <            assertTrue(p.getParallelism() == 1);
194 <        } finally {
195 <            joinPool(p);
196 <        }
197 <    }
198 <
199 <    /**
200 <     * setParallelism changes reported parallelism level.
201 <     */
202 <    public void testSetParallelism() {
203 <        ForkJoinPool p = null;
204 <        try {
205 <            p = new ForkJoinPool(1);
206 <            assertTrue(p.getParallelism() == 1);
207 <            p.setParallelism(2);
208 <            assertTrue(p.getParallelism() == 2);
209 <        } finally {
210 <            joinPool(p);
211 <        }
212 <    }
213 <
214 <    /**
215 <     * setParallelism with argument <= 0 throws exception
216 <     */
217 <    public void testSetParallelism2() {
218 <        ForkJoinPool p = null;
206 >        ForkJoinPool p = new ForkJoinPool(1);
207          try {
208 <            p = new ForkJoinPool(1);
221 <            assertTrue(p.getParallelism() == 1);
222 <            p.setParallelism(-2);
223 <            shouldThrow();
224 <        }catch (IllegalArgumentException success){
208 >            assertEquals(1, p.getParallelism());
209          } finally {
210              joinPool(p);
211          }
212      }
213  
214 <    /**
214 >    /**
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);
237 <            assertTrue(p.getPoolSize() == 0);
220 >            assertEquals(0, p.getActiveThreadCount());
221              Future<String> future = p.submit(new StringTask());
222 <            assertTrue(p.getPoolSize() == 1);
240 <
241 <        } finally {
242 <            joinPool(p);
243 <        }
244 <    }
245 <
246 <    /**
247 <     * setMaximumPoolSize changes size reported by getMaximumPoolSize.
248 <     */
249 <    public void testSetMaximumPoolSize() {
250 <        ForkJoinPool p = null;
251 <        try {
252 <            p = new ForkJoinPool(1);
253 <            p.setMaximumPoolSize(2);
254 <            assertTrue(p.getMaximumPoolSize() == 2);
255 <        } finally {
256 <            joinPool(p);
257 <        }
258 <    }
259 <
260 <    /**
261 <     * setMaximumPoolSize with argument <= 0 throws exception
262 <     */
263 <    public void testSetMaximumPoolSize2() {
264 <        ForkJoinPool p = null;
265 <        try {
266 <            p = new ForkJoinPool(1);
267 <            p.setMaximumPoolSize(-2);
268 <            shouldThrow();
269 <        }catch (IllegalArgumentException success){
270 <        } finally {
271 <            joinPool(p);
272 <        }
273 <    }
274 <
275 <    /**
276 <     * setMaintainsParallelism changes policy reported by
277 <     * getMaintainsParallelism.
278 <     */
279 <    public void testSetMaintainsParallelism() {
280 <        ForkJoinPool p = null;
281 <        try {
282 <            p = new ForkJoinPool(1);
283 <            p.setMaintainsParallelism(false);
284 <            assertFalse(p.getMaintainsParallelism());
285 <        } finally {
286 <            joinPool(p);
287 <        }
288 <    }
289 <    
290 <    /**
291 <     * setAsyncMode changes policy reported by
292 <     * getAsyncMode.
293 <     */
294 <    public void testSetAsyncMode() {
295 <        ForkJoinPool p = null;
296 <        try {
297 <            p = new ForkJoinPool(1);
298 <            p.setAsyncMode(true);
299 <            assertTrue(p.getAsyncMode());
222 >            assertEquals(1, p.getPoolSize());
223          } finally {
224              joinPool(p);
225          }
226      }
227  
228 <    /**
228 >    /**
229       * setUncaughtExceptionHandler changes handler for uncaught exceptions.
230       *
231       * Additionally tests: Overriding ForkJoinWorkerThread.onStart
232       * performs its defined action
233       */
234 <    public void testSetUncaughtExceptionHandler() {
235 <        ForkJoinPool p = null;
234 >    public void testSetUncaughtExceptionHandler() throws InterruptedException {
235 >        final CountDownLatch uehInvoked = new CountDownLatch(1);
236 >        final Thread.UncaughtExceptionHandler eh =
237 >            new Thread.UncaughtExceptionHandler() {
238 >                public void uncaughtException(Thread t, Throwable e) {
239 >                    uehInvoked.countDown();
240 >                }};
241 >        ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
242 >                                          eh, false);
243          try {
244 <            p = new ForkJoinPool(1, new FailingThreadFactory());
245 <            MyHandler eh = new MyHandler();
246 <            p.setUncaughtExceptionHandler(eh);
247 <            assertEquals(eh, p.getUncaughtExceptionHandler());
248 <            p.execute(new FailingTask());
249 <            Thread.sleep(MEDIUM_DELAY_MS);
320 <            assertTrue(eh.catches > 0);
321 <        } catch(InterruptedException e){
322 <            unexpectedException();
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
256 >    /**
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  
343    /**
344     * After invoking a single task, isQuiescent is true,
345     * queues are empty, threads are not active, and
346     * construction parameters continue to hold
347     */
348    public void testisQuiescent() {
349        ForkJoinPool p = null;
350        try {
351            p = new ForkJoinPool(2);
352            p.invoke(new FibTask(20));
353            assertTrue(p.getFactory() == ForkJoinPool.defaultForkJoinWorkerThreadFactory);
354            Thread.sleep(MEDIUM_DELAY_MS);
281              assertTrue(p.isQuiescent());
356            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 <        } catch(InterruptedException e){
291 <            unexpectedException();
290 >            assertTrue(f.isDone());
291 >            assertEquals(6765, (int) f.get());
292          } finally {
293              joinPool(p);
294          }
# Line 372 | Line 297 | public class ForkJoinPoolTest extends JS
297      /**
298       * Completed submit(ForkJoinTask) returns result
299       */
300 <    public void testSubmitForkJoinTask() {
301 <        ForkJoinPool p = null;
300 >    public void testSubmitForkJoinTask() throws Throwable {
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);
382 <        } catch (ExecutionException ex) {
383 <            unexpectedException();
384 <        } catch (InterruptedException ex) {
385 <            unexpectedException();
304 >            assertEquals(21, (int) f.get());
305          } finally {
306              joinPool(p);
307          }
# Line 392 | 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 {
397            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 408 | Line 327 | public class ForkJoinPoolTest extends JS
327      /**
328       * Pool maintains parallelism when using ManagedBlocker
329       */
330 <    public void testBlockingForkJoinTask() {
331 <        ForkJoinPool p = null;
330 >    public void testBlockingForkJoinTask() throws Throwable {
331 >        ForkJoinPool p = new ForkJoinPool(4);
332          try {
414            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);
420 <            int r = f.get();
421 <            assertTrue(r ==  832040);
422 <        } catch (ExecutionException ex) {
423 <            unexpectedException();
424 <        } catch (InterruptedException ex) {
425 <            unexpectedException();
337 >            assertEquals(6765, (int) f.get());
338          } finally {
339 <            joinPool(p);
339 >            p.shutdownNow(); // don't wait out shutdown
340          }
341      }
342  
# Line 432 | 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());
440 <            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 450 | 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());
458 <            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 464 | Line 377 | public class ForkJoinPoolTest extends JS
377                  assertFalse(r.isDone());
378              }
379          } finally {
380 +            done.countDown();
381              joinPool(p);
382          }
383      }
384  
471    
385      // FJ Versions of AbstractExecutorService tests
386  
387      /**
388       * execute(runnable) runs it to completion
389       */
390 <    public void testExecuteRunnable() {
390 >    public void testExecuteRunnable() throws Throwable {
391 >        ExecutorService e = new ForkJoinPool(1);
392          try {
393 <            ExecutorService e = new ForkJoinPool(1);
394 <            TrackedShortRunnable task = new TrackedShortRunnable();
395 <            assertFalse(task.done);
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 <            future.get();
400 <            assertTrue(task.done);
401 <        }
402 <        catch (ExecutionException ex) {
403 <            unexpectedException();
404 <        }
405 <        catch (InterruptedException ex) {
490 <            unexpectedException();
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  
494
409      /**
410       * Completed submit(callable) returns result
411       */
412 <    public void testSubmitCallable() {
412 >    public void testSubmitCallable() throws Throwable {
413 >        ExecutorService e = new ForkJoinPool(1);
414          try {
500            ExecutorService e = new ForkJoinPool(1);
415              Future<String> future = e.submit(new StringTask());
416 <            String result = future.get();
417 <            assertSame(TEST_STRING, result);
418 <        }
419 <        catch (ExecutionException ex) {
420 <            unexpectedException();
507 <        }
508 <        catch (InterruptedException ex) {
509 <            unexpectedException();
416 >            assertSame(TEST_STRING, future.get());
417 >            assertTrue(future.isDone());
418 >            assertFalse(future.isCancelled());
419 >        } finally {
420 >            joinPool(e);
421          }
422      }
423  
424      /**
425       * Completed submit(runnable) returns successfully
426       */
427 <    public void testSubmitRunnable() {
427 >    public void testSubmitRunnable() throws Throwable {
428 >        ExecutorService e = new ForkJoinPool(1);
429          try {
518            ExecutorService e = new ForkJoinPool(1);
430              Future<?> future = e.submit(new NoOpRunnable());
431 <            future.get();
431 >            assertNull(future.get());
432              assertTrue(future.isDone());
433 <        }
434 <        catch (ExecutionException ex) {
435 <            unexpectedException();
525 <        }
526 <        catch (InterruptedException ex) {
527 <            unexpectedException();
433 >            assertFalse(future.isCancelled());
434 >        } finally {
435 >            joinPool(e);
436          }
437      }
438  
439      /**
440       * Completed submit(runnable, result) returns result
441       */
442 <    public void testSubmitRunnable2() {
442 >    public void testSubmitRunnable2() throws Throwable {
443 >        ExecutorService e = new ForkJoinPool(1);
444          try {
536            ExecutorService e = new ForkJoinPool(1);
445              Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
446 <            String result = future.get();
447 <            assertSame(TEST_STRING, result);
448 <        }
449 <        catch (ExecutionException ex) {
450 <            unexpectedException();
543 <        }
544 <        catch (InterruptedException ex) {
545 <            unexpectedException();
446 >            assertSame(TEST_STRING, future.get());
447 >            assertTrue(future.isDone());
448 >            assertFalse(future.isCancelled());
449 >        } finally {
450 >            joinPool(e);
451          }
452      }
453  
549
454      /**
455 <     * A submitted privileged action to completion
455 >     * A submitted privileged action runs to completion
456       */
457 <    public void testSubmitPrivilegedAction() {
458 <        Policy savedPolicy = null;
459 <        try {
460 <            savedPolicy = Policy.getPolicy();
461 <            AdjustablePolicy policy = new AdjustablePolicy();
558 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
559 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
560 <            Policy.setPolicy(policy);
561 <        } catch(AccessControlException ok) {
562 <            return;
563 <        }
564 <        try {
565 <            ExecutorService e = new ForkJoinPool(1);
566 <            Future future = e.submit(Executors.callable(new PrivilegedAction() {
457 >    public void testSubmitPrivilegedAction() throws Exception {
458 >        Runnable r = new CheckedRunnable() {
459 >            public void realRun() throws Exception {
460 >                ExecutorService e = new ForkJoinPool(1);
461 >                Future future = e.submit(Executors.callable(new PrivilegedAction() {
462                      public Object run() {
463                          return TEST_STRING;
464                      }}));
465  
466 <            Object result = future.get();
467 <            assertSame(TEST_STRING, result);
468 <        }
469 <        catch (ExecutionException ex) {
470 <            unexpectedException();
576 <        }
577 <        catch (InterruptedException ex) {
578 <            unexpectedException();
579 <        }
580 <        finally {
581 <            try {
582 <                Policy.setPolicy(savedPolicy);
583 <            } catch(AccessControlException ok) {
584 <                return;
585 <            }
586 <        }
466 >                assertSame(TEST_STRING, future.get());
467 >            }};
468 >
469 >        runWithPermissions(r,
470 >                           new RuntimePermission("modifyThread"));
471      }
472  
473      /**
474 <     * A submitted a privileged exception action runs to completion
474 >     * A submitted privileged exception action runs to completion
475       */
476 <    public void testSubmitPrivilegedExceptionAction() {
477 <        Policy savedPolicy = null;
478 <        try {
479 <            savedPolicy = Policy.getPolicy();
480 <            AdjustablePolicy policy = new AdjustablePolicy();
597 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
598 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
599 <            Policy.setPolicy(policy);
600 <        } catch(AccessControlException ok) {
601 <            return;
602 <        }
603 <
604 <        try {
605 <            ExecutorService e = new ForkJoinPool(1);
606 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
476 >    public void testSubmitPrivilegedExceptionAction() throws Exception {
477 >        Runnable r = new CheckedRunnable() {
478 >            public void realRun() throws Exception {
479 >                ExecutorService e = new ForkJoinPool(1);
480 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
481                      public Object run() {
482                          return TEST_STRING;
483                      }}));
484  
485 <            Object result = future.get();
486 <            assertSame(TEST_STRING, result);
487 <        }
488 <        catch (ExecutionException ex) {
615 <            unexpectedException();
616 <        }
617 <        catch (InterruptedException ex) {
618 <            unexpectedException();
619 <        }
620 <        finally {
621 <            Policy.setPolicy(savedPolicy);
622 <        }
485 >                assertSame(TEST_STRING, future.get());
486 >            }};
487 >
488 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
489      }
490  
491      /**
492       * A submitted failed privileged exception action reports exception
493       */
494 <    public void testSubmitFailedPrivilegedExceptionAction() {
495 <        Policy savedPolicy = null;
496 <        try {
497 <            savedPolicy = Policy.getPolicy();
498 <            AdjustablePolicy policy = new AdjustablePolicy();
633 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
634 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
635 <            Policy.setPolicy(policy);
636 <        } catch(AccessControlException ok) {
637 <            return;
638 <        }
639 <
640 <
641 <        try {
642 <            ExecutorService e = new ForkJoinPool(1);
643 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
494 >    public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
495 >        Runnable r = new CheckedRunnable() {
496 >            public void realRun() throws Exception {
497 >                ExecutorService e = new ForkJoinPool(1);
498 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
499                      public Object run() throws Exception {
500                          throw new IndexOutOfBoundsException();
501                      }}));
502  
503 <            Object result = future.get();
504 <            shouldThrow();
505 <        }
506 <        catch (ExecutionException success) {
507 <        } catch (CancellationException success) {
508 <        } catch (InterruptedException ex) {
509 <            unexpectedException();
510 <        }
656 <        finally {
657 <            Policy.setPolicy(savedPolicy);
658 <        }
503 >                try {
504 >                    future.get();
505 >                    shouldThrow();
506 >                } catch (ExecutionException success) {
507 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
508 >                }}};
509 >
510 >        runWithPermissions(r, new RuntimePermission("modifyThread"));
511      }
512  
513      /**
514 <     * execute(null runnable) throws NPE
514 >     * execute(null runnable) throws NullPointerException
515       */
516      public void testExecuteNullRunnable() {
517 +        ExecutorService e = new ForkJoinPool(1);
518          try {
519 <            ExecutorService e = new ForkJoinPool(1);
667 <            TrackedShortRunnable task = null;
668 <            Future<?> future = e.submit(task);
519 >            Future<?> future = e.submit((Runnable) null);
520              shouldThrow();
521 <        }
522 <        catch (NullPointerException success) {
523 <        }
673 <        catch (Exception ex) {
674 <            unexpectedException();
521 >        } catch (NullPointerException success) {
522 >        } finally {
523 >            joinPool(e);
524          }
525      }
526  
678
527      /**
528 <     * submit(null callable) throws NPE
528 >     * submit(null callable) throws NullPointerException
529       */
530      public void testSubmitNullCallable() {
531 +        ExecutorService e = new ForkJoinPool(1);
532          try {
533 <            ExecutorService e = new ForkJoinPool(1);
685 <            StringTask t = null;
686 <            Future<String> future = e.submit(t);
533 >            Future<String> future = e.submit((Callable) null);
534              shouldThrow();
535 <        }
536 <        catch (NullPointerException success) {
537 <        }
691 <        catch (Exception ex) {
692 <            unexpectedException();
535 >        } catch (NullPointerException success) {
536 >        } finally {
537 >            joinPool(e);
538          }
539      }
540  
696
541      /**
542 <     *  Blocking on submit(callable) throws InterruptedException if
699 <     *  caller interrupted.
542 >     * submit(callable).get() throws InterruptedException if interrupted
543       */
544 <    public void testInterruptedSubmit() {
545 <        final ForkJoinPool p = new ForkJoinPool(1);
546 <        Thread t = new Thread(new Runnable() {
547 <                public void run() {
548 <                    try {
549 <                        p.submit(new Callable<Object>() {
550 <                                public Object call() {
551 <                                    try {
552 <                                        Thread.sleep(MEDIUM_DELAY_MS);
553 <                                        shouldThrow();
554 <                                    } catch(InterruptedException e){
555 <                                    }
556 <                                    return null;
557 <                                }
558 <                            }).get();
559 <                    } catch(InterruptedException success){
717 <                    } catch(Exception e) {
718 <                        unexpectedException();
719 <                    }
720 <
721 <                }
722 <            });
723 <        try {
544 >    public void testInterruptedSubmit() throws InterruptedException {
545 >        final CountDownLatch submitted    = new CountDownLatch(1);
546 >        final CountDownLatch quittingTime = new CountDownLatch(1);
547 >        final ExecutorService p = new ForkJoinPool(1);
548 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
549 >            public Void realCall() throws InterruptedException {
550 >                assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
551 >                return null;
552 >            }};
553 >        try {
554 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
555 >                public void realRun() throws Exception {
556 >                    Future<Void> future = p.submit(awaiter);
557 >                    submitted.countDown();
558 >                    future.get();
559 >                }});
560              t.start();
561 <            Thread.sleep(SHORT_DELAY_MS);
561 >            assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
562              t.interrupt();
563 <        } catch(Exception e){
564 <            unexpectedException();
563 >            t.join();
564 >        } finally {
565 >            quittingTime.countDown();
566 >            joinPool(p);
567          }
730        joinPool(p);
568      }
569  
570      /**
571 <     *  get of submit(callable) throws ExecutionException if callable
572 <     *  throws exception
571 >     * get of submit(callable) throws ExecutionException if callable
572 >     * throws exception
573       */
574 <    public void testSubmitEE() {
574 >    public void testSubmitEE() throws Throwable {
575          ForkJoinPool p = new ForkJoinPool(1);
739
576          try {
577 <            Callable c = new Callable() {
578 <                    public Object call() {
579 <                        int i = 5/0;
744 <                        return Boolean.TRUE;
745 <                    }
746 <                };
747 <
748 <            for(int i =0; i < 5; i++){
749 <                p.submit(c).get();
750 <            }
751 <
577 >            p.submit(new Callable() {
578 >                public Object call() { throw new ArithmeticException(); }})
579 >                .get();
580              shouldThrow();
581 +        } catch (ExecutionException success) {
582 +            assertTrue(success.getCause() instanceof ArithmeticException);
583 +        } finally {
584 +            joinPool(p);
585          }
754        catch(ExecutionException success){
755        } catch (CancellationException success) {
756        } catch(Exception e) {
757            unexpectedException();
758        }
759        joinPool(p);
586      }
587  
588      /**
589 <     * invokeAny(null) throws NPE
589 >     * invokeAny(null) throws NullPointerException
590       */
591 <    public void testInvokeAny1() {
591 >    public void testInvokeAny1() throws Throwable {
592          ExecutorService e = new ForkJoinPool(1);
593          try {
594              e.invokeAny(null);
595 +            shouldThrow();
596          } catch (NullPointerException success) {
770        } catch(Exception ex) {
771            unexpectedException();
597          } finally {
598              joinPool(e);
599          }
600      }
601  
602      /**
603 <     * invokeAny(empty collection) throws IAE
603 >     * invokeAny(empty collection) throws IllegalArgumentException
604       */
605 <    public void testInvokeAny2() {
605 >    public void testInvokeAny2() throws Throwable {
606          ExecutorService e = new ForkJoinPool(1);
607          try {
608              e.invokeAny(new ArrayList<Callable<String>>());
609 +            shouldThrow();
610          } catch (IllegalArgumentException success) {
785        } catch(Exception ex) {
786            unexpectedException();
611          } finally {
612              joinPool(e);
613          }
614      }
615  
616      /**
617 <     * invokeAny(c) throws NPE if c has null elements
617 >     * invokeAny(c) throws NullPointerException if c has a single null element
618       */
619 <    public void testInvokeAny3() {
619 >    public void testInvokeAny3() throws Throwable {
620          ExecutorService e = new ForkJoinPool(1);
621 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
622 +        l.add(null);
623          try {
798            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
799            l.add(new StringTask());
800            l.add(null);
624              e.invokeAny(l);
625 +            shouldThrow();
626          } catch (NullPointerException success) {
803        } catch(Exception ex) {
804            ex.printStackTrace();
805            unexpectedException();
627          } finally {
628              joinPool(e);
629          }
630      }
631  
632      /**
633 +     * invokeAny(c) throws NullPointerException if c has null elements
634 +     */
635 +    public void testInvokeAny4() throws Throwable {
636 +        CountDownLatch latch = new CountDownLatch(1);
637 +        ExecutorService e = new ForkJoinPool(1);
638 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
639 +        l.add(latchAwaitingStringTask(latch));
640 +        l.add(null);
641 +        try {
642 +            e.invokeAny(l);
643 +            shouldThrow();
644 +        } catch (NullPointerException success) {
645 +        } finally {
646 +            latch.countDown();
647 +            joinPool(e);
648 +        }
649 +    }
650 +
651 +    /**
652       * invokeAny(c) throws ExecutionException if no task in c completes
653       */
654 <    public void testInvokeAny4() {
654 >    public void testInvokeAny5() throws Throwable {
655          ExecutorService e = new ForkJoinPool(1);
656 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
657 +        l.add(new NPETask());
658          try {
817            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
818            l.add(new NPETask());
659              e.invokeAny(l);
660 <        } catch(ExecutionException success) {
661 <        } catch (CancellationException success) {
662 <        } catch(Exception ex) {
823 <            unexpectedException();
660 >            shouldThrow();
661 >        } catch (ExecutionException success) {
662 >            assertTrue(success.getCause() instanceof NullPointerException);
663          } finally {
664              joinPool(e);
665          }
# Line 829 | Line 668 | public class ForkJoinPoolTest extends JS
668      /**
669       * invokeAny(c) returns result of some task in c if at least one completes
670       */
671 <    public void testInvokeAny5() {
671 >    public void testInvokeAny6() throws Throwable {
672          ExecutorService e = new ForkJoinPool(1);
673          try {
674 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
674 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
675              l.add(new StringTask());
676              l.add(new StringTask());
677              String result = e.invokeAny(l);
678              assertSame(TEST_STRING, result);
840        } catch (ExecutionException success) {
841        } catch (CancellationException success) {
842        } catch(Exception ex) {
843            unexpectedException();
679          } finally {
680              joinPool(e);
681          }
682      }
683  
684      /**
685 <     * invokeAll(null) throws NPE
685 >     * invokeAll(null) throws NullPointerException
686       */
687 <    public void testInvokeAll1() {
687 >    public void testInvokeAll1() throws Throwable {
688          ExecutorService e = new ForkJoinPool(1);
689          try {
690              e.invokeAll(null);
691 +            shouldThrow();
692          } catch (NullPointerException success) {
857        } catch(Exception ex) {
858            unexpectedException();
693          } finally {
694              joinPool(e);
695          }
# Line 864 | Line 698 | public class ForkJoinPoolTest extends JS
698      /**
699       * invokeAll(empty collection) returns empty collection
700       */
701 <    public void testInvokeAll2() {
701 >    public void testInvokeAll2() throws InterruptedException {
702          ExecutorService e = new ForkJoinPool(1);
703          try {
704 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
704 >            List<Future<String>> r
705 >                = e.invokeAll(new ArrayList<Callable<String>>());
706              assertTrue(r.isEmpty());
872        } catch(Exception ex) {
873            unexpectedException();
707          } finally {
708              joinPool(e);
709          }
710      }
711  
712      /**
713 <     * invokeAll(c) throws NPE if c has null elements
713 >     * invokeAll(c) throws NullPointerException if c has null elements
714       */
715 <    public void testInvokeAll3() {
715 >    public void testInvokeAll3() throws InterruptedException {
716          ExecutorService e = new ForkJoinPool(1);
717 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
718 +        l.add(new StringTask());
719 +        l.add(null);
720          try {
885            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
886            l.add(new StringTask());
887            l.add(null);
721              e.invokeAll(l);
722 +            shouldThrow();
723          } catch (NullPointerException success) {
890        } catch(Exception ex) {
891            unexpectedException();
724          } finally {
725              joinPool(e);
726          }
727      }
728  
729      /**
730 <     * get of returned element of invokeAll(c) throws exception on failed task
730 >     * get of returned element of invokeAll(c) throws
731 >     * ExecutionException on failed task
732       */
733 <    public void testInvokeAll4() {
733 >    public void testInvokeAll4() throws Throwable {
734          ExecutorService e = new ForkJoinPool(1);
735 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
736 +        l.add(new NPETask());
737 +        List<Future<String>> futures = e.invokeAll(l);
738 +        assertEquals(1, futures.size());
739          try {
740 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
741 <            l.add(new NPETask());
742 <            List<Future<String>> result = e.invokeAll(l);
743 <            assertEquals(1, result.size());
907 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
908 <                it.next().get();
909 <        } catch(ExecutionException success) {
910 <        } catch (CancellationException success) {
911 <        } catch(Exception ex) {
912 <            ex.printStackTrace();
913 <            unexpectedException();
740 >            futures.get(0).get();
741 >            shouldThrow();
742 >        } catch (ExecutionException success) {
743 >            assertTrue(success.getCause() instanceof NullPointerException);
744          } finally {
745              joinPool(e);
746          }
# Line 919 | Line 749 | public class ForkJoinPoolTest extends JS
749      /**
750       * invokeAll(c) returns results of all completed tasks in c
751       */
752 <    public void testInvokeAll5() {
752 >    public void testInvokeAll5() throws Throwable {
753          ExecutorService e = new ForkJoinPool(1);
754          try {
755 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
755 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
756              l.add(new StringTask());
757              l.add(new StringTask());
758 <            List<Future<String>> result = e.invokeAll(l);
759 <            assertEquals(2, result.size());
760 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
761 <                assertSame(TEST_STRING, it.next().get());
932 <        } catch (ExecutionException success) {
933 <        } catch (CancellationException success) {
934 <        } catch(Exception ex) {
935 <            ex.printStackTrace();
936 <            unexpectedException();
758 >            List<Future<String>> futures = e.invokeAll(l);
759 >            assertEquals(2, futures.size());
760 >            for (Future<String> future : futures)
761 >                assertSame(TEST_STRING, future.get());
762          } finally {
763              joinPool(e);
764          }
765      }
766  
942
767      /**
768 <     * timed invokeAny(null) throws NPE
768 >     * timed invokeAny(null) throws NullPointerException
769       */
770 <    public void testTimedInvokeAny1() {
770 >    public void testTimedInvokeAny1() throws Throwable {
771          ExecutorService e = new ForkJoinPool(1);
772          try {
773 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
773 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
774 >            shouldThrow();
775          } catch (NullPointerException success) {
951        } catch(Exception ex) {
952            ex.printStackTrace();
953            unexpectedException();
776          } finally {
777              joinPool(e);
778          }
779      }
780  
781      /**
782 <     * timed invokeAny(null time unit) throws NPE
782 >     * timed invokeAny(null time unit) throws NullPointerException
783       */
784 <    public void testTimedInvokeAnyNullTimeUnit() {
784 >    public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
785          ExecutorService e = new ForkJoinPool(1);
786 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
787 +        l.add(new StringTask());
788          try {
965            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
966            l.add(new StringTask());
789              e.invokeAny(l, MEDIUM_DELAY_MS, null);
790 +            shouldThrow();
791          } catch (NullPointerException success) {
969        } catch(Exception ex) {
970            ex.printStackTrace();
971            unexpectedException();
792          } finally {
793              joinPool(e);
794          }
795      }
796  
797      /**
798 <     * timed invokeAny(empty collection) throws IAE
798 >     * timed invokeAny(empty collection) throws IllegalArgumentException
799       */
800 <    public void testTimedInvokeAny2() {
800 >    public void testTimedInvokeAny2() throws Throwable {
801          ExecutorService e = new ForkJoinPool(1);
802          try {
803 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
803 >            e.invokeAny(new ArrayList<Callable<String>>(),
804 >                        MEDIUM_DELAY_MS, MILLISECONDS);
805 >            shouldThrow();
806          } catch (IllegalArgumentException success) {
985        } catch(Exception ex) {
986            ex.printStackTrace();
987            unexpectedException();
807          } finally {
808              joinPool(e);
809          }
810      }
811  
812      /**
813 <     * timed invokeAny(c) throws NPE if c has null elements
813 >     * timed invokeAny(c) throws NullPointerException if c has null elements
814       */
815 <    public void testTimedInvokeAny3() {
815 >    public void testTimedInvokeAny3() throws Throwable {
816 >        CountDownLatch latch = new CountDownLatch(1);
817          ExecutorService e = new ForkJoinPool(1);
818 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
819 +        l.add(latchAwaitingStringTask(latch));
820 +        l.add(null);
821          try {
822 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
823 <            l.add(new StringTask());
1001 <            l.add(null);
1002 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
822 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
823 >            shouldThrow();
824          } catch (NullPointerException success) {
1004        } catch(Exception ex) {
1005            ex.printStackTrace();
1006            unexpectedException();
825          } finally {
826 +            latch.countDown();
827              joinPool(e);
828          }
829      }
# Line 1012 | Line 831 | public class ForkJoinPoolTest extends JS
831      /**
832       * timed invokeAny(c) throws ExecutionException if no task completes
833       */
834 <    public void testTimedInvokeAny4() {
834 >    public void testTimedInvokeAny4() throws Throwable {
835          ExecutorService e = new ForkJoinPool(1);
836 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
837 +        l.add(new NPETask());
838          try {
839 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
840 <            l.add(new NPETask());
841 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
842 <        } catch(ExecutionException success) {
1022 <        } catch (CancellationException success) {
1023 <        } catch(Exception ex) {
1024 <            ex.printStackTrace();
1025 <            unexpectedException();
839 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
840 >            shouldThrow();
841 >        } catch (ExecutionException success) {
842 >            assertTrue(success.getCause() instanceof NullPointerException);
843          } finally {
844              joinPool(e);
845          }
# Line 1031 | Line 848 | public class ForkJoinPoolTest extends JS
848      /**
849       * timed invokeAny(c) returns result of some task in c
850       */
851 <    public void testTimedInvokeAny5() {
851 >    public void testTimedInvokeAny5() throws Throwable {
852          ExecutorService e = new ForkJoinPool(1);
853          try {
854 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
854 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
855              l.add(new StringTask());
856              l.add(new StringTask());
857 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
857 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
858              assertSame(TEST_STRING, result);
1042        } catch (ExecutionException success) {
1043        } catch (CancellationException success) {
1044        } catch(Exception ex) {
1045            ex.printStackTrace();
1046            unexpectedException();
859          } finally {
860              joinPool(e);
861          }
862      }
863  
864      /**
865 <     * timed invokeAll(null) throws NPE
865 >     * timed invokeAll(null) throws NullPointerException
866       */
867 <    public void testTimedInvokeAll1() {
867 >    public void testTimedInvokeAll1() throws Throwable {
868          ExecutorService e = new ForkJoinPool(1);
869          try {
870 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
870 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
871 >            shouldThrow();
872          } catch (NullPointerException success) {
1060        } catch(Exception ex) {
1061            ex.printStackTrace();
1062            unexpectedException();
873          } finally {
874              joinPool(e);
875          }
876      }
877  
878      /**
879 <     * timed invokeAll(null time unit) throws NPE
879 >     * timed invokeAll(null time unit) throws NullPointerException
880       */
881 <    public void testTimedInvokeAllNullTimeUnit() {
881 >    public void testTimedInvokeAllNullTimeUnit() throws Throwable {
882          ExecutorService e = new ForkJoinPool(1);
883 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
884 +        l.add(new StringTask());
885          try {
1074            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1075            l.add(new StringTask());
886              e.invokeAll(l, MEDIUM_DELAY_MS, null);
887 +            shouldThrow();
888          } catch (NullPointerException success) {
1078        } catch(Exception ex) {
1079            ex.printStackTrace();
1080            unexpectedException();
889          } finally {
890              joinPool(e);
891          }
# Line 1086 | Line 894 | public class ForkJoinPoolTest extends JS
894      /**
895       * timed invokeAll(empty collection) returns empty collection
896       */
897 <    public void testTimedInvokeAll2() {
897 >    public void testTimedInvokeAll2() throws InterruptedException {
898          ExecutorService e = new ForkJoinPool(1);
899          try {
900 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
900 >            List<Future<String>> r
901 >                = e.invokeAll(new ArrayList<Callable<String>>(),
902 >                              MEDIUM_DELAY_MS, MILLISECONDS);
903              assertTrue(r.isEmpty());
1094        } catch(Exception ex) {
1095            ex.printStackTrace();
1096            unexpectedException();
904          } finally {
905              joinPool(e);
906          }
907      }
908  
909      /**
910 <     * timed invokeAll(c) throws NPE if c has null elements
910 >     * timed invokeAll(c) throws NullPointerException if c has null elements
911       */
912 <    public void testTimedInvokeAll3() {
912 >    public void testTimedInvokeAll3() throws InterruptedException {
913          ExecutorService e = new ForkJoinPool(1);
914 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
915 +        l.add(new StringTask());
916 +        l.add(null);
917          try {
918 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
919 <            l.add(new StringTask());
1110 <            l.add(null);
1111 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
918 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
919 >            shouldThrow();
920          } catch (NullPointerException success) {
1113        } catch(Exception ex) {
1114            ex.printStackTrace();
1115            unexpectedException();
921          } finally {
922              joinPool(e);
923          }
# Line 1121 | Line 926 | public class ForkJoinPoolTest extends JS
926      /**
927       * get of returned element of invokeAll(c) throws exception on failed task
928       */
929 <    public void testTimedInvokeAll4() {
929 >    public void testTimedInvokeAll4() throws Throwable {
930          ExecutorService e = new ForkJoinPool(1);
931 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
932 +        l.add(new NPETask());
933 +        List<Future<String>> futures
934 +            = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
935 +        assertEquals(1, futures.size());
936          try {
937 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
938 <            l.add(new NPETask());
939 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
940 <            assertEquals(1, result.size());
1131 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1132 <                it.next().get();
1133 <        } catch(ExecutionException success) {
1134 <        } catch (CancellationException success) {
1135 <        } catch(Exception ex) {
1136 <            ex.printStackTrace();
1137 <            unexpectedException();
937 >            futures.get(0).get();
938 >            shouldThrow();
939 >        } catch (ExecutionException success) {
940 >            assertTrue(success.getCause() instanceof NullPointerException);
941          } finally {
942              joinPool(e);
943          }
# Line 1143 | Line 946 | public class ForkJoinPoolTest extends JS
946      /**
947       * timed invokeAll(c) returns results of all completed tasks in c
948       */
949 <    public void testTimedInvokeAll5() {
949 >    public void testTimedInvokeAll5() throws Throwable {
950          ExecutorService e = new ForkJoinPool(1);
951          try {
952 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
952 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
953              l.add(new StringTask());
954              l.add(new StringTask());
955 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
956 <            assertEquals(2, result.size());
957 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
958 <                assertSame(TEST_STRING, it.next().get());
959 <        } catch (ExecutionException success) {
1157 <        } catch (CancellationException success) {
1158 <        } catch(Exception ex) {
1159 <            ex.printStackTrace();
1160 <            unexpectedException();
955 >            List<Future<String>> futures
956 >                = e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
957 >            assertEquals(2, futures.size());
958 >            for (Future<String> future : futures)
959 >                assertSame(TEST_STRING, future.get());
960          } finally {
961              joinPool(e);
962          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines