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.6 by jsr166, Mon Aug 3 22:08:07 2009 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 170 | Line 186 | public class ForkJoinPoolTest extends JS
186		try {
187		new ForkJoinPool(-1);
188		shouldThrow();
189	<	}
174	<	catch (IllegalArgumentException success) {}
189	>	} catch (IllegalArgumentException success) {}
190		}
191
192		/**
#	Line 179 | 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) {
185	<	}
199	>	} catch (NullPointerException success) {}
200		}
201
202
#	Line 190 | Line 204 | public class ForkJoinPoolTest extends JS
204		* getParallelism returns size set in constructor
205		*/
206		public void testGetParallelism() {
207	<	ForkJoinPool p = null;
194	<	try {
195	<	p = new ForkJoinPool(1);
196	<	assertTrue(p.getParallelism() == 1);
197	<	} finally {
198	<	joinPool(p);
199	<	}
200	<	}
201	<
202	<	/**
203	<	* setParallelism changes reported parallelism level.
204	<	*/
205	<	public void testSetParallelism() {
206	<	ForkJoinPool p = null;
207	<	try {
208	<	p = new ForkJoinPool(1);
209	<	assertTrue(p.getParallelism() == 1);
210	<	p.setParallelism(2);
211	<	assertTrue(p.getParallelism() == 2);
212	<	} finally {
213	<	joinPool(p);
214	<	}
215	<	}
216	<
217	<	/**
218	<	* setParallelism with argument <= 0 throws exception
219	<	*/
220	<	public void testSetParallelism2() {
221	<	ForkJoinPool p = null;
207	>	ForkJoinPool p = new ForkJoinPool(1);
208		try {
209	<	p = new ForkJoinPool(1);
224	<	assertTrue(p.getParallelism() == 1);
225	<	p.setParallelism(-2);
226	<	shouldThrow();
227	<	} catch (IllegalArgumentException success) {
209	>	assertEquals(1, p.getParallelism());
210		} finally {
211		joinPool(p);
212		}
#	Line 234 | 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);
240	<	assertTrue(p.getPoolSize() == 0);
221	>	assertEquals(0, p.getActiveThreadCount());
222		Future<String> future = p.submit(new StringTask());
223	<	assertTrue(p.getPoolSize() == 1);
243	<
244	<	} finally {
245	<	joinPool(p);
246	<	}
247	<	}
248	<
249	<	/**
250	<	* setMaximumPoolSize changes size reported by getMaximumPoolSize.
251	<	*/
252	<	public void testSetMaximumPoolSize() {
253	<	ForkJoinPool p = null;
254	<	try {
255	<	p = new ForkJoinPool(1);
256	<	p.setMaximumPoolSize(2);
257	<	assertTrue(p.getMaximumPoolSize() == 2);
258	<	} finally {
259	<	joinPool(p);
260	<	}
261	<	}
262	<
263	<	/**
264	<	* setMaximumPoolSize with argument <= 0 throws exception
265	<	*/
266	<	public void testSetMaximumPoolSize2() {
267	<	ForkJoinPool p = null;
268	<	try {
269	<	p = new ForkJoinPool(1);
270	<	p.setMaximumPoolSize(-2);
271	<	shouldThrow();
272	<	} catch (IllegalArgumentException success) {
273	<	} finally {
274	<	joinPool(p);
275	<	}
276	<	}
277	<
278	<	/**
279	<	* setMaintainsParallelism changes policy reported by
280	<	* getMaintainsParallelism.
281	<	*/
282	<	public void testSetMaintainsParallelism() {
283	<	ForkJoinPool p = null;
284	<	try {
285	<	p = new ForkJoinPool(1);
286	<	p.setMaintainsParallelism(false);
287	<	assertFalse(p.getMaintainsParallelism());
288	<	} finally {
289	<	joinPool(p);
290	<	}
291	<	}
292	<
293	<	/**
294	<	* setAsyncMode changes policy reported by
295	<	* getAsyncMode.
296	<	*/
297	<	public void testSetAsyncMode() {
298	<	ForkJoinPool p = null;
299	<	try {
300	<	p = new ForkJoinPool(1);
301	<	p.setAsyncMode(true);
302	<	assertTrue(p.getAsyncMode());
223	>	assertEquals(1, p.getPoolSize());
224		} finally {
225		joinPool(p);
226		}
#	Line 312 | 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	<	}
327	<	}
328	<
329	<	/**
330	<	* setUncaughtExceptionHandler of null removes handler
331	<	*/
332	<	public void testSetUncaughtExceptionHandler2() {
333	<	ForkJoinPool p = null;
334	<	try {
335	<	p = new ForkJoinPool(1);
336	<	p.setUncaughtExceptionHandler(null);
337	<	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
343	–
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());
358	–	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 373 | 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 {
378	–	p = new ForkJoinPool(1);
287		ForkJoinTask<Integer> f = p.submit(new FibTask(8));
288	<	int r = f.get();
381	<	assertTrue(r == 21);
288	>	assertEquals(21, (int) f.get());
289		} finally {
290		joinPool(p);
291		}
#	Line 388 | 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 {
393	–	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 405 | 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 {
410	–	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);
416	<	int r = f.get();
417	<	assertTrue(r ==  832040);
321	>	assertEquals(6765, (int) f.get());
322		} finally {
323	<	joinPool(p);
323	>	p.shutdownNow(); // don't wait out shutdown
324		}
325		}
326
#	Line 424 | 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());
432	<	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 442 | 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());
450	<	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 468 | 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 481 | 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 491 | 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 501 | 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 to completion
433	>	* A submitted privileged action runs to completion
434		*/
435		public void testSubmitPrivilegedAction() throws Throwable {
436		Policy savedPolicy = null;
#	Line 521 | Line 443 | public class ForkJoinPoolTest extends JS
443		} catch (AccessControlException ok) {
444		return;
445		}
446	+
447		try {
448		ExecutorService e = new ForkJoinPool(1);
449	<	Future future = e.submit(Executors.callable(new PrivilegedAction() {
449	>	try {
450	>	Future future = e.submit(Executors.callable(new PrivilegedAction() {
451		public Object run() {
452		return TEST_STRING;
453		}}));
454
455	<	Object result = future.get();
456	<	assertSame(TEST_STRING, result);
457	<	}
458	<	finally {
455	>	Object result = future.get();
456	>	assertSame(TEST_STRING, result);
457	>	} finally {
458	>	joinPool(e);
459	>	}
460	>	} finally {
461		Policy.setPolicy(savedPolicy);
462		}
463		}
464
465		/**
466	<	* A submitted a privileged exception action runs to completion
466	>	* A submitted privileged exception action runs to completion
467		*/
468		public void testSubmitPrivilegedExceptionAction() throws Throwable {
469		Policy savedPolicy = null;
#	Line 553 | Line 479 | public class ForkJoinPoolTest extends JS
479
480		try {
481		ExecutorService e = new ForkJoinPool(1);
482	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
482	>	try {
483	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
484		public Object run() {
485		return TEST_STRING;
486		}}));
487
488	<	Object result = future.get();
489	<	assertSame(TEST_STRING, result);
490	<	}
491	<	finally {
488	>	Object result = future.get();
489	>	assertSame(TEST_STRING, result);
490	>	} finally {
491	>	joinPool(e);
492	>	}
493	>	} finally {
494		Policy.setPolicy(savedPolicy);
495		}
496		}
#	Line 581 | Line 510 | public class ForkJoinPoolTest extends JS
510		return;
511		}
512
584	–
513		try {
514		ExecutorService e = new ForkJoinPool(1);
515	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
515	>	try {
516	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
517		public Object run() throws Exception {
518		throw new IndexOutOfBoundsException();
519		}}));
520
521	<	Object result = future.get();
522	<	shouldThrow();
523	<	} catch (ExecutionException success) {
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		}
#	Line 601 | Line 534 | public class ForkJoinPoolTest extends JS
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);
606	<	TrackedShortRunnable task = null;
607	<	Future<?> future = e.submit(task);
539	>	Future<?> future = e.submit((Runnable) null);
540		shouldThrow();
541		} catch (NullPointerException success) {
542	+	} finally {
543	+	joinPool(e);
544		}
545		}
546
#	Line 615 | 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);
620	<	StringTask t = null;
621	<	Future<String> future = e.submit(t);
554	>	Future<String> future = e.submit((Callable) null);
555		shouldThrow();
556		} catch (NullPointerException success) {
557	+	} finally {
558	+	joinPool(e);
559		}
560		}
561
562
563		/**
564	<	* Blocking on submit(callable) throws InterruptedException if
630	<	* 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	<	void realRun() throws Throwable {
571	<	p.submit(new CheckedCallable<Object>() {
572	<	public Object realCall() throws Throwable {
573	<	Thread.sleep(MEDIUM_DELAY_MS);
574	<	return null;
575	<	}}).get();
576	<	}});
577	<
578	<	t.start();
579	<	Thread.sleep(SHORT_DELAY_MS);
580	<	t.interrupt();
581	<	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 653 | Line 595 | public class ForkJoinPoolTest extends JS
595		*/
596		public void testSubmitEE() throws Throwable {
597		ForkJoinPool p = new ForkJoinPool(1);
656	–
598		try {
599	<	Callable c = new Callable() {
600	<	public Object call() {
601	<	int i = 5/0;
602	<	return Boolean.TRUE;
603	<	}
663	<	};
664	<
665	<	for (int i = 0; i < 5; i++) {
666	<	p.submit(c).get();
667	<	}
599	>	p.submit(new Callable() {
600	>	public Object call() {
601	>	int i = 5/0;
602	>	return Boolean.TRUE;
603	>	}}).get();
604		shouldThrow();
605		} catch (ExecutionException success) {
606	+	assertTrue(success.getCause() instanceof ArithmeticException);
607	+	} finally {
608	+	joinPool(p);
609		}
671	–	joinPool(p);
610		}
611
612		/**
#	Line 700 | Line 638 | public class ForkJoinPoolTest extends JS
638		}
639
640		/**
641	<	* invokeAny(c) throws NullPointerException if c has null elements
641	>	* invokeAny(c) throws NullPointerException if c has a single null element
642		*/
643		public void testInvokeAny3() throws Throwable {
644		ExecutorService e = new ForkJoinPool(1);
645	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
646	+	l.add(null);
647		try {
708	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
709	–	l.add(new StringTask());
710	–	l.add(null);
648		e.invokeAny(l);
649		shouldThrow();
650		} catch (NullPointerException success) {
#	Line 717 | Line 654 | public class ForkJoinPoolTest extends JS
654		}
655
656		/**
657	<	* invokeAny(c) throws ExecutionException if no task in c completes
657	>	* invokeAny(c) throws NullPointerException if c has null elements
658		*/
659		public void testInvokeAny4() throws Throwable {
660	+	CountDownLatch latch = new CountDownLatch(1);
661		ExecutorService e = new ForkJoinPool(1);
662	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
663	+	l.add(latchAwaitingStringTask(latch));
664	+	l.add(null);
665	+	try {
666	+	e.invokeAny(l);
667	+	shouldThrow();
668	+	} catch (NullPointerException success) {
669	+	} finally {
670	+	latch.countDown();
671	+	joinPool(e);
672	+	}
673	+	}
674	+
675	+	/**
676	+	* invokeAny(c) throws ExecutionException if no task in c completes
677	+	*/
678	+	public void testInvokeAny5() throws Throwable {
679	+	ExecutorService e = new ForkJoinPool(1);
680	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
681	+	l.add(new NPETask());
682		try {
725	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
726	–	l.add(new NPETask());
683		e.invokeAny(l);
684		shouldThrow();
685		} catch (ExecutionException success) {
686	+	assertTrue(success.getCause() instanceof NullPointerException);
687		} finally {
688		joinPool(e);
689		}
#	Line 735 | Line 692 | public class ForkJoinPoolTest extends JS
692		/**
693		* invokeAny(c) returns result of some task in c if at least one completes
694		*/
695	<	public void testInvokeAny5() throws Throwable {
695	>	public void testInvokeAny6() throws Throwable {
696		ExecutorService e = new ForkJoinPool(1);
697		try {
698	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
698	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
699		l.add(new StringTask());
700		l.add(new StringTask());
701		String result = e.invokeAny(l);
#	Line 781 | Line 738 | public class ForkJoinPoolTest extends JS
738		*/
739		public void testInvokeAll3() throws InterruptedException {
740		ExecutorService e = new ForkJoinPool(1);
741	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
742	+	l.add(new StringTask());
743	+	l.add(null);
744		try {
785	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
786	–	l.add(new StringTask());
787	–	l.add(null);
745		e.invokeAll(l);
746		shouldThrow();
747		} catch (NullPointerException success) {
#	Line 799 | Line 756 | public class ForkJoinPoolTest extends JS
756		*/
757		public void testInvokeAll4() throws Throwable {
758		ExecutorService e = new ForkJoinPool(1);
759	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
760	+	l.add(new NPETask());
761	+	List<Future<String>> futures = e.invokeAll(l);
762	+	assertEquals(1, futures.size());
763		try {
764	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
804	<	l.add(new NPETask());
805	<	List<Future<String>> result = e.invokeAll(l);
806	<	assertEquals(1, result.size());
807	<	for (Future<String> future : result)
808	<	future.get();
764	>	futures.get(0).get();
765		shouldThrow();
766		} catch (ExecutionException success) {
767	+	assertTrue(success.getCause() instanceof NullPointerException);
768		} finally {
769		joinPool(e);
770		}
#	Line 819 | Line 776 | public class ForkJoinPoolTest extends JS
776		public void testInvokeAll5() throws Throwable {
777		ExecutorService e = new ForkJoinPool(1);
778		try {
779	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
779	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
780		l.add(new StringTask());
781		l.add(new StringTask());
782	<	List<Future<String>> result = e.invokeAll(l);
783	<	assertEquals(2, result.size());
784	<	for (Future<String> future : result)
782	>	List<Future<String>> futures = e.invokeAll(l);
783	>	assertEquals(2, futures.size());
784	>	for (Future<String> future : futures)
785		assertSame(TEST_STRING, future.get());
786		} finally {
787		joinPool(e);
#	Line 851 | Line 808 | public class ForkJoinPoolTest extends JS
808		*/
809		public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
810		ExecutorService e = new ForkJoinPool(1);
811	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
812	+	l.add(new StringTask());
813		try {
855	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
856	–	l.add(new StringTask());
814		e.invokeAny(l, MEDIUM_DELAY_MS, null);
815		shouldThrow();
816		} catch (NullPointerException success) {
#	Line 881 | Line 838 | public class ForkJoinPoolTest extends JS
838		* timed invokeAny(c) throws NullPointerException if c has null elements
839		*/
840		public void testTimedInvokeAny3() throws Throwable {
841	+	CountDownLatch latch = new CountDownLatch(1);
842		ExecutorService e = new ForkJoinPool(1);
843	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
844	+	l.add(latchAwaitingStringTask(latch));
845	+	l.add(null);
846		try {
886	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
887	–	l.add(new StringTask());
888	–	l.add(null);
847		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
848		shouldThrow();
849		} catch (NullPointerException success) {
850		} finally {
851	+	latch.countDown();
852		joinPool(e);
853		}
854		}
#	Line 899 | Line 858 | public class ForkJoinPoolTest extends JS
858		*/
859		public void testTimedInvokeAny4() throws Throwable {
860		ExecutorService e = new ForkJoinPool(1);
861	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
862	+	l.add(new NPETask());
863		try {
903	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
904	–	l.add(new NPETask());
864		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
865		shouldThrow();
866		} catch (ExecutionException success) {
867	+	assertTrue(success.getCause() instanceof NullPointerException);
868		} finally {
869		joinPool(e);
870		}
#	Line 916 | Line 876 | public class ForkJoinPoolTest extends JS
876		public void testTimedInvokeAny5() throws Throwable {
877		ExecutorService e = new ForkJoinPool(1);
878		try {
879	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
879	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
880		l.add(new StringTask());
881		l.add(new StringTask());
882		String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
#	Line 945 | Line 905 | public class ForkJoinPoolTest extends JS
905		*/
906		public void testTimedInvokeAllNullTimeUnit() throws Throwable {
907		ExecutorService e = new ForkJoinPool(1);
908	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
909	+	l.add(new StringTask());
910		try {
949	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
950	–	l.add(new StringTask());
911		e.invokeAll(l, MEDIUM_DELAY_MS, null);
912		shouldThrow();
913		} catch (NullPointerException success) {
#	Line 976 | Line 936 | public class ForkJoinPoolTest extends JS
936		*/
937		public void testTimedInvokeAll3() throws InterruptedException {
938		ExecutorService e = new ForkJoinPool(1);
939	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
940	+	l.add(new StringTask());
941	+	l.add(null);
942		try {
980	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
981	–	l.add(new StringTask());
982	–	l.add(null);
943		e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
944		shouldThrow();
945		} catch (NullPointerException success) {
#	Line 993 | Line 953 | public class ForkJoinPoolTest extends JS
953		*/
954		public void testTimedInvokeAll4() throws Throwable {
955		ExecutorService e = new ForkJoinPool(1);
956	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
957	+	l.add(new NPETask());
958	+	List<Future<String>> futures
959	+	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
960	+	assertEquals(1, futures.size());
961		try {
962	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
998	<	l.add(new NPETask());
999	<	List<Future<String>> result
1000	<	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1001	<	assertEquals(1, result.size());
1002	<	for (Future<String> future : result)
1003	<	future.get();
962	>	futures.get(0).get();
963		shouldThrow();
964		} catch (ExecutionException success) {
965	+	assertTrue(success.getCause() instanceof NullPointerException);
966		} finally {
967		joinPool(e);
968		}
#	Line 1014 | Line 974 | public class ForkJoinPoolTest extends JS
974		public void testTimedInvokeAll5() throws Throwable {
975		ExecutorService e = new ForkJoinPool(1);
976		try {
977	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
977	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
978		l.add(new StringTask());
979		l.add(new StringTask());
980	<	List<Future<String>> result
980	>	List<Future<String>> futures
981		= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
982	<	assertEquals(2, result.size());
983	<	for (Future<String> future : result)
982	>	assertEquals(2, futures.size());
983	>	for (Future<String> future : futures)
984		assertSame(TEST_STRING, future.get());
985		} finally {
986		joinPool(e);

Diff Legend

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