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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines