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.27 by jsr166, Fri Sep 17 01:04:10 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;
236	>	final CountDownLatch uncaughtExceptionHappened = new CountDownLatch(1);
237	>	final Thread.UncaughtExceptionHandler eh =
238	>	new Thread.UncaughtExceptionHandler() {
239	>	public void uncaughtException(Thread t, Throwable e) {
240	>	uncaughtExceptionHappened.countDown();
241	>	}};
242	>	ForkJoinPool p = new ForkJoinPool(1, new FailingThreadFactory(),
243	>	eh, false);
244		try {
245	<	p = new ForkJoinPool(1, new FailingThreadFactory());
318	<	MyHandler eh = new MyHandler();
319	<	p.setUncaughtExceptionHandler(eh);
320	<	assertEquals(eh, p.getUncaughtExceptionHandler());
245	>	assertSame(eh, p.getUncaughtExceptionHandler());
246		p.execute(new FailingTask());
247	<	Thread.sleep(MEDIUM_DELAY_MS);
323	<	assertTrue(eh.catches > 0);
324	<	} finally {
325	<	joinPool(p);
326	<	}
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());
247	>	uncaughtExceptionHappened.await();
248		} finally {
249	+	//p.shutdownNow();
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 {
352	–	p = new ForkJoinPool(2);
262		p.invoke(new FibTask(20));
263	<	assertTrue(p.getFactory() ==
264	<	ForkJoinPool.defaultForkJoinWorkerThreadFactory);
263	>	assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
264	>	p.getFactory());
265		Thread.sleep(MEDIUM_DELAY_MS);
266		assertTrue(p.isQuiescent());
358	–	assertTrue(p.getMaintainsParallelism());
267		assertFalse(p.getAsyncMode());
268	<	assertTrue(p.getActiveThreadCount() == 0);
269	<	assertTrue(p.getQueuedTaskCount() == 0);
270	<	assertTrue(p.getQueuedSubmissionCount() == 0);
268	>	assertEquals(0, p.getActiveThreadCount());
269	>	assertEquals(0, p.getQueuedTaskCount());
270	>	assertEquals(0, p.getQueuedSubmissionCount());
271		assertFalse(p.hasQueuedSubmissions());
272		assertFalse(p.isShutdown());
273		assertFalse(p.isTerminating());
#	Line 373 | Line 281 | public class ForkJoinPoolTest extends JS
281		* Completed submit(ForkJoinTask) returns result
282		*/
283		public void testSubmitForkJoinTask() throws Throwable {
284	<	ForkJoinPool p = null;
284	>	ForkJoinPool p = new ForkJoinPool(1);
285		try {
378	–	p = new ForkJoinPool(1);
286		ForkJoinTask<Integer> f = p.submit(new FibTask(8));
287	<	int r = f.get();
381	<	assertTrue(r == 21);
287	>	assertEquals(21, (int) f.get());
288		} finally {
289		joinPool(p);
290		}
#	Line 388 | Line 294 | public class ForkJoinPoolTest extends JS
294		* A task submitted after shutdown is rejected
295		*/
296		public void testSubmitAfterShutdown() {
297	<	ForkJoinPool p = null;
297	>	ForkJoinPool p = new ForkJoinPool(1);
298		try {
393	–	p = new ForkJoinPool(1);
299		p.shutdown();
300		assertTrue(p.isShutdown());
301	<	ForkJoinTask<Integer> f = p.submit(new FibTask(8));
302	<	shouldThrow();
303	<	} catch (RejectedExecutionException success) {
301	>	try {
302	>	ForkJoinTask<Integer> f = p.submit(new FibTask(8));
303	>	shouldThrow();
304	>	} catch (RejectedExecutionException success) {}
305		} finally {
306		joinPool(p);
307		}
#	Line 405 | Line 311 | public class ForkJoinPoolTest extends JS
311		* Pool maintains parallelism when using ManagedBlocker
312		*/
313		public void testBlockingForkJoinTask() throws Throwable {
314	<	ForkJoinPool p = null;
314	>	ForkJoinPool p = new ForkJoinPool(4);
315		try {
410	–	p = new ForkJoinPool(4);
316		ReentrantLock lock = new ReentrantLock();
317		ManagedLocker locker = new ManagedLocker(lock);
318		ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
319		p.execute(f);
320	<	assertTrue(p.getPoolSize() >= 4);
416	<	int r = f.get();
417	<	assertTrue(r ==  832040);
320	>	assertEquals(832040, (int) f.get());
321		} finally {
322	<	joinPool(p);
322	>	p.shutdownNow(); // don't wait out shutdown
323		}
324		}
325
#	Line 424 | Line 327 | public class ForkJoinPoolTest extends JS
327		* pollSubmission returns unexecuted submitted task, if present
328		*/
329		public void testPollSubmission() {
330	<	SubFJP p = null;
330	>	SubFJP p = new SubFJP();
331		try {
429	–	p = new SubFJP();
332		ForkJoinTask a = p.submit(new MediumRunnable());
333		ForkJoinTask b = p.submit(new MediumRunnable());
334		ForkJoinTask c = p.submit(new MediumRunnable());
#	Line 442 | Line 344 | public class ForkJoinPoolTest extends JS
344		* drainTasksTo transfers unexecuted submitted tasks, if present
345		*/
346		public void testDrainTasksTo() {
347	<	SubFJP p = null;
347	>	SubFJP p = new SubFJP();
348		try {
447	–	p = new SubFJP();
349		ForkJoinTask a = p.submit(new MediumRunnable());
350		ForkJoinTask b = p.submit(new MediumRunnable());
351		ForkJoinTask c = p.submit(new MediumRunnable());
#	Line 468 | Line 369 | public class ForkJoinPoolTest extends JS
369		*/
370		public void testExecuteRunnable() throws Throwable {
371		ExecutorService e = new ForkJoinPool(1);
372	<	TrackedShortRunnable task = new TrackedShortRunnable();
373	<	assertFalse(task.done);
374	<	Future<?> future = e.submit(task);
375	<	future.get();
376	<	assertTrue(task.done);
372	>	try {
373	>	TrackedShortRunnable task = new TrackedShortRunnable();
374	>	assertFalse(task.done);
375	>	Future<?> future = e.submit(task);
376	>	future.get();
377	>	assertTrue(task.done);
378	>	} finally {
379	>	joinPool(e);
380	>	}
381		}
382
383
#	Line 481 | Line 386 | public class ForkJoinPoolTest extends JS
386		*/
387		public void testSubmitCallable() throws Throwable {
388		ExecutorService e = new ForkJoinPool(1);
389	<	Future<String> future = e.submit(new StringTask());
390	<	String result = future.get();
391	<	assertSame(TEST_STRING, result);
389	>	try {
390	>	Future<String> future = e.submit(new StringTask());
391	>	String result = future.get();
392	>	assertSame(TEST_STRING, result);
393	>	} finally {
394	>	joinPool(e);
395	>	}
396		}
397
398		/**
#	Line 491 | Line 400 | public class ForkJoinPoolTest extends JS
400		*/
401		public void testSubmitRunnable() throws Throwable {
402		ExecutorService e = new ForkJoinPool(1);
403	<	Future<?> future = e.submit(new NoOpRunnable());
404	<	future.get();
405	<	assertTrue(future.isDone());
403	>	try {
404	>	Future<?> future = e.submit(new NoOpRunnable());
405	>	future.get();
406	>	assertTrue(future.isDone());
407	>	} finally {
408	>	joinPool(e);
409	>	}
410		}
411
412		/**
#	Line 501 | Line 414 | public class ForkJoinPoolTest extends JS
414		*/
415		public void testSubmitRunnable2() throws Throwable {
416		ExecutorService e = new ForkJoinPool(1);
417	<	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
418	<	String result = future.get();
419	<	assertSame(TEST_STRING, result);
417	>	try {
418	>	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
419	>	String result = future.get();
420	>	assertSame(TEST_STRING, result);
421	>	} finally {
422	>	joinPool(e);
423	>	}
424		}
425
426
#	Line 521 | Line 438 | public class ForkJoinPoolTest extends JS
438		} catch (AccessControlException ok) {
439		return;
440		}
441	+
442		try {
443		ExecutorService e = new ForkJoinPool(1);
444	<	Future future = e.submit(Executors.callable(new PrivilegedAction() {
444	>	try {
445	>	Future future = e.submit(Executors.callable(new PrivilegedAction() {
446		public Object run() {
447		return TEST_STRING;
448		}}));
449
450	<	Object result = future.get();
451	<	assertSame(TEST_STRING, result);
452	<	}
453	<	finally {
450	>	Object result = future.get();
451	>	assertSame(TEST_STRING, result);
452	>	} finally {
453	>	joinPool(e);
454	>	}
455	>	} finally {
456		Policy.setPolicy(savedPolicy);
457		}
458		}
#	Line 553 | Line 474 | public class ForkJoinPoolTest extends JS
474
475		try {
476		ExecutorService e = new ForkJoinPool(1);
477	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
477	>	try {
478	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
479		public Object run() {
480		return TEST_STRING;
481		}}));
482
483	<	Object result = future.get();
484	<	assertSame(TEST_STRING, result);
485	<	}
486	<	finally {
483	>	Object result = future.get();
484	>	assertSame(TEST_STRING, result);
485	>	} finally {
486	>	joinPool(e);
487	>	}
488	>	} finally {
489		Policy.setPolicy(savedPolicy);
490		}
491		}
#	Line 581 | Line 505 | public class ForkJoinPoolTest extends JS
505		return;
506		}
507
584	–
508		try {
509		ExecutorService e = new ForkJoinPool(1);
510	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
510	>	try {
511	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
512		public Object run() throws Exception {
513		throw new IndexOutOfBoundsException();
514		}}));
515
516	<	Object result = future.get();
517	<	shouldThrow();
518	<	} catch (ExecutionException success) {
516	>	Object result = future.get();
517	>	shouldThrow();
518	>	} catch (ExecutionException success) {
519	>	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
520	>	} finally {
521	>	joinPool(e);
522	>	}
523		} finally {
524		Policy.setPolicy(savedPolicy);
525		}
#	Line 601 | Line 529 | public class ForkJoinPoolTest extends JS
529		* execute(null runnable) throws NullPointerException
530		*/
531		public void testExecuteNullRunnable() {
532	+	ExecutorService e = new ForkJoinPool(1);
533	+	TrackedShortRunnable task = null;
534		try {
605	–	ExecutorService e = new ForkJoinPool(1);
606	–	TrackedShortRunnable task = null;
535		Future<?> future = e.submit(task);
536		shouldThrow();
537		} catch (NullPointerException success) {
538	+	} finally {
539	+	joinPool(e);
540		}
541		}
542
#	Line 615 | Line 545 | public class ForkJoinPoolTest extends JS
545		* submit(null callable) throws NullPointerException
546		*/
547		public void testSubmitNullCallable() {
548	+	ExecutorService e = new ForkJoinPool(1);
549	+	StringTask t = null;
550		try {
619	–	ExecutorService e = new ForkJoinPool(1);
620	–	StringTask t = null;
551		Future<String> future = e.submit(t);
552		shouldThrow();
553		} catch (NullPointerException success) {
554	+	} finally {
555	+	joinPool(e);
556		}
557		}
558
559
560		/**
561	<	* Blocking on submit(callable) throws InterruptedException if
630	<	* caller interrupted.
561	>	* submit(callable).get() throws InterruptedException if interrupted
562		*/
563		public void testInterruptedSubmit() throws InterruptedException {
564	<	final ForkJoinPool p = new ForkJoinPool(1);
565	<
566	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
567	<	void realRun() throws Throwable {
568	<	p.submit(new CheckedCallable<Object>() {
569	<	public Object realCall() throws Throwable {
570	<	Thread.sleep(MEDIUM_DELAY_MS);
571	<	return null;
572	<	}}).get();
573	<	}});
574	<
575	<	t.start();
576	<	Thread.sleep(SHORT_DELAY_MS);
577	<	t.interrupt();
578	<	joinPool(p);
564	>	final CountDownLatch submitted    = new CountDownLatch(1);
565	>	final CountDownLatch quittingTime = new CountDownLatch(1);
566	>	final ExecutorService p = new ForkJoinPool(1);
567	>	final Callable<Void> awaiter = new CheckedCallable<Void>() {
568	>	public Void realCall() throws InterruptedException {
569	>	assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
570	>	return null;
571	>	}};
572	>	try {
573	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
574	>	public void realRun() throws Exception {
575	>	Future<Void> future = p.submit(awaiter);
576	>	submitted.countDown();
577	>	future.get();
578	>	}});
579	>	t.start();
580	>	assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
581	>	t.interrupt();
582	>	t.join();
583	>	} finally {
584	>	quittingTime.countDown();
585	>	joinPool(p);
586	>	}
587		}
588
589		/**
#	Line 653 | Line 592 | public class ForkJoinPoolTest extends JS
592		*/
593		public void testSubmitEE() throws Throwable {
594		ForkJoinPool p = new ForkJoinPool(1);
656	–
595		try {
596	<	Callable c = new Callable() {
597	<	public Object call() {
598	<	int i = 5/0;
599	<	return Boolean.TRUE;
600	<	}
663	<	};
664	<
665	<	for (int i = 0; i < 5; i++) {
666	<	p.submit(c).get();
667	<	}
596	>	p.submit(new Callable() {
597	>	public Object call() {
598	>	int i = 5/0;
599	>	return Boolean.TRUE;
600	>	}}).get();
601		shouldThrow();
602		} catch (ExecutionException success) {
603	+	assertTrue(success.getCause() instanceof ArithmeticException);
604	+	} finally {
605	+	joinPool(p);
606		}
671	–	joinPool(p);
607		}
608
609		/**
#	Line 700 | Line 635 | public class ForkJoinPoolTest extends JS
635		}
636
637		/**
638	<	* invokeAny(c) throws NullPointerException if c has null elements
638	>	* invokeAny(c) throws NullPointerException if c has a single null element
639		*/
640		public void testInvokeAny3() throws Throwable {
641		ExecutorService e = new ForkJoinPool(1);
642	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
643	+	l.add(null);
644		try {
708	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
709	–	l.add(new StringTask());
710	–	l.add(null);
645		e.invokeAny(l);
646		shouldThrow();
647		} catch (NullPointerException success) {
#	Line 717 | Line 651 | public class ForkJoinPoolTest extends JS
651		}
652
653		/**
654	<	* invokeAny(c) throws ExecutionException if no task in c completes
654	>	* invokeAny(c) throws NullPointerException if c has null elements
655		*/
656		public void testInvokeAny4() throws Throwable {
657	+	CountDownLatch latch = new CountDownLatch(1);
658		ExecutorService e = new ForkJoinPool(1);
659	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
660	+	l.add(latchAwaitingStringTask(latch));
661	+	l.add(null);
662	+	try {
663	+	e.invokeAny(l);
664	+	shouldThrow();
665	+	} catch (NullPointerException success) {
666	+	} finally {
667	+	latch.countDown();
668	+	joinPool(e);
669	+	}
670	+	}
671	+
672	+	/**
673	+	* invokeAny(c) throws ExecutionException if no task in c completes
674	+	*/
675	+	public void testInvokeAny5() throws Throwable {
676	+	ExecutorService e = new ForkJoinPool(1);
677	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
678	+	l.add(new NPETask());
679		try {
725	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
726	–	l.add(new NPETask());
680		e.invokeAny(l);
681		shouldThrow();
682		} catch (ExecutionException success) {
683	+	assertTrue(success.getCause() instanceof NullPointerException);
684		} finally {
685		joinPool(e);
686		}
#	Line 735 | Line 689 | public class ForkJoinPoolTest extends JS
689		/**
690		* invokeAny(c) returns result of some task in c if at least one completes
691		*/
692	<	public void testInvokeAny5() throws Throwable {
692	>	public void testInvokeAny6() throws Throwable {
693		ExecutorService e = new ForkJoinPool(1);
694		try {
695	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
695	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
696		l.add(new StringTask());
697		l.add(new StringTask());
698		String result = e.invokeAny(l);
#	Line 781 | Line 735 | public class ForkJoinPoolTest extends JS
735		*/
736		public void testInvokeAll3() throws InterruptedException {
737		ExecutorService e = new ForkJoinPool(1);
738	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
739	+	l.add(new StringTask());
740	+	l.add(null);
741		try {
785	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
786	–	l.add(new StringTask());
787	–	l.add(null);
742		e.invokeAll(l);
743		shouldThrow();
744		} catch (NullPointerException success) {
#	Line 799 | Line 753 | public class ForkJoinPoolTest extends JS
753		*/
754		public void testInvokeAll4() throws Throwable {
755		ExecutorService e = new ForkJoinPool(1);
756	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
757	+	l.add(new NPETask());
758	+	List<Future<String>> futures = e.invokeAll(l);
759	+	assertEquals(1, futures.size());
760		try {
761	<	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();
761	>	futures.get(0).get();
762		shouldThrow();
763		} catch (ExecutionException success) {
764	+	assertTrue(success.getCause() instanceof NullPointerException);
765		} finally {
766		joinPool(e);
767		}
#	Line 819 | Line 773 | public class ForkJoinPoolTest extends JS
773		public void testInvokeAll5() throws Throwable {
774		ExecutorService e = new ForkJoinPool(1);
775		try {
776	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
776	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
777		l.add(new StringTask());
778		l.add(new StringTask());
779	<	List<Future<String>> result = e.invokeAll(l);
780	<	assertEquals(2, result.size());
781	<	for (Future<String> future : result)
779	>	List<Future<String>> futures = e.invokeAll(l);
780	>	assertEquals(2, futures.size());
781	>	for (Future<String> future : futures)
782		assertSame(TEST_STRING, future.get());
783		} finally {
784		joinPool(e);
#	Line 851 | Line 805 | public class ForkJoinPoolTest extends JS
805		*/
806		public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
807		ExecutorService e = new ForkJoinPool(1);
808	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
809	+	l.add(new StringTask());
810		try {
855	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
856	–	l.add(new StringTask());
811		e.invokeAny(l, MEDIUM_DELAY_MS, null);
812		shouldThrow();
813		} catch (NullPointerException success) {
#	Line 881 | Line 835 | public class ForkJoinPoolTest extends JS
835		* timed invokeAny(c) throws NullPointerException if c has null elements
836		*/
837		public void testTimedInvokeAny3() throws Throwable {
838	+	CountDownLatch latch = new CountDownLatch(1);
839		ExecutorService e = new ForkJoinPool(1);
840	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
841	+	l.add(latchAwaitingStringTask(latch));
842	+	l.add(null);
843		try {
886	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
887	–	l.add(new StringTask());
888	–	l.add(null);
844		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
845		shouldThrow();
846		} catch (NullPointerException success) {
847		} finally {
848	+	latch.countDown();
849		joinPool(e);
850		}
851		}
#	Line 899 | Line 855 | public class ForkJoinPoolTest extends JS
855		*/
856		public void testTimedInvokeAny4() throws Throwable {
857		ExecutorService e = new ForkJoinPool(1);
858	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
859	+	l.add(new NPETask());
860		try {
903	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
904	–	l.add(new NPETask());
861		e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
862		shouldThrow();
863		} catch (ExecutionException success) {
864	+	assertTrue(success.getCause() instanceof NullPointerException);
865		} finally {
866		joinPool(e);
867		}
#	Line 916 | Line 873 | public class ForkJoinPoolTest extends JS
873		public void testTimedInvokeAny5() throws Throwable {
874		ExecutorService e = new ForkJoinPool(1);
875		try {
876	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
876	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
877		l.add(new StringTask());
878		l.add(new StringTask());
879		String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
#	Line 945 | Line 902 | public class ForkJoinPoolTest extends JS
902		*/
903		public void testTimedInvokeAllNullTimeUnit() throws Throwable {
904		ExecutorService e = new ForkJoinPool(1);
905	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
906	+	l.add(new StringTask());
907		try {
949	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
950	–	l.add(new StringTask());
908		e.invokeAll(l, MEDIUM_DELAY_MS, null);
909		shouldThrow();
910		} catch (NullPointerException success) {
#	Line 976 | Line 933 | public class ForkJoinPoolTest extends JS
933		*/
934		public void testTimedInvokeAll3() throws InterruptedException {
935		ExecutorService e = new ForkJoinPool(1);
936	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
937	+	l.add(new StringTask());
938	+	l.add(null);
939		try {
980	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
981	–	l.add(new StringTask());
982	–	l.add(null);
940		e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
941		shouldThrow();
942		} catch (NullPointerException success) {
#	Line 993 | Line 950 | public class ForkJoinPoolTest extends JS
950		*/
951		public void testTimedInvokeAll4() throws Throwable {
952		ExecutorService e = new ForkJoinPool(1);
953	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
954	+	l.add(new NPETask());
955	+	List<Future<String>> futures
956	+	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
957	+	assertEquals(1, futures.size());
958		try {
959	<	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();
959	>	futures.get(0).get();
960		shouldThrow();
961		} catch (ExecutionException success) {
962	+	assertTrue(success.getCause() instanceof NullPointerException);
963		} finally {
964		joinPool(e);
965		}
#	Line 1014 | Line 971 | public class ForkJoinPoolTest extends JS
971		public void testTimedInvokeAll5() throws Throwable {
972		ExecutorService e = new ForkJoinPool(1);
973		try {
974	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
974	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
975		l.add(new StringTask());
976		l.add(new StringTask());
977	<	List<Future<String>> result
977	>	List<Future<String>> futures
978		= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
979	<	assertEquals(2, result.size());
980	<	for (Future<String> future : result)
979	>	assertEquals(2, futures.size());
980	>	for (Future<String> future : futures)
981		assertSame(TEST_STRING, future.get());
982		} finally {
983		joinPool(e);

Diff Legend

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