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.5 by jsr166, Sat Nov 21 02:07:26 2009 UTC vs.
Revision 1.7 by jsr166, Tue Dec 1 23:01:44 2009 UTC

#	Line 148 | Line 148 | public class ForkJoinTaskTest extends JS
148
149		}
150
151	<	static final class AsyncFib  extends BinaryAsyncAction {
151	>	static final class AsyncFib extends BinaryAsyncAction {
152		int number;
153		public AsyncFib(int n) {
154		this.number = n;
#	Line 177 | Line 177 | public class ForkJoinTaskTest extends JS
177		}
178
179
180	<	static final class FailingAsyncFib  extends BinaryAsyncAction {
180	>	static final class FailingAsyncFib extends BinaryAsyncAction {
181		int number;
182		public FailingAsyncFib(int n) {
183		this.number = n;
#	Line 292 | Line 292 | public class ForkJoinTaskTest extends JS
292		try {
293		AsyncFib f = new AsyncFib(8);
294		f.fork();
295	<	f.get(5L, TimeUnit.SECONDS);
295	>	f.get(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
296		threadAssertTrue(f.number == 21);
297		threadAssertTrue(f.isDone());
298		} catch (Exception ex) {
#	Line 470 | Line 470 | public class ForkJoinTaskTest extends JS
470		try {
471		FailingAsyncFib f = new FailingAsyncFib(8);
472		f.fork();
473	<	f.get(5L, TimeUnit.SECONDS);
473	>	f.get(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
474		shouldThrow();
475		} catch (ExecutionException success) {
476		} catch (Exception ex) {
#	Line 605 | Line 605 | public class ForkJoinTaskTest extends JS
605		AsyncFib f = new AsyncFib(8);
606		f.cancel(true);
607		f.fork();
608	<	f.get(5L, TimeUnit.SECONDS);
608	>	f.get(LONG_DELAY_MS, TimeUnit.MILLISECONDS);
609		shouldThrow();
610		} catch (CancellationException success) {
611		} catch (Exception ex) {

Diff Legend

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