82 |
|
} catch (Throwable fail) { threadUnexpectedException(fail); } |
83 |
|
} |
84 |
|
|
85 |
< |
<T> void checkCompletedNormally(RecursiveTask<T> a, T expected) { |
85 |
> |
<T> void checkCompletedNormally(RecursiveTask<T> a, T expectedValue) { |
86 |
|
assertTrue(a.isDone()); |
87 |
|
assertFalse(a.isCancelled()); |
88 |
|
assertTrue(a.isCompletedNormally()); |
89 |
|
assertFalse(a.isCompletedAbnormally()); |
90 |
|
assertNull(a.getException()); |
91 |
< |
assertSame(expected, a.getRawResult()); |
92 |
< |
assertSame(expected, a.join()); |
91 |
> |
assertSame(expectedValue, a.getRawResult()); |
92 |
> |
assertSame(expectedValue, a.join()); |
93 |
|
assertFalse(a.cancel(false)); |
94 |
|
assertFalse(a.cancel(true)); |
95 |
+ |
|
96 |
+ |
T v1 = null, v2 = null; |
97 |
|
try { |
98 |
< |
assertSame(expected, a.get()); |
99 |
< |
assertSame(expected, a.get(randomTimeout(), randomTimeUnit())); |
98 |
> |
v1 = a.get(); |
99 |
> |
v2 = a.get(randomTimeout(), randomTimeUnit()); |
100 |
|
} catch (Throwable fail) { threadUnexpectedException(fail); } |
101 |
+ |
assertSame(expectedValue, v1); |
102 |
+ |
assertSame(expectedValue, v2); |
103 |
|
} |
104 |
|
|
105 |
|
/** |
106 |
|
* Waits for the task to complete, and checks that when it does, |
107 |
|
* it will have an Integer result equals to the given int. |
108 |
|
*/ |
109 |
< |
void checkCompletesNormally(RecursiveTask<Integer> a, int expected) { |
109 |
> |
void checkCompletesNormally(RecursiveTask<Integer> a, int expectedValue) { |
110 |
|
Integer r = a.join(); |
111 |
< |
assertEquals(expected, (int) r); |
111 |
> |
assertEquals(expectedValue, (int) r); |
112 |
|
checkCompletedNormally(a, r); |
113 |
|
} |
114 |
|
|
116 |
|
* Like checkCompletesNormally, but verifies that the task has |
117 |
|
* already completed. |
118 |
|
*/ |
119 |
< |
void checkCompletedNormally(RecursiveTask<Integer> a, int expected) { |
119 |
> |
void checkCompletedNormally(RecursiveTask<Integer> a, int expectedValue) { |
120 |
|
Integer r = a.getRawResult(); |
121 |
< |
assertEquals(expected, (int) r); |
121 |
> |
assertEquals(expectedValue, (int) r); |
122 |
|
checkCompletedNormally(a, r); |
123 |
|
} |
124 |
|
|