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.23 by dl, Sun Oct 11 13:30:30 2015 UTC vs.
Revision 1.28 by jsr166, Sat Mar 18 20:42:20 2017 UTC

#	Line 8 | Line 8 | import static java.util.concurrent.TimeU
8		import static java.util.concurrent.TimeUnit.SECONDS;
9
10		import java.util.Arrays;
11	–	import java.util.Collections;
11		import java.util.concurrent.CountDownLatch;
12		import java.util.concurrent.ExecutionException;
13		import java.util.concurrent.ForkJoinPool;
#	Line 101 | Line 100 | public class ForkJoinTask8Test extends J
100		assertNull(a.getException());
101		assertNull(a.getRawResult());
102		if (a instanceof BinaryAsyncAction)
103	<	assertTrue(((BinaryAsyncAction)a).getForkJoinTaskTag() == INITIAL_STATE);
103	>	assertEquals(INITIAL_STATE,
104	>	((BinaryAsyncAction)a).getForkJoinTaskTag());
105
106		try {
107		a.get(0L, SECONDS);
#	Line 122 | Line 122 | public class ForkJoinTask8Test extends J
122		assertNull(a.getException());
123		assertSame(expected, a.getRawResult());
124		if (a instanceof BinaryAsyncAction)
125	<	assertTrue(((BinaryAsyncAction)a).getForkJoinTaskTag() == COMPLETE_STATE);
125	>	assertEquals(COMPLETE_STATE,
126	>	((BinaryAsyncAction)a).getForkJoinTaskTag());
127
128		{
129		Thread.currentThread().interrupt();
#	Line 250 | Line 251 | public class ForkJoinTask8Test extends J
251		}
252		return false;
253		}
254	<
254	>
255		public final void complete() {
256		BinaryAsyncAction a = this;
257		for (;;) {
#	Line 310 | Line 311 | public class ForkJoinTask8Test extends J
311		try {
312		AsyncFib f = this;
313		int n = f.number;
314	<	if (n > 1) {
315	<	while (n > 1) {
316	<	AsyncFib p = f;
317	<	AsyncFib r = new AsyncFib(n - 2);
318	<	f = new AsyncFib(--n);
319	<	p.linkSubtasks(r, f);
319	<	r.fork();
320	<	}
321	<	f.number = n;
314	>	while (n > 1) {
315	>	AsyncFib p = f;
316	>	AsyncFib r = new AsyncFib(n - 2);
317	>	f = new AsyncFib(--n);
318	>	p.linkSubtasks(r, f);
319	>	r.fork();
320		}
321		f.complete();
322		}
#	Line 351 | Line 349 | public class ForkJoinTask8Test extends J
349		try {
350		FailingAsyncFib f = this;
351		int n = f.number;
352	<	if (n > 1) {
353	<	while (n > 1) {
354	<	FailingAsyncFib p = f;
355	<	FailingAsyncFib r = new FailingAsyncFib(n - 2);
356	<	f = new FailingAsyncFib(--n);
357	<	p.linkSubtasks(r, f);
360	<	r.fork();
361	<	}
362	<	f.number = n;
352	>	while (n > 1) {
353	>	FailingAsyncFib p = f;
354	>	FailingAsyncFib r = new FailingAsyncFib(n - 2);
355	>	f = new FailingAsyncFib(--n);
356	>	p.linkSubtasks(r, f);
357	>	r.fork();
358		}
359		f.complete();
360		}
#	Line 927 | Line 922 | public class ForkJoinTask8Test extends J
922		AsyncFib f = new AsyncFib(8);
923		FailingAsyncFib g = new FailingAsyncFib(9);
924		ForkJoinTask[] tasks = { f, g };
925	<	Collections.shuffle(Arrays.asList(tasks));
925	>	shuffle(tasks);
926		try {
927		invokeAll(tasks[0], tasks[1]);
928		shouldThrow();
#	Line 954 | Line 949 | public class ForkJoinTask8Test extends J
949		FailingAsyncFib g = new FailingAsyncFib(9);
950		AsyncFib h = new AsyncFib(7);
951		ForkJoinTask[] tasks = { f, g, h };
952	<	Collections.shuffle(Arrays.asList(tasks));
952	>	shuffle(tasks);
953		try {
954		invokeAll(tasks[0], tasks[1], tasks[2]);
955		shouldThrow();
#	Line 981 | Line 976 | public class ForkJoinTask8Test extends J
976		AsyncFib g = new AsyncFib(9);
977		AsyncFib h = new AsyncFib(7);
978		ForkJoinTask[] tasks = { f, g, h };
979	<	Collections.shuffle(Arrays.asList(tasks));
979	>	shuffle(tasks);
980		try {
981		invokeAll(Arrays.asList(tasks));
982		shouldThrow();

Diff Legend

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