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.19 by dl, Sun Feb 28 13:35:22 2010 UTC vs.
Revision 1.34 by jsr166, Thu Nov 18 19:14:34 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.getActiveThreadCount() == 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();
249	>	p.shutdownNow(); // failure might have prevented processing task
250		joinPool(p);
251		}
252		}
253
254		/**
329	–	* setUncaughtExceptionHandler of null removes handler
330	–	*/
331	–	public void testSetUncaughtExceptionHandler2() {
332	–	ForkJoinPool p = null;
333	–	try {
334	–	p = new ForkJoinPool(1);
335	–	p.setUncaughtExceptionHandler(null);
336	–	assertNull(p.getUncaughtExceptionHandler());
337	–	} finally {
338	–	joinPool(p);
339	–	}
340	–	}
341	–
342	–
343	–	/**
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());
357	–	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 372 | 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 {
377	–	p = new ForkJoinPool(1);
287		ForkJoinTask<Integer> f = p.submit(new FibTask(8));
288	<	int r = f.get();
380	<	assertTrue(r == 21);
288	>	assertEquals(21, (int) f.get());
289		} finally {
290		joinPool(p);
291		}
#	Line 387 | 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 {
392	–	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 404 | 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 {
409	–	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);
415	<	int r = f.get();
416	<	assertTrue(r == 832040);
321	>	assertEquals(6765, (int) f.get());
322		} finally {
323		p.shutdownNow(); // don't wait out shutdown
324		}
#	Line 423 | 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());
431	<	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 441 | 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());
449	<	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 467 | 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 480 | 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 490 | 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 500 | 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
431	+
432		/**
433		* A submitted privileged action runs to completion
434		*/
435		public void testSubmitPrivilegedAction() throws Throwable {
436	<	Runnable r = new CheckedRunnable() {
437	<	public void realRun() throws Exception {
438	<	ExecutorService e = new ForkJoinPool(1);
436	>	Policy savedPolicy = null;
437	>	try {
438	>	savedPolicy = Policy.getPolicy();
439	>	AdjustablePolicy policy = new AdjustablePolicy();
440	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
441	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
442	>	Policy.setPolicy(policy);
443	>	} catch (AccessControlException ok) {
444	>	return;
445	>	}
446	>
447	>	try {
448	>	ExecutorService e = new ForkJoinPool(1);
449	>	try {
450		Future future = e.submit(Executors.callable(new PrivilegedAction() {
451		public Object run() {
452		return TEST_STRING;
#	Line 519 | Line 454 | public class ForkJoinPoolTest extends JS
454
455		Object result = future.get();
456		assertSame(TEST_STRING, result);
457	<	}};
458	<
459	<	runWithPermissions(r, new RuntimePermission("modifyThread"));
457	>	} finally {
458	>	joinPool(e);
459	>	}
460	>	} finally {
461	>	Policy.setPolicy(savedPolicy);
462	>	}
463		}
464
465		/**
466		* A submitted privileged exception action runs to completion
467		*/
468		public void testSubmitPrivilegedExceptionAction() throws Throwable {
469	<	Runnable r = new CheckedRunnable() {
470	<	public void realRun() throws Exception {
471	<	ExecutorService e = new ForkJoinPool(1);
469	>	Policy savedPolicy = null;
470	>	try {
471	>	savedPolicy = Policy.getPolicy();
472	>	AdjustablePolicy policy = new AdjustablePolicy();
473	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
474	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
475	>	Policy.setPolicy(policy);
476	>	} catch (AccessControlException ok) {
477	>	return;
478	>	}
479	>
480	>	try {
481	>	ExecutorService e = new ForkJoinPool(1);
482	>	try {
483		Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
484		public Object run() {
485		return TEST_STRING;
#	Line 538 | Line 487 | public class ForkJoinPoolTest extends JS
487
488		Object result = future.get();
489		assertSame(TEST_STRING, result);
490	<	}};
491	<
492	<	runWithPermissions(r, new RuntimePermission("modifyThread"));
490	>	} finally {
491	>	joinPool(e);
492	>	}
493	>	} finally {
494	>	Policy.setPolicy(savedPolicy);
495	>	}
496		}
497
498		/**
499		* A submitted failed privileged exception action reports exception
500		*/
501		public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
502	<	Runnable r = new CheckedRunnable() {
503	<	public void realRun() throws Exception {
504	<	ExecutorService e = new ForkJoinPool(1);
502	>	Policy savedPolicy = null;
503	>	try {
504	>	savedPolicy = Policy.getPolicy();
505	>	AdjustablePolicy policy = new AdjustablePolicy();
506	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
507	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
508	>	Policy.setPolicy(policy);
509	>	} catch (AccessControlException ok) {
510	>	return;
511	>	}
512	>
513	>	try {
514	>	ExecutorService e = new ForkJoinPool(1);
515	>	try {
516		Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
517		public Object run() throws Exception {
518		throw new IndexOutOfBoundsException();
519		}}));
520
521	<	try {
522	<	Object result = future.get();
523	<	shouldThrow();
524	<	} catch (ExecutionException success) {
525	<	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
526	<	}}};
527	<
528	<	runWithPermissions(r, new RuntimePermission("modifyThread"));
521	>	Object result = future.get();
522	>	shouldThrow();
523	>	} catch (ExecutionException success) {
524	>	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
525	>	} finally {
526	>	joinPool(e);
527	>	}
528	>	} finally {
529	>	Policy.setPolicy(savedPolicy);
530	>	}
531		}
532
533		/**
534		* execute(null runnable) throws NullPointerException
535		*/
536		public void testExecuteNullRunnable() {
537	+	ExecutorService e = new ForkJoinPool(1);
538		try {
539	<	ExecutorService e = new ForkJoinPool(1);
574	<	TrackedShortRunnable task = null;
575	<	Future<?> future = e.submit(task);
539	>	Future<?> future = e.submit((Runnable) null);
540		shouldThrow();
541	<	} catch (NullPointerException success) {}
541	>	} catch (NullPointerException success) {
542	>	} finally {
543	>	joinPool(e);
544	>	}
545		}
546
547
#	Line 582 | Line 549 | public class ForkJoinPoolTest extends JS
549		* submit(null callable) throws NullPointerException
550		*/
551		public void testSubmitNullCallable() {
552	+	ExecutorService e = new ForkJoinPool(1);
553		try {
554	<	ExecutorService e = new ForkJoinPool(1);
587	<	StringTask t = null;
588	<	Future<String> future = e.submit(t);
554	>	Future<String> future = e.submit((Callable) null);
555		shouldThrow();
556	<	} catch (NullPointerException success) {}
556	>	} catch (NullPointerException success) {
557	>	} finally {
558	>	joinPool(e);
559	>	}
560		}
561
562
563		/**
564	<	* Blocking on submit(callable) throws InterruptedException if
596	<	* caller interrupted.
564	>	* submit(callable).get() throws InterruptedException if interrupted
565		*/
566		public void testInterruptedSubmit() throws InterruptedException {
567	<	final ForkJoinPool p = new ForkJoinPool(1);
568	<
569	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
570	<	public void realRun() throws Throwable {
571	<	p.submit(new CheckedCallable<Object>() {
572	<	public Object realCall() throws Throwable {
573	<	try {
574	<	Thread.sleep(MEDIUM_DELAY_MS);
575	<	} catch (InterruptedException ok) {
576	<	}
577	<	return null;
578	<	}}).get();
579	<	}});
580	<
581	<	t.start();
582	<	Thread.sleep(SHORT_DELAY_MS);
583	<	t.interrupt();
584	<	t.join();
585	<	p.shutdownNow();
586	<	joinPool(p);
567	>	final CountDownLatch submitted    = new CountDownLatch(1);
568	>	final CountDownLatch quittingTime = new CountDownLatch(1);
569	>	final ExecutorService p = new ForkJoinPool(1);
570	>	final Callable<Void> awaiter = new CheckedCallable<Void>() {
571	>	public Void realCall() throws InterruptedException {
572	>	assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
573	>	return null;
574	>	}};
575	>	try {
576	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
577	>	public void realRun() throws Exception {
578	>	Future<Void> future = p.submit(awaiter);
579	>	submitted.countDown();
580	>	future.get();
581	>	}});
582	>	t.start();
583	>	assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
584	>	t.interrupt();
585	>	t.join();
586	>	} finally {
587	>	quittingTime.countDown();
588	>	joinPool(p);
589	>	}
590		}
591
592		/**
#	Line 633 | Line 604 | public class ForkJoinPoolTest extends JS
604		shouldThrow();
605		} catch (ExecutionException success) {
606		assertTrue(success.getCause() instanceof ArithmeticException);
607	+	} finally {
608	+	joinPool(p);
609		}
637	–
638	–	joinPool(p);
610		}
611
612		/**

Diff Legend

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