ViewVC Help

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

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

Comparing jsr166/src/test/tck/ForkJoinPoolTest.java (file contents):
Revision 1.75 by jsr166, Mon May 29 22:44:27 2017 UTC vs.
Revision 1.77 by jsr166, Wed Nov 21 23:42:12 2018 UTC

#	Line 28 | Line 28 | import java.util.concurrent.atomic.Atomi
28		import java.util.concurrent.atomic.AtomicInteger;
29		import java.util.concurrent.locks.ReentrantLock;
30
31	–	import junit.framework.AssertionFailedError;
31		import junit.framework.Test;
32		import junit.framework.TestSuite;
33
#	Line 110 | Line 109 | public class ForkJoinPoolTest extends JS
109		return n;
110		FibTask f1 = new FibTask(n - 1);
111		f1.fork();
112	<	return (new FibTask(n - 2)).compute() + f1.join();
112	>	return new FibTask(n - 2).compute() + f1.join();
113		}
114		}
115
#	Line 304 | Line 303 | public class ForkJoinPoolTest extends JS
303		p.getFactory());
304		while (! p.isQuiescent()) {
305		if (millisElapsedSince(startTime) > LONG_DELAY_MS)
306	<	throw new AssertionFailedError("timed out");
306	>	throw new AssertionError("timed out");
307		assertFalse(p.getAsyncMode());
308		assertFalse(p.isShutdown());
309		assertFalse(p.isTerminating());

Diff Legend

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