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.44 by jsr166, Thu Oct 8 03:08:37 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
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 + 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 < public class AbstractExecutorServiceTest extends JSR166TestCase{
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);
38      }
39  
40 <    /**
40 >    /**
41       * A no-frills implementation of AbstractExecutorService, designed
42       * to test the submit methods only.
43       */
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 = Policy.getPolicy();
111 <        AdjustablePolicy policy = new AdjustablePolicy();
112 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
113 <        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() {
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) {
137 <            unexpectedException();
138 <        }
139 <        finally {
140 <            Policy.setPolicy(savedPolicy);
141 <        }
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 = Policy.getPolicy();
132 <        AdjustablePolicy policy = new AdjustablePolicy();
133 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
134 <        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() {
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) {
164 <            unexpectedException();
165 <        }
166 <        catch (InterruptedException ex) {
167 <            unexpectedException();
168 <        }
169 <        finally {
170 <            Policy.setPolicy(savedPolicy);
171 <        }
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 = Policy.getPolicy();
150 <        AdjustablePolicy policy = new AdjustablePolicy();
151 <        policy.addPermission(new RuntimePermission("getContextClassLoader"));
152 <        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() {
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 <        }
198 <        finally {
199 <            Policy.setPolicy(savedPolicy);
200 <        }
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();
209 <            TrackedShortRunnable task = null;
210 <            Future<?> future = e.submit(task);
173 >            e.submit((Runnable) null);
174              shouldThrow();
175 <        }
213 <        catch (NullPointerException success) {
214 <        }
215 <        catch (Exception ex) {
216 <            unexpectedException();
217 <        }
175 >        } catch (NullPointerException success) {}
176      }
177  
220
178      /**
179       * submit(null callable) throws NPE
180       */
181      public void testSubmitNullCallable() {
182 +        ExecutorService e = new DirectExecutorService();
183          try {
184 <            ExecutorService e = new DirectExecutorService();
227 <            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 <            }
249 <            shouldThrow();
250 <        } 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 <            }
184 >            e.submit((Callable) null);
185              shouldThrow();
186 <        } catch(RejectedExecutionException e){}
266 <        joinPool(p);
186 >        } catch (NullPointerException success) {}
187      }
188  
269
189      /**
190 <     *  Blocking on submit(callable) throws InterruptedException if
272 <     *  caller interrupted.
190 >     * submit(callable).get() throws InterruptedException if interrupted
191       */
192 <    public void testInterruptedSubmit() {
193 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
194 <        Thread t = new Thread(new Runnable() {
195 <                public void run() {
196 <                    try {
197 <                        p.submit(new Callable<Object>() {
198 <                                public Object call() {
199 <                                    try {
200 <                                        Thread.sleep(MEDIUM_DELAY_MS);
201 <                                        shouldThrow();
202 <                                    } catch(InterruptedException e){
203 <                                    }
204 <                                    return null;
205 <                                }
206 <                            }).get();
207 <                    } catch(InterruptedException success){
208 <                    } catch(Exception e) {
209 <                        unexpectedException();
292 <                    }
192 >    public void testInterruptedSubmit() throws InterruptedException {
193 >        final CountDownLatch submitted    = new CountDownLatch(1);
194 >        final CountDownLatch quittingTime = new CountDownLatch(1);
195 >        final Callable<Void> awaiter = new CheckedCallable<Void>() {
196 >            public Void realCall() throws InterruptedException {
197 >                assertTrue(quittingTime.await(2*LONG_DELAY_MS, MILLISECONDS));
198 >                return null;
199 >            }};
200 >        final ExecutorService p
201 >            = new ThreadPoolExecutor(1,1,60, TimeUnit.SECONDS,
202 >                                     new ArrayBlockingQueue<Runnable>(10));
203 >        try (PoolCleaner cleaner = cleaner(p, quittingTime)) {
204 >            Thread t = newStartedThread(new CheckedInterruptedRunnable() {
205 >                public void realRun() throws Exception {
206 >                    Future<Void> future = p.submit(awaiter);
207 >                    submitted.countDown();
208 >                    future.get();
209 >                }});
210  
211 <                }
295 <            });
296 <        try {
297 <            t.start();
298 <            Thread.sleep(SHORT_DELAY_MS);
211 >            await(submitted);
212              t.interrupt();
213 <        } catch(Exception e){
301 <            unexpectedException();
213 >            awaitTermination(t);
214          }
303        joinPool(p);
215      }
216  
217      /**
218 <     *  get of submitted callable throws Exception if callable
219 <     *  interrupted
218 >     * get of submit(callable) throws ExecutionException if callable
219 >     * throws exception
220       */
221 <    public void testSubmitIE() {
222 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
223 <
224 <        final Callable c = new Callable() {
225 <                public Object call() {
226 <                    try {
316 <                        p.submit(new SmallCallable()).get();
317 <                        shouldThrow();
318 <                    } catch(InterruptedException e){}
319 <                    catch(RejectedExecutionException e2){}
320 <                    catch(ExecutionException e3){}
321 <                    return Boolean.TRUE;
322 <                }
323 <            };
324 <
325 <
326 <
327 <        Thread t = new Thread(new Runnable() {
328 <                public void run() {
329 <                    try {
330 <                        c.call();
331 <                    } catch(Exception e){}
332 <                }
333 <          });
334 <        try {
335 <            t.start();
336 <            Thread.sleep(SHORT_DELAY_MS);
337 <            t.interrupt();
338 <            t.join();
339 <        } catch(InterruptedException e){
340 <            unexpectedException();
341 <        }
342 <
343 <        joinPool(p);
344 <    }
345 <
346 <    /**
347 <     *  get of submit(callable) throws ExecutionException if callable
348 <     *  throws exception
349 <     */
350 <    public void testSubmitEE() {
351 <        ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
352 <
353 <        try {
221 >    public void testSubmitEE() throws InterruptedException {
222 >        final ThreadPoolExecutor p =
223 >            new ThreadPoolExecutor(1, 1,
224 >                                   60, TimeUnit.SECONDS,
225 >                                   new ArrayBlockingQueue<Runnable>(10));
226 >        try (PoolCleaner cleaner = cleaner(p)) {
227              Callable c = new Callable() {
228 <                    public Object call() {
229 <                        int i = 5/0;
357 <                        return Boolean.TRUE;
358 <                    }
359 <                };
360 <
361 <            for(int i =0; i < 5; i++){
228 >                public Object call() { throw new ArithmeticException(); }};
229 >            try {
230                  p.submit(c).get();
231 +                shouldThrow();
232 +            } catch (ExecutionException success) {
233 +                assertTrue(success.getCause() instanceof ArithmeticException);
234              }
364
365            shouldThrow();
366        }
367        catch(ExecutionException success){
368        } catch(Exception e) {
369            unexpectedException();
235          }
371        joinPool(p);
236      }
237  
238      /**
239       * invokeAny(null) throws NPE
240       */
241 <    public void testInvokeAny1() {
242 <        ExecutorService e = new DirectExecutorService();
243 <        try {
244 <            e.invokeAny(null);
245 <        } catch (NullPointerException success) {
246 <        } catch(Exception ex) {
247 <            unexpectedException();
384 <        } finally {
385 <            joinPool(e);
241 >    public void testInvokeAny1() throws Exception {
242 >        final ExecutorService e = new DirectExecutorService();
243 >        try (PoolCleaner cleaner = cleaner(e)) {
244 >            try {
245 >                e.invokeAny(null);
246 >                shouldThrow();
247 >            } catch (NullPointerException success) {}
248          }
249      }
250  
251      /**
252       * invokeAny(empty collection) throws IAE
253       */
254 <    public void testInvokeAny2() {
255 <        ExecutorService e = new DirectExecutorService();
256 <        try {
257 <            e.invokeAny(new ArrayList<Callable<String>>());
258 <        } catch (IllegalArgumentException success) {
259 <        } catch(Exception ex) {
260 <            unexpectedException();
399 <        } finally {
400 <            joinPool(e);
254 >    public void testInvokeAny2() throws Exception {
255 >        final ExecutorService e = new DirectExecutorService();
256 >        try (PoolCleaner cleaner = cleaner(e)) {
257 >            try {
258 >                e.invokeAny(new ArrayList<Callable<String>>());
259 >                shouldThrow();
260 >            } catch (IllegalArgumentException success) {}
261          }
262      }
263  
264      /**
265       * invokeAny(c) throws NPE if c has null elements
266       */
267 <    public void testInvokeAny3() {
268 <        ExecutorService e = new DirectExecutorService();
269 <        try {
270 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
271 <            l.add(new StringTask());
267 >    public void testInvokeAny3() throws Exception {
268 >        final ExecutorService e = new DirectExecutorService();
269 >        try (PoolCleaner cleaner = cleaner(e)) {
270 >            List<Callable<Long>> l = new ArrayList<Callable<Long>>();
271 >            l.add(new Callable<Long>() {
272 >                      public Long call() { throw new ArithmeticException(); }});
273              l.add(null);
274 <            e.invokeAny(l);
275 <        } catch (NullPointerException success) {
276 <        } catch(Exception ex) {
277 <            ex.printStackTrace();
417 <            unexpectedException();
418 <        } finally {
419 <            joinPool(e);
274 >            try {
275 >                e.invokeAny(l);
276 >                shouldThrow();
277 >            } catch (NullPointerException success) {}
278          }
279      }
280  
281      /**
282       * invokeAny(c) throws ExecutionException if no task in c completes
283       */
284 <    public void testInvokeAny4() {
285 <        ExecutorService e = new DirectExecutorService();
286 <        try {
287 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
284 >    public void testInvokeAny4() throws InterruptedException {
285 >        final ExecutorService e = new DirectExecutorService();
286 >        try (PoolCleaner cleaner = cleaner(e)) {
287 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
288              l.add(new NPETask());
289 <            e.invokeAny(l);
290 <        } catch(ExecutionException success) {
291 <        } catch(Exception ex) {
292 <            unexpectedException();
293 <        } finally {
294 <            joinPool(e);
289 >            try {
290 >                e.invokeAny(l);
291 >                shouldThrow();
292 >            } catch (ExecutionException success) {
293 >                assertTrue(success.getCause() instanceof NullPointerException);
294 >            }
295          }
296      }
297  
298      /**
299       * invokeAny(c) returns result of some task in c if at least one completes
300       */
301 <    public void testInvokeAny5() {
302 <        ExecutorService e = new DirectExecutorService();
303 <        try {
304 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
301 >    public void testInvokeAny5() throws Exception {
302 >        final ExecutorService e = new DirectExecutorService();
303 >        try (PoolCleaner cleaner = cleaner(e)) {
304 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
305              l.add(new StringTask());
306              l.add(new StringTask());
307              String result = e.invokeAny(l);
308              assertSame(TEST_STRING, result);
451        } catch (ExecutionException success) {
452        } catch(Exception ex) {
453            unexpectedException();
454        } finally {
455            joinPool(e);
309          }
310      }
311  
312      /**
313       * invokeAll(null) throws NPE
314       */
315 <    public void testInvokeAll1() {
316 <        ExecutorService e = new DirectExecutorService();
317 <        try {
318 <            e.invokeAll(null);
319 <        } catch (NullPointerException success) {
320 <        } catch(Exception ex) {
321 <            unexpectedException();
469 <        } finally {
470 <            joinPool(e);
315 >    public void testInvokeAll1() throws InterruptedException {
316 >        final ExecutorService e = new DirectExecutorService();
317 >        try (PoolCleaner cleaner = cleaner(e)) {
318 >            try {
319 >                e.invokeAll(null);
320 >                shouldThrow();
321 >            } catch (NullPointerException success) {}
322          }
323      }
324  
325      /**
326       * invokeAll(empty collection) returns empty collection
327       */
328 <    public void testInvokeAll2() {
329 <        ExecutorService e = new DirectExecutorService();
330 <        try {
328 >    public void testInvokeAll2() throws InterruptedException {
329 >        final ExecutorService e = new DirectExecutorService();
330 >        try (PoolCleaner cleaner = cleaner(e)) {
331              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
332              assertTrue(r.isEmpty());
482        } catch(Exception ex) {
483            unexpectedException();
484        } finally {
485            joinPool(e);
333          }
334      }
335  
336      /**
337       * invokeAll(c) throws NPE if c has null elements
338       */
339 <    public void testInvokeAll3() {
340 <        ExecutorService e = new DirectExecutorService();
341 <        try {
342 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
339 >    public void testInvokeAll3() throws InterruptedException {
340 >        final ExecutorService e = new DirectExecutorService();
341 >        try (PoolCleaner cleaner = cleaner(e)) {
342 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
343              l.add(new StringTask());
344              l.add(null);
345 <            e.invokeAll(l);
346 <        } catch (NullPointerException success) {
347 <        } catch(Exception ex) {
348 <            unexpectedException();
502 <        } finally {
503 <            joinPool(e);
345 >            try {
346 >                e.invokeAll(l);
347 >                shouldThrow();
348 >            } catch (NullPointerException success) {}
349          }
350      }
351  
352      /**
353       * get of returned element of invokeAll(c) throws exception on failed task
354       */
355 <    public void testInvokeAll4() {
356 <        ExecutorService e = new DirectExecutorService();
357 <        try {
358 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
355 >    public void testInvokeAll4() throws Exception {
356 >        final ExecutorService e = new DirectExecutorService();
357 >        try (PoolCleaner cleaner = cleaner(e)) {
358 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
359              l.add(new NPETask());
360 <            List<Future<String>> result = e.invokeAll(l);
361 <            assertEquals(1, result.size());
362 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
363 <                it.next().get();
364 <        } catch(ExecutionException success) {
365 <        } catch(Exception ex) {
366 <            unexpectedException();
367 <        } finally {
523 <            joinPool(e);
360 >            List<Future<String>> futures = e.invokeAll(l);
361 >            assertEquals(1, futures.size());
362 >            try {
363 >                futures.get(0).get();
364 >                shouldThrow();
365 >            } catch (ExecutionException success) {
366 >                assertTrue(success.getCause() instanceof NullPointerException);
367 >            }
368          }
369      }
370  
371      /**
372       * invokeAll(c) returns results of all completed tasks in c
373       */
374 <    public void testInvokeAll5() {
375 <        ExecutorService e = new DirectExecutorService();
376 <        try {
377 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
374 >    public void testInvokeAll5() throws Exception {
375 >        final ExecutorService e = new DirectExecutorService();
376 >        try (PoolCleaner cleaner = cleaner(e)) {
377 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
378              l.add(new StringTask());
379              l.add(new StringTask());
380 <            List<Future<String>> result = e.invokeAll(l);
381 <            assertEquals(2, result.size());
382 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
383 <                assertSame(TEST_STRING, it.next().get());
540 <        } catch (ExecutionException success) {
541 <        } catch(Exception ex) {
542 <            unexpectedException();
543 <        } finally {
544 <            joinPool(e);
380 >            List<Future<String>> futures = e.invokeAll(l);
381 >            assertEquals(2, futures.size());
382 >            for (Future<String> future : futures)
383 >                assertSame(TEST_STRING, future.get());
384          }
385      }
386  
548
387      /**
388       * timed invokeAny(null) throws NPE
389       */
390 <    public void testTimedInvokeAny1() {
391 <        ExecutorService e = new DirectExecutorService();
392 <        try {
393 <            e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
394 <        } catch (NullPointerException success) {
395 <        } catch(Exception ex) {
396 <            unexpectedException();
559 <        } finally {
560 <            joinPool(e);
390 >    public void testTimedInvokeAny1() throws Exception {
391 >        final ExecutorService e = new DirectExecutorService();
392 >        try (PoolCleaner cleaner = cleaner(e)) {
393 >            try {
394 >                e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
395 >                shouldThrow();
396 >            } catch (NullPointerException success) {}
397          }
398      }
399  
400      /**
401       * timed invokeAny(null time unit) throws NPE
402       */
403 <    public void testTimedInvokeAnyNullTimeUnit() {
404 <        ExecutorService e = new DirectExecutorService();
405 <        try {
406 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
407 <            l.add(new StringTask());
408 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
409 <        } catch (NullPointerException success) {
410 <        } catch(Exception ex) {
411 <            unexpectedException();
576 <        } finally {
577 <            joinPool(e);
403 >    public void testTimedInvokeAnyNullTimeUnit() throws Exception {
404 >        final ExecutorService e = new DirectExecutorService();
405 >        try (PoolCleaner cleaner = cleaner(e)) {
406 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
407 >            l.add(new StringTask());
408 >            try {
409 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
410 >                shouldThrow();
411 >            } catch (NullPointerException success) {}
412          }
413      }
414  
415      /**
416       * timed invokeAny(empty collection) throws IAE
417       */
418 <    public void testTimedInvokeAny2() {
419 <        ExecutorService e = new DirectExecutorService();
420 <        try {
421 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
422 <        } catch (IllegalArgumentException success) {
423 <        } catch(Exception ex) {
424 <            unexpectedException();
425 <        } finally {
592 <            joinPool(e);
418 >    public void testTimedInvokeAny2() throws Exception {
419 >        final ExecutorService e = new DirectExecutorService();
420 >        try (PoolCleaner cleaner = cleaner(e)) {
421 >            try {
422 >                e.invokeAny(new ArrayList<Callable<String>>(),
423 >                            MEDIUM_DELAY_MS, MILLISECONDS);
424 >                shouldThrow();
425 >            } catch (IllegalArgumentException success) {}
426          }
427      }
428  
429      /**
430       * timed invokeAny(c) throws NPE if c has null elements
431       */
432 <    public void testTimedInvokeAny3() {
433 <        ExecutorService e = new DirectExecutorService();
434 <        try {
435 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
436 <            l.add(new StringTask());
432 >    public void testTimedInvokeAny3() throws Exception {
433 >        final ExecutorService e = new DirectExecutorService();
434 >        try (PoolCleaner cleaner = cleaner(e)) {
435 >            List<Callable<Long>> l = new ArrayList<Callable<Long>>();
436 >            l.add(new Callable<Long>() {
437 >                      public Long call() { throw new ArithmeticException(); }});
438              l.add(null);
439 <            e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
440 <        } catch (NullPointerException success) {
441 <        } catch(Exception ex) {
442 <            ex.printStackTrace();
609 <            unexpectedException();
610 <        } finally {
611 <            joinPool(e);
439 >            try {
440 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
441 >                shouldThrow();
442 >            } catch (NullPointerException success) {}
443          }
444      }
445  
446      /**
447       * timed invokeAny(c) throws ExecutionException if no task completes
448       */
449 <    public void testTimedInvokeAny4() {
450 <        ExecutorService e = new DirectExecutorService();
451 <        try {
452 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
449 >    public void testTimedInvokeAny4() throws Exception {
450 >        final ExecutorService e = new DirectExecutorService();
451 >        try (PoolCleaner cleaner = cleaner(e)) {
452 >            long startTime = System.nanoTime();
453 >            List<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) {
457 <        } catch(Exception ex) {
458 <            unexpectedException();
459 <        } finally {
460 <            joinPool(e);
455 >            try {
456 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
457 >                shouldThrow();
458 >            } catch (ExecutionException success) {
459 >                assertTrue(success.getCause() instanceof NullPointerException);
460 >            }
461 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
462          }
463      }
464  
465      /**
466       * timed invokeAny(c) returns result of some task in c
467       */
468 <    public void testTimedInvokeAny5() {
469 <        ExecutorService e = new DirectExecutorService();
470 <        try {
471 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
468 >    public void testTimedInvokeAny5() throws Exception {
469 >        final ExecutorService e = new DirectExecutorService();
470 >        try (PoolCleaner cleaner = cleaner(e)) {
471 >            long startTime = System.nanoTime();
472 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
473              l.add(new StringTask());
474              l.add(new StringTask());
475 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
475 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
476              assertSame(TEST_STRING, result);
477 <        } catch (ExecutionException success) {
644 <        } catch(Exception ex) {
645 <            unexpectedException();
646 <        } finally {
647 <            joinPool(e);
477 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
478          }
479      }
480  
481      /**
482       * timed invokeAll(null) throws NPE
483       */
484 <    public void testTimedInvokeAll1() {
485 <        ExecutorService e = new DirectExecutorService();
486 <        try {
487 <            e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
488 <        } catch (NullPointerException success) {
489 <        } catch(Exception ex) {
490 <            unexpectedException();
661 <        } finally {
662 <            joinPool(e);
484 >    public void testTimedInvokeAll1() throws InterruptedException {
485 >        final ExecutorService e = new DirectExecutorService();
486 >        try (PoolCleaner cleaner = cleaner(e)) {
487 >            try {
488 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
489 >                shouldThrow();
490 >            } catch (NullPointerException success) {}
491          }
492      }
493  
494      /**
495       * timed invokeAll(null time unit) throws NPE
496       */
497 <    public void testTimedInvokeAllNullTimeUnit() {
498 <        ExecutorService e = new DirectExecutorService();
499 <        try {
500 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
501 <            l.add(new StringTask());
502 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
503 <        } catch (NullPointerException success) {
504 <        } catch(Exception ex) {
505 <            unexpectedException();
678 <        } finally {
679 <            joinPool(e);
497 >    public void testTimedInvokeAllNullTimeUnit() throws InterruptedException {
498 >        final ExecutorService e = new DirectExecutorService();
499 >        try (PoolCleaner cleaner = cleaner(e)) {
500 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
501 >            l.add(new StringTask());
502 >            try {
503 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
504 >                shouldThrow();
505 >            } catch (NullPointerException success) {}
506          }
507      }
508  
509      /**
510       * timed invokeAll(empty collection) returns empty collection
511       */
512 <    public void testTimedInvokeAll2() {
513 <        ExecutorService e = new DirectExecutorService();
514 <        try {
515 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
512 >    public void testTimedInvokeAll2() throws InterruptedException {
513 >        final ExecutorService e = new DirectExecutorService();
514 >        try (PoolCleaner cleaner = cleaner(e)) {
515 >            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
516              assertTrue(r.isEmpty());
691        } catch(Exception ex) {
692            unexpectedException();
693        } finally {
694            joinPool(e);
517          }
518      }
519  
520      /**
521       * timed invokeAll(c) throws NPE if c has null elements
522       */
523 <    public void testTimedInvokeAll3() {
524 <        ExecutorService e = new DirectExecutorService();
525 <        try {
526 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
523 >    public void testTimedInvokeAll3() throws InterruptedException {
524 >        final ExecutorService e = new DirectExecutorService();
525 >        try (PoolCleaner cleaner = cleaner(e)) {
526 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
527              l.add(new StringTask());
528              l.add(null);
529 <            e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
530 <        } catch (NullPointerException success) {
531 <        } catch(Exception ex) {
532 <            unexpectedException();
711 <        } finally {
712 <            joinPool(e);
529 >            try {
530 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
531 >                shouldThrow();
532 >            } catch (NullPointerException success) {}
533          }
534      }
535  
536      /**
537       * get of returned element of invokeAll(c) throws exception on failed task
538       */
539 <    public void testTimedInvokeAll4() {
540 <        ExecutorService e = new DirectExecutorService();
541 <        try {
542 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
539 >    public void testTimedInvokeAll4() throws Exception {
540 >        final ExecutorService e = new DirectExecutorService();
541 >        try (PoolCleaner cleaner = cleaner(e)) {
542 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
543              l.add(new NPETask());
544 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
545 <            assertEquals(1, result.size());
546 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
547 <                it.next().get();
548 <        } catch(ExecutionException success) {
549 <        } catch(Exception ex) {
550 <            unexpectedException();
551 <        } finally {
552 <            joinPool(e);
544 >            List<Future<String>> futures =
545 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
546 >            assertEquals(1, futures.size());
547 >            try {
548 >                futures.get(0).get();
549 >                shouldThrow();
550 >            } catch (ExecutionException success) {
551 >                assertTrue(success.getCause() instanceof NullPointerException);
552 >            }
553          }
554      }
555  
556      /**
557       * timed invokeAll(c) returns results of all completed tasks in c
558       */
559 <    public void testTimedInvokeAll5() {
560 <        ExecutorService e = new DirectExecutorService();
561 <        try {
562 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
559 >    public void testTimedInvokeAll5() throws Exception {
560 >        final ExecutorService e = new DirectExecutorService();
561 >        try (PoolCleaner cleaner = cleaner(e)) {
562 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
563              l.add(new StringTask());
564              l.add(new StringTask());
565 <            List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
566 <            assertEquals(2, result.size());
567 <            for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
568 <                assertSame(TEST_STRING, it.next().get());
569 <        } catch (ExecutionException success) {
750 <        } catch(Exception ex) {
751 <            unexpectedException();
752 <        } finally {
753 <            joinPool(e);
565 >            List<Future<String>> futures =
566 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
567 >            assertEquals(2, futures.size());
568 >            for (Future<String> future : futures)
569 >                assertSame(TEST_STRING, future.get());
570          }
571      }
572  
573      /**
574       * timed invokeAll cancels tasks not completed by timeout
575       */
576 <    public void testTimedInvokeAll6() {
577 <        ExecutorService e = new DirectExecutorService();
578 <        try {
579 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
580 <            l.add(new StringTask());
581 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
582 <            l.add(new StringTask());
583 <            List<Future<String>> result = e.invokeAll(l, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
584 <            assertEquals(3, result.size());
585 <            Iterator<Future<String>> it = result.iterator();
586 <            Future<String> f1 = it.next();
587 <            Future<String> f2 = it.next();
588 <            Future<String> f3 = it.next();
589 <            assertTrue(f1.isDone());
590 <            assertFalse(f1.isCancelled());
591 <            assertTrue(f2.isDone());
592 <            assertTrue(f3.isDone());
593 <            assertTrue(f3.isCancelled());
594 <        } catch(Exception ex) {
595 <            unexpectedException();
596 <        } finally {
597 <            joinPool(e);
576 >    public void testTimedInvokeAll6() throws Exception {
577 >        final ExecutorService e = new DirectExecutorService();
578 >        try (PoolCleaner cleaner = cleaner(e)) {
579 >            for (long timeout = timeoutMillis();;) {
580 >                List<Callable<String>> tasks = new ArrayList<>();
581 >                tasks.add(new StringTask("0"));
582 >                tasks.add(Executors.callable(possiblyInterruptedRunnable(timeout),
583 >                                             TEST_STRING));
584 >                tasks.add(new StringTask("2"));
585 >                long startTime = System.nanoTime();
586 >                List<Future<String>> futures =
587 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
588 >                assertEquals(tasks.size(), futures.size());
589 >                assertTrue(millisElapsedSince(startTime) >= timeout);
590 >                for (Future future : futures)
591 >                    assertTrue(future.isDone());
592 >                try {
593 >                    assertEquals("0", futures.get(0).get());
594 >                    assertEquals(TEST_STRING, futures.get(1).get());
595 >                } catch (CancellationException retryWithLongerTimeout) {
596 >                    // unusual delay before starting second task
597 >                    timeout *= 2;
598 >                    if (timeout >= LONG_DELAY_MS / 2)
599 >                        fail("expected exactly one task to be cancelled");
600 >                    continue;
601 >                }
602 >                assertTrue(futures.get(2).isCancelled());
603 >                break;
604 >            }
605          }
606      }
607  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines