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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines