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.10 by jsr166, Sat Nov 21 10:25:05 2009 UTC vs.
Revision 1.36 by jsr166, Mon Nov 29 07:42:58 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);
245	<	} finally {
246	<	joinPool(p);
247	<	}
325	<	}
326	<
327	<	/**
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());
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
341	–
254		/**
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	>	final CountDownLatch done = new CountDownLatch(1);
332	>	SubFJP p = new SubFJP();
333		try {
334	<	p = new SubFJP();
335	<	ForkJoinTask a = p.submit(new MediumRunnable());
336	<	ForkJoinTask b = p.submit(new MediumRunnable());
430	<	ForkJoinTask c = p.submit(new MediumRunnable());
334	>	ForkJoinTask a = p.submit(awaiter(done));
335	>	ForkJoinTask b = p.submit(awaiter(done));
336	>	ForkJoinTask c = p.submit(awaiter(done));
337		ForkJoinTask r = p.pollSubmission();
338		assertTrue(r == a || r == b || r == c);
339		assertFalse(r.isDone());
340		} finally {
341	+	done.countDown();
342		joinPool(p);
343		}
344		}
#	Line 440 | Line 347 | public class ForkJoinPoolTest extends JS
347		* drainTasksTo transfers unexecuted submitted tasks, if present
348		*/
349		public void testDrainTasksTo() {
350	<	SubFJP p = null;
350	>	final CountDownLatch done = new CountDownLatch(1);
351	>	SubFJP p = new SubFJP();
352		try {
353	<	p = new SubFJP();
354	<	ForkJoinTask a = p.submit(new MediumRunnable());
355	<	ForkJoinTask b = p.submit(new MediumRunnable());
448	<	ForkJoinTask c = p.submit(new MediumRunnable());
353	>	ForkJoinTask a = p.submit(awaiter(done));
354	>	ForkJoinTask b = p.submit(awaiter(done));
355	>	ForkJoinTask c = p.submit(awaiter(done));
356		ArrayList<ForkJoinTask> al = new ArrayList();
357		p.drainTasksTo(al);
358		assertTrue(al.size() > 0);
#	Line 454 | Line 361 | public class ForkJoinPoolTest extends JS
361		assertFalse(r.isDone());
362		}
363		} finally {
364	+	done.countDown();
365		joinPool(p);
366		}
367		}
#	Line 466 | Line 374 | public class ForkJoinPoolTest extends JS
374		*/
375		public void testExecuteRunnable() throws Throwable {
376		ExecutorService e = new ForkJoinPool(1);
377	<	TrackedShortRunnable task = new TrackedShortRunnable();
378	<	assertFalse(task.done);
379	<	Future<?> future = e.submit(task);
380	<	future.get();
381	<	assertTrue(task.done);
377	>	try {
378	>	TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
379	>	assertFalse(task.isDone());
380	>	Future<?> future = e.submit(task);
381	>	assertNull(future.get());
382	>	assertNull(future.get(MEDIUM_DELAY_MS, MILLISECONDS));
383	>	assertTrue(task.isDone());
384	>	assertTrue(future.isDone());
385	>	assertFalse(future.isCancelled());
386	>	} finally {
387	>	joinPool(e);
388	>	}
389		}
390
391
#	Line 479 | Line 394 | public class ForkJoinPoolTest extends JS
394		*/
395		public void testSubmitCallable() throws Throwable {
396		ExecutorService e = new ForkJoinPool(1);
397	<	Future<String> future = e.submit(new StringTask());
398	<	String result = future.get();
399	<	assertSame(TEST_STRING, result);
397	>	try {
398	>	Future<String> future = e.submit(new StringTask());
399	>	assertSame(TEST_STRING, future.get());
400	>	assertTrue(future.isDone());
401	>	assertFalse(future.isCancelled());
402	>	} finally {
403	>	joinPool(e);
404	>	}
405		}
406
407		/**
#	Line 489 | Line 409 | public class ForkJoinPoolTest extends JS
409		*/
410		public void testSubmitRunnable() throws Throwable {
411		ExecutorService e = new ForkJoinPool(1);
412	<	Future<?> future = e.submit(new NoOpRunnable());
413	<	future.get();
414	<	assertTrue(future.isDone());
412	>	try {
413	>	Future<?> future = e.submit(new NoOpRunnable());
414	>	assertNull(future.get());
415	>	assertTrue(future.isDone());
416	>	assertFalse(future.isCancelled());
417	>	} finally {
418	>	joinPool(e);
419	>	}
420		}
421
422		/**
#	Line 499 | Line 424 | public class ForkJoinPoolTest extends JS
424		*/
425		public void testSubmitRunnable2() throws Throwable {
426		ExecutorService e = new ForkJoinPool(1);
427	<	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
428	<	String result = future.get();
429	<	assertSame(TEST_STRING, result);
427	>	try {
428	>	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
429	>	assertSame(TEST_STRING, future.get());
430	>	assertTrue(future.isDone());
431	>	assertFalse(future.isCancelled());
432	>	} finally {
433	>	joinPool(e);
434	>	}
435		}
436
507	–
437		/**
438	<	* A submitted privileged action to completion
438	>	* A submitted privileged action runs to completion
439		*/
440	<	public void testSubmitPrivilegedAction() throws Throwable {
441	<	Policy savedPolicy = null;
442	<	try {
443	<	savedPolicy = Policy.getPolicy();
444	<	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() {
440	>	public void testSubmitPrivilegedAction() throws Exception {
441	>	Runnable r = new CheckedRunnable() {
442	>	public void realRun() throws Exception {
443	>	ExecutorService e = new ForkJoinPool(1);
444	>	Future future = e.submit(Executors.callable(new PrivilegedAction() {
445		public Object run() {
446		return TEST_STRING;
447		}}));
448
449	<	Object result = future.get();
450	<	assertSame(TEST_STRING, result);
451	<	}
452	<	finally {
453	<	Policy.setPolicy(savedPolicy);
534	<	}
449	>	assertSame(TEST_STRING, future.get());
450	>	}};
451	>
452	>	runWithPermissions(r,
453	>	new RuntimePermission("modifyThread"));
454		}
455
456		/**
457	<	* A submitted a privileged exception action runs to completion
457	>	* A submitted privileged exception action runs to completion
458		*/
459	<	public void testSubmitPrivilegedExceptionAction() throws Throwable {
460	<	Policy savedPolicy = null;
461	<	try {
462	<	savedPolicy = Policy.getPolicy();
463	<	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() {
459	>	public void testSubmitPrivilegedExceptionAction() throws Exception {
460	>	Runnable r = new CheckedRunnable() {
461	>	public void realRun() throws Exception {
462	>	ExecutorService e = new ForkJoinPool(1);
463	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
464		public Object run() {
465		return TEST_STRING;
466		}}));
467
468	<	Object result = future.get();
469	<	assertSame(TEST_STRING, result);
470	<	}
471	<	finally {
563	<	Policy.setPolicy(savedPolicy);
564	<	}
468	>	assertSame(TEST_STRING, future.get());
469	>	}};
470	>
471	>	runWithPermissions(r, new RuntimePermission("modifyThread"));
472		}
473
474		/**
475		* A submitted failed privileged exception action reports exception
476		*/
477	<	public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
478	<	Policy savedPolicy = null;
479	<	try {
480	<	savedPolicy = Policy.getPolicy();
481	<	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() {
477	>	public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
478	>	Runnable r = new CheckedRunnable() {
479	>	public void realRun() throws Exception {
480	>	ExecutorService e = new ForkJoinPool(1);
481	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
482		public Object run() throws Exception {
483		throw new IndexOutOfBoundsException();
484		}}));
485
486	<	Object result = future.get();
487	<	shouldThrow();
488	<	} catch (ExecutionException success) {
489	<	} finally {
490	<	Policy.setPolicy(savedPolicy);
491	<	}
486	>	try {
487	>	future.get();
488	>	shouldThrow();
489	>	} catch (ExecutionException success) {
490	>	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
491	>	}}};
492	>
493	>	runWithPermissions(r, new RuntimePermission("modifyThread"));
494		}
495
496		/**
497		* execute(null runnable) throws NullPointerException
498		*/
499		public void testExecuteNullRunnable() {
500	+	ExecutorService e = new ForkJoinPool(1);
501		try {
502	<	ExecutorService e = new ForkJoinPool(1);
604	<	TrackedShortRunnable task = null;
605	<	Future<?> future = e.submit(task);
502	>	Future<?> future = e.submit((Runnable) null);
503		shouldThrow();
504	<	} catch (NullPointerException success) {}
504	>	} catch (NullPointerException success) {
505	>	} finally {
506	>	joinPool(e);
507	>	}
508		}
509
510
#	Line 612 | Line 512 | public class ForkJoinPoolTest extends JS
512		* submit(null callable) throws NullPointerException
513		*/
514		public void testSubmitNullCallable() {
515	+	ExecutorService e = new ForkJoinPool(1);
516		try {
517	<	ExecutorService e = new ForkJoinPool(1);
617	<	StringTask t = null;
618	<	Future<String> future = e.submit(t);
517	>	Future<String> future = e.submit((Callable) null);
518		shouldThrow();
519	<	} catch (NullPointerException success) {}
519	>	} catch (NullPointerException success) {
520	>	} finally {
521	>	joinPool(e);
522	>	}
523		}
524
525
526		/**
527	<	* Blocking on submit(callable) throws InterruptedException if
626	<	* caller interrupted.
527	>	* submit(callable).get() throws InterruptedException if interrupted
528		*/
529		public void testInterruptedSubmit() throws InterruptedException {
530	<	final ForkJoinPool p = new ForkJoinPool(1);
531	<
532	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
533	<	void realRun() throws Throwable {
534	<	p.submit(new CheckedCallable<Object>() {
535	<	public Object realCall() throws Throwable {
536	<	try {
537	<	Thread.sleep(MEDIUM_DELAY_MS);
538	<	} catch (InterruptedException ok) {
539	<	}
540	<	return null;
541	<	}}).get();
542	<	}});
543	<
544	<	t.start();
545	<	Thread.sleep(SHORT_DELAY_MS);
546	<	t.interrupt();
547	<	t.join();
548	<	p.shutdownNow();
549	<	joinPool(p);
530	>	final CountDownLatch submitted    = new CountDownLatch(1);
531	>	final CountDownLatch quittingTime = new CountDownLatch(1);
532	>	final ExecutorService p = new ForkJoinPool(1);
533	>	final Callable<Void> awaiter = new CheckedCallable<Void>() {
534	>	public Void realCall() throws InterruptedException {
535	>	assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
536	>	return null;
537	>	}};
538	>	try {
539	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
540	>	public void realRun() throws Exception {
541	>	Future<Void> future = p.submit(awaiter);
542	>	submitted.countDown();
543	>	future.get();
544	>	}});
545	>	t.start();
546	>	assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
547	>	t.interrupt();
548	>	t.join();
549	>	} finally {
550	>	quittingTime.countDown();
551	>	joinPool(p);
552	>	}
553		}
554
555		/**
#	Line 661 | Line 565 | public class ForkJoinPoolTest extends JS
565		return Boolean.TRUE;
566		}}).get();
567		shouldThrow();
568	<	} catch (ExecutionException success) {}
569	<
570	<	joinPool(p);
568	>	} catch (ExecutionException success) {
569	>	assertTrue(success.getCause() instanceof ArithmeticException);
570	>	} finally {
571	>	joinPool(p);
572	>	}
573		}
574
575		/**
#	Line 699 | Line 605 | public class ForkJoinPoolTest extends JS
605		*/
606		public void testInvokeAny3() throws Throwable {
607		ExecutorService e = new ForkJoinPool(1);
608	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
609	+	l.add(null);
610		try {
703	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
704	–	l.add(null);
611		e.invokeAny(l);
612		shouldThrow();
613		} catch (NullPointerException success) {
#	Line 714 | Line 620 | public class ForkJoinPoolTest extends JS
620		* invokeAny(c) throws NullPointerException if c has null elements
621		*/
622		public void testInvokeAny4() throws Throwable {
623	+	CountDownLatch latch = new CountDownLatch(1);
624		ExecutorService e = new ForkJoinPool(1);
625	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
626	+	l.add(latchAwaitingStringTask(latch));
627	+	l.add(null);
628		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);
629		e.invokeAny(l);
630		shouldThrow();
631		} catch (NullPointerException success) {
632		} finally {
633	+	latch.countDown();
634		joinPool(e);
635		}
636		}
#	Line 738 | Line 640 | public class ForkJoinPoolTest extends JS
640		*/
641		public void testInvokeAny5() throws Throwable {
642		ExecutorService e = new ForkJoinPool(1);
643	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
644	+	l.add(new NPETask());
645		try {
742	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
743	–	l.add(new NPETask());
646		e.invokeAny(l);
647		shouldThrow();
648		} catch (ExecutionException success) {
649	+	assertTrue(success.getCause() instanceof NullPointerException);
650		} finally {
651		joinPool(e);
652		}
#	Line 755 | Line 658 | public class ForkJoinPoolTest extends JS
658		public void testInvokeAny6() throws Throwable {
659		ExecutorService e = new ForkJoinPool(1);
660		try {
661	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
661	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
662		l.add(new StringTask());
663		l.add(new StringTask());
664		String result = e.invokeAny(l);
#	Line 798 | Line 701 | public class ForkJoinPoolTest extends JS
701		*/
702		public void testInvokeAll3() throws InterruptedException {
703		ExecutorService e = new ForkJoinPool(1);
704	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
705	+	l.add(new StringTask());
706	+	l.add(null);
707		try {
802	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
803	–	l.add(new StringTask());
804	–	l.add(null);
708		e.invokeAll(l);
709		shouldThrow();
710		} catch (NullPointerException success) {
#	Line 816 | Line 719 | public class ForkJoinPoolTest extends JS
719		*/
720		public void testInvokeAll4() throws Throwable {
721		ExecutorService e = new ForkJoinPool(1);
722	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
723	+	l.add(new NPETask());
724	+	List<Future<String>> futures = e.invokeAll(l);
725	+	assertEquals(1, futures.size());
726		try {
727	<	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();
727	>	futures.get(0).get();
728		shouldThrow();
729		} catch (ExecutionException success) {
730	+	assertTrue(success.getCause() instanceof NullPointerException);
731		} finally {
732		joinPool(e);
733		}
#	Line 836 | Line 739 | public class ForkJoinPoolTest extends JS
739		public void testInvokeAll5() throws Throwable {
740		ExecutorService e = new ForkJoinPool(1);
741		try {
742	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
742	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
743		l.add(new StringTask());
744		l.add(new StringTask());
745	<	List<Future<String>> result = e.invokeAll(l);
746	<	assertEquals(2, result.size());
747	<	for (Future<String> future : result)
745	>	List<Future<String>> futures = e.invokeAll(l);
746	>	assertEquals(2, futures.size());
747	>	for (Future<String> future : futures)
748		assertSame(TEST_STRING, future.get());
749		} finally {
750		joinPool(e);
#	Line 868 | Line 771 | public class ForkJoinPoolTest extends JS
771		*/
772		public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
773		ExecutorService e = new ForkJoinPool(1);
774	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
775	+	l.add(new StringTask());
776		try {
872	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
873	–	l.add(new StringTask());
777		e.invokeAny(l, MEDIUM_DELAY_MS, null);
778		shouldThrow();
779		} catch (NullPointerException success) {
#	Line 898 | Line 801 | public class ForkJoinPoolTest extends JS
801		* timed invokeAny(c) throws NullPointerException if c has null elements
802		*/
803		public void testTimedInvokeAny3() throws Throwable {
804	+	CountDownLatch latch = new CountDownLatch(1);
805		ExecutorService e = new ForkJoinPool(1);
806	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
807	+	l.add(latchAwaitingStringTask(latch));
808	+	l.add(null);
809		try {
903	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
904	–	l.add(new StringTask());
905	–	l.add(null);
810		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
811		shouldThrow();
812		} catch (NullPointerException success) {
813		} finally {
814	+	latch.countDown();
815		joinPool(e);
816		}
817		}
#	Line 916 | Line 821 | public class ForkJoinPoolTest extends JS
821		*/
822		public void testTimedInvokeAny4() throws Throwable {
823		ExecutorService e = new ForkJoinPool(1);
824	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
825	+	l.add(new NPETask());
826		try {
920	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
921	–	l.add(new NPETask());
827		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
828		shouldThrow();
829		} catch (ExecutionException success) {
830	+	assertTrue(success.getCause() instanceof NullPointerException);
831		} finally {
832		joinPool(e);
833		}
#	Line 933 | Line 839 | public class ForkJoinPoolTest extends JS
839		public void testTimedInvokeAny5() throws Throwable {
840		ExecutorService e = new ForkJoinPool(1);
841		try {
842	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
842	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
843		l.add(new StringTask());
844		l.add(new StringTask());
845		String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
#	Line 962 | Line 868 | public class ForkJoinPoolTest extends JS
868		*/
869		public void testTimedInvokeAllNullTimeUnit() throws Throwable {
870		ExecutorService e = new ForkJoinPool(1);
871	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
872	+	l.add(new StringTask());
873		try {
966	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
967	–	l.add(new StringTask());
874		e.invokeAll(l, MEDIUM_DELAY_MS, null);
875		shouldThrow();
876		} catch (NullPointerException success) {
#	Line 993 | Line 899 | public class ForkJoinPoolTest extends JS
899		*/
900		public void testTimedInvokeAll3() throws InterruptedException {
901		ExecutorService e = new ForkJoinPool(1);
902	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
903	+	l.add(new StringTask());
904	+	l.add(null);
905		try {
997	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
998	–	l.add(new StringTask());
999	–	l.add(null);
906		e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
907		shouldThrow();
908		} catch (NullPointerException success) {
#	Line 1010 | Line 916 | public class ForkJoinPoolTest extends JS
916		*/
917		public void testTimedInvokeAll4() throws Throwable {
918		ExecutorService e = new ForkJoinPool(1);
919	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
920	+	l.add(new NPETask());
921	+	List<Future<String>> futures
922	+	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
923	+	assertEquals(1, futures.size());
924		try {
925	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1015	<	l.add(new NPETask());
1016	<	List<Future<String>> result
1017	<	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1018	<	assertEquals(1, result.size());
1019	<	for (Future<String> future : result)
1020	<	future.get();
925	>	futures.get(0).get();
926		shouldThrow();
927		} catch (ExecutionException success) {
928	+	assertTrue(success.getCause() instanceof NullPointerException);
929		} finally {
930		joinPool(e);
931		}
#	Line 1031 | Line 937 | public class ForkJoinPoolTest extends JS
937		public void testTimedInvokeAll5() throws Throwable {
938		ExecutorService e = new ForkJoinPool(1);
939		try {
940	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
940	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
941		l.add(new StringTask());
942		l.add(new StringTask());
943	<	List<Future<String>> result
943	>	List<Future<String>> futures
944		= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
945	<	assertEquals(2, result.size());
946	<	for (Future<String> future : result)
945	>	assertEquals(2, futures.size());
946	>	for (Future<String> future : futures)
947		assertSame(TEST_STRING, future.get());
948		} finally {
949		joinPool(e);

Diff Legend

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