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.33 by jsr166, Mon Jan 14 22:05:39 2013 UTC vs.
Revision 1.49 by dl, Tue Jan 26 13:33:05 2021 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 import junit.framework.*;
10 import java.util.*;
11 import java.util.concurrent.*;
12 import java.util.concurrent.atomic.AtomicBoolean;
9   import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 < 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 30 | Line 47 | public class AbstractExecutorServiceTest
47          public void shutdown() { shutdown = true; }
48          public List<Runnable> shutdownNow() {
49              shutdown = true;
50 <            return Collections.EMPTY_LIST;
50 >            return Collections.emptyList();
51          }
52          public boolean isShutdown() { return shutdown; }
53          public boolean isTerminated() { return isShutdown(); }
# Line 46 | Line 63 | public class AbstractExecutorServiceTest
63      public void testExecuteRunnable() throws Exception {
64          ExecutorService e = new DirectExecutorService();
65          final AtomicBoolean done = new AtomicBoolean(false);
66 <        CheckedRunnable task = new CheckedRunnable() {
66 >        Future<?> future = e.submit(new CheckedRunnable() {
67              public void realRun() {
68                  done.set(true);
69 <            }};
53 <        Future<?> future = e.submit(task);
69 >            }});
70          assertNull(future.get());
71          assertNull(future.get(0, MILLISECONDS));
72          assertTrue(done.get());
# Line 95 | Line 111 | public class AbstractExecutorServiceTest
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() {
114 >                Future<?> future = e.submit(Executors.callable(new PrivilegedAction<Object>() {
115                      public Object run() {
116                          return TEST_STRING;
117                      }}));
# Line 116 | Line 132 | public class AbstractExecutorServiceTest
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() {
135 >                Future<?> future = e.submit(Executors.callable(new PrivilegedExceptionAction<Object>() {
136                      public Object run() {
137                          return TEST_STRING;
138                      }}));
# Line 134 | Line 150 | public class AbstractExecutorServiceTest
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() {
153 >                Future<?> future = e.submit(Executors.callable(new PrivilegedExceptionAction<Object>() {
154                      public Object run() throws Exception {
155                          throw new IndexOutOfBoundsException();
156                      }}));
# Line 150 | Line 166 | public class AbstractExecutorServiceTest
166      }
167  
168      /**
169 <     * execute(null runnable) throws NPE
154 <     */
155 <    public void testExecuteNullRunnable() {
156 <        try {
157 <            ExecutorService e = new DirectExecutorService();
158 <            e.submit((Runnable) null);
159 <            shouldThrow();
160 <        } catch (NullPointerException success) {}
161 <    }
162 <
163 <    /**
164 <     * submit(null callable) throws NPE
169 >     * Submitting null tasks throws NullPointerException
170       */
171 <    public void testSubmitNullCallable() {
172 <        try {
173 <            ExecutorService e = new DirectExecutorService();
174 <            e.submit((Callable) null);
175 <            shouldThrow();
171 <        } catch (NullPointerException success) {}
171 >    public void testNullTaskSubmission() {
172 >        final ExecutorService e = new DirectExecutorService();
173 >        try (PoolCleaner cleaner = cleaner(e)) {
174 >            assertNullTaskSubmissionThrowsNullPointerException(e);
175 >        }
176      }
177  
178      /**
# Line 177 | Line 181 | public class AbstractExecutorServiceTest
181      public void testInterruptedSubmit() throws InterruptedException {
182          final CountDownLatch submitted    = new CountDownLatch(1);
183          final CountDownLatch quittingTime = new CountDownLatch(1);
180        final ExecutorService p
181            = new ThreadPoolExecutor(1,1,60, TimeUnit.SECONDS,
182                                     new ArrayBlockingQueue<Runnable>(10));
184          final Callable<Void> awaiter = new CheckedCallable<Void>() {
185              public Void realCall() throws InterruptedException {
186 <                quittingTime.await();
186 >                assertTrue(quittingTime.await(2*LONG_DELAY_MS, MILLISECONDS));
187                  return null;
188              }};
189 <        try {
190 <            Thread t = new Thread(new CheckedInterruptedRunnable() {
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 <            t.start();
200 <            submitted.await();
199 >
200 >            await(submitted);
201              t.interrupt();
202 <            t.join();
199 <        } finally {
200 <            quittingTime.countDown();
201 <            joinPool(p);
202 >            awaitTermination(t);
203          }
204      }
205  
# Line 207 | Line 208 | public class AbstractExecutorServiceTest
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() { throw new ArithmeticException(); }};
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          }
224        joinPool(p);
225      }
226  
227      /**
228       * invokeAny(null) throws NPE
229       */
230      public void testInvokeAny1() throws Exception {
231 <        ExecutorService e = new DirectExecutorService();
232 <        try {
233 <            e.invokeAny(null);
234 <            shouldThrow();
235 <        } catch (NullPointerException success) {
236 <        } finally {
237 <            joinPool(e);
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() throws Exception {
244 <        ExecutorService e = new DirectExecutorService();
245 <        try {
246 <            e.invokeAny(new ArrayList<Callable<String>>());
247 <            shouldThrow();
248 <        } catch (IllegalArgumentException success) {
249 <        } finally {
250 <            joinPool(e);
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 256 | Line 256 | public class AbstractExecutorServiceTest
256       * invokeAny(c) throws NPE if c has null elements
257       */
258      public void testInvokeAny3() throws Exception {
259 <        ExecutorService e = new DirectExecutorService();
260 <        List<Callable<Long>> l = new ArrayList<Callable<Long>>();
261 <        l.add(new Callable<Long>() {
262 <            public Long call() { throw new ArithmeticException(); }});
263 <        l.add(null);
264 <        try {
265 <            e.invokeAny(l);
266 <            shouldThrow();
267 <        } catch (NullPointerException success) {
268 <        } finally {
269 <            joinPool(e);
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 >            try {
266 >                e.invokeAny(l);
267 >                shouldThrow();
268 >            } catch (NullPointerException success) {}
269          }
270      }
271  
# Line 274 | 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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
278 <        l.add(new NPETask());
279 <        try {
280 <            e.invokeAny(l);
281 <            shouldThrow();
282 <        } catch (ExecutionException success) {
283 <            assertTrue(success.getCause() instanceof NullPointerException);
284 <        } finally {
285 <            joinPool(e);
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 >            try {
281 >                e.invokeAny(l);
282 >                shouldThrow();
283 >            } catch (ExecutionException success) {
284 >                assertTrue(success.getCause() instanceof NullPointerException);
285 >            }
286          }
287      }
288  
# Line 291 | 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 <            List<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);
301        } finally {
302            joinPool(e);
300          }
301      }
302  
# Line 307 | 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 {
316 <            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());
328        } finally {
329            joinPool(e);
326          }
327      }
328  
# Line 334 | 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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
335 <        l.add(new StringTask());
336 <        l.add(null);
337 <        try {
338 <            e.invokeAll(l);
339 <            shouldThrow();
340 <        } catch (NullPointerException success) {
341 <        } finally {
346 <            joinPool(e);
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 >            try {
339 >                e.invokeAll(l);
340 >                shouldThrow();
341 >            } catch (NullPointerException success) {}
342          }
343      }
344  
# Line 351 | 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 <            List<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>> futures = e.invokeAll(l);
354              assertEquals(1, futures.size());
# Line 363 | Line 358 | public class AbstractExecutorServiceTest
358              } catch (ExecutionException success) {
359                  assertTrue(success.getCause() instanceof NullPointerException);
360              }
366        } finally {
367            joinPool(e);
361          }
362      }
363  
# Line 372 | 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 <            List<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>> futures = e.invokeAll(l);
374              assertEquals(2, futures.size());
375              for (Future<String> future : futures)
376                  assertSame(TEST_STRING, future.get());
384        } finally {
385            joinPool(e);
377          }
378      }
379  
# Line 390 | Line 381 | public class AbstractExecutorServiceTest
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 {
399 <            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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
399 <        l.add(new StringTask());
400 <        try {
401 <            e.invokeAny(l, MEDIUM_DELAY_MS, null);
402 <            shouldThrow();
403 <        } catch (NullPointerException success) {
404 <        } finally {
415 <            joinPool(e);
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 >            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 434 | Line 424 | public class AbstractExecutorServiceTest
424       * timed invokeAny(c) throws NPE if c has null elements
425       */
426      public void testTimedInvokeAny3() throws Exception {
427 <        ExecutorService e = new DirectExecutorService();
428 <        List<Callable<Long>> l = new ArrayList<Callable<Long>>();
429 <        l.add(new Callable<Long>() {
430 <            public Long call() { throw new ArithmeticException(); }});
431 <        l.add(null);
432 <        try {
433 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
434 <            shouldThrow();
435 <        } catch (NullPointerException success) {
436 <        } finally {
447 <            joinPool(e);
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 >            try {
434 >                e.invokeAny(l, randomTimeout(), randomTimeUnit());
435 >                shouldThrow();
436 >            } catch (NullPointerException success) {}
437          }
438      }
439  
# Line 452 | 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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
446 <        l.add(new NPETask());
447 <        try {
448 <            e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
449 <            shouldThrow();
450 <        } catch (ExecutionException success) {
451 <            assertTrue(success.getCause() instanceof NullPointerException);
452 <        } finally {
453 <            joinPool(e);
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 >            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 469 | 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 <            List<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 {
480 <            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 {
494 <            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 499 | 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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
494 <        l.add(new StringTask());
495 <        try {
496 <            e.invokeAll(l, MEDIUM_DELAY_MS, null);
497 <            shouldThrow();
498 <        } catch (NullPointerException success) {
499 <        } finally {
510 <            joinPool(e);
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 >            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());
522        } finally {
523            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 <        List<Callable<String>> l = new ArrayList<Callable<String>>();
523 <        l.add(new StringTask());
524 <        l.add(null);
525 <        try {
526 <            e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
527 <            shouldThrow();
528 <        } catch (NullPointerException success) {
529 <        } finally {
540 <            joinPool(e);
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 >            try {
527 >                e.invokeAll(l, randomTimeout(), randomTimeUnit());
528 >                shouldThrow();
529 >            } catch (NullPointerException success) {}
530          }
531      }
532  
# Line 545 | 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 <            List<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>> futures =
542 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
542 >                e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
543              assertEquals(1, futures.size());
544              try {
545                  futures.get(0).get();
# Line 558 | Line 547 | public class AbstractExecutorServiceTest
547              } catch (ExecutionException success) {
548                  assertTrue(success.getCause() instanceof NullPointerException);
549              }
561        } finally {
562            joinPool(e);
550          }
551      }
552  
# Line 567 | 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 <            List<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>> futures =
563 <                e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
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());
580        } finally {
581            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 <            List<Callable<String>> l = new ArrayList<Callable<String>>();
577 <            l.add(new StringTask());
578 <            l.add(Executors.callable(possiblyInterruptedRunnable(2 * SHORT_DELAY_MS), TEST_STRING));
579 <            l.add(new StringTask());
580 <            List<Future<String>> futures =
581 <                e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
582 <            assertEquals(l.size(), futures.size());
583 <            for (Future future : futures)
584 <                assertTrue(future.isDone());
585 <            assertFalse(futures.get(0).isCancelled());
586 <            assertFalse(futures.get(1).isCancelled());
587 <            assertTrue(futures.get(2).isCancelled());
588 <        } finally {
589 <            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