ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/AbstractExecutorServiceTest.java
(Generate patch)

Comparing jsr166/src/test/tck/AbstractExecutorServiceTest.java (file contents):
Revision 1.9 by dl, Thu Dec 25 19:48:57 2003 UTC vs.
Revision 1.30 by jsr166, Tue Mar 15 19:47:06 2011 UTC

# Line 1 | Line 1
1   /*
2 < * Written by members of JCP JSR-166 Expert Group and released to the
3 < * public domain. Use, modify, and redistribute this code in any way
4 < * without acknowledgement. Other contributors include Andrew Wright,
5 < * Jeffrey Hayes, Pat Fischer, Mike Judd.
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/publicdomain/zero/1.0/
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9  
10   import junit.framework.*;
11   import java.util.*;
12   import java.util.concurrent.*;
13 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
14   import java.math.BigInteger;
15   import java.security.*;
16  
17 < public class AbstractExecutorServiceTest extends JSR166TestCase{
17 > public class AbstractExecutorServiceTest extends JSR166TestCase {
18      public static void main(String[] args) {
19 <        junit.textui.TestRunner.run (suite());
19 >        junit.textui.TestRunner.run(suite());
20      }
21      public static Test suite() {
22          return new TestSuite(AbstractExecutorServiceTest.class);
23      }
24  
25 <    /**
25 >    /**
26       * A no-frills implementation of AbstractExecutorService, designed
27       * to test the submit methods only.
28       */
29      static class DirectExecutorService extends AbstractExecutorService {
30          public void execute(Runnable r) { r.run(); }
31          public void shutdown() { shutdown = true; }
32 <        public List<Runnable> shutdownNow() { shutdown = true; return Collections.EMPTY_LIST; }
32 >        public List<Runnable> shutdownNow() {
33 >            shutdown = true;
34 >            return Collections.EMPTY_LIST;
35 >        }
36          public boolean isShutdown() { return shutdown; }
37          public boolean isTerminated() { return isShutdown(); }
38 <        public boolean awaitTermination(long timeout, TimeUnit unit) { return isShutdown(); }
38 >        public boolean awaitTermination(long timeout, TimeUnit unit) {
39 >            return isShutdown();
40 >        }
41          private volatile boolean shutdown = false;
42      }
43  
44      /**
45 <     * execute of runnable runs it to completion
45 >     * execute(runnable) runs it to completion
46       */
47 <    public void testExecuteRunnable() {
48 <        try {
49 <            ExecutorService e = new DirectExecutorService();
50 <            TrackedShortRunnable task = new TrackedShortRunnable();
51 <            assertFalse(task.done);
52 <            Future<?> future = e.submit(task);
53 <            future.get();
47 <            assertTrue(task.done);
48 <        }
49 <        catch (ExecutionException ex) {
50 <            unexpectedException();
51 <        }
52 <        catch (InterruptedException ex) {
53 <            unexpectedException();
54 <        }
47 >    public void testExecuteRunnable() throws Exception {
48 >        ExecutorService e = new DirectExecutorService();
49 >        TrackedShortRunnable task = new TrackedShortRunnable();
50 >        assertFalse(task.done);
51 >        Future<?> future = e.submit(task);
52 >        future.get();
53 >        assertTrue(task.done);
54      }
55  
56  
57      /**
58 <     * completed submit of callable returns result
58 >     * Completed submit(callable) returns result
59       */
60 <    public void testSubmitCallable() {
61 <        try {
62 <            ExecutorService e = new DirectExecutorService();
63 <            Future<String> future = e.submit(new StringTask());
64 <            String result = future.get();
66 <            assertSame(TEST_STRING, result);
67 <        }
68 <        catch (ExecutionException ex) {
69 <            unexpectedException();
70 <        }
71 <        catch (InterruptedException ex) {
72 <            unexpectedException();
73 <        }
60 >    public void testSubmitCallable() throws Exception {
61 >        ExecutorService e = new DirectExecutorService();
62 >        Future<String> future = e.submit(new StringTask());
63 >        String result = future.get();
64 >        assertSame(TEST_STRING, result);
65      }
66  
67      /**
68 <     * completed submit of runnable returns successfully
68 >     * Completed submit(runnable) returns successfully
69       */
70 <    public void testSubmitRunnable() {
71 <        try {
72 <            ExecutorService e = new DirectExecutorService();
73 <            Future<?> future = e.submit(new NoOpRunnable());
74 <            future.get();
84 <            assertTrue(future.isDone());
85 <        }
86 <        catch (ExecutionException ex) {
87 <            unexpectedException();
88 <        }
89 <        catch (InterruptedException ex) {
90 <            unexpectedException();
91 <        }
70 >    public void testSubmitRunnable() throws Exception {
71 >        ExecutorService e = new DirectExecutorService();
72 >        Future<?> future = e.submit(new NoOpRunnable());
73 >        future.get();
74 >        assertTrue(future.isDone());
75      }
76  
77      /**
78 <     * completed submit of (runnable, result) returns result
78 >     * Completed submit(runnable, result) returns result
79       */
80 <    public void testSubmitRunnable2() {
81 <        try {
82 <            ExecutorService e = new DirectExecutorService();
83 <            Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
84 <            String result = future.get();
102 <            assertSame(TEST_STRING, result);
103 <        }
104 <        catch (ExecutionException ex) {
105 <            unexpectedException();
106 <        }
107 <        catch (InterruptedException ex) {
108 <            unexpectedException();
109 <        }
80 >    public void testSubmitRunnable2() throws Exception {
81 >        ExecutorService e = new DirectExecutorService();
82 >        Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
83 >        String result = future.get();
84 >        assertSame(TEST_STRING, result);
85      }
86  
87  
88      /**
89 <     * submit of a privileged action runs it to completion
89 >     * A submitted privileged action runs to completion
90       */
91 <    public void testSubmitPrivilegedAction() {
92 <        Policy savedPolicy = Policy.getPolicy();
93 <        AdjustablePolicy policy = new AdjustablePolicy();
94 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
95 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
121 <        Policy.setPolicy(policy);
122 <        try {
123 <            ExecutorService e = new DirectExecutorService();
124 <            Future future = e.submit(Executors.callable(new PrivilegedAction() {
91 >    public void testSubmitPrivilegedAction() throws Exception {
92 >        Runnable r = new CheckedRunnable() {
93 >            public void realRun() throws Exception {
94 >                ExecutorService e = new DirectExecutorService();
95 >                Future future = e.submit(Executors.callable(new PrivilegedAction() {
96                      public Object run() {
97                          return TEST_STRING;
98                      }}));
99  
100 <            Object result = future.get();
101 <            assertSame(TEST_STRING, result);
102 <        }
103 <        catch (ExecutionException ex) {
104 <            unexpectedException();
105 <        }
106 <        catch (InterruptedException ex) {
136 <            unexpectedException();
137 <        }
138 <        finally {
139 <            Policy.setPolicy(savedPolicy);
140 <        }
100 >                assertSame(TEST_STRING, future.get());
101 >            }};
102 >
103 >        runWithPermissions(r,
104 >                           new RuntimePermission("getClassLoader"),
105 >                           new RuntimePermission("setContextClassLoader"),
106 >                           new RuntimePermission("modifyThread"));
107      }
108  
109      /**
110 <     * submit of a privileged exception action runs it to completion
110 >     * A submitted privileged exception action runs to completion
111       */
112 <    public void testSubmitPrivilegedExceptionAction() {
113 <        Policy savedPolicy = Policy.getPolicy();
114 <        AdjustablePolicy policy = new AdjustablePolicy();
115 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
116 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
151 <        Policy.setPolicy(policy);
152 <        try {
153 <            ExecutorService e = new DirectExecutorService();
154 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
112 >    public void testSubmitPrivilegedExceptionAction() throws Exception {
113 >        Runnable r = new CheckedRunnable() {
114 >            public void realRun() throws Exception {
115 >                ExecutorService e = new DirectExecutorService();
116 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
117                      public Object run() {
118                          return TEST_STRING;
119                      }}));
120  
121 <            Object result = future.get();
122 <            assertSame(TEST_STRING, result);
123 <        }
124 <        catch (ExecutionException ex) {
163 <            unexpectedException();
164 <        }
165 <        catch (InterruptedException ex) {
166 <            unexpectedException();
167 <        }
168 <        finally {
169 <            Policy.setPolicy(savedPolicy);
170 <        }
121 >                assertSame(TEST_STRING, future.get());
122 >            }};
123 >
124 >        runWithPermissions(r);
125      }
126  
127      /**
128 <     * submit of a failed privileged exception action reports exception
128 >     * A submitted failed privileged exception action reports exception
129       */
130 <    public void testSubmitFailedPrivilegedExceptionAction() {
131 <        Policy savedPolicy = Policy.getPolicy();
132 <        AdjustablePolicy policy = new AdjustablePolicy();
133 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
134 <        policy.addPermission(new RuntimePermission("setContextClassLoader"));
181 <        Policy.setPolicy(policy);
182 <        try {
183 <            ExecutorService e = new DirectExecutorService();
184 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
130 >    public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
131 >        Runnable r = new CheckedRunnable() {
132 >            public void realRun() throws Exception {
133 >                ExecutorService e = new DirectExecutorService();
134 >                Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
135                      public Object run() throws Exception {
136                          throw new IndexOutOfBoundsException();
137                      }}));
138  
139 <            Object result = future.get();
140 <            shouldThrow();
141 <        }
142 <        catch (ExecutionException success) {
143 <        }
144 <        catch (InterruptedException ex) {
145 <            unexpectedException();
146 <        }
197 <        finally {
198 <            Policy.setPolicy(savedPolicy);
199 <        }
139 >                try {
140 >                    future.get();
141 >                    shouldThrow();
142 >                } catch (ExecutionException success) {
143 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
144 >                }}};
145 >
146 >        runWithPermissions(r);
147      }
148  
149      /**
150 <     * execute with a null runnable throws NPE
150 >     * execute(null runnable) throws NPE
151       */
152      public void testExecuteNullRunnable() {
153          try {
154              ExecutorService e = new DirectExecutorService();
155 <            TrackedShortRunnable task = null;
209 <            Future<?> future = e.submit(task);
155 >            e.submit((Runnable) null);
156              shouldThrow();
157 <        }
212 <        catch (NullPointerException success) {
213 <        }
214 <        catch (Exception ex) {
215 <            unexpectedException();
216 <        }
157 >        } catch (NullPointerException success) {}
158      }
159  
160  
161      /**
162 <     * submit of a null callable throws NPE
162 >     * submit(null callable) throws NPE
163       */
164      public void testSubmitNullCallable() {
165          try {
166              ExecutorService e = new DirectExecutorService();
167 <            StringTask t = null;
227 <            Future<String> future = e.submit(t);
228 <            shouldThrow();
229 <        }
230 <        catch (NullPointerException success) {
231 <        }
232 <        catch (Exception ex) {
233 <            unexpectedException();
234 <        }
235 <    }
236 <
237 <    /**
238 <     * submit of Runnable throws RejectedExecutionException if
239 <     * saturated.
240 <     */
241 <    public void testExecute1() {
242 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
243 <        try {
244 <
245 <            for(int i = 0; i < 5; ++i){
246 <                p.submit(new MediumRunnable());
247 <            }
167 >            e.submit((Callable) null);
168              shouldThrow();
169 <        } catch(RejectedExecutionException success){}
250 <        joinPool(p);
169 >        } catch (NullPointerException success) {}
170      }
171  
172      /**
173 <     * Completed submit of Callable throws RejectedExecutionException
255 <     *  if saturated.
173 >     * submit(callable).get() throws InterruptedException if interrupted
174       */
175 <    public void testExecute2() {
176 <         ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
177 <        try {
178 <            for(int i = 0; i < 5; ++i) {
179 <                p.submit(new SmallCallable());
180 <            }
181 <            shouldThrow();
182 <        } catch(RejectedExecutionException e){}
183 <        joinPool(p);
184 <    }
185 <
186 <
187 <    /**
188 <     *  blocking on submit of Callable throws InterruptedException if
189 <     *  caller interrupted.
190 <     */
191 <    public void testInterruptedSubmit() {
192 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
275 <        Thread t = new Thread(new Runnable() {
276 <                public void run() {
277 <                    try {
278 <                        p.submit(new Callable<Object>() {
279 <                                public Object call() {
280 <                                    try {
281 <                                        Thread.sleep(MEDIUM_DELAY_MS);
282 <                                        shouldThrow();
283 <                                    } catch(InterruptedException e){
284 <                                    }
285 <                                    return null;
286 <                                }
287 <                            }).get();
288 <                    } catch(InterruptedException success){
289 <                    } catch(Exception e) {
290 <                        unexpectedException();
291 <                    }
292 <
293 <                }
294 <            });
295 <        try {
175 >    public void testInterruptedSubmit() throws InterruptedException {
176 >        final CountDownLatch submitted    = new CountDownLatch(1);
177 >        final CountDownLatch quittingTime = new CountDownLatch(1);
178 >        final ExecutorService p
179 >            = new ThreadPoolExecutor(1,1,60, TimeUnit.SECONDS,
180 >                                     new ArrayBlockingQueue<Runnable>(10));
181 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
182 >            public Void realCall() throws InterruptedException {
183 >                quittingTime.await();
184 >                return null;
185 >            }};
186 >        try {
187 >            Thread t = new Thread(new CheckedInterruptedRunnable() {
188 >                public void realRun() throws Exception {
189 >                    Future<Void> future = p.submit(awaiter);
190 >                    submitted.countDown();
191 >                    future.get();
192 >                }});
193              t.start();
194 <            Thread.sleep(SHORT_DELAY_MS);
298 <            t.interrupt();
299 <        } catch(Exception e){
300 <            unexpectedException();
301 <        }
302 <        joinPool(p);
303 <    }
304 <
305 <    /**
306 <     *  get of submit of Callable throws Exception if callable
307 <     *  interrupted
308 <     */
309 <    public void testSubmitIE() {
310 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
311 <
312 <        final Callable c = new Callable() {
313 <                public Object call() {
314 <                    try {
315 <                        p.submit(new SmallCallable()).get();
316 <                        shouldThrow();
317 <                    } catch(InterruptedException e){}
318 <                    catch(RejectedExecutionException e2){}
319 <                    catch(ExecutionException e3){}
320 <                    return Boolean.TRUE;
321 <                }
322 <            };
323 <
324 <
325 <
326 <        Thread t = new Thread(new Runnable() {
327 <                public void run() {
328 <                    try {
329 <                        c.call();
330 <                    } catch(Exception e){}
331 <                }
332 <          });
333 <        try {
334 <            t.start();
335 <            Thread.sleep(SHORT_DELAY_MS);
194 >            submitted.await();
195              t.interrupt();
196              t.join();
197 <        } catch(InterruptedException e){
198 <            unexpectedException();
197 >        } finally {
198 >            quittingTime.countDown();
199 >            joinPool(p);
200          }
341
342        joinPool(p);
201      }
202  
203      /**
204 <     *  completed submit of Callable throws ExecutionException if
205 <     *  callable throws exception
204 >     * get of submit(callable) throws ExecutionException if callable
205 >     * throws exception
206       */
207 <    public void testSubmitEE() {
208 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
207 >    public void testSubmitEE() throws InterruptedException {
208 >        ThreadPoolExecutor p =
209 >            new ThreadPoolExecutor(1, 1,
210 >                                   60, TimeUnit.SECONDS,
211 >                                   new ArrayBlockingQueue<Runnable>(10));
212  
213 <        try {
214 <            Callable c = new Callable() {
354 <                    public Object call() {
355 <                        int i = 5/0;
356 <                        return Boolean.TRUE;
357 <                    }
358 <                };
359 <
360 <            for(int i =0; i < 5; i++){
361 <                p.submit(c).get();
362 <            }
213 >        Callable c = new Callable() {
214 >            public Object call() { return 5/0; }};
215  
216 +        try {
217 +            p.submit(c).get();
218              shouldThrow();
219 <        }
220 <        catch(ExecutionException success){
367 <        } catch(Exception e) {
368 <            unexpectedException();
219 >        } catch (ExecutionException success) {
220 >            assertTrue(success.getCause() instanceof ArithmeticException);
221          }
222          joinPool(p);
223      }
# Line 373 | Line 225 | public class AbstractExecutorServiceTest
225      /**
226       * invokeAny(null) throws NPE
227       */
228 <    public void testInvokeAny1() {
228 >    public void testInvokeAny1() throws Exception {
229          ExecutorService e = new DirectExecutorService();
230          try {
231              e.invokeAny(null);
232 +            shouldThrow();
233          } catch (NullPointerException success) {
381        } catch(Exception ex) {
382            unexpectedException();
234          } finally {
235              joinPool(e);
236          }
# Line 388 | Line 239 | public class AbstractExecutorServiceTest
239      /**
240       * invokeAny(empty collection) throws IAE
241       */
242 <    public void testInvokeAny2() {
242 >    public void testInvokeAny2() throws Exception {
243          ExecutorService e = new DirectExecutorService();
244          try {
245              e.invokeAny(new ArrayList<Callable<String>>());
246 +            shouldThrow();
247          } catch (IllegalArgumentException success) {
396        } catch(Exception ex) {
397            unexpectedException();
248          } finally {
249              joinPool(e);
250          }
# Line 403 | Line 253 | public class AbstractExecutorServiceTest
253      /**
254       * invokeAny(c) throws NPE if c has null elements
255       */
256 <    public void testInvokeAny3() {
256 >    public void testInvokeAny3() throws Exception {
257          ExecutorService e = new DirectExecutorService();
258 +        List<Callable<Integer>> l = new ArrayList<Callable<Integer>>();
259 +        l.add(new Callable<Integer>() {
260 +                  public Integer call() { return 5/0; }});
261 +        l.add(null);
262          try {
409            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
410            l.add(new StringTask());
411            l.add(null);
263              e.invokeAny(l);
264 +            shouldThrow();
265          } catch (NullPointerException success) {
414        } catch(Exception ex) {
415            ex.printStackTrace();
416            unexpectedException();
266          } finally {
267              joinPool(e);
268          }
269      }
270  
271      /**
272 <     * invokeAny(c) throws ExecutionException if no task completes
272 >     * invokeAny(c) throws ExecutionException if no task in c completes
273       */
274 <    public void testInvokeAny4() {
274 >    public void testInvokeAny4() throws InterruptedException {
275          ExecutorService e = new DirectExecutorService();
276 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
277 +        l.add(new NPETask());
278          try {
428            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
429            l.add(new NPETask());
279              e.invokeAny(l);
280 <        } catch(ExecutionException success) {
281 <        } catch(Exception ex) {
282 <            unexpectedException();
280 >            shouldThrow();
281 >        } catch (ExecutionException success) {
282 >            assertTrue(success.getCause() instanceof NullPointerException);
283          } finally {
284              joinPool(e);
285          }
286      }
287  
288      /**
289 <     * invokeAny(c) returns result of some task
289 >     * invokeAny(c) returns result of some task in c if at least one completes
290       */
291 <    public void testInvokeAny5() {
291 >    public void testInvokeAny5() throws Exception {
292          ExecutorService e = new DirectExecutorService();
293          try {
294 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
294 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
295              l.add(new StringTask());
296              l.add(new StringTask());
297              String result = e.invokeAny(l);
298              assertSame(TEST_STRING, result);
450        } catch (ExecutionException success) {
451        } catch(Exception ex) {
452            unexpectedException();
299          } finally {
300              joinPool(e);
301          }
# Line 458 | Line 304 | public class AbstractExecutorServiceTest
304      /**
305       * invokeAll(null) throws NPE
306       */
307 <    public void testInvokeAll1() {
307 >    public void testInvokeAll1() throws InterruptedException {
308          ExecutorService e = new DirectExecutorService();
309          try {
310              e.invokeAll(null);
311 +            shouldThrow();
312          } catch (NullPointerException success) {
466        } catch(Exception ex) {
467            unexpectedException();
313          } finally {
314              joinPool(e);
315          }
# Line 473 | Line 318 | public class AbstractExecutorServiceTest
318      /**
319       * invokeAll(empty collection) returns empty collection
320       */
321 <    public void testInvokeAll2() {
321 >    public void testInvokeAll2() throws InterruptedException {
322          ExecutorService e = new DirectExecutorService();
323          try {
324              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
325              assertTrue(r.isEmpty());
481        } catch(Exception ex) {
482            unexpectedException();
326          } finally {
327              joinPool(e);
328          }
# Line 488 | Line 331 | public class AbstractExecutorServiceTest
331      /**
332       * invokeAll(c) throws NPE if c has null elements
333       */
334 <    public void testInvokeAll3() {
334 >    public void testInvokeAll3() throws InterruptedException {
335          ExecutorService e = new DirectExecutorService();
336 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
337 +        l.add(new StringTask());
338 +        l.add(null);
339          try {
494            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
495            l.add(new StringTask());
496            l.add(null);
340              e.invokeAll(l);
341 +            shouldThrow();
342          } catch (NullPointerException success) {
499        } catch(Exception ex) {
500            unexpectedException();
343          } finally {
344              joinPool(e);
345          }
346      }
347  
348      /**
349 <     * get of element of invokeAll(c) throws exception on failed task
349 >     * get of returned element of invokeAll(c) throws exception on failed task
350       */
351 <    public void testInvokeAll4() {
351 >    public void testInvokeAll4() throws Exception {
352          ExecutorService e = new DirectExecutorService();
353          try {
354 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
354 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
355              l.add(new NPETask());
356 <            List<Future<String>> result = e.invokeAll(l);
357 <            assertEquals(1, result.size());
358 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
359 <                it.next().get();
360 <        } catch(ExecutionException success) {
361 <        } catch(Exception ex) {
362 <            unexpectedException();
356 >            List<Future<String>> futures = e.invokeAll(l);
357 >            assertEquals(1, futures.size());
358 >            try {
359 >                futures.get(0).get();
360 >                shouldThrow();
361 >            } catch (ExecutionException success) {
362 >                assertTrue(success.getCause() instanceof NullPointerException);
363 >            }
364          } finally {
365              joinPool(e);
366          }
367      }
368  
369      /**
370 <     * invokeAll(c) returns results of all completed tasks
370 >     * invokeAll(c) returns results of all completed tasks in c
371       */
372 <    public void testInvokeAll5() {
372 >    public void testInvokeAll5() throws Exception {
373          ExecutorService e = new DirectExecutorService();
374          try {
375 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
375 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
376              l.add(new StringTask());
377              l.add(new StringTask());
378 <            List<Future<String>> result = e.invokeAll(l);
379 <            assertEquals(2, result.size());
380 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
381 <                assertSame(TEST_STRING, it.next().get());
539 <        } catch (ExecutionException success) {
540 <        } catch(Exception ex) {
541 <            unexpectedException();
378 >            List<Future<String>> futures = e.invokeAll(l);
379 >            assertEquals(2, futures.size());
380 >            for (Future<String> future : futures)
381 >                assertSame(TEST_STRING, future.get());
382          } finally {
383              joinPool(e);
384          }
# Line 548 | Line 388 | public class AbstractExecutorServiceTest
388      /**
389       * timed invokeAny(null) throws NPE
390       */
391 <    public void testTimedInvokeAny1() {
391 >    public void testTimedInvokeAny1() throws Exception {
392          ExecutorService e = new DirectExecutorService();
393          try {
394 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
394 >            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
395 >            shouldThrow();
396          } catch (NullPointerException success) {
556        } catch(Exception ex) {
557            unexpectedException();
397          } finally {
398              joinPool(e);
399          }
400      }
401  
402      /**
403 <     * timed invokeAny(,,null) throws NPE
403 >     * timed invokeAny(null time unit) throws NPE
404       */
405 <    public void testTimedInvokeAnyNullTimeUnit() {
405 >    public void testTimedInvokeAnyNullTimeUnit() throws Exception {
406          ExecutorService e = new DirectExecutorService();
407 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
408 +        l.add(new StringTask());
409          try {
569            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
570            l.add(new StringTask());
410              e.invokeAny(l, MEDIUM_DELAY_MS, null);
411 +            shouldThrow();
412          } catch (NullPointerException success) {
573        } catch(Exception ex) {
574            unexpectedException();
413          } finally {
414              joinPool(e);
415          }
# Line 580 | Line 418 | public class AbstractExecutorServiceTest
418      /**
419       * timed invokeAny(empty collection) throws IAE
420       */
421 <    public void testTimedInvokeAny2() {
421 >    public void testTimedInvokeAny2() throws Exception {
422          ExecutorService e = new DirectExecutorService();
423          try {
424 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
424 >            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
425 >            shouldThrow();
426          } catch (IllegalArgumentException success) {
588        } catch(Exception ex) {
589            unexpectedException();
427          } finally {
428              joinPool(e);
429          }
# Line 595 | Line 432 | public class AbstractExecutorServiceTest
432      /**
433       * timed invokeAny(c) throws NPE if c has null elements
434       */
435 <    public void testTimedInvokeAny3() {
435 >    public void testTimedInvokeAny3() throws Exception {
436          ExecutorService e = new DirectExecutorService();
437 +        List<Callable<Integer>> l = new ArrayList<Callable<Integer>>();
438 +        l.add(new Callable<Integer>() {
439 +                  public Integer call() { return 5/0; }});
440 +        l.add(null);
441          try {
442 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
443 <            l.add(new StringTask());
603 <            l.add(null);
604 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
442 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
443 >            shouldThrow();
444          } catch (NullPointerException success) {
606        } catch(Exception ex) {
607            ex.printStackTrace();
608            unexpectedException();
445          } finally {
446              joinPool(e);
447          }
# Line 614 | Line 450 | public class AbstractExecutorServiceTest
450      /**
451       * timed invokeAny(c) throws ExecutionException if no task completes
452       */
453 <    public void testTimedInvokeAny4() {
453 >    public void testTimedInvokeAny4() throws Exception {
454          ExecutorService e = new DirectExecutorService();
455 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
456 +        l.add(new NPETask());
457          try {
458 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
459 <            l.add(new NPETask());
460 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
461 <        } catch(ExecutionException success) {
624 <        } catch(Exception ex) {
625 <            unexpectedException();
458 >            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
459 >            shouldThrow();
460 >        } catch (ExecutionException success) {
461 >            assertTrue(success.getCause() instanceof NullPointerException);
462          } finally {
463              joinPool(e);
464          }
465      }
466  
467      /**
468 <     * timed invokeAny(c) returns result of some task
468 >     * timed invokeAny(c) returns result of some task in c
469       */
470 <    public void testTimedInvokeAny5() {
470 >    public void testTimedInvokeAny5() throws Exception {
471          ExecutorService e = new DirectExecutorService();
472          try {
473 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
473 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
474              l.add(new StringTask());
475              l.add(new StringTask());
476 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
476 >            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
477              assertSame(TEST_STRING, result);
642        } catch (ExecutionException success) {
643        } catch(Exception ex) {
644            unexpectedException();
478          } finally {
479              joinPool(e);
480          }
# Line 650 | Line 483 | public class AbstractExecutorServiceTest
483      /**
484       * timed invokeAll(null) throws NPE
485       */
486 <    public void testTimedInvokeAll1() {
486 >    public void testTimedInvokeAll1() throws InterruptedException {
487          ExecutorService e = new DirectExecutorService();
488          try {
489 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
489 >            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
490 >            shouldThrow();
491          } catch (NullPointerException success) {
658        } catch(Exception ex) {
659            unexpectedException();
492          } finally {
493              joinPool(e);
494          }
495      }
496  
497      /**
498 <     * timed invokeAll(,,null) throws NPE
498 >     * timed invokeAll(null time unit) throws NPE
499       */
500 <    public void testTimedInvokeAllNullTimeUnit() {
500 >    public void testTimedInvokeAllNullTimeUnit() throws InterruptedException {
501          ExecutorService e = new DirectExecutorService();
502 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
503 +        l.add(new StringTask());
504          try {
671            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
672            l.add(new StringTask());
505              e.invokeAll(l, MEDIUM_DELAY_MS, null);
506 +            shouldThrow();
507          } catch (NullPointerException success) {
675        } catch(Exception ex) {
676            unexpectedException();
508          } finally {
509              joinPool(e);
510          }
# Line 682 | Line 513 | public class AbstractExecutorServiceTest
513      /**
514       * timed invokeAll(empty collection) returns empty collection
515       */
516 <    public void testTimedInvokeAll2() {
516 >    public void testTimedInvokeAll2() throws InterruptedException {
517          ExecutorService e = new DirectExecutorService();
518          try {
519 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
519 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
520              assertTrue(r.isEmpty());
690        } catch(Exception ex) {
691            unexpectedException();
521          } finally {
522              joinPool(e);
523          }
# Line 697 | Line 526 | public class AbstractExecutorServiceTest
526      /**
527       * timed invokeAll(c) throws NPE if c has null elements
528       */
529 <    public void testTimedInvokeAll3() {
529 >    public void testTimedInvokeAll3() throws InterruptedException {
530          ExecutorService e = new DirectExecutorService();
531 +        List<Callable<String>> l = new ArrayList<Callable<String>>();
532 +        l.add(new StringTask());
533 +        l.add(null);
534          try {
535 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
536 <            l.add(new StringTask());
705 <            l.add(null);
706 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
535 >            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
536 >            shouldThrow();
537          } catch (NullPointerException success) {
708        } catch(Exception ex) {
709            unexpectedException();
538          } finally {
539              joinPool(e);
540          }
541      }
542  
543      /**
544 <     * get of element of invokeAll(c) throws exception on failed task
544 >     * get of returned element of invokeAll(c) throws exception on failed task
545       */
546 <    public void testTimedInvokeAll4() {
546 >    public void testTimedInvokeAll4() throws Exception {
547          ExecutorService e = new DirectExecutorService();
548          try {
549 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
549 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
550              l.add(new NPETask());
551 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
552 <            assertEquals(1, result.size());
553 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
554 <                it.next().get();
555 <        } catch(ExecutionException success) {
556 <        } catch(Exception ex) {
557 <            unexpectedException();
551 >            List<Future<String>> futures =
552 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
553 >            assertEquals(1, futures.size());
554 >            try {
555 >                futures.get(0).get();
556 >                shouldThrow();
557 >            } catch (ExecutionException success) {
558 >                assertTrue(success.getCause() instanceof NullPointerException);
559 >            }
560          } finally {
561              joinPool(e);
562          }
563      }
564  
565      /**
566 <     * timed invokeAll(c) returns results of all completed tasks
566 >     * timed invokeAll(c) returns results of all completed tasks in c
567       */
568 <    public void testTimedInvokeAll5() {
568 >    public void testTimedInvokeAll5() throws Exception {
569          ExecutorService e = new DirectExecutorService();
570          try {
571 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
571 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
572              l.add(new StringTask());
573              l.add(new StringTask());
574 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
575 <            assertEquals(2, result.size());
576 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
577 <                assertSame(TEST_STRING, it.next().get());
578 <        } catch (ExecutionException success) {
749 <        } catch(Exception ex) {
750 <            unexpectedException();
574 >            List<Future<String>> futures =
575 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
576 >            assertEquals(2, futures.size());
577 >            for (Future<String> future : futures)
578 >                assertSame(TEST_STRING, future.get());
579          } finally {
580              joinPool(e);
581          }
582      }
583  
584      /**
585 <     * timed invokeAll(c) cancels tasks not completed by timeout
585 >     * timed invokeAll cancels tasks not completed by timeout
586       */
587 <    public void testTimedInvokeAll6() {
587 >    public void testTimedInvokeAll6() throws InterruptedException {
588          ExecutorService e = new DirectExecutorService();
589          try {
590 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
590 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
591 >            l.add(new StringTask());
592 >            l.add(Executors.callable(possiblyInterruptedRunnable(2 * SHORT_DELAY_MS), TEST_STRING));
593              l.add(new StringTask());
594 <            l.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
595 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
596 <            assertEquals(2, result.size());
597 <            Iterator<Future<String>> it = result.iterator();
594 >            List<Future<String>> futures =
595 >                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
596 >            assertEquals(3, futures.size());
597 >            Iterator<Future<String>> it = futures.iterator();
598              Future<String> f1 = it.next();
599              Future<String> f2 = it.next();
600 +            Future<String> f3 = it.next();
601              assertTrue(f1.isDone());
602              assertFalse(f1.isCancelled());
603              assertTrue(f2.isDone());
604 <            //            assertTrue(f2.isCancelled());
605 <        } catch(Exception ex) {
606 <            unexpectedException();
604 >            assertFalse(f2.isCancelled());
605 >            assertTrue(f3.isDone());
606 >            assertTrue(f3.isCancelled());
607          } finally {
608              joinPool(e);
609          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines