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.11 by jsr166, Sat Nov 21 20:02:13 2009 UTC vs.
Revision 1.35 by dl, Fri Nov 19 00:20: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 178 | 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) {}
200		}
#	Line 188 | Line 204 | public class ForkJoinPoolTest extends JS
204		* getParallelism returns size set in constructor
205		*/
206		public void testGetParallelism() {
207	<	ForkJoinPool p = null;
192	<	try {
193	<	p = new ForkJoinPool(1);
194	<	assertTrue(p.getParallelism() == 1);
195	<	} finally {
196	<	joinPool(p);
197	<	}
198	<	}
199	<
200	<	/**
201	<	* setParallelism changes reported parallelism level.
202	<	*/
203	<	public void testSetParallelism() {
204	<	ForkJoinPool p = null;
205	<	try {
206	<	p = new ForkJoinPool(1);
207	<	assertTrue(p.getParallelism() == 1);
208	<	p.setParallelism(2);
209	<	assertTrue(p.getParallelism() == 2);
210	<	} finally {
211	<	joinPool(p);
212	<	}
213	<	}
214	<
215	<	/**
216	<	* setParallelism with argument <= 0 throws exception
217	<	*/
218	<	public void testSetParallelism2() {
219	<	ForkJoinPool p = null;
207	>	ForkJoinPool p = new ForkJoinPool(1);
208		try {
209	<	p = new ForkJoinPool(1);
222	<	assertTrue(p.getParallelism() == 1);
223	<	p.setParallelism(-2);
224	<	shouldThrow();
225	<	} catch (IllegalArgumentException success) {
209	>	assertEquals(1, p.getParallelism());
210		} finally {
211		joinPool(p);
212		}
#	Line 232 | 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);
238	<	assertTrue(p.getPoolSize() == 0);
221	>	assertEquals(0, p.getActiveThreadCount());
222		Future<String> future = p.submit(new StringTask());
223	<	assertTrue(p.getPoolSize() == 1);
241	<
242	<	} finally {
243	<	joinPool(p);
244	<	}
245	<	}
246	<
247	<	/**
248	<	* setMaximumPoolSize changes size reported by getMaximumPoolSize.
249	<	*/
250	<	public void testSetMaximumPoolSize() {
251	<	ForkJoinPool p = null;
252	<	try {
253	<	p = new ForkJoinPool(1);
254	<	p.setMaximumPoolSize(2);
255	<	assertTrue(p.getMaximumPoolSize() == 2);
256	<	} finally {
257	<	joinPool(p);
258	<	}
259	<	}
260	<
261	<	/**
262	<	* setMaximumPoolSize with argument <= 0 throws exception
263	<	*/
264	<	public void testSetMaximumPoolSize2() {
265	<	ForkJoinPool p = null;
266	<	try {
267	<	p = new ForkJoinPool(1);
268	<	p.setMaximumPoolSize(-2);
269	<	shouldThrow();
270	<	} catch (IllegalArgumentException success) {
271	<	} finally {
272	<	joinPool(p);
273	<	}
274	<	}
275	<
276	<	/**
277	<	* setMaintainsParallelism changes policy reported by
278	<	* getMaintainsParallelism.
279	<	*/
280	<	public void testSetMaintainsParallelism() {
281	<	ForkJoinPool p = null;
282	<	try {
283	<	p = new ForkJoinPool(1);
284	<	p.setMaintainsParallelism(false);
285	<	assertFalse(p.getMaintainsParallelism());
286	<	} finally {
287	<	joinPool(p);
288	<	}
289	<	}
290	<
291	<	/**
292	<	* setAsyncMode changes policy reported by
293	<	* getAsyncMode.
294	<	*/
295	<	public void testSetAsyncMode() {
296	<	ForkJoinPool p = null;
297	<	try {
298	<	p = new ForkJoinPool(1);
299	<	p.setAsyncMode(true);
300	<	assertTrue(p.getAsyncMode());
223	>	assertEquals(1, p.getPoolSize());
224		} finally {
225		joinPool(p);
226		}
#	Line 310 | 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		/**
328	–	* setUncaughtExceptionHandler of null removes handler
329	–	*/
330	–	public void testSetUncaughtExceptionHandler2() {
331	–	ForkJoinPool p = null;
332	–	try {
333	–	p = new ForkJoinPool(1);
334	–	p.setUncaughtExceptionHandler(null);
335	–	assertNull(p.getUncaughtExceptionHandler());
336	–	} finally {
337	–	joinPool(p);
338	–	}
339	–	}
340	–
341	–
342	–	/**
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());
356	–	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 371 | 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 {
376	–	p = new ForkJoinPool(1);
287		ForkJoinTask<Integer> f = p.submit(new FibTask(8));
288	<	int r = f.get();
379	<	assertTrue(r == 21);
288	>	assertEquals(21, (int) f.get());
289		} finally {
290		joinPool(p);
291		}
#	Line 386 | 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 {
391	–	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 403 | 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 {
408	–	p = new ForkJoinPool(4);
317		ReentrantLock lock = new ReentrantLock();
318		ManagedLocker locker = new ManagedLocker(lock);
319	<	ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
319	>	ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
320		p.execute(f);
321	<	assertTrue(p.getPoolSize() >= 4);
414	<	int r = f.get();
415	<	assertTrue(r ==  832040);
321	>	assertEquals(6765, (int) f.get());
322		} finally {
323		p.shutdownNow(); // don't wait out shutdown
324		}
#	Line 422 | 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 {
333	<	p = new SubFJP();
334	<	ForkJoinTask a = p.submit(new MediumRunnable());
335	<	ForkJoinTask b = p.submit(new MediumRunnable());
430	<	ForkJoinTask c = p.submit(new MediumRunnable());
333	>	ForkJoinTask a = p.submit(new ShortRunnable());
334	>	ForkJoinTask b = p.submit(new ShortRunnable());
335	>	ForkJoinTask c = p.submit(new ShortRunnable());
336		ForkJoinTask r = p.pollSubmission();
337		assertTrue(r == a || r == b || r == c);
338		assertFalse(r.isDone());
#	Line 440 | 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 {
350	<	p = new SubFJP();
351	<	ForkJoinTask a = p.submit(new MediumRunnable());
352	<	ForkJoinTask b = p.submit(new MediumRunnable());
448	<	ForkJoinTask c = p.submit(new MediumRunnable());
350	>	ForkJoinTask a = p.submit(new ShortRunnable());
351	>	ForkJoinTask b = p.submit(new ShortRunnable());
352	>	ForkJoinTask c = p.submit(new ShortRunnable());
353		ArrayList<ForkJoinTask> al = new ArrayList();
354		p.drainTasksTo(al);
355		assertTrue(al.size() > 0);
#	Line 466 | 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	>	TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
375	>	assertFalse(task.isDone());
376	>	Future<?> future = e.submit(task);
377	>	assertNull(future.get());
378	>	assertTrue(task.isDone());
379	>	assertFalse(future.isCancelled());
380	>	} finally {
381	>	joinPool(e);
382	>	}
383		}
384
385
#	Line 479 | Line 388 | public class ForkJoinPoolTest extends JS
388		*/
389		public void testSubmitCallable() throws Throwable {
390		ExecutorService e = new ForkJoinPool(1);
391	<	Future<String> future = e.submit(new StringTask());
392	<	String result = future.get();
393	<	assertSame(TEST_STRING, result);
391	>	try {
392	>	Future<String> future = e.submit(new StringTask());
393	>	assertSame(TEST_STRING, future.get());
394	>	assertTrue(future.isDone());
395	>	assertFalse(future.isCancelled());
396	>	} finally {
397	>	joinPool(e);
398	>	}
399		}
400
401		/**
#	Line 489 | Line 403 | public class ForkJoinPoolTest extends JS
403		*/
404		public void testSubmitRunnable() throws Throwable {
405		ExecutorService e = new ForkJoinPool(1);
406	<	Future<?> future = e.submit(new NoOpRunnable());
407	<	future.get();
408	<	assertTrue(future.isDone());
406	>	try {
407	>	Future<?> future = e.submit(new NoOpRunnable());
408	>	assertNull(future.get());
409	>	assertTrue(future.isDone());
410	>	assertFalse(future.isCancelled());
411	>	} finally {
412	>	joinPool(e);
413	>	}
414		}
415
416		/**
#	Line 499 | Line 418 | public class ForkJoinPoolTest extends JS
418		*/
419		public void testSubmitRunnable2() throws Throwable {
420		ExecutorService e = new ForkJoinPool(1);
421	<	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
422	<	String result = future.get();
423	<	assertSame(TEST_STRING, result);
421	>	try {
422	>	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
423	>	assertSame(TEST_STRING, future.get());
424	>	assertTrue(future.isDone());
425	>	assertFalse(future.isCancelled());
426	>	} finally {
427	>	joinPool(e);
428	>	}
429		}
430
507	–
431		/**
432	<	* A submitted privileged action to completion
432	>	* A submitted privileged action runs to completion
433		*/
434	<	public void testSubmitPrivilegedAction() throws Throwable {
435	<	Policy savedPolicy = null;
436	<	try {
437	<	savedPolicy = Policy.getPolicy();
438	<	AdjustablePolicy policy = new AdjustablePolicy();
516	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
517	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
518	<	Policy.setPolicy(policy);
519	<	} catch (AccessControlException ok) {
520	<	return;
521	<	}
522	<	try {
523	<	ExecutorService e = new ForkJoinPool(1);
524	<	Future future = e.submit(Executors.callable(new PrivilegedAction() {
434	>	public void testSubmitPrivilegedAction() throws Exception {
435	>	Runnable r = new CheckedRunnable() {
436	>	public void realRun() throws Exception {
437	>	ExecutorService e = new ForkJoinPool(1);
438	>	Future future = e.submit(Executors.callable(new PrivilegedAction() {
439		public Object run() {
440		return TEST_STRING;
441		}}));
442
443	<	Object result = future.get();
444	<	assertSame(TEST_STRING, result);
445	<	}
446	<	finally {
447	<	Policy.setPolicy(savedPolicy);
534	<	}
443	>	assertSame(TEST_STRING, future.get());
444	>	}};
445	>
446	>	runWithPermissions(r,
447	>	new RuntimePermission("modifyThread"));
448		}
449
450		/**
451	<	* A submitted a privileged exception action runs to completion
451	>	* A submitted privileged exception action runs to completion
452		*/
453	<	public void testSubmitPrivilegedExceptionAction() throws Throwable {
454	<	Policy savedPolicy = null;
455	<	try {
456	<	savedPolicy = Policy.getPolicy();
457	<	AdjustablePolicy policy = new AdjustablePolicy();
545	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
546	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
547	<	Policy.setPolicy(policy);
548	<	} catch (AccessControlException ok) {
549	<	return;
550	<	}
551	<
552	<	try {
553	<	ExecutorService e = new ForkJoinPool(1);
554	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
453	>	public void testSubmitPrivilegedExceptionAction() throws Exception {
454	>	Runnable r = new CheckedRunnable() {
455	>	public void realRun() throws Exception {
456	>	ExecutorService e = new ForkJoinPool(1);
457	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
458		public Object run() {
459		return TEST_STRING;
460		}}));
461
462	<	Object result = future.get();
463	<	assertSame(TEST_STRING, result);
464	<	}
465	<	finally {
563	<	Policy.setPolicy(savedPolicy);
564	<	}
462	>	assertSame(TEST_STRING, future.get());
463	>	}};
464	>
465	>	runWithPermissions(r, new RuntimePermission("modifyThread"));
466		}
467
468		/**
469		* A submitted failed privileged exception action reports exception
470		*/
471	<	public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
472	<	Policy savedPolicy = null;
473	<	try {
474	<	savedPolicy = Policy.getPolicy();
475	<	AdjustablePolicy policy = new AdjustablePolicy();
575	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
576	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
577	<	Policy.setPolicy(policy);
578	<	} catch (AccessControlException ok) {
579	<	return;
580	<	}
581	<
582	<
583	<	try {
584	<	ExecutorService e = new ForkJoinPool(1);
585	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
471	>	public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
472	>	Runnable r = new CheckedRunnable() {
473	>	public void realRun() throws Exception {
474	>	ExecutorService e = new ForkJoinPool(1);
475	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
476		public Object run() throws Exception {
477		throw new IndexOutOfBoundsException();
478		}}));
479
480	<	Object result = future.get();
481	<	shouldThrow();
482	<	} catch (ExecutionException success) {
483	<	} finally {
484	<	Policy.setPolicy(savedPolicy);
485	<	}
480	>	try {
481	>	future.get();
482	>	shouldThrow();
483	>	} catch (ExecutionException success) {
484	>	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
485	>	}}};
486	>
487	>	runWithPermissions(r, new RuntimePermission("modifyThread"));
488		}
489
490		/**
491		* execute(null runnable) throws NullPointerException
492		*/
493		public void testExecuteNullRunnable() {
494	+	ExecutorService e = new ForkJoinPool(1);
495		try {
496	<	ExecutorService e = new ForkJoinPool(1);
604	<	TrackedShortRunnable task = null;
605	<	Future<?> future = e.submit(task);
496	>	Future<?> future = e.submit((Runnable) null);
497		shouldThrow();
498	<	} catch (NullPointerException success) {}
498	>	} catch (NullPointerException success) {
499	>	} finally {
500	>	joinPool(e);
501	>	}
502		}
503
504
#	Line 612 | Line 506 | public class ForkJoinPoolTest extends JS
506		* submit(null callable) throws NullPointerException
507		*/
508		public void testSubmitNullCallable() {
509	+	ExecutorService e = new ForkJoinPool(1);
510		try {
511	<	ExecutorService e = new ForkJoinPool(1);
617	<	StringTask t = null;
618	<	Future<String> future = e.submit(t);
511	>	Future<String> future = e.submit((Callable) null);
512		shouldThrow();
513	<	} catch (NullPointerException success) {}
513	>	} catch (NullPointerException success) {
514	>	} finally {
515	>	joinPool(e);
516	>	}
517		}
518
519
520		/**
521	<	* Blocking on submit(callable) throws InterruptedException if
626	<	* caller interrupted.
521	>	* submit(callable).get() throws InterruptedException if interrupted
522		*/
523		public void testInterruptedSubmit() throws InterruptedException {
524	<	final ForkJoinPool p = new ForkJoinPool(1);
525	<
526	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
527	<	void realRun() throws Throwable {
528	<	p.submit(new CheckedCallable<Object>() {
529	<	public Object realCall() throws Throwable {
530	<	try {
531	<	Thread.sleep(MEDIUM_DELAY_MS);
532	<	} catch (InterruptedException ok) {
533	<	}
534	<	return null;
535	<	}}).get();
536	<	}});
537	<
538	<	t.start();
539	<	Thread.sleep(SHORT_DELAY_MS);
540	<	t.interrupt();
541	<	t.join();
542	<	p.shutdownNow();
543	<	joinPool(p);
524	>	final CountDownLatch submitted    = new CountDownLatch(1);
525	>	final CountDownLatch quittingTime = new CountDownLatch(1);
526	>	final ExecutorService p = new ForkJoinPool(1);
527	>	final Callable<Void> awaiter = new CheckedCallable<Void>() {
528	>	public Void realCall() throws InterruptedException {
529	>	assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
530	>	return null;
531	>	}};
532	>	try {
533	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
534	>	public void realRun() throws Exception {
535	>	Future<Void> future = p.submit(awaiter);
536	>	submitted.countDown();
537	>	future.get();
538	>	}});
539	>	t.start();
540	>	assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
541	>	t.interrupt();
542	>	t.join();
543	>	} finally {
544	>	quittingTime.countDown();
545	>	joinPool(p);
546	>	}
547		}
548
549		/**
#	Line 661 | Line 559 | public class ForkJoinPoolTest extends JS
559		return Boolean.TRUE;
560		}}).get();
561		shouldThrow();
562	<	} catch (ExecutionException success) {}
563	<
564	<	joinPool(p);
562	>	} catch (ExecutionException success) {
563	>	assertTrue(success.getCause() instanceof ArithmeticException);
564	>	} finally {
565	>	joinPool(p);
566	>	}
567		}
568
569		/**
#	Line 699 | Line 599 | public class ForkJoinPoolTest extends JS
599		*/
600		public void testInvokeAny3() throws Throwable {
601		ExecutorService e = new ForkJoinPool(1);
602	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
603	+	l.add(null);
604		try {
703	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
704	–	l.add(null);
605		e.invokeAny(l);
606		shouldThrow();
607		} catch (NullPointerException success) {
#	Line 714 | Line 614 | public class ForkJoinPoolTest extends JS
614		* invokeAny(c) throws NullPointerException if c has null elements
615		*/
616		public void testInvokeAny4() throws Throwable {
617	+	CountDownLatch latch = new CountDownLatch(1);
618		ExecutorService e = new ForkJoinPool(1);
619	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
620	+	l.add(latchAwaitingStringTask(latch));
621	+	l.add(null);
622		try {
719	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
720	–	l.add(new Callable<String>() {
721	–	public String call() {
722	–	// The delay gives the pool a chance to notice
723	–	// the null element.
724	–	sleepTillInterrupted(SMALL_DELAY_MS);
725	–	return "foo";
726	–	}});
727	–	l.add(null);
623		e.invokeAny(l);
624		shouldThrow();
625		} catch (NullPointerException success) {
626		} finally {
627	+	latch.countDown();
628		joinPool(e);
629		}
630		}
#	Line 738 | Line 634 | public class ForkJoinPoolTest extends JS
634		*/
635		public void testInvokeAny5() throws Throwable {
636		ExecutorService e = new ForkJoinPool(1);
637	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
638	+	l.add(new NPETask());
639		try {
742	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
743	–	l.add(new NPETask());
640		e.invokeAny(l);
641		shouldThrow();
642		} catch (ExecutionException success) {
643	+	assertTrue(success.getCause() instanceof NullPointerException);
644		} finally {
645		joinPool(e);
646		}
#	Line 755 | Line 652 | public class ForkJoinPoolTest extends JS
652		public void testInvokeAny6() throws Throwable {
653		ExecutorService e = new ForkJoinPool(1);
654		try {
655	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
655	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
656		l.add(new StringTask());
657		l.add(new StringTask());
658		String result = e.invokeAny(l);
#	Line 798 | Line 695 | public class ForkJoinPoolTest extends JS
695		*/
696		public void testInvokeAll3() throws InterruptedException {
697		ExecutorService e = new ForkJoinPool(1);
698	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
699	+	l.add(new StringTask());
700	+	l.add(null);
701		try {
802	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
803	–	l.add(new StringTask());
804	–	l.add(null);
702		e.invokeAll(l);
703		shouldThrow();
704		} catch (NullPointerException success) {
#	Line 816 | Line 713 | public class ForkJoinPoolTest extends JS
713		*/
714		public void testInvokeAll4() throws Throwable {
715		ExecutorService e = new ForkJoinPool(1);
716	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
717	+	l.add(new NPETask());
718	+	List<Future<String>> futures = e.invokeAll(l);
719	+	assertEquals(1, futures.size());
720		try {
721	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
821	<	l.add(new NPETask());
822	<	List<Future<String>> result = e.invokeAll(l);
823	<	assertEquals(1, result.size());
824	<	for (Future<String> future : result)
825	<	future.get();
721	>	futures.get(0).get();
722		shouldThrow();
723		} catch (ExecutionException success) {
724	+	assertTrue(success.getCause() instanceof NullPointerException);
725		} finally {
726		joinPool(e);
727		}
#	Line 836 | Line 733 | public class ForkJoinPoolTest extends JS
733		public void testInvokeAll5() throws Throwable {
734		ExecutorService e = new ForkJoinPool(1);
735		try {
736	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
736	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
737		l.add(new StringTask());
738		l.add(new StringTask());
739	<	List<Future<String>> result = e.invokeAll(l);
740	<	assertEquals(2, result.size());
741	<	for (Future<String> future : result)
739	>	List<Future<String>> futures = e.invokeAll(l);
740	>	assertEquals(2, futures.size());
741	>	for (Future<String> future : futures)
742		assertSame(TEST_STRING, future.get());
743		} finally {
744		joinPool(e);
#	Line 868 | Line 765 | public class ForkJoinPoolTest extends JS
765		*/
766		public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
767		ExecutorService e = new ForkJoinPool(1);
768	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
769	+	l.add(new StringTask());
770		try {
872	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
873	–	l.add(new StringTask());
771		e.invokeAny(l, MEDIUM_DELAY_MS, null);
772		shouldThrow();
773		} catch (NullPointerException success) {
#	Line 898 | Line 795 | public class ForkJoinPoolTest extends JS
795		* timed invokeAny(c) throws NullPointerException if c has null elements
796		*/
797		public void testTimedInvokeAny3() throws Throwable {
798	+	CountDownLatch latch = new CountDownLatch(1);
799		ExecutorService e = new ForkJoinPool(1);
800	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
801	+	l.add(latchAwaitingStringTask(latch));
802	+	l.add(null);
803		try {
903	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
904	–	l.add(new StringTask());
905	–	l.add(null);
804		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
805		shouldThrow();
806		} catch (NullPointerException success) {
807		} finally {
808	+	latch.countDown();
809		joinPool(e);
810		}
811		}
#	Line 916 | Line 815 | public class ForkJoinPoolTest extends JS
815		*/
816		public void testTimedInvokeAny4() throws Throwable {
817		ExecutorService e = new ForkJoinPool(1);
818	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
819	+	l.add(new NPETask());
820		try {
920	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
921	–	l.add(new NPETask());
821		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
822		shouldThrow();
823		} catch (ExecutionException success) {
#	Line 934 | Line 833 | public class ForkJoinPoolTest extends JS
833		public void testTimedInvokeAny5() throws Throwable {
834		ExecutorService e = new ForkJoinPool(1);
835		try {
836	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
836	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
837		l.add(new StringTask());
838		l.add(new StringTask());
839		String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
#	Line 963 | Line 862 | public class ForkJoinPoolTest extends JS
862		*/
863		public void testTimedInvokeAllNullTimeUnit() throws Throwable {
864		ExecutorService e = new ForkJoinPool(1);
865	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
866	+	l.add(new StringTask());
867		try {
967	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
968	–	l.add(new StringTask());
868		e.invokeAll(l, MEDIUM_DELAY_MS, null);
869		shouldThrow();
870		} catch (NullPointerException success) {
#	Line 994 | Line 893 | public class ForkJoinPoolTest extends JS
893		*/
894		public void testTimedInvokeAll3() throws InterruptedException {
895		ExecutorService e = new ForkJoinPool(1);
896	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
897	+	l.add(new StringTask());
898	+	l.add(null);
899		try {
998	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
999	–	l.add(new StringTask());
1000	–	l.add(null);
900		e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
901		shouldThrow();
902		} catch (NullPointerException success) {
#	Line 1011 | Line 910 | public class ForkJoinPoolTest extends JS
910		*/
911		public void testTimedInvokeAll4() throws Throwable {
912		ExecutorService e = new ForkJoinPool(1);
913	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
914	+	l.add(new NPETask());
915	+	List<Future<String>> futures
916	+	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
917	+	assertEquals(1, futures.size());
918		try {
919	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1016	<	l.add(new NPETask());
1017	<	List<Future<String>> result
1018	<	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1019	<	assertEquals(1, result.size());
1020	<	for (Future<String> future : result)
1021	<	future.get();
919	>	futures.get(0).get();
920		shouldThrow();
921		} catch (ExecutionException success) {
922	+	assertTrue(success.getCause() instanceof NullPointerException);
923		} finally {
924		joinPool(e);
925		}
#	Line 1032 | Line 931 | public class ForkJoinPoolTest extends JS
931		public void testTimedInvokeAll5() throws Throwable {
932		ExecutorService e = new ForkJoinPool(1);
933		try {
934	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
934	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
935		l.add(new StringTask());
936		l.add(new StringTask());
937	<	List<Future<String>> result
937	>	List<Future<String>> futures
938		= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
939	<	assertEquals(2, result.size());
940	<	for (Future<String> future : result)
939	>	assertEquals(2, futures.size());
940	>	for (Future<String> future : futures)
941		assertSame(TEST_STRING, future.get());
942		} finally {
943		joinPool(e);

Diff Legend

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