ViewVC Help

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

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

Comparing jsr166/src/test/tck/ForkJoinTask8Test.java (file contents):
Revision 1.28 by jsr166, Sat Mar 18 20:42:20 2017 UTC vs.
Revision 1.32 by jsr166, Sun Jul 22 20:42:51 2018 UTC

#	Line 5 | Line 5
5		*/
6
7		import static java.util.concurrent.TimeUnit.MILLISECONDS;
8	–	import static java.util.concurrent.TimeUnit.SECONDS;
8
9		import java.util.Arrays;
10		import java.util.concurrent.CountDownLatch;
#	Line 104 | Line 103 | public class ForkJoinTask8Test extends J
103		((BinaryAsyncAction)a).getForkJoinTaskTag());
104
105		try {
106	<	a.get(0L, SECONDS);
106	>	a.get(randomExpiredTimeout(), randomTimeUnit());
107		shouldThrow();
108		} catch (TimeoutException success) {
109		} catch (Throwable fail) { threadUnexpectedException(fail); }
#	Line 114 | Line 113 | public class ForkJoinTask8Test extends J
113		checkCompletedNormally(a, null);
114		}
115
116	<	<T> void checkCompletedNormally(ForkJoinTask<T> a, T expected) {
116	>	<T> void checkCompletedNormally(ForkJoinTask<T> a, T expectedValue) {
117		assertTrue(a.isDone());
118		assertFalse(a.isCancelled());
119		assertTrue(a.isCompletedNormally());
120		assertFalse(a.isCompletedAbnormally());
121		assertNull(a.getException());
122	<	assertSame(expected, a.getRawResult());
122	>	assertSame(expectedValue, a.getRawResult());
123		if (a instanceof BinaryAsyncAction)
124		assertEquals(COMPLETE_STATE,
125		((BinaryAsyncAction)a).getForkJoinTaskTag());
#	Line 128 | Line 127 | public class ForkJoinTask8Test extends J
127		{
128		Thread.currentThread().interrupt();
129		long startTime = System.nanoTime();
130	<	assertSame(expected, a.join());
131	<	assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
130	>	assertSame(expectedValue, a.join());
131	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
132		Thread.interrupted();
133		}
134
#	Line 137 | Line 136 | public class ForkJoinTask8Test extends J
136		Thread.currentThread().interrupt();
137		long startTime = System.nanoTime();
138		a.quietlyJoin();        // should be no-op
139	<	assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
139	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
140		Thread.interrupted();
141		}
142
143		assertFalse(a.cancel(false));
144		assertFalse(a.cancel(true));
145	+
146	+	T v1 = null, v2 = null;
147		try {
148	<	assertSame(expected, a.get());
149	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
149	<	try {
150	<	assertSame(expected, a.get(5L, SECONDS));
148	>	v1 = a.get();
149	>	v2 = a.get(randomTimeout(), randomTimeUnit());
150		} catch (Throwable fail) { threadUnexpectedException(fail); }
151	+	assertSame(expectedValue, v1);
152	+	assertSame(expectedValue, v2);
153		}
154
155		void checkCompletedAbnormally(ForkJoinTask a, Throwable t) {
#	Line 175 | Line 176 | public class ForkJoinTask8Test extends J
176		{
177		long startTime = System.nanoTime();
178		a.quietlyJoin();        // should be no-op
179	<	assertTrue(millisElapsedSince(startTime) < SMALL_DELAY_MS);
179	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
180		}
181
182		try {
#	Line 186 | Line 187 | public class ForkJoinTask8Test extends J
187		} catch (Throwable fail) { threadUnexpectedException(fail); }
188
189		try {
190	<	a.get(5L, SECONDS);
190	>	a.get(randomTimeout(), randomTimeUnit());
191		shouldThrow();
192		} catch (ExecutionException success) {
193		assertSame(t.getClass(), success.getCause().getClass());
#	Line 488 | Line 489 | public class ForkJoinTask8Test extends J
489		AsyncFib f = new AsyncFib(8);
490		assertSame(f, f.fork());
491		try {
492	<	f.get(5L, null);
492	>	f.get(randomTimeout(), null);
493		shouldThrow();
494		} catch (NullPointerException success) {}
495		}};

Diff Legend

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