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.18 by dl, Mon Feb 22 11:25:16 2010 UTC vs.
Revision 1.44 by dl, Tue Jan 10 13:48:27 2012 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;
236	<	try {
237	<	p = new ForkJoinPool(1, new FailingThreadFactory());
238	<	MyHandler eh = new MyHandler();
239	<	p.setUncaughtExceptionHandler(eh);
240	<	assertEquals(eh, p.getUncaughtExceptionHandler());
241	<	p.execute(new FailingTask());
242	<	Thread.sleep(MEDIUM_DELAY_MS);
243	<	assertTrue(eh.catches > 0);
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	>	assertSame(eh, p.getUncaughtExceptionHandler());
245	>	try {
246	>	p.execute(new FibTask(8));
247	>	assertTrue(uehInvoked.await(10000, MILLISECONDS));
248	>	} catch(RejectedExecutionException ok) {
249	>	}
250		} finally {
251	+	p.shutdownNow(); // failure might have prevented processing task
252		joinPool(p);
253		}
254		}
255
256		/**
257	<	* setUncaughtExceptionHandler of null removes handler
257	>	* After invoking a single task, isQuiescent eventually becomes
258	>	* true, at which time queues are empty, threads are not active,
259	>	* the task has completed successfully, and construction
260	>	* parameters continue to hold
261		*/
262	<	public void testSetUncaughtExceptionHandler2() {
263	<	ForkJoinPool p = null;
262	>	public void testIsQuiescent() throws Exception {
263	>	ForkJoinPool p = new ForkJoinPool(2);
264		try {
265	<	p = new ForkJoinPool(1);
266	<	p.setUncaughtExceptionHandler(null);
267	<	assertNull(p.getUncaughtExceptionHandler());
268	<	} finally {
269	<	joinPool(p);
270	<	}
271	<	}
272	<
265	>	assertTrue(p.isQuiescent());
266	>	long startTime = System.nanoTime();
267	>	FibTask f = new FibTask(20);
268	>	p.invoke(f);
269	>	assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
270	>	p.getFactory());
271	>	while (! p.isQuiescent()) {
272	>	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
273	>	throw new AssertionFailedError("timed out");
274	>	assertFalse(p.getAsyncMode());
275	>	assertFalse(p.isShutdown());
276	>	assertFalse(p.isTerminating());
277	>	assertFalse(p.isTerminated());
278	>	Thread.yield();
279	>	}
280
342	–	/**
343	–	* After invoking a single task, isQuiescent is true,
344	–	* queues are empty, threads are not active, and
345	–	* construction parameters continue to hold
346	–	*/
347	–	public void testisQuiescent() throws InterruptedException {
348	–	ForkJoinPool p = null;
349	–	try {
350	–	p = new ForkJoinPool(2);
351	–	p.invoke(new FibTask(20));
352	–	assertTrue(p.getFactory() ==
353	–	ForkJoinPool.defaultForkJoinWorkerThreadFactory);
354	–	Thread.sleep(MEDIUM_DELAY_MS);
281		assertTrue(p.isQuiescent());
356	–	assertTrue(p.getMaintainsParallelism());
282		assertFalse(p.getAsyncMode());
283	<	assertTrue(p.getActiveThreadCount() == 0);
284	<	assertTrue(p.getQueuedTaskCount() == 0);
285	<	assertTrue(p.getQueuedSubmissionCount() == 0);
283	>	assertEquals(0, p.getActiveThreadCount());
284	>	assertEquals(0, p.getQueuedTaskCount());
285	>	assertEquals(0, p.getQueuedSubmissionCount());
286		assertFalse(p.hasQueuedSubmissions());
287		assertFalse(p.isShutdown());
288		assertFalse(p.isTerminating());
289		assertFalse(p.isTerminated());
290	+	assertTrue(f.isDone());
291	+	assertEquals(6765, (int) f.get());
292		} finally {
293		joinPool(p);
294		}
#	Line 371 | Line 298 | public class ForkJoinPoolTest extends JS
298		* Completed submit(ForkJoinTask) returns result
299		*/
300		public void testSubmitForkJoinTask() throws Throwable {
301	<	ForkJoinPool p = null;
301	>	ForkJoinPool p = new ForkJoinPool(1);
302		try {
376	–	p = new ForkJoinPool(1);
303		ForkJoinTask<Integer> f = p.submit(new FibTask(8));
304	<	int r = f.get();
379	<	assertTrue(r == 21);
304	>	assertEquals(21, (int) f.get());
305		} finally {
306		joinPool(p);
307		}
#	Line 386 | Line 311 | public class ForkJoinPoolTest extends JS
311		* A task submitted after shutdown is rejected
312		*/
313		public void testSubmitAfterShutdown() {
314	<	ForkJoinPool p = null;
314	>	ForkJoinPool p = new ForkJoinPool(1);
315		try {
391	–	p = new ForkJoinPool(1);
316		p.shutdown();
317		assertTrue(p.isShutdown());
318	<	ForkJoinTask<Integer> f = p.submit(new FibTask(8));
319	<	shouldThrow();
320	<	} catch (RejectedExecutionException success) {
318	>	try {
319	>	ForkJoinTask<Integer> f = p.submit(new FibTask(8));
320	>	shouldThrow();
321	>	} catch (RejectedExecutionException success) {}
322		} finally {
323		joinPool(p);
324		}
#	Line 403 | Line 328 | public class ForkJoinPoolTest extends JS
328		* Pool maintains parallelism when using ManagedBlocker
329		*/
330		public void testBlockingForkJoinTask() throws Throwable {
331	<	ForkJoinPool p = null;
331	>	ForkJoinPool p = new ForkJoinPool(4);
332		try {
408	–	p = new ForkJoinPool(4);
333		ReentrantLock lock = new ReentrantLock();
334		ManagedLocker locker = new ManagedLocker(lock);
335	<	ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
335	>	ForkJoinTask<Integer> f = new LockingFibTask(20, locker, lock);
336		p.execute(f);
337	<	assertTrue(p.getPoolSize() >= 4);
414	<	int r = f.get();
415	<	assertTrue(r == 832040);
337	>	assertEquals(6765, (int) f.get());
338		} finally {
339		p.shutdownNow(); // don't wait out shutdown
340		}
#	Line 422 | Line 344 | public class ForkJoinPoolTest extends JS
344		* pollSubmission returns unexecuted submitted task, if present
345		*/
346		public void testPollSubmission() {
347	<	SubFJP p = null;
347	>	final CountDownLatch done = new CountDownLatch(1);
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());
430	<	ForkJoinTask c = p.submit(new MediumRunnable());
350	>	ForkJoinTask a = p.submit(awaiter(done));
351	>	ForkJoinTask b = p.submit(awaiter(done));
352	>	ForkJoinTask c = p.submit(awaiter(done));
353		ForkJoinTask r = p.pollSubmission();
354		assertTrue(r == a || r == b || r == c);
355		assertFalse(r.isDone());
356		} finally {
357	+	done.countDown();
358		joinPool(p);
359		}
360		}
#	Line 440 | Line 363 | public class ForkJoinPoolTest extends JS
363		* drainTasksTo transfers unexecuted submitted tasks, if present
364		*/
365		public void testDrainTasksTo() {
366	<	SubFJP p = null;
366	>	final CountDownLatch done = new CountDownLatch(1);
367	>	SubFJP p = new SubFJP();
368		try {
369	<	p = new SubFJP();
370	<	ForkJoinTask a = p.submit(new MediumRunnable());
371	<	ForkJoinTask b = p.submit(new MediumRunnable());
448	<	ForkJoinTask c = p.submit(new MediumRunnable());
369	>	ForkJoinTask a = p.submit(awaiter(done));
370	>	ForkJoinTask b = p.submit(awaiter(done));
371	>	ForkJoinTask c = p.submit(awaiter(done));
372		ArrayList<ForkJoinTask> al = new ArrayList();
373		p.drainTasksTo(al);
374		assertTrue(al.size() > 0);
#	Line 454 | Line 377 | public class ForkJoinPoolTest extends JS
377		assertFalse(r.isDone());
378		}
379		} finally {
380	+	done.countDown();
381		joinPool(p);
382		}
383		}
384
461	–
385		// FJ Versions of AbstractExecutorService tests
386
387		/**
#	Line 466 | Line 389 | public class ForkJoinPoolTest extends JS
389		*/
390		public void testExecuteRunnable() throws Throwable {
391		ExecutorService e = new ForkJoinPool(1);
392	<	TrackedShortRunnable task = new TrackedShortRunnable();
393	<	assertFalse(task.done);
394	<	Future<?> future = e.submit(task);
395	<	future.get();
396	<	assertTrue(task.done);
392	>	try {
393	>	final AtomicBoolean done = new AtomicBoolean(false);
394	>	CheckedRunnable task = new CheckedRunnable() {
395	>	public void realRun() {
396	>	done.set(true);
397	>	}};
398	>	Future<?> future = e.submit(task);
399	>	assertNull(future.get());
400	>	assertNull(future.get(0, MILLISECONDS));
401	>	assertTrue(done.get());
402	>	assertTrue(future.isDone());
403	>	assertFalse(future.isCancelled());
404	>	} finally {
405	>	joinPool(e);
406	>	}
407		}
408
476	–
409		/**
410		* Completed submit(callable) returns result
411		*/
412		public void testSubmitCallable() throws Throwable {
413		ExecutorService e = new ForkJoinPool(1);
414	<	Future<String> future = e.submit(new StringTask());
415	<	String result = future.get();
416	<	assertSame(TEST_STRING, result);
414	>	try {
415	>	Future<String> future = e.submit(new StringTask());
416	>	assertSame(TEST_STRING, future.get());
417	>	assertTrue(future.isDone());
418	>	assertFalse(future.isCancelled());
419	>	} finally {
420	>	joinPool(e);
421	>	}
422		}
423
424		/**
#	Line 489 | Line 426 | public class ForkJoinPoolTest extends JS
426		*/
427		public void testSubmitRunnable() throws Throwable {
428		ExecutorService e = new ForkJoinPool(1);
429	<	Future<?> future = e.submit(new NoOpRunnable());
430	<	future.get();
431	<	assertTrue(future.isDone());
429	>	try {
430	>	Future<?> future = e.submit(new NoOpRunnable());
431	>	assertNull(future.get());
432	>	assertTrue(future.isDone());
433	>	assertFalse(future.isCancelled());
434	>	} finally {
435	>	joinPool(e);
436	>	}
437		}
438
439		/**
#	Line 499 | Line 441 | public class ForkJoinPoolTest extends JS
441		*/
442		public void testSubmitRunnable2() throws Throwable {
443		ExecutorService e = new ForkJoinPool(1);
444	<	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
445	<	String result = future.get();
446	<	assertSame(TEST_STRING, result);
444	>	try {
445	>	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
446	>	assertSame(TEST_STRING, future.get());
447	>	assertTrue(future.isDone());
448	>	assertFalse(future.isCancelled());
449	>	} finally {
450	>	joinPool(e);
451	>	}
452		}
453
454		/**
455		* A submitted privileged action runs to completion
456		*/
457	<	public void testSubmitPrivilegedAction() throws Throwable {
457	>	public void testSubmitPrivilegedAction() throws Exception {
458		Runnable r = new CheckedRunnable() {
459		public void realRun() throws Exception {
460		ExecutorService e = new ForkJoinPool(1);
#	Line 516 | Line 463 | public class ForkJoinPoolTest extends JS
463		return TEST_STRING;
464		}}));
465
466	<	Object result = future.get();
520	<	assertSame(TEST_STRING, result);
466	>	assertSame(TEST_STRING, future.get());
467		}};
468
469	<	runWithPermissions(r, new RuntimePermission("modifyThread"));
469	>	runWithPermissions(r,
470	>	new RuntimePermission("modifyThread"));
471		}
472
473		/**
474		* A submitted privileged exception action runs to completion
475		*/
476	<	public void testSubmitPrivilegedExceptionAction() throws Throwable {
476	>	public void testSubmitPrivilegedExceptionAction() throws Exception {
477		Runnable r = new CheckedRunnable() {
478		public void realRun() throws Exception {
479		ExecutorService e = new ForkJoinPool(1);
#	Line 535 | Line 482 | public class ForkJoinPoolTest extends JS
482		return TEST_STRING;
483		}}));
484
485	<	Object result = future.get();
539	<	assertSame(TEST_STRING, result);
485	>	assertSame(TEST_STRING, future.get());
486		}};
487
488		runWithPermissions(r, new RuntimePermission("modifyThread"));
#	Line 545 | Line 491 | public class ForkJoinPoolTest extends JS
491		/**
492		* A submitted failed privileged exception action reports exception
493		*/
494	<	public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
494	>	public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
495		Runnable r = new CheckedRunnable() {
496		public void realRun() throws Exception {
497		ExecutorService e = new ForkJoinPool(1);
#	Line 555 | Line 501 | public class ForkJoinPoolTest extends JS
501		}}));
502
503		try {
504	<	Object result = future.get();
504	>	future.get();
505		shouldThrow();
506		} catch (ExecutionException success) {
507		assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
#	Line 568 | Line 514 | public class ForkJoinPoolTest extends JS
514		* execute(null runnable) throws NullPointerException
515		*/
516		public void testExecuteNullRunnable() {
517	+	ExecutorService e = new ForkJoinPool(1);
518		try {
519	<	ExecutorService e = new ForkJoinPool(1);
573	<	TrackedShortRunnable task = null;
574	<	Future<?> future = e.submit(task);
519	>	Future<?> future = e.submit((Runnable) null);
520		shouldThrow();
521	<	} catch (NullPointerException success) {}
521	>	} catch (NullPointerException success) {
522	>	} finally {
523	>	joinPool(e);
524	>	}
525		}
526
579	–
527		/**
528		* submit(null callable) throws NullPointerException
529		*/
530		public void testSubmitNullCallable() {
531	+	ExecutorService e = new ForkJoinPool(1);
532		try {
533	<	ExecutorService e = new ForkJoinPool(1);
586	<	StringTask t = null;
587	<	Future<String> future = e.submit(t);
533	>	Future<String> future = e.submit((Callable) null);
534		shouldThrow();
535	<	} catch (NullPointerException success) {}
535	>	} catch (NullPointerException success) {
536	>	} finally {
537	>	joinPool(e);
538	>	}
539		}
540
592	–
541		/**
542	<	* Blocking on submit(callable) throws InterruptedException if
595	<	* caller interrupted.
542	>	* submit(callable).get() throws InterruptedException if interrupted
543		*/
544		public void testInterruptedSubmit() throws InterruptedException {
545	<	final ForkJoinPool p = new ForkJoinPool(1);
546	<
547	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
548	<	public void realRun() throws Throwable {
549	<	p.submit(new CheckedCallable<Object>() {
550	<	public Object realCall() throws Throwable {
551	<	try {
552	<	Thread.sleep(MEDIUM_DELAY_MS);
553	<	} catch (InterruptedException ok) {
554	<	}
555	<	return null;
556	<	}}).get();
557	<	}});
558	<
559	<	t.start();
560	<	Thread.sleep(SHORT_DELAY_MS);
561	<	t.interrupt();
562	<	t.join();
563	<	p.shutdownNow();
564	<	joinPool(p);
545	>	final CountDownLatch submitted    = new CountDownLatch(1);
546	>	final CountDownLatch quittingTime = new CountDownLatch(1);
547	>	final ExecutorService p = new ForkJoinPool(1);
548	>	final Callable<Void> awaiter = new CheckedCallable<Void>() {
549	>	public Void realCall() throws InterruptedException {
550	>	assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
551	>	return null;
552	>	}};
553	>	try {
554	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
555	>	public void realRun() throws Exception {
556	>	Future<Void> future = p.submit(awaiter);
557	>	submitted.countDown();
558	>	future.get();
559	>	}});
560	>	t.start();
561	>	assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
562	>	t.interrupt();
563	>	t.join();
564	>	} finally {
565	>	quittingTime.countDown();
566	>	joinPool(p);
567	>	}
568		}
569
570		/**
#	Line 632 | Line 582 | public class ForkJoinPoolTest extends JS
582		shouldThrow();
583		} catch (ExecutionException success) {
584		assertTrue(success.getCause() instanceof ArithmeticException);
585	+	} finally {
586	+	joinPool(p);
587		}
636	–
637	–	joinPool(p);
588		}
589
590		/**
#	Line 816 | Line 766 | public class ForkJoinPoolTest extends JS
766		}
767		}
768
819	–
769		/**
770		* timed invokeAny(null) throws NullPointerException
771		*/

Diff Legend

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