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.1 by dl, Fri Jul 31 23:02:49 2009 UTC vs.
Revision 1.30 by jsr166, Fri Sep 17 17:07:47 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.*;
10	<	import java.util.concurrent.locks.*;
11	<	import java.security.*;
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.security.AccessControlException;
28	>	import java.security.Policy;
29	>	import java.security.PrivilegedAction;
30	>	import java.security.PrivilegedExceptionAction;
31
32	<	public class ForkJoinPoolTest extends JSR166TestCase{
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 25 | Line 44 | public class ForkJoinPoolTest extends JS
44		* 1. shutdown and related methods are tested via super.joinPool.
45		*
46		* 2. newTaskFor and adapters are tested in submit/invoke tests
47	<	*
47	>	*
48		* 3. We cannot portably test monitoring methods such as
49		* getStealCount() since they rely ultimately on random task
50		* stealing that may cause tasks not to be stolen/propagated
51		* across threads, especially on uniprocessors.
52	<	*
52	>	*
53		* 4. There are no independently testable ForkJoinWorkerThread
54		* methods, but they are covered here and in task tests.
55		*/
#	Line 38 | 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 47 | 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 implements ForkJoinPool.ForkJoinWorkerThreadFactory {
73	<	int calls = 0;
74	<	public ForkJoinWorkerThread newThread(ForkJoinPool p){
72	>	static class FailingThreadFactory
73	>	implements ForkJoinPool.ForkJoinWorkerThreadFactory {
74	>	volatile int calls = 0;
75	>	public ForkJoinWorkerThread newThread(ForkJoinPool p) {
76		if (++calls > 1) return null;
77		return new FailingFJWSubclass(p);
78	<	}
78	>	}
79		}
80
81	<	static class SubFJP extends ForkJoinPool { // to expose protected
81	>	static class SubFJP extends ForkJoinPool { // to expose protected
82		SubFJP() { super(1); }
83		public int drainTasksTo(Collection<? super ForkJoinTask<?>> c) {
84		return super.drainTasksTo(c);
#	Line 83 | Line 103 | public class ForkJoinPoolTest extends JS
103		}
104
105		// A simple recursive task for testing
106	<	static final class FibTask extends RecursiveTask<Integer> {
106	>	static final class FibTask extends RecursiveTask<Integer> {
107		final int number;
108		FibTask(int n) { number = n; }
109		public Integer compute() {
#	Line 97 | Line 117 | public class ForkJoinPoolTest extends JS
117		}
118
119		// A failing task for testing
120	<	static final class FailingTask extends ForkJoinTask<Void> {
120	>	static final class FailingTask extends ForkJoinTask<Void> {
121		public final Void getRawResult() { return null; }
122		protected final void setRawResult(Void mustBeNull) { }
123		protected final boolean exec() { throw new Error(); }
#	Line 105 | Line 125 | public class ForkJoinPoolTest extends JS
125		}
126
127		// Fib needlessly using locking to test ManagedBlockers
128	<	static final class LockingFibTask extends RecursiveTask<Integer> {
128	>	static final class LockingFibTask extends RecursiveTask<Integer> {
129		final int number;
130		final ManagedLocker locker;
131		final ReentrantLock lock;
132	<	LockingFibTask(int n, ManagedLocker locker, ReentrantLock lock) {
133	<	number = n;
132	>	LockingFibTask(int n, ManagedLocker locker, ReentrantLock lock) {
133	>	number = n;
134		this.locker = locker;
135		this.lock = lock;
136		}
#	Line 119 | Line 139 | public class ForkJoinPoolTest extends JS
139		LockingFibTask f1 = null;
140		LockingFibTask f2 = null;
141		locker.block();
142	<	n = number;
142	>	n = number;
143		if (n > 1) {
144		f1 = new LockingFibTask(n - 1, locker, lock);
145		f2 = new LockingFibTask(n - 2, locker, lock);
#	Line 134 | Line 154 | public class ForkJoinPoolTest extends JS
154		}
155		}
156
157	<	/**
158	<	* Succesfully constructed pool reports default factory,
157	>	/**
158	>	* Successfully constructed pool reports default factory,
159		* parallelism and async mode policies, no active threads or
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() == ForkJoinPool.defaultForkJoinWorkerThreadFactory);
165	>	assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
166	>	p.getFactory());
167		assertTrue(p.isQuiescent());
148	–	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 160 | Line 179 | public class ForkJoinPoolTest extends JS
179		}
180		}
181
182	<	/**
183	<	* Constructor throws if size argument is less than zero
182	>	/**
183	>	* Constructor throws if size argument is less than zero
184		*/
185		public void testConstructor1() {
186		try {
187		new ForkJoinPool(-1);
188		shouldThrow();
189	<	}
171	<	catch (IllegalArgumentException success){}
189	>	} catch (IllegalArgumentException success) {}
190		}
191
192	<	/**
193	<	* Constructor throws if factory argument is null
192	>	/**
193	>	* Constructor throws if factory argument is null
194		*/
195		public void testConstructor2() {
196		try {
197	<	new ForkJoinPool(1, null);
197	>	new ForkJoinPool(1, null, null, false);
198		shouldThrow();
199	<	}
182	<	catch (NullPointerException success){}
199	>	} catch (NullPointerException success) {}
200		}
201
202
203	<	/**
204	<	* getParallelism returns size set in constructor
203	>	/**
204	>	* getParallelism returns size set in constructor
205		*/
206		public void testGetParallelism() {
207	<	ForkJoinPool p = null;
191	<	try {
192	<	p = new ForkJoinPool(1);
193	<	assertTrue(p.getParallelism() == 1);
194	<	} finally {
195	<	joinPool(p);
196	<	}
197	<	}
198	<
199	<	/**
200	<	* setParallelism changes reported parallelism level.
201	<	*/
202	<	public void testSetParallelism() {
203	<	ForkJoinPool p = null;
204	<	try {
205	<	p = new ForkJoinPool(1);
206	<	assertTrue(p.getParallelism() == 1);
207	<	p.setParallelism(2);
208	<	assertTrue(p.getParallelism() == 2);
209	<	} finally {
210	<	joinPool(p);
211	<	}
212	<	}
213	<
214	<	/**
215	<	* setParallelism with argument <= 0 throws exception
216	<	*/
217	<	public void testSetParallelism2() {
218	<	ForkJoinPool p = null;
207	>	ForkJoinPool p = new ForkJoinPool(1);
208		try {
209	<	p = new ForkJoinPool(1);
221	<	assertTrue(p.getParallelism() == 1);
222	<	p.setParallelism(-2);
223	<	shouldThrow();
224	<	}catch (IllegalArgumentException success){
209	>	assertEquals(1, p.getParallelism());
210		} finally {
211		joinPool(p);
212		}
213		}
214
215	<	/**
215	>	/**
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);
237	<	assertTrue(p.getPoolSize() == 0);
221	>	assertEquals(0, p.getActiveThreadCount());
222		Future<String> future = p.submit(new StringTask());
223	<	assertTrue(p.getPoolSize() == 1);
240	<
241	<	} finally {
242	<	joinPool(p);
243	<	}
244	<	}
245	<
246	<	/**
247	<	* setMaximumPoolSize changes size reported by getMaximumPoolSize.
248	<	*/
249	<	public void testSetMaximumPoolSize() {
250	<	ForkJoinPool p = null;
251	<	try {
252	<	p = new ForkJoinPool(1);
253	<	p.setMaximumPoolSize(2);
254	<	assertTrue(p.getMaximumPoolSize() == 2);
255	<	} finally {
256	<	joinPool(p);
257	<	}
258	<	}
259	<
260	<	/**
261	<	* setMaximumPoolSize with argument <= 0 throws exception
262	<	*/
263	<	public void testSetMaximumPoolSize2() {
264	<	ForkJoinPool p = null;
265	<	try {
266	<	p = new ForkJoinPool(1);
267	<	p.setMaximumPoolSize(-2);
268	<	shouldThrow();
269	<	}catch (IllegalArgumentException success){
270	<	} finally {
271	<	joinPool(p);
272	<	}
273	<	}
274	<
275	<	/**
276	<	* setMaintainsParallelism changes policy reported by
277	<	* getMaintainsParallelism.
278	<	*/
279	<	public void testSetMaintainsParallelism() {
280	<	ForkJoinPool p = null;
281	<	try {
282	<	p = new ForkJoinPool(1);
283	<	p.setMaintainsParallelism(false);
284	<	assertFalse(p.getMaintainsParallelism());
285	<	} finally {
286	<	joinPool(p);
287	<	}
288	<	}
289	<
290	<	/**
291	<	* setAsyncMode changes policy reported by
292	<	* getAsyncMode.
293	<	*/
294	<	public void testSetAsyncMode() {
295	<	ForkJoinPool p = null;
296	<	try {
297	<	p = new ForkJoinPool(1);
298	<	p.setAsyncMode(true);
299	<	assertTrue(p.getAsyncMode());
223	>	assertEquals(1, p.getPoolSize());
224		} finally {
225		joinPool(p);
226		}
227		}
228
229	<	/**
229	>	/**
230		* setUncaughtExceptionHandler changes handler for uncaught exceptions.
231		*
232		* Additionally tests: Overriding ForkJoinWorkerThread.onStart
233		* performs its defined action
234		*/
235	<	public void testSetUncaughtExceptionHandler() {
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	<	} catch(InterruptedException e){
246	<	unexpectedException();
247	<	} finally {
324	<	joinPool(p);
325	<	}
326	<	}
327	<
328	<	/**
329	<	* setUncaughtExceptionHandler of null removes handler
330	<	*/
331	<	public void testSetUncaughtExceptionHandler2() {
332	<	ForkJoinPool p = null;
333	<	try {
334	<	p = new ForkJoinPool(1);
335	<	p.setUncaughtExceptionHandler(null);
336	<	assertNull(p.getUncaughtExceptionHandler());
235	>	public void testSetUncaughtExceptionHandler() throws InterruptedException {
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
254	<
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() {
260	<	ForkJoinPool p = null;
259	>	public void testisQuiescent() throws InterruptedException {
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() == ForkJoinPool.defaultForkJoinWorkerThreadFactory);
265	<	Thread.sleep(MEDIUM_DELAY_MS);
264	>	assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
265	>	p.getFactory());
266	>	Thread.sleep(SMALL_DELAY_MS);
267		assertTrue(p.isQuiescent());
356	–	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());
275		assertFalse(p.isTerminated());
365	–	} catch(InterruptedException e){
366	–	unexpectedException();
276		} finally {
277		joinPool(p);
278		}
#	Line 372 | Line 281 | public class ForkJoinPoolTest extends JS
281		/**
282		* Completed submit(ForkJoinTask) returns result
283		*/
284	<	public void testSubmitForkJoinTask() {
285	<	ForkJoinPool p = null;
284	>	public void testSubmitForkJoinTask() throws Throwable {
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);
382	<	} catch (ExecutionException ex) {
383	<	unexpectedException();
384	<	} catch (InterruptedException ex) {
385	<	unexpectedException();
288	>	assertEquals(21, (int) f.get());
289		} finally {
290		joinPool(p);
291		}
#	Line 392 | 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 {
397	–	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 408 | Line 311 | public class ForkJoinPoolTest extends JS
311		/**
312		* Pool maintains parallelism when using ManagedBlocker
313		*/
314	<	public void testBlockingForkJoinTask() {
315	<	ForkJoinPool p = null;
314	>	public void testBlockingForkJoinTask() throws Throwable {
315	>	ForkJoinPool p = new ForkJoinPool(4);
316		try {
414	–	p = new ForkJoinPool(4);
317		ReentrantLock lock = new ReentrantLock();
318		ManagedLocker locker = new ManagedLocker(lock);
319		ForkJoinTask<Integer> f = new LockingFibTask(30, locker, lock);
320		p.execute(f);
321	<	assertTrue(p.getPoolSize() >= 4);
420	<	int r = f.get();
421	<	assertTrue(r ==  832040);
422	<	} catch (ExecutionException ex) {
423	<	unexpectedException();
424	<	} catch (InterruptedException ex) {
425	<	unexpectedException();
321	>	assertEquals(832040, (int) f.get());
322		} finally {
323	<	joinPool(p);
323	>	p.shutdownNow(); // don't wait out shutdown
324		}
325		}
326
#	Line 432 | 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 {
437	–	p = new SubFJP();
333		ForkJoinTask a = p.submit(new MediumRunnable());
334		ForkJoinTask b = p.submit(new MediumRunnable());
335		ForkJoinTask c = p.submit(new MediumRunnable());
#	Line 450 | 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 {
455	–	p = new SubFJP();
350		ForkJoinTask a = p.submit(new MediumRunnable());
351		ForkJoinTask b = p.submit(new MediumRunnable());
352		ForkJoinTask c = p.submit(new MediumRunnable());
#	Line 468 | Line 362 | public class ForkJoinPoolTest extends JS
362		}
363		}
364
365	<
365	>
366		// FJ Versions of AbstractExecutorService tests
367
368		/**
369		* execute(runnable) runs it to completion
370		*/
371	<	public void testExecuteRunnable() {
371	>	public void testExecuteRunnable() throws Throwable {
372	>	ExecutorService e = new ForkJoinPool(1);
373		try {
479	–	ExecutorService e = new ForkJoinPool(1);
374		TrackedShortRunnable task = new TrackedShortRunnable();
375		assertFalse(task.done);
376		Future<?> future = e.submit(task);
377		future.get();
378		assertTrue(task.done);
379	<	}
380	<	catch (ExecutionException ex) {
487	<	unexpectedException();
488	<	}
489	<	catch (InterruptedException ex) {
490	<	unexpectedException();
379	>	} finally {
380	>	joinPool(e);
381		}
382		}
383
#	Line 495 | Line 385 | public class ForkJoinPoolTest extends JS
385		/**
386		* Completed submit(callable) returns result
387		*/
388	<	public void testSubmitCallable() {
388	>	public void testSubmitCallable() throws Throwable {
389	>	ExecutorService e = new ForkJoinPool(1);
390		try {
500	–	ExecutorService e = new ForkJoinPool(1);
391		Future<String> future = e.submit(new StringTask());
392		String result = future.get();
393		assertSame(TEST_STRING, result);
394	<	}
395	<	catch (ExecutionException ex) {
506	<	unexpectedException();
507	<	}
508	<	catch (InterruptedException ex) {
509	<	unexpectedException();
394	>	} finally {
395	>	joinPool(e);
396		}
397		}
398
399		/**
400		* Completed submit(runnable) returns successfully
401		*/
402	<	public void testSubmitRunnable() {
402	>	public void testSubmitRunnable() throws Throwable {
403	>	ExecutorService e = new ForkJoinPool(1);
404		try {
518	–	ExecutorService e = new ForkJoinPool(1);
405		Future<?> future = e.submit(new NoOpRunnable());
406		future.get();
407		assertTrue(future.isDone());
408	<	}
409	<	catch (ExecutionException ex) {
524	<	unexpectedException();
525	<	}
526	<	catch (InterruptedException ex) {
527	<	unexpectedException();
408	>	} finally {
409	>	joinPool(e);
410		}
411		}
412
413		/**
414		* Completed submit(runnable, result) returns result
415		*/
416	<	public void testSubmitRunnable2() {
416	>	public void testSubmitRunnable2() throws Throwable {
417	>	ExecutorService e = new ForkJoinPool(1);
418		try {
536	–	ExecutorService e = new ForkJoinPool(1);
419		Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
420		String result = future.get();
421		assertSame(TEST_STRING, result);
422	<	}
423	<	catch (ExecutionException ex) {
542	<	unexpectedException();
543	<	}
544	<	catch (InterruptedException ex) {
545	<	unexpectedException();
422	>	} finally {
423	>	joinPool(e);
424		}
425		}
426
#	Line 550 | Line 428 | public class ForkJoinPoolTest extends JS
428		/**
429		* A submitted privileged action to completion
430		*/
431	<	public void testSubmitPrivilegedAction() {
431	>	public void testSubmitPrivilegedAction() throws Throwable {
432		Policy savedPolicy = null;
433		try {
434		savedPolicy = Policy.getPolicy();
#	Line 558 | Line 436 | public class ForkJoinPoolTest extends JS
436		policy.addPermission(new RuntimePermission("getContextClassLoader"));
437		policy.addPermission(new RuntimePermission("setContextClassLoader"));
438		Policy.setPolicy(policy);
439	<	} catch(AccessControlException ok) {
439	>	} catch (AccessControlException ok) {
440		return;
441		}
442	+
443		try {
444		ExecutorService e = new ForkJoinPool(1);
445	<	Future future = e.submit(Executors.callable(new PrivilegedAction() {
445	>	try {
446	>	Future future = e.submit(Executors.callable(new PrivilegedAction() {
447		public Object run() {
448		return TEST_STRING;
449		}}));
450
451	<	Object result = future.get();
452	<	assertSame(TEST_STRING, result);
453	<	}
454	<	catch (ExecutionException ex) {
575	<	unexpectedException();
576	<	}
577	<	catch (InterruptedException ex) {
578	<	unexpectedException();
579	<	}
580	<	finally {
581	<	try {
582	<	Policy.setPolicy(savedPolicy);
583	<	} catch(AccessControlException ok) {
584	<	return;
451	>	Object result = future.get();
452	>	assertSame(TEST_STRING, result);
453	>	} finally {
454	>	joinPool(e);
455		}
456	+	} finally {
457	+	Policy.setPolicy(savedPolicy);
458		}
459		}
460
461		/**
462		* A submitted a privileged exception action runs to completion
463		*/
464	<	public void testSubmitPrivilegedExceptionAction() {
464	>	public void testSubmitPrivilegedExceptionAction() throws Throwable {
465		Policy savedPolicy = null;
466		try {
467		savedPolicy = Policy.getPolicy();
#	Line 597 | Line 469 | public class ForkJoinPoolTest extends JS
469		policy.addPermission(new RuntimePermission("getContextClassLoader"));
470		policy.addPermission(new RuntimePermission("setContextClassLoader"));
471		Policy.setPolicy(policy);
472	<	} catch(AccessControlException ok) {
472	>	} catch (AccessControlException ok) {
473		return;
474		}
475
476		try {
477		ExecutorService e = new ForkJoinPool(1);
478	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
478	>	try {
479	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
480		public Object run() {
481		return TEST_STRING;
482		}}));
483
484	<	Object result = future.get();
485	<	assertSame(TEST_STRING, result);
486	<	}
487	<	catch (ExecutionException ex) {
488	<	unexpectedException();
489	<	}
617	<	catch (InterruptedException ex) {
618	<	unexpectedException();
619	<	}
620	<	finally {
484	>	Object result = future.get();
485	>	assertSame(TEST_STRING, result);
486	>	} finally {
487	>	joinPool(e);
488	>	}
489	>	} finally {
490		Policy.setPolicy(savedPolicy);
491		}
492		}
#	Line 625 | Line 494 | public class ForkJoinPoolTest extends JS
494		/**
495		* A submitted failed privileged exception action reports exception
496		*/
497	<	public void testSubmitFailedPrivilegedExceptionAction() {
497	>	public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
498		Policy savedPolicy = null;
499		try {
500		savedPolicy = Policy.getPolicy();
#	Line 633 | Line 502 | public class ForkJoinPoolTest extends JS
502		policy.addPermission(new RuntimePermission("getContextClassLoader"));
503		policy.addPermission(new RuntimePermission("setContextClassLoader"));
504		Policy.setPolicy(policy);
505	<	} catch(AccessControlException ok) {
505	>	} catch (AccessControlException ok) {
506		return;
507		}
508
640	–
509		try {
510		ExecutorService e = new ForkJoinPool(1);
511	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
511	>	try {
512	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
513		public Object run() throws Exception {
514		throw new IndexOutOfBoundsException();
515		}}));
516
517	<	Object result = future.get();
518	<	shouldThrow();
519	<	}
520	<	catch (ExecutionException success) {
521	<	} catch (CancellationException success) {
522	<	} catch (InterruptedException ex) {
523	<	unexpectedException();
524	<	}
656	<	finally {
517	>	Object result = future.get();
518	>	shouldThrow();
519	>	} catch (ExecutionException success) {
520	>	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
521	>	} finally {
522	>	joinPool(e);
523	>	}
524	>	} finally {
525		Policy.setPolicy(savedPolicy);
526		}
527		}
528
529		/**
530	<	* execute(null runnable) throws NPE
530	>	* execute(null runnable) throws NullPointerException
531		*/
532		public void testExecuteNullRunnable() {
533	+	ExecutorService e = new ForkJoinPool(1);
534	+	TrackedShortRunnable task = null;
535		try {
666	–	ExecutorService e = new ForkJoinPool(1);
667	–	TrackedShortRunnable task = null;
536		Future<?> future = e.submit(task);
537		shouldThrow();
538	<	}
539	<	catch (NullPointerException success) {
540	<	}
673	<	catch (Exception ex) {
674	<	unexpectedException();
538	>	} catch (NullPointerException success) {
539	>	} finally {
540	>	joinPool(e);
541		}
542		}
543
544
545		/**
546	<	* submit(null callable) throws NPE
546	>	* submit(null callable) throws NullPointerException
547		*/
548		public void testSubmitNullCallable() {
549	+	ExecutorService e = new ForkJoinPool(1);
550	+	StringTask t = null;
551		try {
684	–	ExecutorService e = new ForkJoinPool(1);
685	–	StringTask t = null;
552		Future<String> future = e.submit(t);
553		shouldThrow();
554	<	}
555	<	catch (NullPointerException success) {
556	<	}
691	<	catch (Exception ex) {
692	<	unexpectedException();
554	>	} catch (NullPointerException success) {
555	>	} finally {
556	>	joinPool(e);
557		}
558		}
559
560
561		/**
562	<	*  Blocking on submit(callable) throws InterruptedException if
563	<	*  caller interrupted.
564	<	*/
565	<	public void testInterruptedSubmit() {
566	<	final ForkJoinPool p = new ForkJoinPool(1);
567	<	Thread t = new Thread(new Runnable() {
568	<	public void run() {
569	<	try {
570	<	p.submit(new Callable<Object>() {
571	<	public Object call() {
572	<	try {
573	<	Thread.sleep(MEDIUM_DELAY_MS);
574	<	shouldThrow();
575	<	} catch(InterruptedException e){
576	<	}
577	<	return null;
578	<	}
579	<	}).get();
716	<	} catch(InterruptedException success){
717	<	} catch(Exception e) {
718	<	unexpectedException();
719	<	}
720	<
721	<	}
722	<	});
723	<	try {
562	>	* submit(callable).get() throws InterruptedException if interrupted
563	>	*/
564	>	public void testInterruptedSubmit() throws InterruptedException {
565	>	final CountDownLatch submitted    = new CountDownLatch(1);
566	>	final CountDownLatch quittingTime = new CountDownLatch(1);
567	>	final ExecutorService p = new ForkJoinPool(1);
568	>	final Callable<Void> awaiter = new CheckedCallable<Void>() {
569	>	public Void realCall() throws InterruptedException {
570	>	assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
571	>	return null;
572	>	}};
573	>	try {
574	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
575	>	public void realRun() throws Exception {
576	>	Future<Void> future = p.submit(awaiter);
577	>	submitted.countDown();
578	>	future.get();
579	>	}});
580		t.start();
581	<	Thread.sleep(SHORT_DELAY_MS);
581	>	assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
582		t.interrupt();
583	<	} catch(Exception e){
584	<	unexpectedException();
583	>	t.join();
584	>	} finally {
585	>	quittingTime.countDown();
586	>	joinPool(p);
587		}
730	–	joinPool(p);
588		}
589
590		/**
591	<	*  get of submit(callable) throws ExecutionException if callable
592	<	*  throws exception
591	>	* get of submit(callable) throws ExecutionException if callable
592	>	* throws exception
593		*/
594	<	public void testSubmitEE() {
594	>	public void testSubmitEE() throws Throwable {
595		ForkJoinPool p = new ForkJoinPool(1);
739	–
596		try {
597	<	Callable c = new Callable() {
598	<	public Object call() {
599	<	int i = 5/0;
600	<	return Boolean.TRUE;
601	<	}
746	<	};
747	<
748	<	for(int i =0; i < 5; i++){
749	<	p.submit(c).get();
750	<	}
751	<
597	>	p.submit(new Callable() {
598	>	public Object call() {
599	>	int i = 5/0;
600	>	return Boolean.TRUE;
601	>	}}).get();
602		shouldThrow();
603	+	} catch (ExecutionException success) {
604	+	assertTrue(success.getCause() instanceof ArithmeticException);
605	+	} finally {
606	+	joinPool(p);
607		}
754	–	catch(ExecutionException success){
755	–	} catch (CancellationException success) {
756	–	} catch(Exception e) {
757	–	unexpectedException();
758	–	}
759	–	joinPool(p);
608		}
609
610		/**
611	<	* invokeAny(null) throws NPE
611	>	* invokeAny(null) throws NullPointerException
612		*/
613	<	public void testInvokeAny1() {
613	>	public void testInvokeAny1() throws Throwable {
614		ExecutorService e = new ForkJoinPool(1);
615		try {
616		e.invokeAny(null);
617	+	shouldThrow();
618		} catch (NullPointerException success) {
770	–	} catch(Exception ex) {
771	–	unexpectedException();
619		} finally {
620		joinPool(e);
621		}
622		}
623
624		/**
625	<	* invokeAny(empty collection) throws IAE
625	>	* invokeAny(empty collection) throws IllegalArgumentException
626		*/
627	<	public void testInvokeAny2() {
627	>	public void testInvokeAny2() throws Throwable {
628		ExecutorService e = new ForkJoinPool(1);
629		try {
630		e.invokeAny(new ArrayList<Callable<String>>());
631	+	shouldThrow();
632		} catch (IllegalArgumentException success) {
785	–	} catch(Exception ex) {
786	–	unexpectedException();
633		} finally {
634		joinPool(e);
635		}
636		}
637
638		/**
639	<	* invokeAny(c) throws NPE if c has null elements
639	>	* invokeAny(c) throws NullPointerException if c has a single null element
640		*/
641	<	public void testInvokeAny3() {
641	>	public void testInvokeAny3() throws Throwable {
642		ExecutorService e = new ForkJoinPool(1);
643	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
644	+	l.add(null);
645	+	try {
646	+	e.invokeAny(l);
647	+	shouldThrow();
648	+	} catch (NullPointerException success) {
649	+	} finally {
650	+	joinPool(e);
651	+	}
652	+	}
653	+
654	+	/**
655	+	* invokeAny(c) throws NullPointerException if c has null elements
656	+	*/
657	+	public void testInvokeAny4() throws Throwable {
658	+	CountDownLatch latch = new CountDownLatch(1);
659	+	ExecutorService e = new ForkJoinPool(1);
660	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
661	+	l.add(latchAwaitingStringTask(latch));
662	+	l.add(null);
663		try {
798	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
799	–	l.add(new StringTask());
800	–	l.add(null);
664		e.invokeAny(l);
665	+	shouldThrow();
666		} catch (NullPointerException success) {
803	–	} catch(Exception ex) {
804	–	ex.printStackTrace();
805	–	unexpectedException();
667		} finally {
668	+	latch.countDown();
669		joinPool(e);
670		}
671		}
#	Line 811 | Line 673 | public class ForkJoinPoolTest extends JS
673		/**
674		* invokeAny(c) throws ExecutionException if no task in c completes
675		*/
676	<	public void testInvokeAny4() {
676	>	public void testInvokeAny5() throws Throwable {
677		ExecutorService e = new ForkJoinPool(1);
678	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
679	+	l.add(new NPETask());
680		try {
817	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
818	–	l.add(new NPETask());
681		e.invokeAny(l);
682	<	} catch(ExecutionException success) {
683	<	} catch (CancellationException success) {
684	<	} catch(Exception ex) {
823	<	unexpectedException();
682	>	shouldThrow();
683	>	} catch (ExecutionException success) {
684	>	assertTrue(success.getCause() instanceof NullPointerException);
685		} finally {
686		joinPool(e);
687		}
#	Line 829 | Line 690 | public class ForkJoinPoolTest extends JS
690		/**
691		* invokeAny(c) returns result of some task in c if at least one completes
692		*/
693	<	public void testInvokeAny5() {
693	>	public void testInvokeAny6() throws Throwable {
694		ExecutorService e = new ForkJoinPool(1);
695		try {
696	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
696	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
697		l.add(new StringTask());
698		l.add(new StringTask());
699		String result = e.invokeAny(l);
700		assertSame(TEST_STRING, result);
840	–	} catch (ExecutionException success) {
841	–	} catch (CancellationException success) {
842	–	} catch(Exception ex) {
843	–	unexpectedException();
701		} finally {
702		joinPool(e);
703		}
704		}
705
706		/**
707	<	* invokeAll(null) throws NPE
707	>	* invokeAll(null) throws NullPointerException
708		*/
709	<	public void testInvokeAll1() {
709	>	public void testInvokeAll1() throws Throwable {
710		ExecutorService e = new ForkJoinPool(1);
711		try {
712		e.invokeAll(null);
713	+	shouldThrow();
714		} catch (NullPointerException success) {
857	–	} catch(Exception ex) {
858	–	unexpectedException();
715		} finally {
716		joinPool(e);
717		}
#	Line 864 | Line 720 | public class ForkJoinPoolTest extends JS
720		/**
721		* invokeAll(empty collection) returns empty collection
722		*/
723	<	public void testInvokeAll2() {
723	>	public void testInvokeAll2() throws InterruptedException {
724		ExecutorService e = new ForkJoinPool(1);
725		try {
726	<	List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
726	>	List<Future<String>> r
727	>	= e.invokeAll(new ArrayList<Callable<String>>());
728		assertTrue(r.isEmpty());
872	–	} catch(Exception ex) {
873	–	unexpectedException();
729		} finally {
730		joinPool(e);
731		}
732		}
733
734		/**
735	<	* invokeAll(c) throws NPE if c has null elements
735	>	* invokeAll(c) throws NullPointerException if c has null elements
736		*/
737	<	public void testInvokeAll3() {
737	>	public void testInvokeAll3() throws InterruptedException {
738		ExecutorService e = new ForkJoinPool(1);
739	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
740	+	l.add(new StringTask());
741	+	l.add(null);
742		try {
885	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
886	–	l.add(new StringTask());
887	–	l.add(null);
743		e.invokeAll(l);
744	+	shouldThrow();
745		} catch (NullPointerException success) {
890	–	} catch(Exception ex) {
891	–	unexpectedException();
746		} finally {
747		joinPool(e);
748		}
749		}
750
751		/**
752	<	* get of returned element of invokeAll(c) throws exception on failed task
752	>	* get of returned element of invokeAll(c) throws
753	>	* ExecutionException on failed task
754		*/
755	<	public void testInvokeAll4() {
755	>	public void testInvokeAll4() throws Throwable {
756		ExecutorService e = new ForkJoinPool(1);
757	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
758	+	l.add(new NPETask());
759	+	List<Future<String>> futures = e.invokeAll(l);
760	+	assertEquals(1, futures.size());
761		try {
762	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
763	<	l.add(new NPETask());
764	<	List<Future<String>> result = e.invokeAll(l);
765	<	assertEquals(1, result.size());
907	<	for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
908	<	it.next().get();
909	<	} catch(ExecutionException success) {
910	<	} catch (CancellationException success) {
911	<	} catch(Exception ex) {
912	<	ex.printStackTrace();
913	<	unexpectedException();
762	>	futures.get(0).get();
763	>	shouldThrow();
764	>	} catch (ExecutionException success) {
765	>	assertTrue(success.getCause() instanceof NullPointerException);
766		} finally {
767		joinPool(e);
768		}
#	Line 919 | Line 771 | public class ForkJoinPoolTest extends JS
771		/**
772		* invokeAll(c) returns results of all completed tasks in c
773		*/
774	<	public void testInvokeAll5() {
774	>	public void testInvokeAll5() throws Throwable {
775		ExecutorService e = new ForkJoinPool(1);
776		try {
777	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
777	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
778		l.add(new StringTask());
779		l.add(new StringTask());
780	<	List<Future<String>> result = e.invokeAll(l);
781	<	assertEquals(2, result.size());
782	<	for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
783	<	assertSame(TEST_STRING, it.next().get());
932	<	} catch (ExecutionException success) {
933	<	} catch (CancellationException success) {
934	<	} catch(Exception ex) {
935	<	ex.printStackTrace();
936	<	unexpectedException();
780	>	List<Future<String>> futures = e.invokeAll(l);
781	>	assertEquals(2, futures.size());
782	>	for (Future<String> future : futures)
783	>	assertSame(TEST_STRING, future.get());
784		} finally {
785		joinPool(e);
786		}
#	Line 941 | Line 788 | public class ForkJoinPoolTest extends JS
788
789
790		/**
791	<	* timed invokeAny(null) throws NPE
791	>	* timed invokeAny(null) throws NullPointerException
792		*/
793	<	public void testTimedInvokeAny1() {
793	>	public void testTimedInvokeAny1() throws Throwable {
794		ExecutorService e = new ForkJoinPool(1);
795		try {
796	<	e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
796	>	e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
797	>	shouldThrow();
798		} catch (NullPointerException success) {
951	–	} catch(Exception ex) {
952	–	ex.printStackTrace();
953	–	unexpectedException();
799		} finally {
800		joinPool(e);
801		}
802		}
803
804		/**
805	<	* timed invokeAny(null time unit) throws NPE
805	>	* timed invokeAny(null time unit) throws NullPointerException
806		*/
807	<	public void testTimedInvokeAnyNullTimeUnit() {
807	>	public void testTimedInvokeAnyNullTimeUnit() throws Throwable {
808		ExecutorService e = new ForkJoinPool(1);
809	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
810	+	l.add(new StringTask());
811		try {
965	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
966	–	l.add(new StringTask());
812		e.invokeAny(l, MEDIUM_DELAY_MS, null);
813	+	shouldThrow();
814		} catch (NullPointerException success) {
969	–	} catch(Exception ex) {
970	–	ex.printStackTrace();
971	–	unexpectedException();
815		} finally {
816		joinPool(e);
817		}
818		}
819
820		/**
821	<	* timed invokeAny(empty collection) throws IAE
821	>	* timed invokeAny(empty collection) throws IllegalArgumentException
822		*/
823	<	public void testTimedInvokeAny2() {
823	>	public void testTimedInvokeAny2() throws Throwable {
824		ExecutorService e = new ForkJoinPool(1);
825		try {
826	<	e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
826	>	e.invokeAny(new ArrayList<Callable<String>>(),
827	>	MEDIUM_DELAY_MS, MILLISECONDS);
828	>	shouldThrow();
829		} catch (IllegalArgumentException success) {
985	–	} catch(Exception ex) {
986	–	ex.printStackTrace();
987	–	unexpectedException();
830		} finally {
831		joinPool(e);
832		}
833		}
834
835		/**
836	<	* timed invokeAny(c) throws NPE if c has null elements
836	>	* timed invokeAny(c) throws NullPointerException if c has null elements
837		*/
838	<	public void testTimedInvokeAny3() {
838	>	public void testTimedInvokeAny3() throws Throwable {
839	>	CountDownLatch latch = new CountDownLatch(1);
840		ExecutorService e = new ForkJoinPool(1);
841	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
842	+	l.add(latchAwaitingStringTask(latch));
843	+	l.add(null);
844		try {
845	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
846	<	l.add(new StringTask());
1001	<	l.add(null);
1002	<	e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
845	>	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
846	>	shouldThrow();
847		} catch (NullPointerException success) {
1004	–	} catch(Exception ex) {
1005	–	ex.printStackTrace();
1006	–	unexpectedException();
848		} finally {
849	+	latch.countDown();
850		joinPool(e);
851		}
852		}
#	Line 1012 | Line 854 | public class ForkJoinPoolTest extends JS
854		/**
855		* timed invokeAny(c) throws ExecutionException if no task completes
856		*/
857	<	public void testTimedInvokeAny4() {
857	>	public void testTimedInvokeAny4() throws Throwable {
858		ExecutorService e = new ForkJoinPool(1);
859	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
860	+	l.add(new NPETask());
861		try {
862	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
863	<	l.add(new NPETask());
864	<	e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
865	<	} catch(ExecutionException success) {
1022	<	} catch (CancellationException success) {
1023	<	} catch(Exception ex) {
1024	<	ex.printStackTrace();
1025	<	unexpectedException();
862	>	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
863	>	shouldThrow();
864	>	} catch (ExecutionException success) {
865	>	assertTrue(success.getCause() instanceof NullPointerException);
866		} finally {
867		joinPool(e);
868		}
#	Line 1031 | Line 871 | public class ForkJoinPoolTest extends JS
871		/**
872		* timed invokeAny(c) returns result of some task in c
873		*/
874	<	public void testTimedInvokeAny5() {
874	>	public void testTimedInvokeAny5() throws Throwable {
875		ExecutorService e = new ForkJoinPool(1);
876		try {
877	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
877	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
878		l.add(new StringTask());
879		l.add(new StringTask());
880	<	String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
880	>	String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
881		assertSame(TEST_STRING, result);
1042	–	} catch (ExecutionException success) {
1043	–	} catch (CancellationException success) {
1044	–	} catch(Exception ex) {
1045	–	ex.printStackTrace();
1046	–	unexpectedException();
882		} finally {
883		joinPool(e);
884		}
885		}
886
887		/**
888	<	* timed invokeAll(null) throws NPE
888	>	* timed invokeAll(null) throws NullPointerException
889		*/
890	<	public void testTimedInvokeAll1() {
890	>	public void testTimedInvokeAll1() throws Throwable {
891		ExecutorService e = new ForkJoinPool(1);
892		try {
893	<	e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
893	>	e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
894	>	shouldThrow();
895		} catch (NullPointerException success) {
1060	–	} catch(Exception ex) {
1061	–	ex.printStackTrace();
1062	–	unexpectedException();
896		} finally {
897		joinPool(e);
898		}
899		}
900
901		/**
902	<	* timed invokeAll(null time unit) throws NPE
902	>	* timed invokeAll(null time unit) throws NullPointerException
903		*/
904	<	public void testTimedInvokeAllNullTimeUnit() {
904	>	public void testTimedInvokeAllNullTimeUnit() throws Throwable {
905		ExecutorService e = new ForkJoinPool(1);
906	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
907	+	l.add(new StringTask());
908		try {
1074	–	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
1075	–	l.add(new StringTask());
909		e.invokeAll(l, MEDIUM_DELAY_MS, null);
910	+	shouldThrow();
911		} catch (NullPointerException success) {
1078	–	} catch(Exception ex) {
1079	–	ex.printStackTrace();
1080	–	unexpectedException();
912		} finally {
913		joinPool(e);
914		}
#	Line 1086 | Line 917 | public class ForkJoinPoolTest extends JS
917		/**
918		* timed invokeAll(empty collection) returns empty collection
919		*/
920	<	public void testTimedInvokeAll2() {
920	>	public void testTimedInvokeAll2() throws InterruptedException {
921		ExecutorService e = new ForkJoinPool(1);
922		try {
923	<	List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
923	>	List<Future<String>> r
924	>	= e.invokeAll(new ArrayList<Callable<String>>(),
925	>	MEDIUM_DELAY_MS, MILLISECONDS);
926		assertTrue(r.isEmpty());
1094	–	} catch(Exception ex) {
1095	–	ex.printStackTrace();
1096	–	unexpectedException();
927		} finally {
928		joinPool(e);
929		}
930		}
931
932		/**
933	<	* timed invokeAll(c) throws NPE if c has null elements
933	>	* timed invokeAll(c) throws NullPointerException if c has null elements
934		*/
935	<	public void testTimedInvokeAll3() {
935	>	public void testTimedInvokeAll3() throws InterruptedException {
936		ExecutorService e = new ForkJoinPool(1);
937	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
938	+	l.add(new StringTask());
939	+	l.add(null);
940		try {
941	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
942	<	l.add(new StringTask());
1110	<	l.add(null);
1111	<	e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
941	>	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
942	>	shouldThrow();
943		} catch (NullPointerException success) {
1113	–	} catch(Exception ex) {
1114	–	ex.printStackTrace();
1115	–	unexpectedException();
944		} finally {
945		joinPool(e);
946		}
#	Line 1121 | Line 949 | public class ForkJoinPoolTest extends JS
949		/**
950		* get of returned element of invokeAll(c) throws exception on failed task
951		*/
952	<	public void testTimedInvokeAll4() {
952	>	public void testTimedInvokeAll4() throws Throwable {
953		ExecutorService e = new ForkJoinPool(1);
954	+	List<Callable<String>> l = new ArrayList<Callable<String>>();
955	+	l.add(new NPETask());
956	+	List<Future<String>> futures
957	+	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
958	+	assertEquals(1, futures.size());
959		try {
960	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
961	<	l.add(new NPETask());
962	<	List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
963	<	assertEquals(1, result.size());
1131	<	for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
1132	<	it.next().get();
1133	<	} catch(ExecutionException success) {
1134	<	} catch (CancellationException success) {
1135	<	} catch(Exception ex) {
1136	<	ex.printStackTrace();
1137	<	unexpectedException();
960	>	futures.get(0).get();
961	>	shouldThrow();
962	>	} catch (ExecutionException success) {
963	>	assertTrue(success.getCause() instanceof NullPointerException);
964		} finally {
965		joinPool(e);
966		}
#	Line 1143 | Line 969 | public class ForkJoinPoolTest extends JS
969		/**
970		* timed invokeAll(c) returns results of all completed tasks in c
971		*/
972	<	public void testTimedInvokeAll5() {
972	>	public void testTimedInvokeAll5() throws Throwable {
973		ExecutorService e = new ForkJoinPool(1);
974		try {
975	<	ArrayList<Callable<String>> l = new ArrayList<Callable<String>>();
975	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
976		l.add(new StringTask());
977		l.add(new StringTask());
978	<	List<Future<String>> result = e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
979	<	assertEquals(2, result.size());
980	<	for (Iterator<Future<String>> it = result.iterator(); it.hasNext();)
981	<	assertSame(TEST_STRING, it.next().get());
982	<	} catch (ExecutionException success) {
1157	<	} catch (CancellationException success) {
1158	<	} catch(Exception ex) {
1159	<	ex.printStackTrace();
1160	<	unexpectedException();
978	>	List<Future<String>> futures
979	>	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
980	>	assertEquals(2, futures.size());
981	>	for (Future<String> future : futures)
982	>	assertSame(TEST_STRING, future.get());
983		} finally {
984		joinPool(e);
985		}

Diff Legend

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