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.29 by jsr166, Fri Sep 17 16:49:25 2010 UTC vs.
Revision 1.31 by jsr166, Sat Oct 9 19:46:42 2010 UTC

#	Line 259 | Line 259 | public class ForkJoinPoolTest extends JS
259		public void testisQuiescent() throws InterruptedException {
260		ForkJoinPool p = new ForkJoinPool(2);
261		try {
262	+	assertTrue(p.isQuiescent());
263		p.invoke(new FibTask(20));
264		assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
265		p.getFactory());
266	<	Thread.sleep(MEDIUM_DELAY_MS);
266	>	Thread.sleep(SMALL_DELAY_MS);
267		assertTrue(p.isQuiescent());
268		assertFalse(p.getAsyncMode());
269		assertEquals(0, p.getActiveThreadCount());
#	Line 530 | Line 531 | public class ForkJoinPoolTest extends JS
531		*/
532		public void testExecuteNullRunnable() {
533		ExecutorService e = new ForkJoinPool(1);
533	–	TrackedShortRunnable task = null;
534		try {
535	<	Future<?> future = e.submit(task);
535	>	Future<?> future = e.submit((Runnable) null);
536		shouldThrow();
537		} catch (NullPointerException success) {
538		} finally {
#	Line 546 | Line 546 | public class ForkJoinPoolTest extends JS
546		*/
547		public void testSubmitNullCallable() {
548		ExecutorService e = new ForkJoinPool(1);
549	–	StringTask t = null;
549		try {
550	<	Future<String> future = e.submit(t);
550	>	Future<String> future = e.submit((Callable) null);
551		shouldThrow();
552		} catch (NullPointerException success) {
553		} finally {

Diff Legend

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