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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines