ViewVC Help

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

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

Comparing jsr166/src/test/tck/RecursiveActionTest.java (file contents):
Revision 1.39 by jsr166, Mon Jun 3 17:55:49 2013 UTC vs.
Revision 1.43 by jsr166, Sun Feb 22 19:16:38 2015 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.Arrays;
10	>	import java.util.HashSet;
11		import java.util.concurrent.CancellationException;
9	–	import java.util.concurrent.SynchronousQueue;
12		import java.util.concurrent.ExecutionException;
13		import java.util.concurrent.ForkJoinPool;
14		import java.util.concurrent.ForkJoinTask;
15		import java.util.concurrent.ForkJoinWorkerThread;
16		import java.util.concurrent.RecursiveAction;
17	+	import java.util.concurrent.SynchronousQueue;
18		import java.util.concurrent.ThreadLocalRandom;
16	–	import java.util.concurrent.TimeUnit;
19		import java.util.concurrent.TimeoutException;
20	<	import static java.util.concurrent.TimeUnit.SECONDS;
21	<	import java.util.Arrays;
22	<	import java.util.HashSet;
20	>
21	>	import junit.framework.Test;
22	>	import junit.framework.TestSuite;
23
24		public class RecursiveActionTest extends JSR166TestCase {
25
#	Line 502 | Line 504 | public class RecursiveActionTest extends
504		FibAction f = new FibAction(8);
505		assertSame(f, f.fork());
506		helpQuiesce();
507	+	while (!f.isDone()) // wait out race
508	+	;
509		assertEquals(21, f.result);
510		assertEquals(0, getQueuedTaskCount());
511		checkCompletedNormally(f);
#	Line 587 | Line 591 | public class RecursiveActionTest extends
591		FailingFibAction f = new FailingFibAction(8);
592		assertSame(f, f.fork());
593		try {
594	<	f.get(5L, TimeUnit.SECONDS);
594	>	f.get(5L, SECONDS);
595		shouldThrow();
596		} catch (ExecutionException success) {
597		Throwable cause = success.getCause();

Diff Legend

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