ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ForkJoinPool8Test.java

Comparing jsr166/src/test/tck/ForkJoinPool8Test.java (file contents):
Revision 1.26 by jsr166, Sat Nov 1 16:02:23 2014 UTC vs.
Revision 1.29 by jsr166, Wed Dec 31 19:05:42 2014 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.MILLISECONDS;
8	>	import static java.util.concurrent.TimeUnit.SECONDS;
9	>
10	>	import java.util.HashSet;
11		import java.util.concurrent.CancellationException;
12	+	import java.util.concurrent.CountedCompleter;
13		import java.util.concurrent.ExecutionException;
14		import java.util.concurrent.ForkJoinPool;
15		import java.util.concurrent.ForkJoinTask;
12	–	import java.util.concurrent.ForkJoinWorkerThread;
16		import java.util.concurrent.RecursiveAction;
14	–	import java.util.concurrent.CountedCompleter;
15	–	import java.util.concurrent.ThreadLocalRandom;
16	–	import java.util.concurrent.TimeUnit;
17		import java.util.concurrent.TimeoutException;
18	<	import static java.util.concurrent.TimeUnit.SECONDS;
19	<	import static java.util.concurrent.TimeUnit.MILLISECONDS;
20	<	import java.util.Arrays;
21	<	import java.util.HashSet;
18	>
19	>	import junit.framework.Test;
20	>	import junit.framework.TestSuite;
21
22		public class ForkJoinPool8Test extends JSR166TestCase {
23		public static void main(String[] args) {
#	Line 479 | Line 478 | public class ForkJoinPool8Test extends J
478		FailingFibAction f = new FailingFibAction(8);
479		assertSame(f, f.fork());
480		try {
481	<	f.get(5L, TimeUnit.SECONDS);
481	>	f.get(5L, SECONDS);
482		shouldThrow();
483		} catch (ExecutionException success) {
484		Throwable cause = success.getCause();
#	Line 1541 | Line 1540 | public class ForkJoinPool8Test extends J
1540		* timeout elapsed
1541		*/
1542		public void testAwaitQuiescence2() throws Exception {
1543	+	/**
1544	+	* """It is possible to disable or limit the use of threads in the
1545	+	* common pool by setting the parallelism property to zero. However
1546	+	* doing so may cause unjoined tasks to never be executed."""
1547	+	*/
1548	+	if ("0".equals(System.getProperty(
1549	+	"java.util.concurrent.ForkJoinPool.common.parallelism")))
1550	+	return;
1551		final ForkJoinPool p = new ForkJoinPool();
1552		try {
1553		assertTrue(p.isQuiescent());

Diff Legend

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