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.1 by dl, Sun Jul 21 22:24:18 2013 UTC vs.
Revision 1.7 by jsr166, Wed Dec 31 19:05:42 2014 UTC

#	Line 3 | Line 3
3		* Expert Group and released to the public domain, as explained at
4		* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6	+
7	+	import static java.util.concurrent.TimeUnit.MILLISECONDS;
8	+	import static java.util.concurrent.TimeUnit.SECONDS;
9	+
10	+	import java.util.HashSet;
11		import java.util.concurrent.ExecutionException;
7	–	import java.util.concurrent.CancellationException;
12		import java.util.concurrent.ForkJoinPool;
13		import java.util.concurrent.ForkJoinTask;
10	–	import java.util.concurrent.ForkJoinWorkerThread;
14		import java.util.concurrent.RecursiveAction;
12	–	import java.util.concurrent.TimeUnit;
15		import java.util.concurrent.TimeoutException;
16	<	import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
17	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
18	<	import static java.util.concurrent.TimeUnit.SECONDS;
17	<	import java.util.HashSet;
18	<	import junit.framework.*;
16	>
17	>	import junit.framework.Test;
18	>	import junit.framework.TestSuite;
19
20		public class ForkJoinTask8Test extends JSR166TestCase {
21
#	Line 32 | Line 32 | public class ForkJoinTask8Test extends J
32		static final short INITIAL_STATE = -1;
33		static final short COMPLETE_STATE = 0;
34		static final short EXCEPTION_STATE = 1;
35	–
35
36		public static void main(String[] args) {
37		junit.textui.TestRunner.run(suite());
#	Line 206 | Line 205 | public class ForkJoinTask8Test extends J
205		}
206
207		protected void onComplete(BinaryAsyncAction x, BinaryAsyncAction y) {
208	<	if (this.getForkJoinTaskTag() != COMPLETE_STATE ||
209	<	x.getForkJoinTaskTag() != COMPLETE_STATE ||
208	>	if (this.getForkJoinTaskTag() != COMPLETE_STATE ||
209	>	x.getForkJoinTaskTag() != COMPLETE_STATE ||
210		y.getForkJoinTaskTag() != COMPLETE_STATE) {
211		completeThisExceptionally(new FJException());
212		}
#	Line 241 | Line 240 | public class ForkJoinTask8Test extends J
240		a.sibling = null;
241		a.parent = null;
242		a.completeThis();
243	<	if (p == null ||
243	>	if (p == null ||
244		p.compareAndSetForkJoinTaskTag(INITIAL_STATE, COMPLETE_STATE))
245		break;
246		try {
#	Line 279 | Line 278 | public class ForkJoinTask8Test extends J
278		super.reinitialize();
279		}
280
282	–
281		}
282
283		static final class AsyncFib extends BinaryAsyncAction {
#	Line 304 | Line 302 | public class ForkJoinTask8Test extends J
302		}
303		f.complete();
304		}
305	<	catch(Throwable ex) {
305	>	catch (Throwable ex) {
306		compareAndSetForkJoinTaskTag(INITIAL_STATE, EXCEPTION_STATE);
307		}
308		return false;
#	Line 573 | Line 571 | public class ForkJoinTask8Test extends J
571		testInvokeOnPool(mainPool(), a);
572		}
573
576	–
574		/**
575		* getPool of executing task returns its pool
576		*/
#	Line 796 | Line 793 | public class ForkJoinTask8Test extends J
793		}
794
795		/**
796	<	* invokeAll(collection)  throws exception if any task does
796	>	* invokeAll(collection) throws exception if any task does
797		*/
798		public void testAbnormalInvokeAllCollection() {
799		RecursiveAction a = new CheckedRecursiveAction() {
#	Line 1373 | Line 1370 | public class ForkJoinTask8Test extends J
1370		}
1371
1372		/**
1373	<	* invokeAll(collection)  throws exception if any task does
1373	>	* invokeAll(collection) throws exception if any task does
1374		*/
1375		public void testAbnormalInvokeAllCollectionSingleton() {
1376		RecursiveAction a = new CheckedRecursiveAction() {
#	Line 1395 | Line 1392 | public class ForkJoinTask8Test extends J
1392		testInvokeOnPool(singletonPool(), a);
1393		}
1394
1398	–
1395		/**
1396		* ForkJoinTask.quietlyComplete returns when task completes
1397		* normally without setting a value. The most recent value

Diff Legend

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