87 |
|
checkCompletedNormally(a, null); |
88 |
|
} |
89 |
|
|
90 |
< |
<T> void checkCompletedNormally(ForkJoinTask<T> a, T expected) { |
90 |
> |
<T> void checkCompletedNormally(ForkJoinTask<T> a, T expectedValue) { |
91 |
|
assertTrue(a.isDone()); |
92 |
|
assertFalse(a.isCancelled()); |
93 |
|
assertTrue(a.isCompletedNormally()); |
94 |
|
assertFalse(a.isCompletedAbnormally()); |
95 |
|
assertNull(a.getException()); |
96 |
< |
assertSame(expected, a.getRawResult()); |
96 |
> |
assertSame(expectedValue, a.getRawResult()); |
97 |
|
|
98 |
|
{ |
99 |
|
Thread.currentThread().interrupt(); |
100 |
|
long startTime = System.nanoTime(); |
101 |
< |
assertSame(expected, a.join()); |
101 |
> |
assertSame(expectedValue, a.join()); |
102 |
|
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS); |
103 |
|
Thread.interrupted(); |
104 |
|
} |
113 |
|
|
114 |
|
assertFalse(a.cancel(false)); |
115 |
|
assertFalse(a.cancel(true)); |
116 |
+ |
|
117 |
+ |
T v1 = null, v2 = null; |
118 |
|
try { |
119 |
< |
assertSame(expected, a.get()); |
120 |
< |
assertSame(expected, a.get(randomTimeout(), randomTimeUnit())); |
119 |
> |
v1 = a.get(); |
120 |
> |
v2 = a.get(randomTimeout(), randomTimeUnit()); |
121 |
|
} catch (Throwable fail) { threadUnexpectedException(fail); } |
122 |
+ |
assertSame(expectedValue, v1); |
123 |
+ |
assertSame(expectedValue, v2); |
124 |
|
} |
125 |
|
|
126 |
|
void checkCancelled(ForkJoinTask a) { |
499 |
|
AsyncFib f = new AsyncFib(8); |
500 |
|
assertSame(f, f.fork()); |
501 |
|
helpQuiesce(); |
502 |
+ |
while (!f.isDone()) // wait out race |
503 |
+ |
; |
504 |
|
assertEquals(21, f.number); |
505 |
|
assertEquals(0, getQueuedTaskCount()); |
506 |
|
checkCompletedNormally(f); |
1693 |
|
task.toString()); |
1694 |
|
} |
1695 |
|
} |
1696 |
+ |
|
1697 |
+ |
// adaptInterruptible deferred to its own independent change |
1698 |
+ |
// https://bugs.openjdk.java.net/browse/JDK-8246587 |
1699 |
+ |
|
1700 |
+ |
// /** |
1701 |
+ |
// * adaptInterruptible(callable).toString() contains toString of wrapped task |
1702 |
+ |
// */ |
1703 |
+ |
// public void testAdaptInterruptible_Callable_toString() { |
1704 |
+ |
// if (testImplementationDetails) { |
1705 |
+ |
// Callable<String> c = () -> ""; |
1706 |
+ |
// ForkJoinTask<String> task = ForkJoinTask.adaptInterruptible(c); |
1707 |
+ |
// assertEquals( |
1708 |
+ |
// identityString(task) + "[Wrapped task = " + c.toString() + "]", |
1709 |
+ |
// task.toString()); |
1710 |
+ |
// } |
1711 |
+ |
// } |
1712 |
|
} |