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.43 by jsr166, Sun May 29 13:45:35 2011 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
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.atomic.AtomicBoolean;
26	>	import java.util.concurrent.locks.ReentrantLock;
27		import static java.util.concurrent.TimeUnit.MILLISECONDS;
28	<	import java.util.concurrent.locks.*;
29	<	import java.security.*;
28	>	import java.security.AccessControlException;
29	>	import java.security.Policy;
30	>	import java.security.PrivilegedAction;
31	>	import java.security.PrivilegedExceptionAction;
32
33		public class ForkJoinPoolTest extends JSR166TestCase {
34		public static void main(String[] args) {
35	<	junit.textui.TestRunner.run (suite());
35	>	junit.textui.TestRunner.run(suite());
36		}
37	+
38		public static Test suite() {
39		return new TestSuite(ForkJoinPoolTest.class);
40		}
#	Line 39 | Line 58 | public class ForkJoinPoolTest extends JS
58		// Some classes to test extension and factory methods
59
60		static class MyHandler implements Thread.UncaughtExceptionHandler {
61	<	int catches = 0;
61	>	volatile int catches = 0;
62		public void uncaughtException(Thread t, Throwable e) {
63		++catches;
64		}
#	Line 48 | Line 67 | public class ForkJoinPoolTest extends JS
67		// to test handlers
68		static class FailingFJWSubclass extends ForkJoinWorkerThread {
69		public FailingFJWSubclass(ForkJoinPool p) { super(p) ; }
70	<	protected void onStart() { throw new Error(); }
70	>	protected void onStart() { super.onStart(); throw new Error(); }
71		}
72
73		static class FailingThreadFactory
74		implements ForkJoinPool.ForkJoinWorkerThreadFactory {
75	<	int calls = 0;
75	>	volatile int calls = 0;
76		public ForkJoinWorkerThread newThread(ForkJoinPool p) {
77		if (++calls > 1) return null;
78		return new FailingFJWSubclass(p);
#	Line 142 | Line 161 | public class ForkJoinPoolTest extends JS
161		* tasks, and quiescent running state.
162		*/
163		public void testDefaultInitialState() {
164	<	ForkJoinPool p = null;
164	>	ForkJoinPool p = new ForkJoinPool(1);
165		try {
166	<	p = new ForkJoinPool(1);
167	<	assertTrue(p.getFactory() ==
149	<	ForkJoinPool.defaultForkJoinWorkerThreadFactory);
150	<	assertTrue(p.isQuiescent());
151	<	assertTrue(p.getMaintainsParallelism());
166	>	assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
167	>	p.getFactory());
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		}
201
186	–
202		/**
203		* getParallelism returns size set in constructor
204		*/
205		public void testGetParallelism() {
206	<	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;
206	>	ForkJoinPool p = new ForkJoinPool(1);
207		try {
208	<	p = new ForkJoinPool(1);
222	<	assertTrue(p.getParallelism() == 1);
223	<	p.setParallelism(-2);
224	<	shouldThrow();
225	<	} catch (IllegalArgumentException success) {
208	>	assertEquals(1, p.getParallelism());
209		} finally {
210		joinPool(p);
211		}
#	Line 232 | Line 215 | public class ForkJoinPoolTest extends JS
215		* getPoolSize returns number of started workers.
216		*/
217		public void testGetPoolSize() {
218	<	ForkJoinPool p = null;
218	>	ForkJoinPool p = new ForkJoinPool(1);
219		try {
220	<	p = new ForkJoinPool(1);
238	<	assertTrue(p.getActiveThreadCount() == 0);
220	>	assertEquals(0, p.getActiveThreadCount());
221		Future<String> future = p.submit(new StringTask());
222	<	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());
222	>	assertEquals(1, p.getPoolSize());
223		} finally {
224		joinPool(p);
225		}
#	Line 310 | Line 232 | public class ForkJoinPoolTest extends JS
232		* performs its defined action
233		*/
234		public void testSetUncaughtExceptionHandler() throws InterruptedException {
235	<	ForkJoinPool p = null;
235	>	final CountDownLatch uehInvoked = new CountDownLatch(1);
236	>	final Thread.UncaughtExceptionHandler eh =
237	>	new Thread.UncaughtExceptionHandler() {
238	>	public void uncaughtException(Thread t, Throwable e) {
239	>	uehInvoked.countDown();
240	>	}};
241	>	ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
242	>	eh, false);
243		try {
244	<	p = new ForkJoinPool(1, new FailingThreadFactory());
245	<	MyHandler eh = new MyHandler();
246	<	p.setUncaughtExceptionHandler(eh);
318	<	assertEquals(eh, p.getUncaughtExceptionHandler());
319	<	p.execute(new FailingTask());
320	<	Thread.sleep(MEDIUM_DELAY_MS);
321	<	assertTrue(eh.catches > 0);
244	>	assertSame(eh, p.getUncaughtExceptionHandler());
245	>	p.execute(new FibTask(8));
246	>	assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
247		} finally {
248	<	p.shutdownNow();
248	>	p.shutdownNow(); // failure might have prevented processing task
249		joinPool(p);
250		}
251		}
252
253		/**
254	<	* setUncaughtExceptionHandler of null removes handler
254	>	* After invoking a single task, isQuiescent eventually becomes
255	>	* true, at which time queues are empty, threads are not active,
256	>	* the task has completed successfully, and construction
257	>	* parameters continue to hold
258		*/
259	<	public void testSetUncaughtExceptionHandler2() {
260	<	ForkJoinPool p = null;
259	>	public void testIsQuiescent() throws Exception {
260	>	ForkJoinPool p = new ForkJoinPool(2);
261		try {
262	<	p = new ForkJoinPool(1);
263	<	p.setUncaughtExceptionHandler(null);
264	<	assertNull(p.getUncaughtExceptionHandler());
265	<	} finally {
266	<	joinPool(p);
267	<	}
268	<	}
269	<
262	>	assertTrue(p.isQuiescent());
263	>	long startTime = System.nanoTime();
264	>	FibTask f = new FibTask(20);
265	>	p.invoke(f);
266	>	assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
267	>	p.getFactory());
268	>	while (! p.isQuiescent()) {
269	>	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
270	>	throw new AssertionFailedError("timed out");
271	>	assertFalse(p.getAsyncMode());
272	>	assertFalse(p.isShutdown());
273	>	assertFalse(p.isTerminating());
274	>	assertFalse(p.isTerminated());
275	>	Thread.yield();
276	>	}
277
343	–	/**
344	–	* After invoking a single task, isQuiescent is true,
345	–	* queues are empty, threads are not active, and
346	–	* construction parameters continue to hold
347	–	*/
348	–	public void testisQuiescent() throws InterruptedException {
349	–	ForkJoinPool p = null;
350	–	try {
351	–	p = new ForkJoinPool(2);
352	–	p.invoke(new FibTask(20));
353	–	assertTrue(p.getFactory() ==
354	–	ForkJoinPool.defaultForkJoinWorkerThreadFactory);
355	–	Thread.sleep(MEDIUM_DELAY_MS);
278		assertTrue(p.isQuiescent());
357	–	assertTrue(p.getMaintainsParallelism());
279		assertFalse(p.getAsyncMode());
280	<	assertTrue(p.getActiveThreadCount() == 0);
281	<	assertTrue(p.getQueuedTaskCount() == 0);
282	<	assertTrue(p.getQueuedSubmissionCount() == 0);
280	>	assertEquals(0, p.getActiveThreadCount());
281	>	assertEquals(0, p.getQueuedTaskCount());
282	>	assertEquals(0, p.getQueuedSubmissionCount());
283		assertFalse(p.hasQueuedSubmissions());
284		assertFalse(p.isShutdown());
285		assertFalse(p.isTerminating());
286		assertFalse(p.isTerminated());
287	+	assertTrue(f.isDone());
288	+	assertEquals(6765, (int) f.get());
289		} finally {
290		joinPool(p);
291		}
#	Line 372 | Line 295 | public class ForkJoinPoolTest extends JS
295		* Completed submit(ForkJoinTask) returns result
296		*/
297		public void testSubmitForkJoinTask() throws Throwable {
298	<	ForkJoinPool p = null;
298	>	ForkJoinPool p = new ForkJoinPool(1);
299		try {
377	–	p = new ForkJoinPool(1);
300		ForkJoinTask<Integer> f = p.submit(new FibTask(8));
301	<	int r = f.get();
380	<	assertTrue(r == 21);
301	>	assertEquals(21, (int) f.get());
302		} finally {
303		joinPool(p);
304		}
#	Line 387 | Line 308 | public class ForkJoinPoolTest extends JS
308		* A task submitted after shutdown is rejected
309		*/
310		public void testSubmitAfterShutdown() {
311	<	ForkJoinPool p = null;
311	>	ForkJoinPool p = new ForkJoinPool(1);
312		try {
392	–	p = new ForkJoinPool(1);
313		p.shutdown();
314		assertTrue(p.isShutdown());
315	<	ForkJoinTask<Integer> f = p.submit(new FibTask(8));
316	<	shouldThrow();
317	<	} catch (RejectedExecutionException success) {
315	>	try {
316	>	ForkJoinTask<Integer> f = p.submit(new FibTask(8));
317	>	shouldThrow();
318	>	} catch (RejectedExecutionException success) {}
319		} finally {
320		joinPool(p);
321		}
#	Line 404 | Line 325 | public class ForkJoinPoolTest extends JS
325		* Pool maintains parallelism when using ManagedBlocker
326		*/
327		public void testBlockingForkJoinTask() throws Throwable {
328	<	ForkJoinPool p = null;
328	>	ForkJoinPool p = new ForkJoinPool(4);
329		try {
409	–	p = new ForkJoinPool(4);
330		ReentrantLock lock = new ReentrantLock();
331		ManagedLocker locker = new ManagedLocker(lock);
332	<	ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
332	>	ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
333		p.execute(f);
334	<	assertTrue(p.getPoolSize() >= 4);
415	<	int r = f.get();
416	<	assertTrue(r == 832040);
334	>	assertEquals(6765, (int) f.get());
335		} finally {
336		p.shutdownNow(); // don't wait out shutdown
337		}
#	Line 423 | Line 341 | public class ForkJoinPoolTest extends JS
341		* pollSubmission returns unexecuted submitted task, if present
342		*/
343		public void testPollSubmission() {
344	<	SubFJP p = null;
344	>	final CountDownLatch done = new CountDownLatch(1);
345	>	SubFJP p = new SubFJP();
346		try {
347	<	p = new SubFJP();
348	<	ForkJoinTask a = p.submit(new MediumRunnable());
349	<	ForkJoinTask b = p.submit(new MediumRunnable());
431	<	ForkJoinTask c = p.submit(new MediumRunnable());
347	>	ForkJoinTask a = p.submit(awaiter(done));
348	>	ForkJoinTask b = p.submit(awaiter(done));
349	>	ForkJoinTask c = p.submit(awaiter(done));
350		ForkJoinTask r = p.pollSubmission();
351		assertTrue(r == a || r == b || r == c);
352		assertFalse(r.isDone());
353		} finally {
354	+	done.countDown();
355		joinPool(p);
356		}
357		}
#	Line 441 | Line 360 | public class ForkJoinPoolTest extends JS
360		* drainTasksTo transfers unexecuted submitted tasks, if present
361		*/
362		public void testDrainTasksTo() {
363	<	SubFJP p = null;
363	>	final CountDownLatch done = new CountDownLatch(1);
364	>	SubFJP p = new SubFJP();
365		try {
366	<	p = new SubFJP();
367	<	ForkJoinTask a = p.submit(new MediumRunnable());
368	<	ForkJoinTask b = p.submit(new MediumRunnable());
449	<	ForkJoinTask c = p.submit(new MediumRunnable());
366	>	ForkJoinTask a = p.submit(awaiter(done));
367	>	ForkJoinTask b = p.submit(awaiter(done));
368	>	ForkJoinTask c = p.submit(awaiter(done));
369		ArrayList<ForkJoinTask> al = new ArrayList();
370		p.drainTasksTo(al);
371		assertTrue(al.size() > 0);
#	Line 455 | Line 374 | public class ForkJoinPoolTest extends JS
374		assertFalse(r.isDone());
375		}
376		} finally {
377	+	done.countDown();
378		joinPool(p);
379		}
380		}
381
462	–
382		// FJ Versions of AbstractExecutorService tests
383
384		/**
#	Line 467 | Line 386 | public class ForkJoinPoolTest extends JS
386		*/
387		public void testExecuteRunnable() throws Throwable {
388		ExecutorService e = new ForkJoinPool(1);
389	<	TrackedShortRunnable task = new TrackedShortRunnable();
390	<	assertFalse(task.done);
391	<	Future<?> future = e.submit(task);
392	<	future.get();
393	<	assertTrue(task.done);
389	>	try {
390	>	final AtomicBoolean done = new AtomicBoolean(false);
391	>	CheckedRunnable task = new CheckedRunnable() {
392	>	public void realRun() {
393	>	done.set(true);
394	>	}};
395	>	Future<?> future = e.submit(task);
396	>	assertNull(future.get());
397	>	assertNull(future.get(0, MILLISECONDS));
398	>	assertTrue(done.get());
399	>	assertTrue(future.isDone());
400	>	assertFalse(future.isCancelled());
401	>	} finally {
402	>	joinPool(e);
403	>	}
404		}
405
477	–
406		/**
407		* Completed submit(callable) returns result
408		*/
409		public void testSubmitCallable() throws Throwable {
410		ExecutorService e = new ForkJoinPool(1);
411	<	Future<String> future = e.submit(new StringTask());
412	<	String result = future.get();
413	<	assertSame(TEST_STRING, result);
411	>	try {
412	>	Future<String> future = e.submit(new StringTask());
413	>	assertSame(TEST_STRING, future.get());
414	>	assertTrue(future.isDone());
415	>	assertFalse(future.isCancelled());
416	>	} finally {
417	>	joinPool(e);
418	>	}
419		}
420
421		/**
#	Line 490 | Line 423 | public class ForkJoinPoolTest extends JS
423		*/
424		public void testSubmitRunnable() throws Throwable {
425		ExecutorService e = new ForkJoinPool(1);
426	<	Future<?> future = e.submit(new NoOpRunnable());
427	<	future.get();
428	<	assertTrue(future.isDone());
426	>	try {
427	>	Future<?> future = e.submit(new NoOpRunnable());
428	>	assertNull(future.get());
429	>	assertTrue(future.isDone());
430	>	assertFalse(future.isCancelled());
431	>	} finally {
432	>	joinPool(e);
433	>	}
434		}
435
436		/**
#	Line 500 | Line 438 | public class ForkJoinPoolTest extends JS
438		*/
439		public void testSubmitRunnable2() throws Throwable {
440		ExecutorService e = new ForkJoinPool(1);
441	<	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
442	<	String result = future.get();
443	<	assertSame(TEST_STRING, result);
441	>	try {
442	>	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
443	>	assertSame(TEST_STRING, future.get());
444	>	assertTrue(future.isDone());
445	>	assertFalse(future.isCancelled());
446	>	} finally {
447	>	joinPool(e);
448	>	}
449		}
450
451		/**
452		* A submitted privileged action runs to completion
453		*/
454	<	public void testSubmitPrivilegedAction() throws Throwable {
454	>	public void testSubmitPrivilegedAction() throws Exception {
455		Runnable r = new CheckedRunnable() {
456		public void realRun() throws Exception {
457		ExecutorService e = new ForkJoinPool(1);
#	Line 517 | Line 460 | public class ForkJoinPoolTest extends JS
460		return TEST_STRING;
461		}}));
462
463	<	Object result = future.get();
521	<	assertSame(TEST_STRING, result);
463	>	assertSame(TEST_STRING, future.get());
464		}};
465
466	<	runWithPermissions(r, new RuntimePermission("modifyThread"));
466	>	runWithPermissions(r,
467	>	new RuntimePermission("modifyThread"));
468		}
469
470		/**
471		* A submitted privileged exception action runs to completion
472		*/
473	<	public void testSubmitPrivilegedExceptionAction() throws Throwable {
473	>	public void testSubmitPrivilegedExceptionAction() throws Exception {
474		Runnable r = new CheckedRunnable() {
475		public void realRun() throws Exception {
476		ExecutorService e = new ForkJoinPool(1);
#	Line 536 | Line 479 | public class ForkJoinPoolTest extends JS
479		return TEST_STRING;
480		}}));
481
482	<	Object result = future.get();
540	<	assertSame(TEST_STRING, result);
482	>	assertSame(TEST_STRING, future.get());
483		}};
484
485		runWithPermissions(r, new RuntimePermission("modifyThread"));
#	Line 546 | Line 488 | public class ForkJoinPoolTest extends JS
488		/**
489		* A submitted failed privileged exception action reports exception
490		*/
491	<	public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
491	>	public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
492		Runnable r = new CheckedRunnable() {
493		public void realRun() throws Exception {
494		ExecutorService e = new ForkJoinPool(1);
#	Line 556 | Line 498 | public class ForkJoinPoolTest extends JS
498		}}));
499
500		try {
501	<	Object result = future.get();
501	>	future.get();
502		shouldThrow();
503		} catch (ExecutionException success) {
504		assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
#	Line 569 | Line 511 | public class ForkJoinPoolTest extends JS
511		* execute(null runnable) throws NullPointerException
512		*/
513		public void testExecuteNullRunnable() {
514	+	ExecutorService e = new ForkJoinPool(1);
515		try {
516	<	ExecutorService e = new ForkJoinPool(1);
574	<	TrackedShortRunnable task = null;
575	<	Future<?> future = e.submit(task);
516	>	Future<?> future = e.submit((Runnable) null);
517		shouldThrow();
518	<	} catch (NullPointerException success) {}
518	>	} catch (NullPointerException success) {
519	>	} finally {
520	>	joinPool(e);
521	>	}
522		}
523
580	–
524		/**
525		* submit(null callable) throws NullPointerException
526		*/
527		public void testSubmitNullCallable() {
528	+	ExecutorService e = new ForkJoinPool(1);
529		try {
530	<	ExecutorService e = new ForkJoinPool(1);
587	<	StringTask t = null;
588	<	Future<String> future = e.submit(t);
530	>	Future<String> future = e.submit((Callable) null);
531		shouldThrow();
532	<	} catch (NullPointerException success) {}
532	>	} catch (NullPointerException success) {
533	>	} finally {
534	>	joinPool(e);
535	>	}
536		}
537
593	–
538		/**
539	<	* Blocking on submit(callable) throws InterruptedException if
596	<	* caller interrupted.
539	>	* submit(callable).get() throws InterruptedException if interrupted
540		*/
541		public void testInterruptedSubmit() throws InterruptedException {
542	<	final ForkJoinPool p = new ForkJoinPool(1);
543	<
544	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
545	<	public void realRun() throws Throwable {
546	<	p.submit(new CheckedCallable<Object>() {
547	<	public Object realCall() throws Throwable {
548	<	try {
549	<	Thread.sleep(MEDIUM_DELAY_MS);
550	<	} catch (InterruptedException ok) {
551	<	}
552	<	return null;
553	<	}}).get();
554	<	}});
555	<
556	<	t.start();
557	<	Thread.sleep(SHORT_DELAY_MS);
558	<	t.interrupt();
559	<	t.join();
560	<	p.shutdownNow();
561	<	joinPool(p);
542	>	final CountDownLatch submitted    = new CountDownLatch(1);
543	>	final CountDownLatch quittingTime = new CountDownLatch(1);
544	>	final ExecutorService p = new ForkJoinPool(1);
545	>	final Callable<Void> awaiter = new CheckedCallable<Void>() {
546	>	public Void realCall() throws InterruptedException {
547	>	assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
548	>	return null;
549	>	}};
550	>	try {
551	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
552	>	public void realRun() throws Exception {
553	>	Future<Void> future = p.submit(awaiter);
554	>	submitted.countDown();
555	>	future.get();
556	>	}});
557	>	t.start();
558	>	assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
559	>	t.interrupt();
560	>	t.join();
561	>	} finally {
562	>	quittingTime.countDown();
563	>	joinPool(p);
564	>	}
565		}
566
567		/**
#	Line 633 | Line 579 | public class ForkJoinPoolTest extends JS
579		shouldThrow();
580		} catch (ExecutionException success) {
581		assertTrue(success.getCause() instanceof ArithmeticException);
582	+	} finally {
583	+	joinPool(p);
584		}
637	–
638	–	joinPool(p);
585		}
586
587		/**
#	Line 817 | Line 763 | public class ForkJoinPoolTest extends JS
763		}
764		}
765
820	–
766		/**
767		* timed invokeAny(null) throws NullPointerException
768		*/

Diff Legend

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