ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/FutureTaskTest.java
(Generate patch)

Comparing jsr166/src/test/tck/FutureTaskTest.java (file contents):
Revision 1.27 by jsr166, Sat Jun 18 14:16:42 2011 UTC vs.
Revision 1.32 by jsr166, Sun Dec 16 18:52:27 2012 UTC

# Line 7 | Line 7
7   */
8  
9   import junit.framework.*;
10 + import java.security.Permission;
11   import java.util.concurrent.Callable;
12   import java.util.concurrent.CancellationException;
13   import java.util.concurrent.CountDownLatch;
# Line 14 | Line 15 | import java.util.concurrent.ExecutionExc
15   import java.util.concurrent.Future;
16   import java.util.concurrent.FutureTask;
17   import java.util.concurrent.TimeoutException;
18 + import java.util.concurrent.atomic.AtomicInteger;
19   import static java.util.concurrent.TimeUnit.MILLISECONDS;
20   import static java.util.concurrent.TimeUnit.SECONDS;
21   import java.util.*;
# Line 27 | Line 29 | public class FutureTaskTest extends JSR1
29          return new TestSuite(FutureTaskTest.class);
30      }
31  
32 +    void checkIsDone(Future<?> f) {
33 +        assertTrue(f.isDone());
34 +        assertFalse(f.cancel(false));
35 +        assertFalse(f.cancel(true));
36 +        if (f instanceof PublicFutureTask) {
37 +            PublicFutureTask pf = (PublicFutureTask) f;
38 +            assertEquals(1, pf.doneCount());
39 +            assertFalse(pf.runAndReset());
40 +            assertEquals(1, pf.doneCount());
41 +
42 +            // Check that run and runAndReset have no effect.
43 +            int savedRunCount = pf.runCount();
44 +            int savedSetCount = pf.setCount();
45 +            int savedSetExceptionCount = pf.setExceptionCount();
46 +            pf.run();
47 +            pf.runAndReset();
48 +            assertEquals(savedRunCount, pf.runCount());
49 +            assertEquals(savedSetCount, pf.setCount());
50 +            assertEquals(savedSetExceptionCount, pf.setExceptionCount());
51 +            assertTrue(f.isDone());
52 +        }
53 +    }
54 +
55      void checkNotDone(Future<?> f) {
56          assertFalse(f.isDone());
57          assertFalse(f.isCancelled());
58 +        if (f instanceof PublicFutureTask) {
59 +            PublicFutureTask pf = (PublicFutureTask) f;
60 +            assertEquals(0, pf.doneCount());
61 +            assertEquals(0, pf.setCount());
62 +            assertEquals(0, pf.setExceptionCount());
63 +        }
64 +    }
65 +
66 +    void checkIsRunning(Future<?> f) {
67 +        checkNotDone(f);
68 +        if (f instanceof FutureTask) {
69 +            FutureTask ft = (FutureTask<?>) f;
70 +            // Check that run methods do nothing
71 +            ft.run();
72 +            if (f instanceof PublicFutureTask)
73 +                assertFalse(((PublicFutureTask) f).runAndReset());
74 +            checkNotDone(f);
75 +        }
76      }
77  
78      <T> void checkCompletedNormally(Future<T> f, T expected) {
79 <        assertTrue(f.isDone());
79 >        checkIsDone(f);
80          assertFalse(f.isCancelled());
81  
82          try {
# Line 42 | Line 85 | public class FutureTaskTest extends JSR1
85          try {
86              assertSame(expected, f.get(5L, SECONDS));
87          } catch (Throwable fail) { threadUnexpectedException(fail); }
45
46        assertFalse(f.cancel(false));
47        assertFalse(f.cancel(true));
88      }
89  
90      void checkCancelled(Future<?> f) {
91 <        assertTrue(f.isDone());
91 >        checkIsDone(f);
92          assertTrue(f.isCancelled());
93  
94          try {
# Line 62 | Line 102 | public class FutureTaskTest extends JSR1
102              shouldThrow();
103          } catch (CancellationException success) {
104          } catch (Throwable fail) { threadUnexpectedException(fail); }
105 +    }
106  
107 <        assertFalse(f.cancel(false));
108 <        assertFalse(f.cancel(true));
107 >    void tryToConfuseDoneTask(PublicFutureTask pf) {
108 >        pf.set(new Object());
109 >        pf.setException(new Error());
110 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
111 >            pf.cancel(true);
112 >        }
113      }
114  
115      void checkCompletedAbnormally(Future<?> f, Throwable t) {
116 <        assertTrue(f.isDone());
116 >        checkIsDone(f);
117          assertFalse(f.isCancelled());
118  
119          try {
# Line 84 | Line 129 | public class FutureTaskTest extends JSR1
129          } catch (ExecutionException success) {
130              assertSame(t, success.getCause());
131          } catch (Throwable fail) { threadUnexpectedException(fail); }
87
88        assertFalse(f.cancel(false));
89        assertFalse(f.cancel(true));
132      }
133  
134      /**
135       * Subclass to expose protected methods
136       */
137      static class PublicFutureTask extends FutureTask {
138 <        public PublicFutureTask(Callable r) { super(r); }
139 <        public boolean runAndReset() { return super.runAndReset(); }
140 <        public void set(Object x) { super.set(x); }
141 <        public void setException(Throwable t) { super.setException(t); }
138 >        private final AtomicInteger runCount;
139 >        private final AtomicInteger doneCount = new AtomicInteger(0);
140 >        private final AtomicInteger runAndResetCount = new AtomicInteger(0);
141 >        private final AtomicInteger setCount = new AtomicInteger(0);
142 >        private final AtomicInteger setExceptionCount = new AtomicInteger(0);
143 >        public int runCount() { return runCount.get(); }
144 >        public int doneCount() { return doneCount.get(); }
145 >        public int runAndResetCount() { return runAndResetCount.get(); }
146 >        public int setCount() { return setCount.get(); }
147 >        public int setExceptionCount() { return setExceptionCount.get(); }
148 >
149 >        PublicFutureTask(Runnable runnable) {
150 >            this(runnable, seven);
151 >        }
152 >        PublicFutureTask(Runnable runnable, Object result) {
153 >            this(runnable, result, new AtomicInteger(0));
154 >        }
155 >        private PublicFutureTask(final Runnable runnable, Object result,
156 >                                 final AtomicInteger runCount) {
157 >            super(new Runnable() {
158 >                public void run() {
159 >                    runCount.getAndIncrement();
160 >                    runnable.run();
161 >                }}, result);
162 >            this.runCount = runCount;
163 >        }
164 >        PublicFutureTask(Callable callable) {
165 >            this(callable, new AtomicInteger(0));
166 >        }
167 >        private PublicFutureTask(final Callable callable,
168 >                                 final AtomicInteger runCount) {
169 >            super(new Callable() {
170 >                public Object call() throws Exception {
171 >                    runCount.getAndIncrement();
172 >                    return callable.call();
173 >                }});
174 >            this.runCount = runCount;
175 >        }
176 >        @Override public void done() {
177 >            assertTrue(isDone());
178 >            doneCount.incrementAndGet();
179 >            super.done();
180 >        }
181 >        @Override public boolean runAndReset() {
182 >            runAndResetCount.incrementAndGet();
183 >            return super.runAndReset();
184 >        }
185 >        @Override public void set(Object x) {
186 >            setCount.incrementAndGet();
187 >            super.set(x);
188 >        }
189 >        @Override public void setException(Throwable t) {
190 >            setExceptionCount.incrementAndGet();
191 >            super.setException(t);
192 >        }
193 >    }
194 >
195 >    class Counter extends CheckedRunnable {
196 >        final AtomicInteger count = new AtomicInteger(0);
197 >        public int get() { return count.get(); }
198 >        public void realRun() {
199 >            count.getAndIncrement();
200 >        }
201      }
202  
203      /**
204 <     * Creating a future with a null callable throws NPE
204 >     * creating a future with a null callable throws NullPointerException
205       */
206      public void testConstructor() {
207          try {
208 <            FutureTask task = new FutureTask(null);
208 >            new FutureTask(null);
209              shouldThrow();
210          } catch (NullPointerException success) {}
211      }
212  
213      /**
214 <     * creating a future with null runnable fails
214 >     * creating a future with null runnable throws NullPointerException
215       */
216      public void testConstructor2() {
217          try {
218 <            FutureTask task = new FutureTask(null, Boolean.TRUE);
218 >            new FutureTask(null, Boolean.TRUE);
219              shouldThrow();
220          } catch (NullPointerException success) {}
221      }
# Line 123 | Line 224 | public class FutureTaskTest extends JSR1
224       * isDone is true when a task completes
225       */
226      public void testIsDone() {
227 <        FutureTask task = new FutureTask(new NoOpCallable());
227 >        PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
228 >        assertFalse(task.isDone());
229          task.run();
230          assertTrue(task.isDone());
231          checkCompletedNormally(task, Boolean.TRUE);
232 +        assertEquals(1, task.runCount());
233      }
234  
235      /**
# Line 134 | Line 237 | public class FutureTaskTest extends JSR1
237       */
238      public void testRunAndReset() {
239          PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
240 <        assertTrue(task.runAndReset());
241 <        checkNotDone(task);
240 >        for (int i = 0; i < 3; i++) {
241 >            assertTrue(task.runAndReset());
242 >            checkNotDone(task);
243 >            assertEquals(i+1, task.runCount());
244 >            assertEquals(i+1, task.runAndResetCount());
245 >            assertEquals(0, task.setCount());
246 >            assertEquals(0, task.setExceptionCount());
247 >        }
248      }
249  
250      /**
251       * runAndReset after cancellation fails
252       */
253 <    public void testResetAfterCancel() {
254 <        PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
255 <        assertTrue(task.cancel(false));
256 <        assertFalse(task.runAndReset());
257 <        checkCancelled(task);
253 >    public void testRunAndResetAfterCancel() {
254 >        for (boolean mayInterruptIfRunning : new boolean[] { true, false }) {
255 >            PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
256 >            assertTrue(task.cancel(mayInterruptIfRunning));
257 >            for (int i = 0; i < 3; i++) {
258 >                assertFalse(task.runAndReset());
259 >                assertEquals(0, task.runCount());
260 >                assertEquals(i+1, task.runAndResetCount());
261 >                assertEquals(0, task.setCount());
262 >                assertEquals(0, task.setExceptionCount());
263 >            }
264 >            tryToConfuseDoneTask(task);
265 >            checkCancelled(task);
266 >        }
267      }
268  
269      /**
# Line 154 | Line 272 | public class FutureTaskTest extends JSR1
272      public void testSet() throws Exception {
273          PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
274          task.set(one);
275 <        assertSame(task.get(), one);
275 >        for (int i = 0; i < 3; i++) {
276 >            assertSame(one, task.get());
277 >            assertSame(one, task.get(LONG_DELAY_MS, MILLISECONDS));
278 >            assertEquals(1, task.setCount());
279 >        }
280 >        tryToConfuseDoneTask(task);
281          checkCompletedNormally(task, one);
282 +        assertEquals(0, task.runCount());
283      }
284  
285      /**
286       * setException causes get to throw ExecutionException
287       */
288 <    public void testSetException() throws Exception {
288 >    public void testSetException_get() throws Exception {
289          Exception nse = new NoSuchElementException();
290          PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
291          task.setException(nse);
292 +
293          try {
294 <            Object x = task.get();
294 >            task.get();
295              shouldThrow();
296          } catch (ExecutionException success) {
297 <            assertSame(success.getCause(), nse);
297 >            assertSame(nse, success.getCause());
298              checkCompletedAbnormally(task, nse);
299          }
300 +
301 +        try {
302 +            task.get(LONG_DELAY_MS, MILLISECONDS);
303 +            shouldThrow();
304 +        } catch (ExecutionException success) {
305 +            assertSame(nse, success.getCause());
306 +            checkCompletedAbnormally(task, nse);
307 +        }
308 +
309 +        assertEquals(1, task.setExceptionCount());
310 +        assertEquals(0, task.setCount());
311 +        tryToConfuseDoneTask(task);
312 +        checkCompletedAbnormally(task, nse);
313 +        assertEquals(0, task.runCount());
314      }
315  
316      /**
317 <     * Cancelling before running succeeds
317 >     * cancel(false) before run succeeds
318       */
319      public void testCancelBeforeRun() {
320 <        FutureTask task = new FutureTask(new NoOpCallable());
320 >        PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
321          assertTrue(task.cancel(false));
322          task.run();
323 +        assertEquals(0, task.runCount());
324 +        assertEquals(0, task.setCount());
325 +        assertEquals(0, task.setExceptionCount());
326 +        assertTrue(task.isCancelled());
327 +        assertTrue(task.isDone());
328 +        tryToConfuseDoneTask(task);
329 +        assertEquals(0, task.runCount());
330          checkCancelled(task);
331      }
332  
333      /**
334 <     * Cancel(true) before run succeeds
334 >     * cancel(true) before run succeeds
335       */
336      public void testCancelBeforeRun2() {
337 <        FutureTask task = new FutureTask(new NoOpCallable());
337 >        PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
338          assertTrue(task.cancel(true));
339          task.run();
340 +        assertEquals(0, task.runCount());
341 +        assertEquals(0, task.setCount());
342 +        assertEquals(0, task.setExceptionCount());
343 +        assertTrue(task.isCancelled());
344 +        assertTrue(task.isDone());
345 +        tryToConfuseDoneTask(task);
346 +        assertEquals(0, task.runCount());
347          checkCancelled(task);
348      }
349  
350      /**
351 <     * cancel of a completed task fails
351 >     * cancel(false) of a completed task fails
352       */
353      public void testCancelAfterRun() {
354 <        FutureTask task = new FutureTask(new NoOpCallable());
354 >        PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
355          task.run();
356          assertFalse(task.cancel(false));
357 +        assertEquals(1, task.runCount());
358 +        assertEquals(1, task.setCount());
359 +        assertEquals(0, task.setExceptionCount());
360 +        tryToConfuseDoneTask(task);
361          checkCompletedNormally(task, Boolean.TRUE);
362 +        assertEquals(1, task.runCount());
363      }
364  
365      /**
366 <     * cancel(true) interrupts a running task
366 >     * cancel(true) of a completed task fails
367       */
368 <    public void testCancelInterrupt() throws InterruptedException {
369 <        final CountDownLatch threadStarted = new CountDownLatch(1);
370 <        final FutureTask task =
371 <            new FutureTask(new CheckedCallable<Object>() {
372 <                public Object realCall() {
373 <                    threadStarted.countDown();
374 <                    long t0 = System.nanoTime();
375 <                    for (;;) {
376 <                        if (Thread.interrupted())
377 <                            return Boolean.TRUE;
378 <                        if (millisElapsedSince(t0) > MEDIUM_DELAY_MS)
379 <                            fail("interrupt not delivered");
380 <                        Thread.yield();
381 <                    }
368 >    public void testCancelAfterRun2() {
369 >        PublicFutureTask task = new PublicFutureTask(new NoOpCallable());
370 >        task.run();
371 >        assertFalse(task.cancel(true));
372 >        assertEquals(1, task.runCount());
373 >        assertEquals(1, task.setCount());
374 >        assertEquals(0, task.setExceptionCount());
375 >        tryToConfuseDoneTask(task);
376 >        checkCompletedNormally(task, Boolean.TRUE);
377 >        assertEquals(1, task.runCount());
378 >    }
379 >
380 >    /**
381 >     * cancel(true) interrupts a running task that subsequently succeeds
382 >     */
383 >    public void testCancelInterrupt() {
384 >        final CountDownLatch pleaseCancel = new CountDownLatch(1);
385 >        final PublicFutureTask task =
386 >            new PublicFutureTask(new CheckedRunnable() {
387 >                public void realRun() {
388 >                    pleaseCancel.countDown();
389 >                    try {
390 >                        delay(LONG_DELAY_MS);
391 >                        shouldThrow();
392 >                    } catch (InterruptedException success) {}
393                  }});
394  
395          Thread t = newStartedThread(task);
396 <        threadStarted.await();
396 >        await(pleaseCancel);
397          assertTrue(task.cancel(true));
398 <        checkCancelled(task);
399 <        awaitTermination(t, MEDIUM_DELAY_MS);
398 >        assertTrue(task.isCancelled());
399 >        assertTrue(task.isDone());
400 >        awaitTermination(t);
401 >        assertEquals(1, task.runCount());
402 >        assertEquals(1, task.setCount());
403 >        assertEquals(0, task.setExceptionCount());
404 >        tryToConfuseDoneTask(task);
405          checkCancelled(task);
406      }
407  
408      /**
409 <     * cancel(false) does not interrupt a running task
410 <     */
411 <    public void testCancelNoInterrupt() throws InterruptedException {
412 <        final CountDownLatch threadStarted = new CountDownLatch(1);
409 >     * cancel(true) interrupts a running task that subsequently
410 >     * succeeds, with a security manager that does not permit
411 >     * Thread.interrupt
412 >     */
413 >    public void testCancelInterrupt_ThrowsSecurityException() {
414 >        if (System.getSecurityManager() != null)
415 >            return;
416 >
417 >        final CountDownLatch pleaseCancel = new CountDownLatch(1);
418          final CountDownLatch cancelled = new CountDownLatch(1);
419 <        final FutureTask<Boolean> task =
420 <            new FutureTask<Boolean>(new CheckedCallable<Boolean>() {
421 <                public Boolean realCall() throws InterruptedException {
422 <                    threadStarted.countDown();
423 <                    cancelled.await(MEDIUM_DELAY_MS, MILLISECONDS);
419 >        final PublicFutureTask task =
420 >            new PublicFutureTask(new CheckedRunnable() {
421 >                public void realRun() {
422 >                    pleaseCancel.countDown();
423 >                    await(cancelled);
424                      assertFalse(Thread.interrupted());
246                    return Boolean.TRUE;
425                  }});
426  
427 <        Thread t = newStartedThread(task);
428 <        threadStarted.await();
429 <        assertTrue(task.cancel(false));
430 <        checkCancelled(task);
427 >        final Thread t = newStartedThread(task);
428 >        await(pleaseCancel);
429 >        System.setSecurityManager(new SecurityManager() {
430 >            public void checkAccess(Thread t) { throw new SecurityException(); }
431 >            public void checkPermission(Permission p) {}});
432 >        try {
433 >            try {
434 >                task.cancel(true);
435 >                shouldThrow();
436 >            }
437 >            catch (SecurityException expected) {}
438 >        } finally {
439 >            System.setSecurityManager(null);
440 >        }
441 >        assertTrue(task.isCancelled());
442 >        assertTrue(task.isDone());
443 >        assertEquals(1, task.runCount());
444 >        assertEquals(1, task.doneCount());
445 >        assertEquals(0, task.setCount());
446 >        assertEquals(0, task.setExceptionCount());
447          cancelled.countDown();
448 <        awaitTermination(t, MEDIUM_DELAY_MS);
448 >        awaitTermination(t);
449 >        assertEquals(1, task.setCount());
450 >        assertEquals(0, task.setExceptionCount());
451 >        tryToConfuseDoneTask(task);
452          checkCancelled(task);
453      }
454  
455      /**
456 <     * run in one thread causes get in another thread to retrieve value
456 >     * cancel(true) interrupts a running task that subsequently throws
457       */
458 <    public void testGetRun() throws InterruptedException {
459 <        final CountDownLatch threadStarted = new CountDownLatch(1);
460 <
461 <        final FutureTask task =
462 <            new FutureTask(new CheckedCallable<Object>() {
463 <                public Object realCall() throws InterruptedException {
464 <                    return Boolean.TRUE;
458 >    public void testCancelInterrupt_taskFails() {
459 >        final CountDownLatch pleaseCancel = new CountDownLatch(1);
460 >        final PublicFutureTask task =
461 >            new PublicFutureTask(new Runnable() {
462 >                public void run() {
463 >                    try {
464 >                        pleaseCancel.countDown();
465 >                        delay(LONG_DELAY_MS);
466 >                    } finally { throw new RuntimeException(); }
467                  }});
468  
469 <        Thread t = newStartedThread(new CheckedRunnable() {
470 <            public void realRun() throws Exception {
471 <                threadStarted.countDown();
472 <                assertSame(Boolean.TRUE, task.get());
473 <            }});
474 <
475 <        threadStarted.await();
476 <        checkNotDone(task);
477 <        assertTrue(t.isAlive());
478 <        task.run();
280 <        checkCompletedNormally(task, Boolean.TRUE);
281 <        awaitTermination(t, MEDIUM_DELAY_MS);
469 >        Thread t = newStartedThread(task);
470 >        await(pleaseCancel);
471 >        assertTrue(task.cancel(true));
472 >        assertTrue(task.isCancelled());
473 >        awaitTermination(t);
474 >        assertEquals(1, task.runCount());
475 >        assertEquals(0, task.setCount());
476 >        assertEquals(1, task.setExceptionCount());
477 >        tryToConfuseDoneTask(task);
478 >        checkCancelled(task);
479      }
480  
481      /**
482 <     * set in one thread causes get in another thread to retrieve value
482 >     * cancel(false) does not interrupt a running task
483       */
484 <    public void testGetSet() throws InterruptedException {
485 <        final CountDownLatch threadStarted = new CountDownLatch(1);
486 <
484 >    public void testCancelNoInterrupt() {
485 >        final CountDownLatch pleaseCancel = new CountDownLatch(1);
486 >        final CountDownLatch cancelled = new CountDownLatch(1);
487          final PublicFutureTask task =
488 <            new PublicFutureTask(new CheckedCallable<Object>() {
489 <                public Object realCall() throws InterruptedException {
488 >            new PublicFutureTask(new CheckedCallable<Boolean>() {
489 >                public Boolean realCall() {
490 >                    pleaseCancel.countDown();
491 >                    await(cancelled);
492 >                    assertFalse(Thread.interrupted());
493                      return Boolean.TRUE;
494                  }});
495  
496 <        Thread t = newStartedThread(new CheckedRunnable() {
497 <            public void realRun() throws Exception {
498 <                threadStarted.countDown();
499 <                assertSame(Boolean.FALSE, task.get());
500 <            }});
501 <
502 <        threadStarted.await();
503 <        checkNotDone(task);
504 <        assertTrue(t.isAlive());
505 <        task.set(Boolean.FALSE);
506 <        checkCompletedNormally(task, Boolean.FALSE);
307 <        awaitTermination(t, MEDIUM_DELAY_MS);
496 >        Thread t = newStartedThread(task);
497 >        await(pleaseCancel);
498 >        assertTrue(task.cancel(false));
499 >        assertTrue(task.isCancelled());
500 >        cancelled.countDown();
501 >        awaitTermination(t);
502 >        assertEquals(1, task.runCount());
503 >        assertEquals(1, task.setCount());
504 >        assertEquals(0, task.setExceptionCount());
505 >        tryToConfuseDoneTask(task);
506 >        checkCancelled(task);
507      }
508  
509      /**
510 <     * run in one thread causes timed get in another thread to retrieve value
510 >     * run in one thread causes get in another thread to retrieve value
511       */
512 <    public void testTimedGetRun() throws InterruptedException {
513 <        final CountDownLatch threadStarted = new CountDownLatch(1);
512 >    public void testGetRun() {
513 >        final CountDownLatch pleaseRun = new CountDownLatch(2);
514  
515 <        final FutureTask task =
516 <            new FutureTask(new CheckedCallable<Object>() {
517 <                public Object realCall() throws InterruptedException {
518 <                    return Boolean.TRUE;
515 >        final PublicFutureTask task =
516 >            new PublicFutureTask(new CheckedCallable<Object>() {
517 >                public Object realCall() {
518 >                    return two;
519                  }});
520  
521 <        Thread t = newStartedThread(new CheckedRunnable() {
521 >        Thread t1 = newStartedThread(new CheckedRunnable() {
522 >            public void realRun() throws Exception {
523 >                pleaseRun.countDown();
524 >                assertSame(two, task.get());
525 >            }});
526 >
527 >        Thread t2 = newStartedThread(new CheckedRunnable() {
528              public void realRun() throws Exception {
529 <                threadStarted.countDown();
530 <                assertSame(Boolean.TRUE,
326 <                           task.get(MEDIUM_DELAY_MS, MILLISECONDS));
529 >                pleaseRun.countDown();
530 >                assertSame(two, task.get(2*LONG_DELAY_MS, MILLISECONDS));
531              }});
532  
533 <        threadStarted.await();
533 >        await(pleaseRun);
534          checkNotDone(task);
535 <        assertTrue(t.isAlive());
535 >        assertTrue(t1.isAlive());
536 >        assertTrue(t2.isAlive());
537          task.run();
538 <        checkCompletedNormally(task, Boolean.TRUE);
539 <        awaitTermination(t, MEDIUM_DELAY_MS);
538 >        checkCompletedNormally(task, two);
539 >        assertEquals(1, task.runCount());
540 >        assertEquals(1, task.setCount());
541 >        assertEquals(0, task.setExceptionCount());
542 >        awaitTermination(t1);
543 >        awaitTermination(t2);
544 >        tryToConfuseDoneTask(task);
545 >        checkCompletedNormally(task, two);
546      }
547  
548      /**
549 <     * set in one thread causes timed get in another thread to retrieve value
549 >     * set in one thread causes get in another thread to retrieve value
550       */
551 <    public void testTimedGetSet() throws InterruptedException {
552 <        final CountDownLatch threadStarted = new CountDownLatch(1);
551 >    public void testGetSet() {
552 >        final CountDownLatch pleaseSet = new CountDownLatch(2);
553  
554          final PublicFutureTask task =
555              new PublicFutureTask(new CheckedCallable<Object>() {
556                  public Object realCall() throws InterruptedException {
557 <                    return Boolean.TRUE;
557 >                    return two;
558                  }});
559  
560 <        Thread t = newStartedThread(new CheckedRunnable() {
560 >        Thread t1 = newStartedThread(new CheckedRunnable() {
561              public void realRun() throws Exception {
562 <                threadStarted.countDown();
563 <                assertSame(Boolean.FALSE,
353 <                           task.get(MEDIUM_DELAY_MS, MILLISECONDS));
562 >                pleaseSet.countDown();
563 >                assertSame(two, task.get());
564              }});
565  
566 <        threadStarted.await();
566 >        Thread t2 = newStartedThread(new CheckedRunnable() {
567 >            public void realRun() throws Exception {
568 >                pleaseSet.countDown();
569 >                assertSame(two, task.get(2*LONG_DELAY_MS, MILLISECONDS));
570 >            }});
571 >
572 >        await(pleaseSet);
573          checkNotDone(task);
574 <        assertTrue(t.isAlive());
575 <        task.set(Boolean.FALSE);
576 <        checkCompletedNormally(task, Boolean.FALSE);
577 <        awaitTermination(t, MEDIUM_DELAY_MS);
574 >        assertTrue(t1.isAlive());
575 >        assertTrue(t2.isAlive());
576 >        task.set(two);
577 >        assertEquals(0, task.runCount());
578 >        assertEquals(1, task.setCount());
579 >        assertEquals(0, task.setExceptionCount());
580 >        tryToConfuseDoneTask(task);
581 >        checkCompletedNormally(task, two);
582 >        awaitTermination(t1);
583 >        awaitTermination(t2);
584      }
585  
586      /**
587       * Cancelling a task causes timed get in another thread to throw
588       * CancellationException
589       */
590 <    public void testTimedGet_Cancellation() throws InterruptedException {
591 <        final CountDownLatch threadStarted = new CountDownLatch(2);
592 <        final FutureTask task =
593 <            new FutureTask(new CheckedInterruptedCallable<Object>() {
594 <                public Object realCall() throws InterruptedException {
595 <                    threadStarted.countDown();
596 <                    delay(LONG_DELAY_MS);
597 <                    return Boolean.TRUE;
598 <                }});
599 <
600 <        Thread t1 = new ThreadShouldThrow(CancellationException.class) {
601 <            public void realRun() throws Exception {
602 <                threadStarted.countDown();
603 <                task.get(MEDIUM_DELAY_MS, MILLISECONDS);
604 <            }};
605 <        Thread t2 = new Thread(task);
606 <        t1.start();
607 <        t2.start();
608 <        threadStarted.await();
609 <        task.cancel(true);
610 <        awaitTermination(t1, MEDIUM_DELAY_MS);
611 <        awaitTermination(t2, MEDIUM_DELAY_MS);
612 <        checkCancelled(task);
613 <    }
614 <
615 <    /**
616 <     * Cancelling a task causes get in another thread to throw
617 <     * CancellationException
618 <     */
619 <    public void testGet_Cancellation() throws InterruptedException {
620 <        final CountDownLatch threadStarted = new CountDownLatch(2);
621 <        final FutureTask task =
622 <            new FutureTask(new CheckedInterruptedCallable<Object>() {
623 <                public Object realCall() throws InterruptedException {
624 <                    threadStarted.countDown();
625 <                    delay(LONG_DELAY_MS);
626 <                    return Boolean.TRUE;
627 <                }});
628 <
629 <        Thread t1 = new ThreadShouldThrow(CancellationException.class) {
630 <            public void realRun() throws Exception {
631 <                threadStarted.countDown();
632 <                task.get();
633 <            }};
634 <        Thread t2 = new Thread(task);
635 <        t1.start();
414 <        t2.start();
415 <        threadStarted.await();
416 <        task.cancel(true);
417 <        awaitTermination(t1, MEDIUM_DELAY_MS);
418 <        awaitTermination(t2, MEDIUM_DELAY_MS);
419 <        checkCancelled(task);
590 >    public void testTimedGet_Cancellation() {
591 >        for (final boolean mayInterruptIfRunning :
592 >                 new boolean[] { true, false }) {
593 >            final CountDownLatch pleaseCancel = new CountDownLatch(3);
594 >            final CountDownLatch cancelled = new CountDownLatch(1);
595 >            final PublicFutureTask task =
596 >                new PublicFutureTask(new CheckedCallable<Object>() {
597 >                    public Object realCall() throws InterruptedException {
598 >                        pleaseCancel.countDown();
599 >                        if (mayInterruptIfRunning) {
600 >                            try {
601 >                                delay(2*LONG_DELAY_MS);
602 >                            } catch (InterruptedException success) {}
603 >                        } else {
604 >                            await(cancelled);
605 >                        }
606 >                        return two;
607 >                    }});
608 >
609 >            Thread t1 = new ThreadShouldThrow(CancellationException.class) {
610 >                public void realRun() throws Exception {
611 >                    pleaseCancel.countDown();
612 >                    task.get();
613 >                }};
614 >            Thread t2 = new ThreadShouldThrow(CancellationException.class) {
615 >                public void realRun() throws Exception {
616 >                    pleaseCancel.countDown();
617 >                    task.get(2*LONG_DELAY_MS, MILLISECONDS);
618 >                }};
619 >            t1.start();
620 >            t2.start();
621 >            Thread t3 = newStartedThread(task);
622 >            await(pleaseCancel);
623 >            checkIsRunning(task);
624 >            task.cancel(mayInterruptIfRunning);
625 >            checkCancelled(task);
626 >            awaitTermination(t1);
627 >            awaitTermination(t2);
628 >            cancelled.countDown();
629 >            awaitTermination(t3);
630 >            assertEquals(1, task.runCount());
631 >            assertEquals(1, task.setCount());
632 >            assertEquals(0, task.setExceptionCount());
633 >            tryToConfuseDoneTask(task);
634 >            checkCancelled(task);
635 >        }
636      }
637  
638      /**
639       * A runtime exception in task causes get to throw ExecutionException
640       */
641      public void testGet_ExecutionException() throws InterruptedException {
642 <        final FutureTask task = new FutureTask(new Callable() {
642 >        final ArithmeticException e = new ArithmeticException();
643 >        final PublicFutureTask task = new PublicFutureTask(new Callable() {
644              public Object call() {
645 <                return 5/0;
645 >                throw e;
646              }});
647  
648          task.run();
649 +        assertEquals(1, task.runCount());
650 +        assertEquals(0, task.setCount());
651 +        assertEquals(1, task.setExceptionCount());
652          try {
653              task.get();
654              shouldThrow();
655          } catch (ExecutionException success) {
656 <            assertTrue(success.getCause() instanceof ArithmeticException);
656 >            assertSame(e, success.getCause());
657 >            tryToConfuseDoneTask(task);
658              checkCompletedAbnormally(task, success.getCause());
659          }
660      }
# Line 442 | Line 663 | public class FutureTaskTest extends JSR1
663       * A runtime exception in task causes timed get to throw ExecutionException
664       */
665      public void testTimedGet_ExecutionException2() throws Exception {
666 <        final FutureTask task = new FutureTask(new Callable() {
666 >        final ArithmeticException e = new ArithmeticException();
667 >        final PublicFutureTask task = new PublicFutureTask(new Callable() {
668              public Object call() {
669 <                return 5/0;
669 >                throw e;
670              }});
671  
672          task.run();
673          try {
674 <            task.get(SHORT_DELAY_MS, MILLISECONDS);
674 >            task.get(LONG_DELAY_MS, MILLISECONDS);
675              shouldThrow();
676          } catch (ExecutionException success) {
677 <            assertTrue(success.getCause() instanceof ArithmeticException);
677 >            assertSame(e, success.getCause());
678 >            tryToConfuseDoneTask(task);
679              checkCompletedAbnormally(task, success.getCause());
680          }
681      }
682  
683      /**
684 <     * Interrupting a waiting get causes it to throw InterruptedException
684 >     * get is interruptible
685       */
686 <    public void testGet_InterruptedException() throws InterruptedException {
687 <        final CountDownLatch threadStarted = new CountDownLatch(1);
686 >    public void testGet_interruptible() {
687 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
688          final FutureTask task = new FutureTask(new NoOpCallable());
689 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
689 >        Thread t = newStartedThread(new CheckedRunnable() {
690              public void realRun() throws Exception {
691 <                threadStarted.countDown();
692 <                task.get();
691 >                Thread.currentThread().interrupt();
692 >                try {
693 >                    task.get();
694 >                    shouldThrow();
695 >                } catch (InterruptedException success) {}
696 >                assertFalse(Thread.interrupted());
697 >
698 >                pleaseInterrupt.countDown();
699 >                try {
700 >                    task.get();
701 >                    shouldThrow();
702 >                } catch (InterruptedException success) {}
703 >                assertFalse(Thread.interrupted());
704              }});
705  
706 <        threadStarted.await();
706 >        await(pleaseInterrupt);
707          t.interrupt();
708 <        awaitTermination(t, MEDIUM_DELAY_MS);
708 >        awaitTermination(t);
709          checkNotDone(task);
710      }
711  
712      /**
713 <     * Interrupting a waiting timed get causes it to throw InterruptedException
713 >     * timed get is interruptible
714       */
715 <    public void testTimedGet_InterruptedException2() throws InterruptedException {
716 <        final CountDownLatch threadStarted = new CountDownLatch(1);
715 >    public void testTimedGet_interruptible() {
716 >        final CountDownLatch pleaseInterrupt = new CountDownLatch(1);
717          final FutureTask task = new FutureTask(new NoOpCallable());
718 <        Thread t = newStartedThread(new CheckedInterruptedRunnable() {
718 >        Thread t = newStartedThread(new CheckedRunnable() {
719              public void realRun() throws Exception {
720 <                threadStarted.countDown();
721 <                task.get(LONG_DELAY_MS, MILLISECONDS);
720 >                Thread.currentThread().interrupt();
721 >                try {
722 >                    task.get(2*LONG_DELAY_MS, MILLISECONDS);
723 >                    shouldThrow();
724 >                } catch (InterruptedException success) {}
725 >                assertFalse(Thread.interrupted());
726 >
727 >                pleaseInterrupt.countDown();
728 >                try {
729 >                    task.get(2*LONG_DELAY_MS, MILLISECONDS);
730 >                    shouldThrow();
731 >                } catch (InterruptedException success) {}
732 >                assertFalse(Thread.interrupted());
733              }});
734  
735 <        threadStarted.await();
735 >        await(pleaseInterrupt);
736          t.interrupt();
737 <        awaitTermination(t, MEDIUM_DELAY_MS);
737 >        awaitTermination(t);
738          checkNotDone(task);
739      }
740  
# Line 497 | Line 742 | public class FutureTaskTest extends JSR1
742       * A timed out timed get throws TimeoutException
743       */
744      public void testGet_TimeoutException() throws Exception {
745 +        FutureTask task = new FutureTask(new NoOpCallable());
746 +        long startTime = System.nanoTime();
747          try {
748 <            FutureTask task = new FutureTask(new NoOpCallable());
502 <            task.get(1, MILLISECONDS);
748 >            task.get(timeoutMillis(), MILLISECONDS);
749              shouldThrow();
750 <        } catch (TimeoutException success) {}
750 >        } catch (TimeoutException success) {
751 >            assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
752 >        }
753 >    }
754 >
755 >    /**
756 >     * timed get with null TimeUnit throws NullPointerException
757 >     */
758 >    public void testGet_NullTimeUnit() throws Exception {
759 >        FutureTask task = new FutureTask(new NoOpCallable());
760 >        long[] timeouts = { Long.MIN_VALUE, 0L, Long.MAX_VALUE };
761 >
762 >        for (long timeout : timeouts) {
763 >            try {
764 >                task.get(timeout, null);
765 >                shouldThrow();
766 >            } catch (NullPointerException success) {}
767 >        }
768 >
769 >        task.run();
770 >
771 >        for (long timeout : timeouts) {
772 >            try {
773 >                task.get(timeout, null);
774 >                shouldThrow();
775 >            } catch (NullPointerException success) {}
776 >        }
777      }
778  
779   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines