< prev index next >
test/jdk/java/util/concurrent/tck/ForkJoinTaskTest.java
Print this page
8207003: Miscellaneous changes imported from jsr166 CVS 2018-09
Reviewed-by: martin, chegar
@@ -112,22 +112,22 @@
<T> void checkCompletedNormally(ForkJoinTask<T> a) {
checkCompletedNormally(a, null);
}
- <T> void checkCompletedNormally(ForkJoinTask<T> a, T expected) {
+ <T> void checkCompletedNormally(ForkJoinTask<T> a, T expectedValue) {
assertTrue(a.isDone());
assertFalse(a.isCancelled());
assertTrue(a.isCompletedNormally());
assertFalse(a.isCompletedAbnormally());
assertNull(a.getException());
- assertSame(expected, a.getRawResult());
+ assertSame(expectedValue, a.getRawResult());
{
Thread.currentThread().interrupt();
long startTime = System.nanoTime();
- assertSame(expected, a.join());
+ assertSame(expectedValue, a.join());
assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
Thread.interrupted();
}
{
@@ -138,14 +138,18 @@
Thread.interrupted();
}
assertFalse(a.cancel(false));
assertFalse(a.cancel(true));
+
+ T v1 = null, v2 = null;
try {
- assertSame(expected, a.get());
- assertSame(expected, a.get(randomTimeout(), randomTimeUnit()));
+ v1 = a.get();
+ v2 = a.get(randomTimeout(), randomTimeUnit());
} catch (Throwable fail) { threadUnexpectedException(fail); }
+ assertSame(expectedValue, v1);
+ assertSame(expectedValue, v2);
}
void checkCancelled(ForkJoinTask a) {
assertTrue(a.isDone());
assertTrue(a.isCancelled());
< prev index next >