60 |
|
pf.run(); |
61 |
|
pf.runAndReset(); |
62 |
|
assertEquals(savedRunCount, pf.runCount()); |
63 |
+ |
Object r2 = null; |
64 |
|
try { |
65 |
< |
assertSame(r, f.get()); |
65 |
> |
r2 = f.get(); |
66 |
|
} catch (CancellationException t) { |
67 |
|
assertSame(exInfo, CancellationException.class); |
68 |
|
} catch (ExecutionException t) { |
70 |
|
} catch (Throwable t) { |
71 |
|
threadUnexpectedException(t); |
72 |
|
} |
73 |
+ |
if (exInfo == null) |
74 |
+ |
assertSame(r, r2); |
75 |
|
assertTrue(f.isDone()); |
76 |
|
} |
77 |
|
} |
90 |
|
void checkIsRunning(Future<?> f) { |
91 |
|
checkNotDone(f); |
92 |
|
if (f instanceof FutureTask) { |
93 |
< |
FutureTask ft = (FutureTask<?>) f; |
93 |
> |
FutureTask<?> ft = (FutureTask<?>) f; |
94 |
|
// Check that run methods do nothing |
95 |
|
ft.run(); |
96 |
|
if (f instanceof PublicFutureTask) { |
104 |
|
} |
105 |
|
} |
106 |
|
|
107 |
< |
<T> void checkCompletedNormally(Future<T> f, T expected) { |
107 |
> |
<T> void checkCompletedNormally(Future<T> f, T expectedValue) { |
108 |
|
checkIsDone(f); |
109 |
|
assertFalse(f.isCancelled()); |
110 |
|
|
111 |
+ |
T v1 = null, v2 = null; |
112 |
|
try { |
113 |
< |
assertSame(expected, f.get()); |
114 |
< |
assertSame(expected, f.get(randomTimeout(), randomTimeUnit())); |
115 |
< |
} catch (Exception fail) { threadUnexpectedException(fail); } |
113 |
> |
v1 = f.get(); |
114 |
> |
v2 = f.get(randomTimeout(), randomTimeUnit()); |
115 |
> |
} catch (Throwable fail) { threadUnexpectedException(fail); } |
116 |
> |
assertSame(expectedValue, v1); |
117 |
> |
assertSame(expectedValue, v2); |
118 |
|
} |
119 |
|
|
120 |
|
void checkCancelled(Future<?> f) { |
164 |
|
/** |
165 |
|
* Subclass to expose protected methods |
166 |
|
*/ |
167 |
< |
static class PublicFutureTask extends FutureTask { |
167 |
> |
static class PublicFutureTask extends FutureTask<Object> { |
168 |
|
private final AtomicInteger runCount; |
169 |
|
private final AtomicInteger doneCount = new AtomicInteger(0); |
170 |
|
private final AtomicInteger runAndResetCount = new AtomicInteger(0); |
191 |
|
}}, result); |
192 |
|
this.runCount = runCount; |
193 |
|
} |
194 |
< |
PublicFutureTask(Callable callable) { |
194 |
> |
PublicFutureTask(Callable<?> callable) { |
195 |
|
this(callable, new AtomicInteger(0)); |
196 |
|
} |
197 |
< |
private PublicFutureTask(final Callable callable, |
197 |
> |
private PublicFutureTask(final Callable<?> callable, |
198 |
|
final AtomicInteger runCount) { |
199 |
< |
super(new Callable() { |
199 |
> |
super(new Callable<Object>() { |
200 |
|
public Object call() throws Exception { |
201 |
|
runCount.getAndIncrement(); |
202 |
|
return callable.call(); |
235 |
|
*/ |
236 |
|
public void testConstructor() { |
237 |
|
try { |
238 |
< |
new FutureTask(null); |
238 |
> |
new FutureTask<Void>(null); |
239 |
|
shouldThrow(); |
240 |
|
} catch (NullPointerException success) {} |
241 |
|
} |
245 |
|
*/ |
246 |
|
public void testConstructor2() { |
247 |
|
try { |
248 |
< |
new FutureTask(null, Boolean.TRUE); |
248 |
> |
new FutureTask<Boolean>(null, Boolean.TRUE); |
249 |
|
shouldThrow(); |
250 |
|
} catch (NullPointerException success) {} |
251 |
|
} |
464 |
|
try { |
465 |
|
task.cancel(true); |
466 |
|
shouldThrow(); |
467 |
< |
} catch (SecurityException expected) {} |
467 |
> |
} catch (SecurityException success) {} |
468 |
|
|
469 |
|
// We failed to deliver the interrupt, but the world retains |
470 |
|
// its sanity, as if we had done task.cancel(false) |
629 |
|
public void testTimedGet_Cancellation(final boolean mayInterruptIfRunning) { |
630 |
|
final CountDownLatch pleaseCancel = new CountDownLatch(3); |
631 |
|
final CountDownLatch cancelled = new CountDownLatch(1); |
632 |
< |
final Callable<Object> callable = |
627 |
< |
new CheckedCallable<Object>() { |
632 |
> |
final Callable<Object> callable = new CheckedCallable<>() { |
633 |
|
public Object realCall() throws InterruptedException { |
634 |
|
pleaseCancel.countDown(); |
635 |
|
if (mayInterruptIfRunning) { |
676 |
|
*/ |
677 |
|
public void testGet_ExecutionException() throws InterruptedException { |
678 |
|
final ArithmeticException e = new ArithmeticException(); |
679 |
< |
final PublicFutureTask task = new PublicFutureTask(new Callable() { |
679 |
> |
final PublicFutureTask task = new PublicFutureTask(new Callable<Object>() { |
680 |
|
public Object call() { |
681 |
|
throw e; |
682 |
|
}}); |
700 |
|
*/ |
701 |
|
public void testTimedGet_ExecutionException2() throws Exception { |
702 |
|
final ArithmeticException e = new ArithmeticException(); |
703 |
< |
final PublicFutureTask task = new PublicFutureTask(new Callable() { |
703 |
> |
final PublicFutureTask task = new PublicFutureTask(new Callable<Object>() { |
704 |
|
public Object call() { |
705 |
|
throw e; |
706 |
|
}}); |
719 |
|
/** |
720 |
|
* get is interruptible |
721 |
|
*/ |
722 |
< |
public void testGet_interruptible() { |
722 |
> |
public void testGet_Interruptible() { |
723 |
|
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
724 |
< |
final FutureTask task = new FutureTask(new NoOpCallable()); |
724 |
> |
final FutureTask<Object> task = new FutureTask<>(new NoOpCallable()); |
725 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
726 |
|
public void realRun() throws Exception { |
727 |
|
Thread.currentThread().interrupt(); |
748 |
|
/** |
749 |
|
* timed get is interruptible |
750 |
|
*/ |
751 |
< |
public void testTimedGet_interruptible() { |
751 |
> |
public void testTimedGet_Interruptible() { |
752 |
|
final CountDownLatch pleaseInterrupt = new CountDownLatch(1); |
753 |
< |
final FutureTask task = new FutureTask(new NoOpCallable()); |
753 |
> |
final FutureTask<Object> task = new FutureTask<>(new NoOpCallable()); |
754 |
|
Thread t = newStartedThread(new CheckedRunnable() { |
755 |
|
public void realRun() throws Exception { |
756 |
|
Thread.currentThread().interrupt(); |
757 |
|
try { |
758 |
< |
task.get(2*LONG_DELAY_MS, MILLISECONDS); |
758 |
> |
task.get(randomTimeout(), randomTimeUnit()); |
759 |
|
shouldThrow(); |
760 |
|
} catch (InterruptedException success) {} |
761 |
|
assertFalse(Thread.interrupted()); |
762 |
|
|
763 |
|
pleaseInterrupt.countDown(); |
764 |
|
try { |
765 |
< |
task.get(2*LONG_DELAY_MS, MILLISECONDS); |
765 |
> |
task.get(LONGER_DELAY_MS, MILLISECONDS); |
766 |
|
shouldThrow(); |
767 |
|
} catch (InterruptedException success) {} |
768 |
|
assertFalse(Thread.interrupted()); |
769 |
|
}}); |
770 |
|
|
771 |
|
await(pleaseInterrupt); |
772 |
+ |
if (randomBoolean()) assertThreadBlocks(t, Thread.State.TIMED_WAITING); |
773 |
|
t.interrupt(); |
774 |
|
awaitTermination(t); |
775 |
|
checkNotDone(task); |
779 |
|
* A timed out timed get throws TimeoutException |
780 |
|
*/ |
781 |
|
public void testGet_TimeoutException() throws Exception { |
782 |
< |
FutureTask task = new FutureTask(new NoOpCallable()); |
782 |
> |
FutureTask<Object> task = new FutureTask<>(new NoOpCallable()); |
783 |
|
long startTime = System.nanoTime(); |
784 |
|
try { |
785 |
|
task.get(timeoutMillis(), MILLISECONDS); |
793 |
|
* timed get with null TimeUnit throws NullPointerException |
794 |
|
*/ |
795 |
|
public void testGet_NullTimeUnit() throws Exception { |
796 |
< |
FutureTask task = new FutureTask(new NoOpCallable()); |
796 |
> |
FutureTask<Object> task = new FutureTask<>(new NoOpCallable()); |
797 |
|
long[] timeouts = { Long.MIN_VALUE, 0L, Long.MAX_VALUE }; |
798 |
|
|
799 |
|
for (long timeout : timeouts) { |
844 |
|
* toString indicates current completion state |
845 |
|
*/ |
846 |
|
public void testToString_incomplete() { |
847 |
< |
FutureTask<String> f = new FutureTask<String>(() -> ""); |
847 |
> |
FutureTask<String> f = new FutureTask<>(() -> ""); |
848 |
|
assertTrue(f.toString().matches(".*\\[.*Not completed.*\\]")); |
849 |
|
if (testImplementationDetails) |
850 |
|
assertTrue(f.toString().startsWith( |
852 |
|
} |
853 |
|
|
854 |
|
public void testToString_normal() { |
855 |
< |
FutureTask<String> f = new FutureTask<String>(() -> ""); |
855 |
> |
FutureTask<String> f = new FutureTask<>(() -> ""); |
856 |
|
f.run(); |
857 |
|
assertTrue(f.toString().matches(".*\\[.*Completed normally.*\\]")); |
858 |
|
if (testImplementationDetails) |
861 |
|
} |
862 |
|
|
863 |
|
public void testToString_exception() { |
864 |
< |
FutureTask<String> f = new FutureTask<String>( |
864 |
> |
FutureTask<String> f = new FutureTask<>( |
865 |
|
() -> { throw new ArithmeticException(); }); |
866 |
|
f.run(); |
867 |
|
assertTrue(f.toString().matches(".*\\[.*Completed exceptionally.*\\]")); |
872 |
|
|
873 |
|
public void testToString_cancelled() { |
874 |
|
for (boolean mayInterruptIfRunning : new boolean[] { true, false }) { |
875 |
< |
FutureTask<String> f = new FutureTask<String>(() -> ""); |
875 |
> |
FutureTask<String> f = new FutureTask<>(() -> ""); |
876 |
|
assertTrue(f.cancel(mayInterruptIfRunning)); |
877 |
|
assertTrue(f.toString().matches(".*\\[.*Cancelled.*\\]")); |
878 |
|
if (testImplementationDetails) |