ViewVC Help

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

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

Comparing jsr166/src/test/tck/RecursiveTaskTest.java (file contents):
Revision 1.33 by jsr166, Sun Oct 4 18:28:51 2015 UTC vs.
Revision 1.38 by jsr166, Wed Nov 8 02:21:43 2017 UTC

#	Line 4 | Line 4
4		* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7	<	import static java.util.concurrent.TimeUnit.SECONDS;
7	>	import static java.util.concurrent.TimeUnit.MILLISECONDS;
8
9		import java.util.HashSet;
10		import java.util.concurrent.CancellationException;
#	Line 69 | Line 69 | public class RecursiveTaskTest extends J
69
70		Thread.currentThread().interrupt();
71		try {
72	<	a.get(5L, SECONDS);
72	>	a.get(randomTimeout(), randomTimeUnit());
73		shouldThrow();
74		} catch (InterruptedException success) {
75		} catch (Throwable fail) { threadUnexpectedException(fail); }
76		}
77
78		try {
79	<	a.get(0L, SECONDS);
79	>	a.get(randomExpiredTimeout(), randomTimeUnit());
80		shouldThrow();
81		} catch (TimeoutException success) {
82		} catch (Throwable fail) { threadUnexpectedException(fail); }
#	Line 94 | Line 94 | public class RecursiveTaskTest extends J
94		assertFalse(a.cancel(true));
95		try {
96		assertSame(expected, a.get());
97	<	} catch (Throwable fail) { threadUnexpectedException(fail); }
98	<	try {
99	<	assertSame(expected, a.get(5L, SECONDS));
97	>	assertSame(expected, a.get(randomTimeout(), randomTimeUnit()));
98		} catch (Throwable fail) { threadUnexpectedException(fail); }
99		}
100
#	Line 141 | Line 139 | public class RecursiveTaskTest extends J
139		} catch (Throwable fail) { threadUnexpectedException(fail); }
140
141		try {
142	<	a.get(5L, SECONDS);
142	>	a.get(randomTimeout(), randomTimeUnit());
143		shouldThrow();
144		} catch (CancellationException success) {
145		} catch (Throwable fail) { threadUnexpectedException(fail); }
#	Line 172 | Line 170 | public class RecursiveTaskTest extends J
170		} catch (Throwable fail) { threadUnexpectedException(fail); }
171
172		try {
173	<	a.get(5L, SECONDS);
173	>	a.get(randomTimeout(), randomTimeUnit());
174		shouldThrow();
175		} catch (ExecutionException success) {
176		assertSame(t.getClass(), success.getCause().getClass());
#	Line 183 | Line 181 | public class RecursiveTaskTest extends J
181		public FJException() { super(); }
182		}
183
184	<	// An invalid return value for Fib
184	>	/** An invalid return value for Fib. */
185		static final Integer NoResult = Integer.valueOf(-17);
186
187	<	// A simple recursive task for testing
187	>	/** A simple recursive task for testing. */
188		final class FibTask extends CheckedRecursiveTask<Integer> {
189		final int number;
190		FibTask(int n) { number = n; }
#	Line 204 | Line 202 | public class RecursiveTaskTest extends J
202		}
203		}
204
205	<	// A recursive action failing in base case
205	>	/** A recursive action failing in base case. */
206		final class FailingFibTask extends RecursiveTask<Integer> {
207		final int number;
208		int result;
#	Line 293 | Line 291 | public class RecursiveTaskTest extends J
291		public Integer realCompute() throws Exception {
292		FibTask f = new FibTask(8);
293		assertSame(f, f.fork());
294	<	Integer r = f.get(5L, SECONDS);
294	>	Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
295		assertEquals(21, (int) r);
296		checkCompletedNormally(f, r);
297		return r;
#	Line 328 | Line 326 | public class RecursiveTaskTest extends J
326		FibTask f = new FibTask(8);
327		assertSame(f, f.fork());
328		helpQuiesce();
329	+	while (!f.isDone()) // wait out race
330	+	;
331		assertEquals(0, getQueuedTaskCount());
332		checkCompletedNormally(f, 21);
333		return NoResult;
#	Line 417 | Line 417 | public class RecursiveTaskTest extends J
417		FailingFibTask f = new FailingFibTask(8);
418		assertSame(f, f.fork());
419		try {
420	<	Integer r = f.get(5L, SECONDS);
420	>	Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
421		shouldThrow();
422		} catch (ExecutionException success) {
423		Throwable cause = success.getCause();
#	Line 514 | Line 514 | public class RecursiveTaskTest extends J
514		assertTrue(f.cancel(true));
515		assertSame(f, f.fork());
516		try {
517	<	Integer r = f.get(5L, SECONDS);
517	>	Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
518		shouldThrow();
519		} catch (CancellationException success) {
520		checkCancelled(f);

Diff Legend

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