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.39 by jsr166, Sun Jul 22 21:13:32 2018 UTC vs.
Revision 1.42 by dl, Tue Jan 26 13:33:06 2021 UTC

#	Line 51 | Line 51 | public class RecursiveTaskTest extends J
51		}
52		}
53
54	<	void checkNotDone(RecursiveTask a) {
54	>	void checkNotDone(RecursiveTask<?> a) {
55		assertFalse(a.isDone());
56		assertFalse(a.isCompletedNormally());
57		assertFalse(a.isCompletedAbnormally());
#	Line 122 | Line 122 | public class RecursiveTaskTest extends J
122		checkCompletedNormally(a, r);
123		}
124
125	<	void checkCancelled(RecursiveTask a) {
125	>	void checkCancelled(RecursiveTask<?> a) {
126		assertTrue(a.isDone());
127		assertTrue(a.isCancelled());
128		assertFalse(a.isCompletedNormally());
#	Line 149 | Line 149 | public class RecursiveTaskTest extends J
149		} catch (Throwable fail) { threadUnexpectedException(fail); }
150		}
151
152	<	void checkCompletedAbnormally(RecursiveTask a, Throwable t) {
152	>	void checkCompletedAbnormally(RecursiveTask<?> a, Throwable t) {
153		assertTrue(a.isDone());
154		assertFalse(a.isCancelled());
155		assertFalse(a.isCompletedNormally());
#	Line 198 | Line 198 | public class RecursiveTaskTest extends J
198		return n;
199		FibTask f1 = new FibTask(n - 1);
200		f1.fork();
201	<	return (new FibTask(n - 2)).compute() + f1.join();
201	>	return new FibTask(n - 2).compute() + f1.join();
202		}
203
204		public void publicSetRawResult(Integer result) {
#	Line 217 | Line 217 | public class RecursiveTaskTest extends J
217		throw new FJException();
218		FailingFibTask f1 = new FailingFibTask(n - 1);
219		f1.fork();
220	<	return (new FibTask(n - 2)).compute() + f1.join();
220	>	return new FibTask(n - 2).compute() + f1.join();
221		}
222		}
223
#	Line 381 | Line 381 | public class RecursiveTaskTest extends J
381		FailingFibTask f = new FailingFibTask(8);
382		assertSame(f, f.fork());
383		try {
384	<	Integer r = f.join();
384	>	f.join();
385		shouldThrow();
386		} catch (FJException success) {
387		checkCompletedAbnormally(f, success);
#	Line 400 | Line 400 | public class RecursiveTaskTest extends J
400		FailingFibTask f = new FailingFibTask(8);
401		assertSame(f, f.fork());
402		try {
403	<	Integer r = f.get();
403	>	f.get();
404		shouldThrow();
405		} catch (ExecutionException success) {
406		Throwable cause = success.getCause();
#	Line 421 | Line 421 | public class RecursiveTaskTest extends J
421		FailingFibTask f = new FailingFibTask(8);
422		assertSame(f, f.fork());
423		try {
424	<	Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
424	>	f.get(LONG_DELAY_MS, MILLISECONDS);
425		shouldThrow();
426		} catch (ExecutionException success) {
427		Throwable cause = success.getCause();
#	Line 458 | Line 458 | public class RecursiveTaskTest extends J
458		FibTask f = new FibTask(8);
459		assertTrue(f.cancel(true));
460		try {
461	<	Integer r = f.invoke();
461	>	f.invoke();
462		shouldThrow();
463		} catch (CancellationException success) {
464		checkCancelled(f);
#	Line 478 | Line 478 | public class RecursiveTaskTest extends J
478		assertTrue(f.cancel(true));
479		assertSame(f, f.fork());
480		try {
481	<	Integer r = f.join();
481	>	f.join();
482		shouldThrow();
483		} catch (CancellationException success) {
484		checkCancelled(f);
#	Line 498 | Line 498 | public class RecursiveTaskTest extends J
498		assertTrue(f.cancel(true));
499		assertSame(f, f.fork());
500		try {
501	<	Integer r = f.get();
501	>	f.get();
502		shouldThrow();
503		} catch (CancellationException success) {
504		checkCancelled(f);
#	Line 518 | Line 518 | public class RecursiveTaskTest extends J
518		assertTrue(f.cancel(true));
519		assertSame(f, f.fork());
520		try {
521	<	Integer r = f.get(LONG_DELAY_MS, MILLISECONDS);
521	>	f.get(LONG_DELAY_MS, MILLISECONDS);
522		shouldThrow();
523		} catch (CancellationException success) {
524		checkCancelled(f);
#	Line 662 | Line 662 | public class RecursiveTaskTest extends J
662		FibTask f = new FibTask(8);
663		f.completeExceptionally(new FJException());
664		try {
665	<	Integer r = f.invoke();
665	>	f.invoke();
666		shouldThrow();
667		} catch (FJException success) {
668		checkCompletedAbnormally(f, success);
#	Line 748 | Line 748 | public class RecursiveTaskTest extends J
748		FibTask f = new FibTask(8);
749		FibTask g = new FibTask(9);
750		FibTask h = new FibTask(7);
751	<	HashSet set = new HashSet();
751	>	HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
752		set.add(f);
753		set.add(g);
754		set.add(h);
#	Line 848 | Line 848 | public class RecursiveTaskTest extends J
848		FailingFibTask f = new FailingFibTask(8);
849		FibTask g = new FibTask(9);
850		FibTask h = new FibTask(7);
851	<	HashSet set = new HashSet();
851	>	HashSet<ForkJoinTask<?>> set = new HashSet<ForkJoinTask<?>>();
852		set.add(f);
853		set.add(g);
854		set.add(h);

Diff Legend

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