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.21 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.49 by dl, Tue Jan 26 13:33:05 2021 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
10 import junit.framework.*;
11 import java.util.*;
12 import java.util.concurrent.*;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < import java.math.BigInteger;
11 < import java.security.*;
10 >
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 > 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 29 | 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.emptyList();
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  
# Line 41 | Line 62 | public class AbstractExecutorServiceTest
62       */
63      public void testExecuteRunnable() throws Exception {
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);
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  
51
77      /**
78       * Completed submit(callable) returns result
79       */
# Line 79 | Line 104 | public class AbstractExecutorServiceTest
104          assertSame(TEST_STRING, result);
105      }
106  
82
107      /**
108 <     * A submitted privileged action to completion
108 >     * A submitted privileged action runs to completion
109       */
110      public void testSubmitPrivilegedAction() throws Exception {
111 <        Policy savedPolicy = null;
112 <        try {
113 <            savedPolicy = Policy.getPolicy();
114 <            AdjustablePolicy policy = new AdjustablePolicy();
91 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
92 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
93 <            Policy.setPolicy(policy);
94 <        } catch (AccessControlException ok) {
95 <            return;
96 <        }
97 <        try {
98 <            ExecutorService e = new DirectExecutorService();
99 <            Future future = e.submit(Executors.callable(new PrivilegedAction() {
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<Object>() {
115                      public Object run() {
116                          return TEST_STRING;
117                      }}));
118  
119 <            Object result = future.get();
120 <            assertSame(TEST_STRING, result);
121 <        }
122 <        finally {
123 <            try {
124 <                Policy.setPolicy(savedPolicy);
125 <            } catch (AccessControlException ok) {
111 <                return;
112 <            }
113 <        }
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() throws Exception {
132 <        Policy savedPolicy = null;
133 <        try {
134 <            savedPolicy = Policy.getPolicy();
135 <            AdjustablePolicy policy = new AdjustablePolicy();
124 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
125 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
126 <            Policy.setPolicy(policy);
127 <        } catch (AccessControlException ok) {
128 <            return;
129 <        }
130 <
131 <        try {
132 <            ExecutorService e = new DirectExecutorService();
133 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
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<Object>() {
136                      public Object run() {
137                          return TEST_STRING;
138                      }}));
139  
140 <            Object result = future.get();
141 <            assertSame(TEST_STRING, result);
142 <        }
143 <        finally {
142 <            Policy.setPolicy(savedPolicy);
143 <        }
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() throws Exception {
150 <        Policy savedPolicy = null;
151 <        try {
152 <            savedPolicy = Policy.getPolicy();
153 <            AdjustablePolicy policy = new AdjustablePolicy();
154 <            policy.addPermission(new RuntimePermission("getContextClassLoader"));
155 <            policy.addPermission(new RuntimePermission("setContextClassLoader"));
156 <            Policy.setPolicy(policy);
157 <        } catch (AccessControlException ok) {
158 <            return;
159 <        }
160 <
161 <        try {
162 <            ExecutorService e = new DirectExecutorService();
163 <            Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
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<Object>() {
154                      public Object run() throws Exception {
155                          throw new IndexOutOfBoundsException();
156                      }}));
157  
168            future.get();
169            shouldThrow();
170        } catch (ExecutionException success) {
171            assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
172        }
173        finally {
174            Policy.setPolicy(savedPolicy);
175        }
176    }
177
178    /**
179     * execute(null runnable) throws NPE
180     */
181    public void testExecuteNullRunnable() {
182        try {
183            ExecutorService e = new DirectExecutorService();
184            e.submit((Runnable) null);
185            shouldThrow();
186        } catch (NullPointerException success) {}
187    }
188
189
190    /**
191     * submit(null callable) throws NPE
192     */
193    public void testSubmitNullCallable() {
194        try {
195            ExecutorService e = new DirectExecutorService();
196            e.submit((Callable) null);
197            shouldThrow();
198        } catch (NullPointerException success) {}
199    }
200
201    /**
202     * submit(runnable) throws RejectedExecutionException if
203     * executor is saturated.
204     */
205    public void testExecute1() {
206        ThreadPoolExecutor p =
207            new ThreadPoolExecutor(1, 1,
208                                   60, TimeUnit.SECONDS,
209                                   new ArrayBlockingQueue<Runnable>(1));
210        try {
211            for (int i = 0; i < 2; ++i)
212                p.submit(new MediumRunnable());
213            for (int i = 0; i < 2; ++i) {
158                  try {
159 <                    p.submit(new MediumRunnable());
159 >                    future.get();
160                      shouldThrow();
161 <                } catch (RejectedExecutionException success) {}
162 <            }
163 <        } finally {
164 <            joinPool(p);
165 <        }
161 >                } catch (ExecutionException success) {
162 >                    assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
163 >                }}};
164 >
165 >        runWithPermissions(r);
166      }
167  
168      /**
169 <     * submit(callable) throws RejectedExecutionException
226 <     * if executor is saturated.
169 >     * Submitting null tasks throws NullPointerException
170       */
171 <    public void testExecute2() {
172 <        ThreadPoolExecutor p =
173 <            new ThreadPoolExecutor(1, 1,
174 <                                   60, TimeUnit.SECONDS,
232 <                                   new ArrayBlockingQueue<Runnable>(1));
233 <        try {
234 <            for (int i = 0; i < 2; ++i)
235 <                p.submit(new MediumRunnable());
236 <            for (int i = 0; i < 2; ++i) {
237 <                try {
238 <                    p.submit(new SmallCallable());
239 <                    shouldThrow();
240 <                } catch (RejectedExecutionException success) {}
241 <            }
242 <        } finally {
243 <            joinPool(p);
171 >    public void testNullTaskSubmission() {
172 >        final ExecutorService e = new DirectExecutorService();
173 >        try (PoolCleaner cleaner = cleaner(e)) {
174 >            assertNullTaskSubmissionThrowsNullPointerException(e);
175          }
176      }
177  
247
178      /**
179 <     *  Blocking on submit(callable) throws InterruptedException if
250 <     *  caller interrupted.
179 >     * submit(callable).get() throws InterruptedException if interrupted
180       */
181      public void testInterruptedSubmit() throws InterruptedException {
182 <        final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,60, TimeUnit.SECONDS, new ArrayBlockingQueue<Runnable>(10));
183 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
184 <            public void realRun() throws Exception {
185 <                p.submit(new CheckedCallable<Object>() {
186 <                             public Object realCall()
187 <                                 throws InterruptedException {
188 <                                 Thread.sleep(SMALL_DELAY_MS);
189 <                                 return null;
190 <                             }}).get();
191 <            }});
192 <
193 <        t.start();
194 <        Thread.sleep(SHORT_DELAY_MS);
195 <        t.interrupt();
196 <        joinPool(p);
197 <    }
198 <
270 <    /**
271 <     *  get of submitted callable throws InterruptedException if callable
272 <     *  interrupted
273 <     */
274 <    public void testSubmitIE() throws InterruptedException {
275 <        final ThreadPoolExecutor p =
276 <            new ThreadPoolExecutor(1, 1,
277 <                                   60, TimeUnit.SECONDS,
278 <                                   new ArrayBlockingQueue<Runnable>(10));
279 <
280 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
281 <            public void realRun() throws Exception {
282 <                p.submit(new SmallCallable()).get();
283 <            }});
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 <        t.start();
201 <        Thread.sleep(SHORT_DELAY_MS);
202 <        t.interrupt();
203 <        t.join();
289 <        joinPool(p);
200 >            await(submitted);
201 >            t.interrupt();
202 >            awaitTermination(t);
203 >        }
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() throws InterruptedException {
211 <        ThreadPoolExecutor p =
211 >        final ThreadPoolExecutor p =
212              new ThreadPoolExecutor(1, 1,
213                                     60, TimeUnit.SECONDS,
214                                     new ArrayBlockingQueue<Runnable>(10));
215 <
216 <        Callable c = new Callable() {
217 <            public Object call() { return 5/0; }};
218 <
219 <        try {
220 <            p.submit(c).get();
221 <            shouldThrow();
222 <        } catch (ExecutionException success) {
223 <            assertTrue(success.getCause() instanceof ArithmeticException);
215 >        try (PoolCleaner cleaner = cleaner(p)) {
216 >            Callable<Object> c = new Callable<Object>() {
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 >            }
224          }
311        joinPool(p);
225      }
226  
227      /**
228       * invokeAny(null) throws NPE
229       */
230 <    public void testInvokeAny1()
231 <        throws InterruptedException, ExecutionException {
232 <        ExecutorService e = new DirectExecutorService();
233 <        try {
234 <            e.invokeAny(null);
235 <            shouldThrow();
236 <        } catch (NullPointerException success) {
324 <        } finally {
325 <            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 <        throws InterruptedException, ExecutionException {
245 <        ExecutorService e = new DirectExecutorService();
246 <        try {
247 <            e.invokeAny(new ArrayList<Callable<String>>());
248 <            shouldThrow();
249 <        } catch (IllegalArgumentException success) {
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  
# Line 345 | Line 256 | public class AbstractExecutorServiceTest
256       * invokeAny(c) throws NPE if c has null elements
257       */
258      public void testInvokeAny3() throws Exception {
259 <        final CountDownLatch latch = new CountDownLatch(1);
260 <        ExecutorService e = new DirectExecutorService();
261 <        try {
262 <            ArrayList<Callable<Integer>> l
263 <                = new ArrayList<Callable<Integer>>();
353 <            l.add(new Callable<Integer>() {
354 <                      public Integer call() { return 5/0; }});
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 <            shouldThrow();
267 <        } catch (NullPointerException success) {
268 <        } finally {
360 <            latch.countDown();
361 <            joinPool(e);
265 >            try {
266 >                e.invokeAny(l);
267 >                shouldThrow();
268 >            } catch (NullPointerException success) {}
269          }
270      }
271  
# Line 366 | Line 273 | public class AbstractExecutorServiceTest
273       * invokeAny(c) throws ExecutionException if no task in c completes
274       */
275      public void testInvokeAny4() throws InterruptedException {
276 <        ExecutorService e = new DirectExecutorService();
277 <        try {
278 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 <            shouldThrow();
282 <        } catch (ExecutionException success) {
283 <            assertTrue(success.getCause() instanceof NullPointerException);
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  
# Line 383 | Line 290 | public class AbstractExecutorServiceTest
290       * invokeAny(c) returns result of some task in c if at least one completes
291       */
292      public void testInvokeAny5() throws Exception {
293 <        ExecutorService e = new DirectExecutorService();
294 <        try {
295 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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);
393        } finally {
394            joinPool(e);
300          }
301      }
302  
# Line 399 | Line 304 | public class AbstractExecutorServiceTest
304       * invokeAll(null) throws NPE
305       */
306      public void testInvokeAll1() throws InterruptedException {
307 <        ExecutorService e = new DirectExecutorService();
308 <        try {
309 <            e.invokeAll(null);
310 <            shouldThrow();
311 <        } catch (NullPointerException success) {
312 <        } finally {
408 <            joinPool(e);
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() throws InterruptedException {
320 <        ExecutorService e = new DirectExecutorService();
321 <        try {
322 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
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());
420        } finally {
421            joinPool(e);
326          }
327      }
328  
# Line 426 | Line 330 | public class AbstractExecutorServiceTest
330       * invokeAll(c) throws NPE if c has null elements
331       */
332      public void testInvokeAll3() throws InterruptedException {
333 <        ExecutorService e = new DirectExecutorService();
334 <        try {
335 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 <            shouldThrow();
340 <        } catch (NullPointerException success) {
341 <        } finally {
438 <            joinPool(e);
338 >            try {
339 >                e.invokeAll(l);
340 >                shouldThrow();
341 >            } catch (NullPointerException success) {}
342          }
343      }
344  
# Line 443 | Line 346 | public class AbstractExecutorServiceTest
346       * get of returned element of invokeAll(c) throws exception on failed task
347       */
348      public void testInvokeAll4() throws Exception {
349 <        ExecutorService e = new DirectExecutorService();
350 <        try {
351 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 (Future<String> future : result) {
356 <                try {
357 <                    future.get();
358 <                    shouldThrow();
359 <                } catch (ExecutionException success) {
457 <                    Throwable cause = success.getCause();
458 <                    assertTrue(cause instanceof NullPointerException);
459 <                }
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              }
461        } finally {
462            joinPool(e);
361          }
362      }
363  
# Line 467 | Line 365 | public class AbstractExecutorServiceTest
365       * invokeAll(c) returns results of all completed tasks in c
366       */
367      public void testInvokeAll5() throws Exception {
368 <        ExecutorService e = new DirectExecutorService();
369 <        try {
370 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 (Future<String> future : result)
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());
479        } finally {
480            joinPool(e);
377          }
378      }
379  
484
380      /**
381       * timed invokeAny(null) throws NPE
382       */
383      public void testTimedInvokeAny1() throws Exception {
384 <        ExecutorService e = new DirectExecutorService();
385 <        try {
386 <            e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
387 <            shouldThrow();
388 <        } catch (NullPointerException success) {
389 <        } finally {
495 <            joinPool(e);
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() throws Exception {
397 <        ExecutorService e = new DirectExecutorService();
398 <        try {
399 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 <            shouldThrow();
403 <        } catch (NullPointerException success) {
404 <        } finally {
511 <            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() throws Exception {
412 <        ExecutorService e = new DirectExecutorService();
413 <        try {
414 <            e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
415 <            shouldThrow();
416 <        } catch (IllegalArgumentException success) {
417 <        } finally {
418 <            joinPool(e);
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  
# Line 530 | Line 424 | public class AbstractExecutorServiceTest
424       * timed invokeAny(c) throws NPE if c has null elements
425       */
426      public void testTimedInvokeAny3() throws Exception {
427 <        final CountDownLatch latch = new CountDownLatch(1);
428 <        ExecutorService e = new DirectExecutorService();
429 <        try {
430 <            ArrayList<Callable<Integer>> l
431 <                = new ArrayList<Callable<Integer>>();
538 <            l.add(new Callable<Integer>() {
539 <                      public Integer call() { return 5/0; }});
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, MILLISECONDS);
434 <            shouldThrow();
435 <        } catch (NullPointerException success) {
436 <        } finally {
545 <            latch.countDown();
546 <            joinPool(e);
433 >            try {
434 >                e.invokeAny(l, randomTimeout(), randomTimeUnit());
435 >                shouldThrow();
436 >            } catch (NullPointerException success) {}
437          }
438      }
439  
# Line 551 | Line 441 | public class AbstractExecutorServiceTest
441       * timed invokeAny(c) throws ExecutionException if no task completes
442       */
443      public void testTimedInvokeAny4() throws Exception {
444 <        ExecutorService e = new DirectExecutorService();
445 <        try {
446 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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, MILLISECONDS);
450 <            shouldThrow();
451 <        } catch (ExecutionException success) {
452 <            assertTrue(success.getCause() instanceof NullPointerException);
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  
# Line 568 | Line 460 | public class AbstractExecutorServiceTest
460       * timed invokeAny(c) returns result of some task in c
461       */
462      public void testTimedInvokeAny5() throws Exception {
463 <        ExecutorService e = new DirectExecutorService();
464 <        try {
465 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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, MILLISECONDS);
469 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
470              assertSame(TEST_STRING, result);
471 <        } finally {
579 <            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() throws InterruptedException {
479 <        ExecutorService e = new DirectExecutorService();
480 <        try {
481 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
482 <            shouldThrow();
483 <        } catch (NullPointerException success) {
484 <        } finally {
593 <            joinPool(e);
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  
# Line 598 | Line 489 | public class AbstractExecutorServiceTest
489       * timed invokeAll(null time unit) throws NPE
490       */
491      public void testTimedInvokeAllNullTimeUnit() throws InterruptedException {
492 <        ExecutorService e = new DirectExecutorService();
493 <        try {
494 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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 <            shouldThrow();
498 <        } catch (NullPointerException success) {
499 <        } finally {
609 <            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() throws InterruptedException {
507 <        ExecutorService e = new DirectExecutorService();
508 <        try {
509 <            List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
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());
621        } finally {
622            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() throws InterruptedException {
521 <        ExecutorService e = new DirectExecutorService();
522 <        try {
523 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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, MILLISECONDS);
527 <            shouldThrow();
528 <        } catch (NullPointerException success) {
529 <        } finally {
639 <            joinPool(e);
526 >            try {
527 >                e.invokeAll(l, randomTimeout(), randomTimeUnit());
528 >                shouldThrow();
529 >            } catch (NullPointerException success) {}
530          }
531      }
532  
# Line 644 | Line 534 | public class AbstractExecutorServiceTest
534       * get of returned element of invokeAll(c) throws exception on failed task
535       */
536      public void testTimedInvokeAll4() throws Exception {
537 <        ExecutorService e = new DirectExecutorService();
538 <        try {
539 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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, MILLISECONDS);
542 <            assertEquals(1, result.size());
543 <            for (Future<String> future : result) {
544 <                try {
545 <                    future.get();
546 <                    shouldThrow();
547 <                } catch (ExecutionException success) {
548 <                    assertTrue(success.getCause() instanceof NullPointerException);
659 <                }
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              }
661        } finally {
662            joinPool(e);
550          }
551      }
552  
# Line 667 | Line 554 | public class AbstractExecutorServiceTest
554       * timed invokeAll(c) returns results of all completed tasks in c
555       */
556      public void testTimedInvokeAll5() throws Exception {
557 <        ExecutorService e = new DirectExecutorService();
558 <        try {
559 <            ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
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, MILLISECONDS);
563 <            assertEquals(2, result.size());
564 <            for (Future<String> future : result)
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());
679        } finally {
680            joinPool(e);
567          }
568      }
569  
570      /**
571       * timed invokeAll cancels tasks not completed by timeout
572       */
573 <    public void testTimedInvokeAll6() throws InterruptedException {
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, 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 <        } finally {
592 <            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