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.6 by jsr166, Mon Aug 3 22:08:07 2009 UTC vs.
Revision 1.30 by jsr166, Fri Sep 17 17:07:47 2010 UTC

#	Line 4 | Line 4
4		* http://creativecommons.org/licenses/publicdomain
5		*/
6
7	–
7		import junit.framework.*;
8	<	import java.util.*;
9	<	import java.util.concurrent.*;
8	>	import java.util.ArrayList;
9	>	import java.util.Collection;
10	>	import java.util.List;
11	>	import java.util.concurrent.Executors;
12	>	import java.util.concurrent.ExecutorService;
13	>	import java.util.concurrent.AbstractExecutorService;
14	>	import java.util.concurrent.CountDownLatch;
15	>	import java.util.concurrent.Callable;
16	>	import java.util.concurrent.Future;
17	>	import java.util.concurrent.ExecutionException;
18	>	import java.util.concurrent.CancellationException;
19	>	import java.util.concurrent.RejectedExecutionException;
20	>	import java.util.concurrent.ForkJoinPool;
21	>	import java.util.concurrent.ForkJoinTask;
22	>	import java.util.concurrent.ForkJoinWorkerThread;
23	>	import java.util.concurrent.RecursiveTask;
24	>	import java.util.concurrent.TimeUnit;
25	>	import java.util.concurrent.locks.ReentrantLock;
26		import static java.util.concurrent.TimeUnit.MILLISECONDS;
27	<	import java.util.concurrent.locks.*;
28	<	import java.security.*;
27	>	import java.security.AccessControlException;
28	>	import java.security.Policy;
29	>	import java.security.PrivilegedAction;
30	>	import java.security.PrivilegedExceptionAction;
31
32		public class ForkJoinPoolTest extends JSR166TestCase {
33		public static void main(String[] args) {
34	<	junit.textui.TestRunner.run (suite());
34	>	junit.textui.TestRunner.run(suite());
35		}
36	+
37		public static Test suite() {
38		return new TestSuite(ForkJoinPoolTest.class);
39		}
#	Line 39 | Line 57 | public class ForkJoinPoolTest extends JS
57		// Some classes to test extension and factory methods
58
59		static class MyHandler implements Thread.UncaughtExceptionHandler {
60	<	int catches = 0;
60	>	volatile int catches = 0;
61		public void uncaughtException(Thread t, Throwable e) {
62		++catches;
63		}
#	Line 48 | Line 66 | public class ForkJoinPoolTest extends JS
66		// to test handlers
67		static class FailingFJWSubclass extends ForkJoinWorkerThread {
68		public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
69	<	protected void onStart() { throw new Error(); }
69	>	protected void onStart() { super.onStart(); throw new Error(); }
70		}
71
72		static class FailingThreadFactory
73		implements ForkJoinPool.ForkJoinWorkerThreadFactory {
74	<	int calls = 0;
74	>	volatile int calls = 0;
75		public ForkJoinWorkerThread newThread(ForkJoinPool p) {
76		if (++calls > 1) return null;
77		return new FailingFJWSubclass(p);
#	Line 142 | Line 160 | public class ForkJoinPoolTest extends JS
160		* tasks, and quiescent running state.
161		*/
162		public void testDefaultInitialState() {
163	<	ForkJoinPool p = null;
163	>	ForkJoinPool p = new ForkJoinPool(1);
164		try {
165	<	p = new ForkJoinPool(1);
166	<	assertTrue(p.getFactory() ==
149	<	ForkJoinPool.defaultForkJoinWorkerThreadFactory);
165	>	assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
166	>	p.getFactory());
167		assertTrue(p.isQuiescent());
151	–	assertTrue(p.getMaintainsParallelism());
168		assertFalse(p.getAsyncMode());
169	<	assertTrue(p.getActiveThreadCount() == 0);
170	<	assertTrue(p.getStealCount() == 0);
171	<	assertTrue(p.getQueuedTaskCount() == 0);
172	<	assertTrue(p.getQueuedSubmissionCount() == 0);
169	>	assertEquals(0, p.getActiveThreadCount());
170	>	assertEquals(0, p.getStealCount());
171	>	assertEquals(0, p.getQueuedTaskCount());
172	>	assertEquals(0, p.getQueuedSubmissionCount());
173		assertFalse(p.hasQueuedSubmissions());
174		assertFalse(p.isShutdown());
175		assertFalse(p.isTerminating());
#	Line 170 | Line 186 | public class ForkJoinPoolTest extends JS
186		try {
187		new ForkJoinPool(-1);
188		shouldThrow();
189	<	}
174	<	catch (IllegalArgumentException success) {}
189	>	} catch (IllegalArgumentException success) {}
190		}
191
192		/**
#	Line 179 | Line 194 | public class ForkJoinPoolTest extends JS
194		*/
195		public void testConstructor2() {
196		try {
197	<	new ForkJoinPool(1, null);
197	>	new ForkJoinPool(1, null, null, false);
198		shouldThrow();
199	<	} catch (NullPointerException success) {
185	<	}
199	>	} catch (NullPointerException success) {}
200		}
201
202
#	Line 190 | Line 204 | public class ForkJoinPoolTest extends JS
204		* getParallelism returns size set in constructor
205		*/
206		public void testGetParallelism() {
207	<	ForkJoinPool p = null;
194	<	try {
195	<	p = new ForkJoinPool(1);
196	<	assertTrue(p.getParallelism() == 1);
197	<	} finally {
198	<	joinPool(p);
199	<	}
200	<	}
201	<
202	<	/**
203	<	* setParallelism changes reported parallelism level.
204	<	*/
205	<	public void testSetParallelism() {
206	<	ForkJoinPool p = null;
207	<	try {
208	<	p = new ForkJoinPool(1);
209	<	assertTrue(p.getParallelism() == 1);
210	<	p.setParallelism(2);
211	<	assertTrue(p.getParallelism() == 2);
212	<	} finally {
213	<	joinPool(p);
214	<	}
215	<	}
216	<
217	<	/**
218	<	* setParallelism with argument <= 0 throws exception
219	<	*/
220	<	public void testSetParallelism2() {
221	<	ForkJoinPool p = null;
207	>	ForkJoinPool p = new ForkJoinPool(1);
208		try {
209	<	p = new ForkJoinPool(1);
224	<	assertTrue(p.getParallelism() == 1);
225	<	p.setParallelism(-2);
226	<	shouldThrow();
227	<	} catch (IllegalArgumentException success) {
209	>	assertEquals(1, p.getParallelism());
210		} finally {
211		joinPool(p);
212		}
#	Line 234 | Line 216 | public class ForkJoinPoolTest extends JS
216		* getPoolSize returns number of started workers.
217		*/
218		public void testGetPoolSize() {
219	<	ForkJoinPool p = null;
219	>	ForkJoinPool p = new ForkJoinPool(1);
220		try {
221	<	p = new ForkJoinPool(1);
240	<	assertTrue(p.getPoolSize() == 0);
221	>	assertEquals(0, p.getActiveThreadCount());
222		Future<String> future = p.submit(new StringTask());
223	<	assertTrue(p.getPoolSize() == 1);
243	<
244	<	} finally {
245	<	joinPool(p);
246	<	}
247	<	}
248	<
249	<	/**
250	<	* setMaximumPoolSize changes size reported by getMaximumPoolSize.
251	<	*/
252	<	public void testSetMaximumPoolSize() {
253	<	ForkJoinPool p = null;
254	<	try {
255	<	p = new ForkJoinPool(1);
256	<	p.setMaximumPoolSize(2);
257	<	assertTrue(p.getMaximumPoolSize() == 2);
258	<	} finally {
259	<	joinPool(p);
260	<	}
261	<	}
262	<
263	<	/**
264	<	* setMaximumPoolSize with argument <= 0 throws exception
265	<	*/
266	<	public void testSetMaximumPoolSize2() {
267	<	ForkJoinPool p = null;
268	<	try {
269	<	p = new ForkJoinPool(1);
270	<	p.setMaximumPoolSize(-2);
271	<	shouldThrow();
272	<	} catch (IllegalArgumentException success) {
273	<	} finally {
274	<	joinPool(p);
275	<	}
276	<	}
277	<
278	<	/**
279	<	* setMaintainsParallelism changes policy reported by
280	<	* getMaintainsParallelism.
281	<	*/
282	<	public void testSetMaintainsParallelism() {
283	<	ForkJoinPool p = null;
284	<	try {
285	<	p = new ForkJoinPool(1);
286	<	p.setMaintainsParallelism(false);
287	<	assertFalse(p.getMaintainsParallelism());
288	<	} finally {
289	<	joinPool(p);
290	<	}
291	<	}
292	<
293	<	/**
294	<	* setAsyncMode changes policy reported by
295	<	* getAsyncMode.
296	<	*/
297	<	public void testSetAsyncMode() {
298	<	ForkJoinPool p = null;
299	<	try {
300	<	p = new ForkJoinPool(1);
301	<	p.setAsyncMode(true);
302	<	assertTrue(p.getAsyncMode());
223	>	assertEquals(1, p.getPoolSize());
224		} finally {
225		joinPool(p);
226		}
#	Line 312 | Line 233 | public class ForkJoinPoolTest extends JS
233		* performs its defined action
234		*/
235		public void testSetUncaughtExceptionHandler() throws InterruptedException {
236	<	ForkJoinPool p = null;
237	<	try {
238	<	p = new ForkJoinPool(1, new FailingThreadFactory());
239	<	MyHandler eh = new MyHandler();
240	<	p.setUncaughtExceptionHandler(eh);
241	<	assertEquals(eh, p.getUncaughtExceptionHandler());
242	<	p.execute(new FailingTask());
243	<	Thread.sleep(MEDIUM_DELAY_MS);
244	<	assertTrue(eh.catches > 0);
236	>	final CountDownLatch uehInvoked = new CountDownLatch(1);
237	>	final Thread.UncaughtExceptionHandler eh =
238	>	new Thread.UncaughtExceptionHandler() {
239	>	public void uncaughtException(Thread t, Throwable e) {
240	>	uehInvoked.countDown();
241	>	}};
242	>	ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
243	>	eh, false);
244	>	try {
245	>	assertSame(eh, p.getUncaughtExceptionHandler());
246	>	p.execute(new FibTask(8));
247	>	assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
248		} finally {
249	+	p.shutdownNow(); // failure might have prevented processing task
250		joinPool(p);
251		}
252		}
253
254		/**
330	–	* setUncaughtExceptionHandler of null removes handler
331	–	*/
332	–	public void testSetUncaughtExceptionHandler2() {
333	–	ForkJoinPool p = null;
334	–	try {
335	–	p = new ForkJoinPool(1);
336	–	p.setUncaughtExceptionHandler(null);
337	–	assertNull(p.getUncaughtExceptionHandler());
338	–	} finally {
339	–	joinPool(p);
340	–	}
341	–	}
342	–
343	–
344	–	/**
255		* After invoking a single task, isQuiescent is true,
256		* queues are empty, threads are not active, and
257		* construction parameters continue to hold
258		*/
259		public void testisQuiescent() throws InterruptedException {
260	<	ForkJoinPool p = null;
260	>	ForkJoinPool p = new ForkJoinPool(2);
261		try {
262	<	p = new ForkJoinPool(2);
262	>	assertTrue(p.isQuiescent());
263		p.invoke(new FibTask(20));
264	<	assertTrue(p.getFactory() ==
265	<	ForkJoinPool.defaultForkJoinWorkerThreadFactory);
266	<	Thread.sleep(MEDIUM_DELAY_MS);
264	>	assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
265	>	p.getFactory());
266	>	Thread.sleep(SMALL_DELAY_MS);
267		assertTrue(p.isQuiescent());
358	–	assertTrue(p.getMaintainsParallelism());
268		assertFalse(p.getAsyncMode());
269	<	assertTrue(p.getActiveThreadCount() == 0);
270	<	assertTrue(p.getQueuedTaskCount() == 0);
271	<	assertTrue(p.getQueuedSubmissionCount() == 0);
269	>	assertEquals(0, p.getActiveThreadCount());
270	>	assertEquals(0, p.getQueuedTaskCount());
271	>	assertEquals(0, p.getQueuedSubmissionCount());
272		assertFalse(p.hasQueuedSubmissions());
273		assertFalse(p.isShutdown());
274		assertFalse(p.isTerminating());
#	Line 373 | Line 282 | public class ForkJoinPoolTest extends JS
282		* Completed submit(ForkJoinTask) returns result
283		*/
284		public void testSubmitForkJoinTask() throws Throwable {
285	<	ForkJoinPool p = null;
285	>	ForkJoinPool p = new ForkJoinPool(1);
286		try {
378	–	p = new ForkJoinPool(1);
287		ForkJoinTask<Integer> f = p.submit(new FibTask(8));
288	<	int r = f.get();
381	<	assertTrue(r == 21);
288	>	assertEquals(21, (int) f.get());
289		} finally {
290		joinPool(p);
291		}
#	Line 388 | Line 295 | public class ForkJoinPoolTest extends JS
295		* A task submitted after shutdown is rejected
296		*/
297		public void testSubmitAfterShutdown() {
298	<	ForkJoinPool p = null;
298	>	ForkJoinPool p = new ForkJoinPool(1);
299		try {
393	–	p = new ForkJoinPool(1);
300		p.shutdown();
301		assertTrue(p.isShutdown());
302	<	ForkJoinTask<Integer> f = p.submit(new FibTask(8));
303	<	shouldThrow();
304	<	} catch (RejectedExecutionException success) {
302	>	try {
303	>	ForkJoinTask<Integer> f = p.submit(new FibTask(8));
304	>	shouldThrow();
305	>	} catch (RejectedExecutionException success) {}
306		} finally {
307		joinPool(p);
308		}
#	Line 405 | Line 312 | public class ForkJoinPoolTest extends JS
312		* Pool maintains parallelism when using ManagedBlocker
313		*/
314		public void testBlockingForkJoinTask() throws Throwable {
315	<	ForkJoinPool p = null;
315	>	ForkJoinPool p = new ForkJoinPool(4);
316		try {
410	–	p = new ForkJoinPool(4);
317		ReentrantLock lock = new ReentrantLock();
318		ManagedLocker locker = new ManagedLocker(lock);
319		ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
320		p.execute(f);
321	<	assertTrue(p.getPoolSize() >= 4);
416	<	int r = f.get();
417	<	assertTrue(r ==  832040);
321	>	assertEquals(832040, (int) f.get());
322		} finally {
323	<	joinPool(p);
323	>	p.shutdownNow(); // don't wait out shutdown
324		}
325		}
326
#	Line 424 | Line 328 | public class ForkJoinPoolTest extends JS
328		* pollSubmission returns unexecuted submitted task, if present
329		*/
330		public void testPollSubmission() {
331	<	SubFJP p = null;
331	>	SubFJP p = new SubFJP();
332		try {
429	–	p = new SubFJP();
333		ForkJoinTask a = p.submit(new MediumRunnable());
334		ForkJoinTask b = p.submit(new MediumRunnable());
335		ForkJoinTask c = p.submit(new MediumRunnable());
#	Line 442 | Line 345 | public class ForkJoinPoolTest extends JS
345		* drainTasksTo transfers unexecuted submitted tasks, if present
346		*/
347		public void testDrainTasksTo() {
348	<	SubFJP p = null;
348	>	SubFJP p = new SubFJP();
349		try {
447	–	p = new SubFJP();
350		ForkJoinTask a = p.submit(new MediumRunnable());
351		ForkJoinTask b = p.submit(new MediumRunnable());
352		ForkJoinTask c = p.submit(new MediumRunnable());
#	Line 468 | Line 370 | public class ForkJoinPoolTest extends JS
370		*/
371		public void testExecuteRunnable() throws Throwable {
372		ExecutorService e = new ForkJoinPool(1);
373	<	TrackedShortRunnable task = new TrackedShortRunnable();
374	<	assertFalse(task.done);
375	<	Future<?> future = e.submit(task);
376	<	future.get();
377	<	assertTrue(task.done);
373	>	try {
374	>	TrackedShortRunnable task = new TrackedShortRunnable();
375	>	assertFalse(task.done);
376	>	Future<?> future = e.submit(task);
377	>	future.get();
378	>	assertTrue(task.done);
379	>	} finally {
380	>	joinPool(e);
381	>	}
382		}
383
384
#	Line 481 | Line 387 | public class ForkJoinPoolTest extends JS
387		*/
388		public void testSubmitCallable() throws Throwable {
389		ExecutorService e = new ForkJoinPool(1);
390	<	Future<String> future = e.submit(new StringTask());
391	<	String result = future.get();
392	<	assertSame(TEST_STRING, result);
390	>	try {
391	>	Future<String> future = e.submit(new StringTask());
392	>	String result = future.get();
393	>	assertSame(TEST_STRING, result);
394	>	} finally {
395	>	joinPool(e);
396	>	}
397		}
398
399		/**
#	Line 491 | Line 401 | public class ForkJoinPoolTest extends JS
401		*/
402		public void testSubmitRunnable() throws Throwable {
403		ExecutorService e = new ForkJoinPool(1);
404	<	Future<?> future = e.submit(new NoOpRunnable());
405	<	future.get();
406	<	assertTrue(future.isDone());
404	>	try {
405	>	Future<?> future = e.submit(new NoOpRunnable());
406	>	future.get();
407	>	assertTrue(future.isDone());
408	>	} finally {
409	>	joinPool(e);
410	>	}
411		}
412
413		/**
#	Line 501 | Line 415 | public class ForkJoinPoolTest extends JS
415		*/
416		public void testSubmitRunnable2() throws Throwable {
417		ExecutorService e = new ForkJoinPool(1);
418	<	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
419	<	String result = future.get();
420	<	assertSame(TEST_STRING, result);
418	>	try {
419	>	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
420	>	String result = future.get();
421	>	assertSame(TEST_STRING, result);
422	>	} finally {
423	>	joinPool(e);
424	>	}
425		}
426
427
#	Line 521 | Line 439 | public class ForkJoinPoolTest extends JS
439		} catch (AccessControlException ok) {
440		return;
441		}
442	+
443		try {
444		ExecutorService e = new ForkJoinPool(1);
445	<	Future future = e.submit(Executors.callable(new PrivilegedAction() {
445	>	try {
446	>	Future future = e.submit(Executors.callable(new PrivilegedAction() {
447		public Object run() {
448		return TEST_STRING;
449		}}));
450
451	<	Object result = future.get();
452	<	assertSame(TEST_STRING, result);
453	<	}
454	<	finally {
451	>	Object result = future.get();
452	>	assertSame(TEST_STRING, result);
453	>	} finally {
454	>	joinPool(e);
455	>	}
456	>	} finally {
457		Policy.setPolicy(savedPolicy);
458		}
459		}
#	Line 553 | Line 475 | public class ForkJoinPoolTest extends JS
475
476		try {
477		ExecutorService e = new ForkJoinPool(1);
478	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
478	>	try {
479	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
480		public Object run() {
481		return TEST_STRING;
482		}}));
483
484	<	Object result = future.get();
485	<	assertSame(TEST_STRING, result);
486	<	}
487	<	finally {
484	>	Object result = future.get();
485	>	assertSame(TEST_STRING, result);
486	>	} finally {
487	>	joinPool(e);
488	>	}
489	>	} finally {
490		Policy.setPolicy(savedPolicy);
491		}
492		}
#	Line 581 | Line 506 | public class ForkJoinPoolTest extends JS
506		return;
507		}
508
584	–
509		try {
510		ExecutorService e = new ForkJoinPool(1);
511	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
511	>	try {
512	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
513		public Object run() throws Exception {
514		throw new IndexOutOfBoundsException();
515		}}));
516
517	<	Object result = future.get();
518	<	shouldThrow();
519	<	} catch (ExecutionException success) {
517	>	Object result = future.get();
518	>	shouldThrow();
519	>	} catch (ExecutionException success) {
520	>	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
521	>	} finally {
522	>	joinPool(e);
523	>	}
524		} finally {
525		Policy.setPolicy(savedPolicy);
526		}
#	Line 601 | Line 530 | public class ForkJoinPoolTest extends JS
530		* execute(null runnable) throws NullPointerException
531		*/
532		public void testExecuteNullRunnable() {
533	+	ExecutorService e = new ForkJoinPool(1);
534	+	TrackedShortRunnable task = null;
535		try {
605	–	ExecutorService e = new ForkJoinPool(1);
606	–	TrackedShortRunnable task = null;
536		Future<?> future = e.submit(task);
537		shouldThrow();
538		} catch (NullPointerException success) {
539	+	} finally {
540	+	joinPool(e);
541		}
542		}
543
#	Line 615 | Line 546 | public class ForkJoinPoolTest extends JS
546		* submit(null callable) throws NullPointerException
547		*/
548		public void testSubmitNullCallable() {
549	+	ExecutorService e = new ForkJoinPool(1);
550	+	StringTask t = null;
551		try {
619	–	ExecutorService e = new ForkJoinPool(1);
620	–	StringTask t = null;
552		Future<String> future = e.submit(t);
553		shouldThrow();
554		} catch (NullPointerException success) {
555	+	} finally {
556	+	joinPool(e);
557		}
558		}
559
560
561		/**
562	<	* Blocking on submit(callable) throws InterruptedException if
630	<	* caller interrupted.
562	>	* submit(callable).get() throws InterruptedException if interrupted
563		*/
564		public void testInterruptedSubmit() throws InterruptedException {
565	<	final ForkJoinPool p = new ForkJoinPool(1);
566	<
567	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
568	<	void realRun() throws Throwable {
569	<	p.submit(new CheckedCallable<Object>() {
570	<	public Object realCall() throws Throwable {
571	<	Thread.sleep(MEDIUM_DELAY_MS);
572	<	return null;
573	<	}}).get();
574	<	}});
575	<
576	<	t.start();
577	<	Thread.sleep(SHORT_DELAY_MS);
578	<	t.interrupt();
579	<	joinPool(p);
565	>	final CountDownLatch submitted    = new CountDownLatch(1);
566	>	final CountDownLatch quittingTime = new CountDownLatch(1);
567	>	final ExecutorService p = new ForkJoinPool(1);
568	>	final Callable<Void> awaiter = new CheckedCallable<Void>() {
569	>	public Void realCall() throws InterruptedException {
570	>	assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
571	>	return null;
572	>	}};
573	>	try {
574	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
575	>	public void realRun() throws Exception {
576	>	Future<Void> future = p.submit(awaiter);
577	>	submitted.countDown();
578	>	future.get();
579	>	}});
580	>	t.start();
581	>	assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
582	>	t.interrupt();
583	>	t.join();
584	>	} finally {
585	>	quittingTime.countDown();
586	>	joinPool(p);
587	>	}
588		}
589
590		/**
#	Line 653 | Line 593 | public class ForkJoinPoolTest extends JS
593		*/
594		public void testSubmitEE() throws Throwable {
595		ForkJoinPool p = new ForkJoinPool(1);
656	–
596		try {
597	<	Callable c = new Callable() {
598	<	public Object call() {
599	<	int i = 5/0;
600	<	return Boolean.TRUE;
601	<	}
663	<	};
664	<
665	<	for (int i = 0; i < 5; i++) {
666	<	p.submit(c).get();
667	<	}
597	>	p.submit(new Callable() {
598	>	public Object call() {
599	>	int i = 5/0;
600	>	return Boolean.TRUE;
601	>	}}).get();
602		shouldThrow();
603		} catch (ExecutionException success) {
604	+	assertTrue(success.getCause() instanceof ArithmeticException);
605	+	} finally {
606	+	joinPool(p);
607		}
671	–	joinPool(p);
608		}
609
610		/**
#	Line 700 | Line 636 | public class ForkJoinPoolTest extends JS
636		}
637
638		/**
639	<	* invokeAny(c) throws NullPointerException if c has null elements
639	>	* invokeAny(c) throws NullPointerException if c has a single null element
640		*/
641		public void testInvokeAny3() throws Throwable {
642		ExecutorService e = new ForkJoinPool(1);
643	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
644	+	l.add(null);
645		try {
708	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
709	–	l.add(new StringTask());
710	–	l.add(null);
646		e.invokeAny(l);
647		shouldThrow();
648		} catch (NullPointerException success) {
#	Line 717 | Line 652 | public class ForkJoinPoolTest extends JS
652		}
653
654		/**
655	<	* invokeAny(c) throws ExecutionException if no task in c completes
655	>	* invokeAny(c) throws NullPointerException if c has null elements
656		*/
657		public void testInvokeAny4() throws Throwable {
658	+	CountDownLatch latch = new CountDownLatch(1);
659		ExecutorService e = new ForkJoinPool(1);
660	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
661	+	l.add(latchAwaitingStringTask(latch));
662	+	l.add(null);
663	+	try {
664	+	e.invokeAny(l);
665	+	shouldThrow();
666	+	} catch (NullPointerException success) {
667	+	} finally {
668	+	latch.countDown();
669	+	joinPool(e);
670	+	}
671	+	}
672	+
673	+	/**
674	+	* invokeAny(c) throws ExecutionException if no task in c completes
675	+	*/
676	+	public void testInvokeAny5() throws Throwable {
677	+	ExecutorService e = new ForkJoinPool(1);
678	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
679	+	l.add(new NPETask());
680		try {
725	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
726	–	l.add(new NPETask());
681		e.invokeAny(l);
682		shouldThrow();
683		} catch (ExecutionException success) {
684	+	assertTrue(success.getCause() instanceof NullPointerException);
685		} finally {
686		joinPool(e);
687		}
#	Line 735 | Line 690 | public class ForkJoinPoolTest extends JS
690		/**
691		* invokeAny(c) returns result of some task in c if at least one completes
692		*/
693	<	public void testInvokeAny5() throws Throwable {
693	>	public void testInvokeAny6() throws Throwable {
694		ExecutorService e = new ForkJoinPool(1);
695		try {
696	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
696	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
697		l.add(new StringTask());
698		l.add(new StringTask());
699		String result = e.invokeAny(l);
#	Line 781 | Line 736 | public class ForkJoinPoolTest extends JS
736		*/
737		public void testInvokeAll3() throws InterruptedException {
738		ExecutorService e = new ForkJoinPool(1);
739	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
740	+	l.add(new StringTask());
741	+	l.add(null);
742		try {
785	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
786	–	l.add(new StringTask());
787	–	l.add(null);
743		e.invokeAll(l);
744		shouldThrow();
745		} catch (NullPointerException success) {
#	Line 799 | Line 754 | public class ForkJoinPoolTest extends JS
754		*/
755		public void testInvokeAll4() throws Throwable {
756		ExecutorService e = new ForkJoinPool(1);
757	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
758	+	l.add(new NPETask());
759	+	List<Future<String>> futures = e.invokeAll(l);
760	+	assertEquals(1, futures.size());
761		try {
762	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
804	<	l.add(new NPETask());
805	<	List<Future<String>> result = e.invokeAll(l);
806	<	assertEquals(1, result.size());
807	<	for (Future<String> future : result)
808	<	future.get();
762	>	futures.get(0).get();
763		shouldThrow();
764		} catch (ExecutionException success) {
765	+	assertTrue(success.getCause() instanceof NullPointerException);
766		} finally {
767		joinPool(e);
768		}
#	Line 819 | Line 774 | public class ForkJoinPoolTest extends JS
774		public void testInvokeAll5() throws Throwable {
775		ExecutorService e = new ForkJoinPool(1);
776		try {
777	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
777	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
778		l.add(new StringTask());
779		l.add(new StringTask());
780	<	List<Future<String>> result = e.invokeAll(l);
781	<	assertEquals(2, result.size());
782	<	for (Future<String> future : result)
780	>	List<Future<String>> futures = e.invokeAll(l);
781	>	assertEquals(2, futures.size());
782	>	for (Future<String> future : futures)
783		assertSame(TEST_STRING, future.get());
784		} finally {
785		joinPool(e);
#	Line 851 | Line 806 | public class ForkJoinPoolTest extends JS
806		*/
807		public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
808		ExecutorService e = new ForkJoinPool(1);
809	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
810	+	l.add(new StringTask());
811		try {
855	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
856	–	l.add(new StringTask());
812		e.invokeAny(l, MEDIUM_DELAY_MS, null);
813		shouldThrow();
814		} catch (NullPointerException success) {
#	Line 881 | Line 836 | public class ForkJoinPoolTest extends JS
836		* timed invokeAny(c) throws NullPointerException if c has null elements
837		*/
838		public void testTimedInvokeAny3() throws Throwable {
839	+	CountDownLatch latch = new CountDownLatch(1);
840		ExecutorService e = new ForkJoinPool(1);
841	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
842	+	l.add(latchAwaitingStringTask(latch));
843	+	l.add(null);
844		try {
886	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
887	–	l.add(new StringTask());
888	–	l.add(null);
845		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
846		shouldThrow();
847		} catch (NullPointerException success) {
848		} finally {
849	+	latch.countDown();
850		joinPool(e);
851		}
852		}
#	Line 899 | Line 856 | public class ForkJoinPoolTest extends JS
856		*/
857		public void testTimedInvokeAny4() throws Throwable {
858		ExecutorService e = new ForkJoinPool(1);
859	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
860	+	l.add(new NPETask());
861		try {
903	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
904	–	l.add(new NPETask());
862		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
863		shouldThrow();
864		} catch (ExecutionException success) {
865	+	assertTrue(success.getCause() instanceof NullPointerException);
866		} finally {
867		joinPool(e);
868		}
#	Line 916 | Line 874 | public class ForkJoinPoolTest extends JS
874		public void testTimedInvokeAny5() throws Throwable {
875		ExecutorService e = new ForkJoinPool(1);
876		try {
877	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
877	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
878		l.add(new StringTask());
879		l.add(new StringTask());
880		String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
#	Line 945 | Line 903 | public class ForkJoinPoolTest extends JS
903		*/
904		public void testTimedInvokeAllNullTimeUnit() throws Throwable {
905		ExecutorService e = new ForkJoinPool(1);
906	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
907	+	l.add(new StringTask());
908		try {
949	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
950	–	l.add(new StringTask());
909		e.invokeAll(l, MEDIUM_DELAY_MS, null);
910		shouldThrow();
911		} catch (NullPointerException success) {
#	Line 976 | Line 934 | public class ForkJoinPoolTest extends JS
934		*/
935		public void testTimedInvokeAll3() throws InterruptedException {
936		ExecutorService e = new ForkJoinPool(1);
937	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
938	+	l.add(new StringTask());
939	+	l.add(null);
940		try {
980	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
981	–	l.add(new StringTask());
982	–	l.add(null);
941		e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
942		shouldThrow();
943		} catch (NullPointerException success) {
#	Line 993 | Line 951 | public class ForkJoinPoolTest extends JS
951		*/
952		public void testTimedInvokeAll4() throws Throwable {
953		ExecutorService e = new ForkJoinPool(1);
954	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
955	+	l.add(new NPETask());
956	+	List<Future<String>> futures
957	+	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
958	+	assertEquals(1, futures.size());
959		try {
960	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
998	<	l.add(new NPETask());
999	<	List<Future<String>> result
1000	<	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1001	<	assertEquals(1, result.size());
1002	<	for (Future<String> future : result)
1003	<	future.get();
960	>	futures.get(0).get();
961		shouldThrow();
962		} catch (ExecutionException success) {
963	+	assertTrue(success.getCause() instanceof NullPointerException);
964		} finally {
965		joinPool(e);
966		}
#	Line 1014 | Line 972 | public class ForkJoinPoolTest extends JS
972		public void testTimedInvokeAll5() throws Throwable {
973		ExecutorService e = new ForkJoinPool(1);
974		try {
975	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
975	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
976		l.add(new StringTask());
977		l.add(new StringTask());
978	<	List<Future<String>> result
978	>	List<Future<String>> futures
979		= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
980	<	assertEquals(2, result.size());
981	<	for (Future<String> future : result)
980	>	assertEquals(2, futures.size());
981	>	for (Future<String> future : futures)
982		assertSame(TEST_STRING, future.get());
983		} finally {
984		joinPool(e);

Diff Legend

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