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.24 by jsr166, Wed Aug 25 00:07:02 2010 UTC vs.
Revision 1.44 by jsr166, Thu Oct 8 03:08:37 2015 UTC

# Line 1 | Line 1
1   /*
2   * Written by Doug Lea with assistance from members of JCP JSR-166
3   * Expert Group and released to the public domain, as explained at
4 < * http://creativecommons.org/licenses/publicdomain
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.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 29 | 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 41 | 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  
51
76      /**
77       * Completed submit(callable) returns result
78       */
# Line 79 | Line 103 | public class AbstractExecutorServiceTest
103          assertSame(TEST_STRING, result);
104      }
105  
82
106      /**
107       * A submitted privileged action runs to completion
108       */
# Line 145 | Line 168 | public class AbstractExecutorServiceTest
168       * execute(null runnable) throws NPE
169       */
170      public void testExecuteNullRunnable() {
171 +        ExecutorService e = new DirectExecutorService();
172          try {
149            ExecutorService e = new DirectExecutorService();
173              e.submit((Runnable) null);
174              shouldThrow();
175          } catch (NullPointerException success) {}
176      }
177  
155
178      /**
179       * submit(null callable) throws NPE
180       */
181      public void testSubmitNullCallable() {
182 +        ExecutorService e = new DirectExecutorService();
183          try {
161            ExecutorService e = new DirectExecutorService();
184              e.submit((Callable) null);
185              shouldThrow();
186          } catch (NullPointerException success) {}
187      }
188  
189      /**
190 <     * submit(runnable) throws RejectedExecutionException if
169 <     * executor is saturated.
170 <     */
171 <    public void testExecute1() {
172 <        ThreadPoolExecutor p =
173 <            new ThreadPoolExecutor(1, 1,
174 <                                   60, TimeUnit.SECONDS,
175 <                                   new ArrayBlockingQueue<Runnable>(1));
176 <        try {
177 <            for (int i = 0; i < 2; ++i)
178 <                p.submit(new MediumRunnable());
179 <            for (int i = 0; i < 2; ++i) {
180 <                try {
181 <                    p.submit(new MediumRunnable());
182 <                    shouldThrow();
183 <                } catch (RejectedExecutionException success) {}
184 <            }
185 <        } finally {
186 <            joinPool(p);
187 <        }
188 <    }
189 <
190 <    /**
191 <     * submit(callable) throws RejectedExecutionException
192 <     * if executor is saturated.
193 <     */
194 <    public void testExecute2() {
195 <        ThreadPoolExecutor p =
196 <            new ThreadPoolExecutor(1, 1,
197 <                                   60, TimeUnit.SECONDS,
198 <                                   new ArrayBlockingQueue<Runnable>(1));
199 <        try {
200 <            for (int i = 0; i < 2; ++i)
201 <                p.submit(new MediumRunnable());
202 <            for (int i = 0; i < 2; ++i) {
203 <                try {
204 <                    p.submit(new SmallCallable());
205 <                    shouldThrow();
206 <                } catch (RejectedExecutionException success) {}
207 <            }
208 <        } finally {
209 <            joinPool(p);
210 <        }
211 <    }
212 <
213 <
214 <    /**
215 <     *  Blocking on submit(callable) throws InterruptedException if
216 <     *  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 <
236 <    /**
237 <     *  get of submitted callable throws InterruptedException if callable
238 <     *  interrupted
239 <     */
240 <    public void testSubmitIE() throws InterruptedException {
241 <        final ThreadPoolExecutor p =
242 <            new ThreadPoolExecutor(1, 1,
243 <                                   60, TimeUnit.SECONDS,
244 <                                   new ArrayBlockingQueue<Runnable>(10));
245 <
246 <        Thread t = new Thread(new CheckedInterruptedRunnable() {
247 <            public void realRun() throws Exception {
248 <                p.submit(new SmallCallable()).get();
249 <            }});
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();
255 <        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          }
277        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) {
290 <        } finally {
291 <            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) {
305 <        } finally {
306 <            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 311 | Line 265 | public class AbstractExecutorServiceTest
265       * invokeAny(c) throws NPE if c has null elements
266       */
267      public void testInvokeAny3() throws Exception {
268 <        ExecutorService e = new DirectExecutorService();
269 <        List<Callable<Integer>> l = new ArrayList<Callable<Integer>>();
270 <        l.add(new Callable<Integer>() {
271 <                  public Integer call() { return 5/0; }});
272 <        l.add(null);
273 <        try {
274 <            e.invokeAny(l);
275 <            shouldThrow();
276 <        } catch (NullPointerException success) {
277 <        } finally {
324 <            joinPool(e);
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 >            try {
275 >                e.invokeAny(l);
276 >                shouldThrow();
277 >            } catch (NullPointerException success) {}
278          }
279      }
280  
# Line 329 | 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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
287 <        l.add(new NPETask());
288 <        try {
289 <            e.invokeAny(l);
290 <            shouldThrow();
291 <        } catch (ExecutionException success) {
292 <            assertTrue(success.getCause() instanceof NullPointerException);
293 <        } finally {
294 <            joinPool(e);
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 >            try {
290 >                e.invokeAny(l);
291 >                shouldThrow();
292 >            } catch (ExecutionException success) {
293 >                assertTrue(success.getCause() instanceof NullPointerException);
294 >            }
295          }
296      }
297  
# Line 346 | 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 {
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);
356        } finally {
357            joinPool(e);
309          }
310      }
311  
# Line 362 | 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 {
371 <            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 376 | 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());
383        } finally {
384            joinPool(e);
333          }
334      }
335  
# Line 389 | 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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
342 <        l.add(new StringTask());
343 <        l.add(null);
344 <        try {
345 <            e.invokeAll(l);
346 <            shouldThrow();
347 <        } catch (NullPointerException success) {
348 <        } finally {
401 <            joinPool(e);
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 >            try {
346 >                e.invokeAll(l);
347 >                shouldThrow();
348 >            } catch (NullPointerException success) {}
349          }
350      }
351  
# Line 406 | 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 {
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>> futures = e.invokeAll(l);
# Line 418 | Line 365 | public class AbstractExecutorServiceTest
365              } catch (ExecutionException success) {
366                  assertTrue(success.getCause() instanceof NullPointerException);
367              }
421        } finally {
422            joinPool(e);
368          }
369      }
370  
# Line 427 | 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 {
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());
# Line 436 | Line 381 | public class AbstractExecutorServiceTest
381              assertEquals(2, futures.size());
382              for (Future<String> future : futures)
383                  assertSame(TEST_STRING, future.get());
439        } finally {
440            joinPool(e);
384          }
385      }
386  
444
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, MILLISECONDS);
394 <            shouldThrow();
395 <        } catch (NullPointerException success) {
396 <        } finally {
455 <            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 460 | 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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
406 <        l.add(new StringTask());
407 <        try {
408 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
409 <            shouldThrow();
410 <        } catch (NullPointerException success) {
411 <        } finally {
471 <            joinPool(e);
404 >        final ExecutorService e = new DirectExecutorService();
405 >        try (PoolCleaner cleaner = cleaner(e)) {
406 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
407 >            l.add(new StringTask());
408 >            try {
409 >                e.invokeAny(l, MEDIUM_DELAY_MS, null);
410 >                shouldThrow();
411 >            } catch (NullPointerException success) {}
412          }
413      }
414  
# Line 476 | 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, 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 490 | Line 430 | public class AbstractExecutorServiceTest
430       * timed invokeAny(c) throws NPE if c has null elements
431       */
432      public void testTimedInvokeAny3() throws Exception {
433 <        ExecutorService e = new DirectExecutorService();
434 <        List<Callable<Integer>> l = new ArrayList<Callable<Integer>>();
435 <        l.add(new Callable<Integer>() {
436 <                  public Integer call() { return 5/0; }});
437 <        l.add(null);
438 <        try {
439 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
440 <            shouldThrow();
441 <        } catch (NullPointerException success) {
442 <        } finally {
503 <            joinPool(e);
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 >            try {
440 >                e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
441 >                shouldThrow();
442 >            } catch (NullPointerException success) {}
443          }
444      }
445  
# Line 508 | 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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
452 <        l.add(new NPETask());
453 <        try {
454 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
455 <            shouldThrow();
456 <        } catch (ExecutionException success) {
457 <            assertTrue(success.getCause() instanceof NullPointerException);
458 <        } finally {
459 <            joinPool(e);
450 >        final ExecutorService e = new DirectExecutorService();
451 >        try (PoolCleaner cleaner = cleaner(e)) {
452 >            long startTime = System.nanoTime();
453 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
454 >            l.add(new NPETask());
455 >            try {
456 >                e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
457 >                shouldThrow();
458 >            } catch (ExecutionException success) {
459 >                assertTrue(success.getCause() instanceof NullPointerException);
460 >            }
461 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
462          }
463      }
464  
# Line 525 | Line 466 | public class AbstractExecutorServiceTest
466       * timed invokeAny(c) returns result of some task in c
467       */
468      public void testTimedInvokeAny5() throws Exception {
469 <        ExecutorService e = new DirectExecutorService();
470 <        try {
469 >        final ExecutorService e = new DirectExecutorService();
470 >        try (PoolCleaner cleaner = cleaner(e)) {
471 >            long startTime = System.nanoTime();
472              List<Callable<String>> l = new ArrayList<Callable<String>>();
473              l.add(new StringTask());
474              l.add(new StringTask());
475 <            String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
475 >            String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
476              assertSame(TEST_STRING, result);
477 <        } finally {
536 <            joinPool(e);
477 >            assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
478          }
479      }
480  
# Line 541 | Line 482 | public class AbstractExecutorServiceTest
482       * timed invokeAll(null) throws NPE
483       */
484      public void testTimedInvokeAll1() throws InterruptedException {
485 <        ExecutorService e = new DirectExecutorService();
486 <        try {
487 <            e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
488 <            shouldThrow();
489 <        } catch (NullPointerException success) {
490 <        } finally {
550 <            joinPool(e);
485 >        final ExecutorService e = new DirectExecutorService();
486 >        try (PoolCleaner cleaner = cleaner(e)) {
487 >            try {
488 >                e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
489 >                shouldThrow();
490 >            } catch (NullPointerException success) {}
491          }
492      }
493  
# Line 555 | Line 495 | public class AbstractExecutorServiceTest
495       * timed invokeAll(null time unit) throws NPE
496       */
497      public void testTimedInvokeAllNullTimeUnit() throws InterruptedException {
498 <        ExecutorService e = new DirectExecutorService();
499 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
500 <        l.add(new StringTask());
501 <        try {
502 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
503 <            shouldThrow();
504 <        } catch (NullPointerException success) {
505 <        } finally {
566 <            joinPool(e);
498 >        final ExecutorService e = new DirectExecutorService();
499 >        try (PoolCleaner cleaner = cleaner(e)) {
500 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
501 >            l.add(new StringTask());
502 >            try {
503 >                e.invokeAll(l, MEDIUM_DELAY_MS, null);
504 >                shouldThrow();
505 >            } catch (NullPointerException success) {}
506          }
507      }
508  
# Line 571 | Line 510 | public class AbstractExecutorServiceTest
510       * timed invokeAll(empty collection) returns empty collection
511       */
512      public void testTimedInvokeAll2() throws InterruptedException {
513 <        ExecutorService e = new DirectExecutorService();
514 <        try {
513 >        final ExecutorService e = new DirectExecutorService();
514 >        try (PoolCleaner cleaner = cleaner(e)) {
515              List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
516              assertTrue(r.isEmpty());
578        } finally {
579            joinPool(e);
517          }
518      }
519  
# Line 584 | Line 521 | public class AbstractExecutorServiceTest
521       * timed invokeAll(c) throws NPE if c has null elements
522       */
523      public void testTimedInvokeAll3() throws InterruptedException {
524 <        ExecutorService e = new DirectExecutorService();
525 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
526 <        l.add(new StringTask());
527 <        l.add(null);
528 <        try {
529 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
530 <            shouldThrow();
531 <        } catch (NullPointerException success) {
532 <        } finally {
596 <            joinPool(e);
524 >        final ExecutorService e = new DirectExecutorService();
525 >        try (PoolCleaner cleaner = cleaner(e)) {
526 >            List<Callable<String>> l = new ArrayList<Callable<String>>();
527 >            l.add(new StringTask());
528 >            l.add(null);
529 >            try {
530 >                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
531 >                shouldThrow();
532 >            } catch (NullPointerException success) {}
533          }
534      }
535  
# Line 601 | Line 537 | public class AbstractExecutorServiceTest
537       * get of returned element of invokeAll(c) throws exception on failed task
538       */
539      public void testTimedInvokeAll4() throws Exception {
540 <        ExecutorService e = new DirectExecutorService();
541 <        try {
540 >        final ExecutorService e = new DirectExecutorService();
541 >        try (PoolCleaner cleaner = cleaner(e)) {
542              List<Callable<String>> l = new ArrayList<Callable<String>>();
543              l.add(new NPETask());
544              List<Future<String>> futures =
545 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
545 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
546              assertEquals(1, futures.size());
547              try {
548                  futures.get(0).get();
# Line 614 | Line 550 | public class AbstractExecutorServiceTest
550              } catch (ExecutionException success) {
551                  assertTrue(success.getCause() instanceof NullPointerException);
552              }
617        } finally {
618            joinPool(e);
553          }
554      }
555  
# Line 623 | Line 557 | public class AbstractExecutorServiceTest
557       * timed invokeAll(c) returns results of all completed tasks in c
558       */
559      public void testTimedInvokeAll5() throws Exception {
560 <        ExecutorService e = new DirectExecutorService();
561 <        try {
560 >        final ExecutorService e = new DirectExecutorService();
561 >        try (PoolCleaner cleaner = cleaner(e)) {
562              List<Callable<String>> l = new ArrayList<Callable<String>>();
563              l.add(new StringTask());
564              l.add(new StringTask());
565              List<Future<String>> futures =
566 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
566 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
567              assertEquals(2, futures.size());
568              for (Future<String> future : futures)
569                  assertSame(TEST_STRING, future.get());
636        } finally {
637            joinPool(e);
570          }
571      }
572  
573      /**
574       * timed invokeAll cancels tasks not completed by timeout
575       */
576 <    public void testTimedInvokeAll6() throws InterruptedException {
577 <        ExecutorService e = new DirectExecutorService();
578 <        try {
579 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
580 <            l.add(new StringTask());
581 <            l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
582 <            l.add(new StringTask());
583 <            List<Future<String>> futures =
584 <                e.invokeAll(l, SMALL_DELAY_MS, MILLISECONDS);
585 <            assertEquals(3, futures.size());
586 <            Iterator<Future<String>> it = futures.iterator();
587 <            Future<String> f1 = it.next();
588 <            Future<String> f2 = it.next();
589 <            Future<String> f3 = it.next();
590 <            assertTrue(f1.isDone());
591 <            assertFalse(f1.isCancelled());
592 <            assertTrue(f2.isDone());
593 <            assertTrue(f3.isDone());
594 <            assertTrue(f3.isCancelled());
595 <        } finally {
596 <            joinPool(e);
576 >    public void testTimedInvokeAll6() throws Exception {
577 >        final ExecutorService e = new DirectExecutorService();
578 >        try (PoolCleaner cleaner = cleaner(e)) {
579 >            for (long timeout = timeoutMillis();;) {
580 >                List<Callable<String>> tasks = new ArrayList<>();
581 >                tasks.add(new StringTask("0"));
582 >                tasks.add(Executors.callable(possiblyInterruptedRunnable(timeout),
583 >                                             TEST_STRING));
584 >                tasks.add(new StringTask("2"));
585 >                long startTime = System.nanoTime();
586 >                List<Future<String>> futures =
587 >                    e.invokeAll(tasks, timeout, MILLISECONDS);
588 >                assertEquals(tasks.size(), futures.size());
589 >                assertTrue(millisElapsedSince(startTime) >= timeout);
590 >                for (Future future : futures)
591 >                    assertTrue(future.isDone());
592 >                try {
593 >                    assertEquals("0", futures.get(0).get());
594 >                    assertEquals(TEST_STRING, futures.get(1).get());
595 >                } catch (CancellationException retryWithLongerTimeout) {
596 >                    // unusual delay before starting second task
597 >                    timeout *= 2;
598 >                    if (timeout >= LONG_DELAY_MS / 2)
599 >                        fail("expected exactly one task to be cancelled");
600 >                    continue;
601 >                }
602 >                assertTrue(futures.get(2).isCancelled());
603 >                break;
604 >            }
605          }
606      }
607  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines