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.28 by jsr166, Fri May 27 17:15:48 2011 UTC vs.
Revision 1.35 by jsr166, Sat Mar 18 18:20:00 2017 UTC

#	Line 4 | Line 4
4		* http://creativecommons.org/publicdomain/zero/1.0/
5		*/
6
7	<	import junit.framework.*;
7	>	import static java.util.concurrent.TimeUnit.SECONDS;
8	>
9	>	import java.util.HashSet;
10		import java.util.concurrent.CancellationException;
11		import java.util.concurrent.ExecutionException;
12		import java.util.concurrent.ForkJoinPool;
13		import java.util.concurrent.ForkJoinTask;
12	–	import java.util.concurrent.ForkJoinWorkerThread;
14		import java.util.concurrent.RecursiveTask;
14	–	import java.util.concurrent.TimeUnit;
15		import java.util.concurrent.TimeoutException;
16	<	import static java.util.concurrent.TimeUnit.SECONDS;
17	<	import java.util.HashSet;
16	>
17	>	import junit.framework.Test;
18	>	import junit.framework.TestSuite;
19
20		public class RecursiveTaskTest extends JSR166TestCase {
21
22		public static void main(String[] args) {
23	<	junit.textui.TestRunner.run(suite());
23	>	main(suite(), args);
24		}
25		public static Test suite() {
26		return new TestSuite(RecursiveTaskTest.class);
#	Line 40 | Line 41 | public class RecursiveTaskTest extends J
41		}
42
43		private <T> T testInvokeOnPool(ForkJoinPool pool, RecursiveTask<T> a) {
44	<	try {
44	>	try (PoolCleaner cleaner = cleaner(pool)) {
45		checkNotDone(a);
46
47		T result = pool.invoke(a);
48
49		checkCompletedNormally(a, result);
50		return result;
50	–	} finally {
51	–	joinPool(pool);
51		}
52		}
53
#	Line 184 | Line 183 | public class RecursiveTaskTest extends J
183		public FJException() { super(); }
184		}
185
186	<	// An invalid return value for Fib
186	>	/** An invalid return value for Fib. */
187		static final Integer NoResult = Integer.valueOf(-17);
188
189	<	// A simple recursive task for testing
189	>	/** A simple recursive task for testing. */
190		final class FibTask extends CheckedRecursiveTask<Integer> {
191		final int number;
192		FibTask(int n) { number = n; }
#	Line 205 | Line 204 | public class RecursiveTaskTest extends J
204		}
205		}
206
207	<	// A recursive action failing in base case
207	>	/** A recursive action failing in base case. */
208		final class FailingFibTask extends RecursiveTask<Integer> {
209		final int number;
210		int result;
#	Line 319 | Line 318 | public class RecursiveTaskTest extends J
318		assertEquals(21, (int) testInvokeOnPool(mainPool(), a));
319		}
320
322	–
321		/**
322		* helpQuiesce returns when tasks are complete.
323		* getQueuedTaskCount returns 0 when quiescent
#	Line 330 | Line 328 | public class RecursiveTaskTest extends J
328		FibTask f = new FibTask(8);
329		assertSame(f, f.fork());
330		helpQuiesce();
331	+	while (!f.isDone()) // wait out race
332	+	;
333		assertEquals(0, getQueuedTaskCount());
334		checkCompletedNormally(f, 21);
335		return NoResult;
#	Line 337 | Line 337 | public class RecursiveTaskTest extends J
337		assertSame(NoResult, testInvokeOnPool(mainPool(), a));
338		}
339
340	–
340		/**
341		* invoke task throws exception when task completes abnormally
342		*/
#	Line 763 | Line 762 | public class RecursiveTaskTest extends J
762		assertSame(NoResult, testInvokeOnPool(mainPool(), a));
763		}
764
766	–
765		/**
766		* invokeAll(tasks) with any null task throws NPE
767		*/

Diff Legend

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