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.22 by jsr166, Sun Nov 21 19:06:53 2010 UTC vs.
Revision 1.25 by jsr166, Tue Nov 23 08:48:23 2010 UTC

#	Line 8 | Line 8 | import junit.framework.*;
8		import java.util.concurrent.CancellationException;
9		import java.util.concurrent.ExecutionException;
10		import java.util.concurrent.ForkJoinPool;
11	+	import java.util.concurrent.ForkJoinTask;
12		import java.util.concurrent.ForkJoinWorkerThread;
13		import java.util.concurrent.RecursiveTask;
14		import java.util.concurrent.TimeUnit;
#	Line 59 | Line 60 | public class RecursiveTaskTest extends J
60		assertNull(a.getException());
61		assertNull(a.getRawResult());
62
63	<	if (! (Thread.currentThread() instanceof ForkJoinWorkerThread)) {
63	>	if (! ForkJoinTask.inForkJoinPool()) {
64		Thread.currentThread().interrupt();
65		try {
66		a.get();
#	Line 90 | Line 91 | public class RecursiveTaskTest extends J
91		assertNull(a.getException());
92		assertSame(expected, a.getRawResult());
93		assertSame(expected, a.join());
94	+	assertFalse(a.cancel(false));
95	+	assertFalse(a.cancel(true));
96		try {
97		assertSame(expected, a.get());
98		} catch (Throwable fail) { threadUnexpectedException(fail); }
#	Line 152 | Line 155 | public class RecursiveTaskTest extends J
155		assertTrue(a.isCompletedAbnormally());
156		assertSame(t, a.getException());
157		assertNull(a.getRawResult());
158	+	assertFalse(a.cancel(false));
159	+	assertFalse(a.cancel(true));
160
161		try {
162		a.join();
#	Line 598 | Line 603 | public class RecursiveTaskTest extends J
603		return NoResult;
604		}
605		};
606	<	a.invoke();
606	>	assertSame(NoResult, a.invoke());
607		}
608
609		/**

Diff Legend

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