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.24 by jsr166, Sun Nov 21 19:06:53 2010 UTC vs.
Revision 1.26 by jsr166, Mon Nov 22 07:40:24 2010 UTC

#	Line 94 | Line 94 | public class ForkJoinTaskTest extends JS
94		assertNull(a.getException());
95		assertSame(expected, a.getRawResult());
96		assertSame(expected, a.join());
97	+	assertFalse(a.cancel(false));
98	+	assertFalse(a.cancel(true));
99		try {
100		assertSame(expected, a.get());
101		} catch (Throwable fail) { threadUnexpectedException(fail); }
#	Line 109 | Line 111 | public class ForkJoinTaskTest extends JS
111		assertTrue(a.isCompletedAbnormally());
112		assertTrue(a.getException() instanceof CancellationException);
113		assertNull(a.getRawResult());
114	+	assertTrue(a.cancel(false));
115	+	assertTrue(a.cancel(true));
116
117		try {
118		a.join();
#	Line 136 | Line 140 | public class ForkJoinTaskTest extends JS
140		assertTrue(a.isCompletedAbnormally());
141		assertSame(t, a.getException());
142		assertNull(a.getRawResult());
143	+	assertFalse(a.cancel(false));
144	+	assertFalse(a.cancel(true));
145
146		try {
147		a.join();
#	Line 343 | Line 349 | public class ForkJoinTaskTest extends JS
349		/**
350		* invoke returns when task completes normally.
351		* isCompletedAbnormally and isCancelled return false for normally
352	<	* completed tasks. getRawResult of a RecursiveAction returns null;
352	>	* completed tasks; getRawResult returns null.
353		*/
354		public void testInvoke() {
355		RecursiveAction a = new CheckedRecursiveAction() {
#	Line 1069 | Line 1075 | public class ForkJoinTaskTest extends JS
1075		/**
1076		* invoke returns when task completes normally.
1077		* isCompletedAbnormally and isCancelled return false for normally
1078	<	* completed tasks. getRawResult of a RecursiveAction returns null;
1078	>	* completed tasks; getRawResult returns null.
1079		*/
1080		public void testInvokeSingleton() {
1081		RecursiveAction a = new CheckedRecursiveAction() {

Diff Legend

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