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.19 by jsr166, Fri Nov 20 05:25:10 2009 UTC vs.
Revision 1.41 by jsr166, Mon Oct 5 22:54:45 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines