ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ForkJoinTaskTest.java

Comparing jsr166/src/test/tck/ForkJoinTaskTest.java (file contents):
Revision 1.55 by jsr166, Wed Nov 8 02:21:43 2017 UTC vs.
Revision 1.56 by jsr166, Sun Jul 22 20:47:22 2018 UTC

#	Line 87 | Line 87 | public class ForkJoinTaskTest extends JS
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		}
#	Line 113 | Line 113 | public class ForkJoinTaskTest extends JS
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) {

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines