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.22 by jsr166, Wed Sep 1 06:41:55 2010 UTC vs.
Revision 1.36 by jsr166, Mon Nov 29 07:42:58 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.Executor;
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;
#	Line 20 | Line 20 | import java.util.concurrent.RejectedExec
20		import java.util.concurrent.ForkJoinPool;
21		import java.util.concurrent.ForkJoinTask;
22		import java.util.concurrent.ForkJoinWorkerThread;
23	–	import java.util.concurrent.RecursiveAction;
23		import java.util.concurrent.RecursiveTask;
24		import java.util.concurrent.TimeUnit;
25	<	import java.util.concurrent.locks.*;
26	<	import java.security.*;
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 {
33		public static void main(String[] args) {
34		junit.textui.TestRunner.run(suite());
35		}
36	+
37		public static Test suite() {
38		return new TestSuite(ForkJoinPoolTest.class);
39		}
#	Line 156 | 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() ==
163	<	ForkJoinPool.defaultForkJoinWorkerThreadFactory);
165	>	assertSame(ForkJoinPool.defaultForkJoinWorkerThreadFactory,
166	>	p.getFactory());
167		assertTrue(p.isQuiescent());
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 201 | Line 204 | public class ForkJoinPoolTest extends JS
204		* getParallelism returns size set in constructor
205		*/
206		public void testGetParallelism() {
207	<	ForkJoinPool p = null;
207	>	ForkJoinPool p = new ForkJoinPool(1);
208		try {
209	<	p = new ForkJoinPool(1);
207	<	assertTrue(p.getParallelism() == 1);
209	>	assertEquals(1, p.getParallelism());
210		} finally {
211		joinPool(p);
212		}
#	Line 214 | 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);
220	<	assertTrue(p.getActiveThreadCount() == 0);
221	>	assertEquals(0, p.getActiveThreadCount());
222		Future<String> future = p.submit(new StringTask());
223	<	assertTrue(p.getPoolSize() == 1);
223	<
223	>	assertEquals(1, p.getPoolSize());
224		} finally {
225		joinPool(p);
226		}
#	Line 233 | 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	<	MyHandler eh = new MyHandler();
239	<	p = new ForkJoinPool(1, new FailingThreadFactory(), eh, false);
240	<	assert(eh == p.getUncaughtExceptionHandler());
241	<	p.execute(new FailingTask());
242	<	Thread.sleep(MEDIUM_DELAY_MS);
243	<	assertTrue(eh.catches > 0);
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();
249	>	p.shutdownNow(); // failure might have prevented processing task
250		joinPool(p);
251		}
252		}
#	Line 253 | Line 257 | public class ForkJoinPoolTest extends JS
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());
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 278 | 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 {
283	–	p = new ForkJoinPool(1);
287		ForkJoinTask<Integer> f = p.submit(new FibTask(8));
288	<	int r = f.get();
286	<	assertTrue(r == 21);
288	>	assertEquals(21, (int) f.get());
289		} finally {
290		joinPool(p);
291		}
#	Line 293 | 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 {
298	–	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 310 | 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 {
315	–	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	<	int r = f.get();
321	<	assertTrue(r == 832040);
321	>	assertEquals(6765, (int) f.get());
322		} finally {
323		p.shutdownNow(); // don't wait out shutdown
324		}
#	Line 328 | 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	>	final CountDownLatch done = new CountDownLatch(1);
332	>	SubFJP p = new SubFJP();
333		try {
334	<	p = new SubFJP();
335	<	ForkJoinTask a = p.submit(new MediumRunnable());
336	<	ForkJoinTask b = p.submit(new MediumRunnable());
336	<	ForkJoinTask c = p.submit(new MediumRunnable());
334	>	ForkJoinTask a = p.submit(awaiter(done));
335	>	ForkJoinTask b = p.submit(awaiter(done));
336	>	ForkJoinTask c = p.submit(awaiter(done));
337		ForkJoinTask r = p.pollSubmission();
338		assertTrue(r == a || r == b || r == c);
339		assertFalse(r.isDone());
340		} finally {
341	+	done.countDown();
342		joinPool(p);
343		}
344		}
#	Line 346 | Line 347 | public class ForkJoinPoolTest extends JS
347		* drainTasksTo transfers unexecuted submitted tasks, if present
348		*/
349		public void testDrainTasksTo() {
350	<	SubFJP p = null;
350	>	final CountDownLatch done = new CountDownLatch(1);
351	>	SubFJP p = new SubFJP();
352		try {
353	<	p = new SubFJP();
354	<	ForkJoinTask a = p.submit(new MediumRunnable());
355	<	ForkJoinTask b = p.submit(new MediumRunnable());
354	<	ForkJoinTask c = p.submit(new MediumRunnable());
353	>	ForkJoinTask a = p.submit(awaiter(done));
354	>	ForkJoinTask b = p.submit(awaiter(done));
355	>	ForkJoinTask c = p.submit(awaiter(done));
356		ArrayList<ForkJoinTask> al = new ArrayList();
357		p.drainTasksTo(al);
358		assertTrue(al.size() > 0);
#	Line 360 | Line 361 | public class ForkJoinPoolTest extends JS
361		assertFalse(r.isDone());
362		}
363		} finally {
364	+	done.countDown();
365		joinPool(p);
366		}
367		}
#	Line 372 | Line 374 | public class ForkJoinPoolTest extends JS
374		*/
375		public void testExecuteRunnable() throws Throwable {
376		ExecutorService e = new ForkJoinPool(1);
377	<	TrackedShortRunnable task = new TrackedShortRunnable();
378	<	assertFalse(task.done);
379	<	Future<?> future = e.submit(task);
380	<	future.get();
381	<	assertTrue(task.done);
377	>	try {
378	>	TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
379	>	assertFalse(task.isDone());
380	>	Future<?> future = e.submit(task);
381	>	assertNull(future.get());
382	>	assertNull(future.get(MEDIUM_DELAY_MS, MILLISECONDS));
383	>	assertTrue(task.isDone());
384	>	assertTrue(future.isDone());
385	>	assertFalse(future.isCancelled());
386	>	} finally {
387	>	joinPool(e);
388	>	}
389		}
390
391
#	Line 385 | Line 394 | public class ForkJoinPoolTest extends JS
394		*/
395		public void testSubmitCallable() throws Throwable {
396		ExecutorService e = new ForkJoinPool(1);
397	<	Future<String> future = e.submit(new StringTask());
398	<	String result = future.get();
399	<	assertSame(TEST_STRING, result);
397	>	try {
398	>	Future<String> future = e.submit(new StringTask());
399	>	assertSame(TEST_STRING, future.get());
400	>	assertTrue(future.isDone());
401	>	assertFalse(future.isCancelled());
402	>	} finally {
403	>	joinPool(e);
404	>	}
405		}
406
407		/**
#	Line 395 | Line 409 | public class ForkJoinPoolTest extends JS
409		*/
410		public void testSubmitRunnable() throws Throwable {
411		ExecutorService e = new ForkJoinPool(1);
412	<	Future<?> future = e.submit(new NoOpRunnable());
413	<	future.get();
414	<	assertTrue(future.isDone());
412	>	try {
413	>	Future<?> future = e.submit(new NoOpRunnable());
414	>	assertNull(future.get());
415	>	assertTrue(future.isDone());
416	>	assertFalse(future.isCancelled());
417	>	} finally {
418	>	joinPool(e);
419	>	}
420		}
421
422		/**
#	Line 405 | Line 424 | public class ForkJoinPoolTest extends JS
424		*/
425		public void testSubmitRunnable2() throws Throwable {
426		ExecutorService e = new ForkJoinPool(1);
427	<	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
428	<	String result = future.get();
429	<	assertSame(TEST_STRING, result);
427	>	try {
428	>	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
429	>	assertSame(TEST_STRING, future.get());
430	>	assertTrue(future.isDone());
431	>	assertFalse(future.isCancelled());
432	>	} finally {
433	>	joinPool(e);
434	>	}
435		}
436
413	–
437		/**
438	<	* A submitted privileged action to completion
438	>	* A submitted privileged action runs to completion
439		*/
440	<	public void testSubmitPrivilegedAction() throws Throwable {
441	<	Policy savedPolicy = null;
442	<	try {
443	<	savedPolicy = Policy.getPolicy();
444	<	AdjustablePolicy policy = new AdjustablePolicy();
422	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
423	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
424	<	Policy.setPolicy(policy);
425	<	} catch (AccessControlException ok) {
426	<	return;
427	<	}
428	<	try {
429	<	ExecutorService e = new ForkJoinPool(1);
430	<	Future future = e.submit(Executors.callable(new PrivilegedAction() {
440	>	public void testSubmitPrivilegedAction() throws Exception {
441	>	Runnable r = new CheckedRunnable() {
442	>	public void realRun() throws Exception {
443	>	ExecutorService e = new ForkJoinPool(1);
444	>	Future future = e.submit(Executors.callable(new PrivilegedAction() {
445		public Object run() {
446		return TEST_STRING;
447		}}));
448
449	<	Object result = future.get();
450	<	assertSame(TEST_STRING, result);
451	<	}
452	<	finally {
453	<	Policy.setPolicy(savedPolicy);
440	<	}
449	>	assertSame(TEST_STRING, future.get());
450	>	}};
451	>
452	>	runWithPermissions(r,
453	>	new RuntimePermission("modifyThread"));
454		}
455
456		/**
457	<	* A submitted a privileged exception action runs to completion
457	>	* A submitted privileged exception action runs to completion
458		*/
459	<	public void testSubmitPrivilegedExceptionAction() throws Throwable {
460	<	Policy savedPolicy = null;
461	<	try {
462	<	savedPolicy = Policy.getPolicy();
463	<	AdjustablePolicy policy = new AdjustablePolicy();
451	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
452	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
453	<	Policy.setPolicy(policy);
454	<	} catch (AccessControlException ok) {
455	<	return;
456	<	}
457	<
458	<	try {
459	<	ExecutorService e = new ForkJoinPool(1);
460	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
459	>	public void testSubmitPrivilegedExceptionAction() throws Exception {
460	>	Runnable r = new CheckedRunnable() {
461	>	public void realRun() throws Exception {
462	>	ExecutorService e = new ForkJoinPool(1);
463	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
464		public Object run() {
465		return TEST_STRING;
466		}}));
467
468	<	Object result = future.get();
469	<	assertSame(TEST_STRING, result);
470	<	}
471	<	finally {
469	<	Policy.setPolicy(savedPolicy);
470	<	}
468	>	assertSame(TEST_STRING, future.get());
469	>	}};
470	>
471	>	runWithPermissions(r, new RuntimePermission("modifyThread"));
472		}
473
474		/**
475		* A submitted failed privileged exception action reports exception
476		*/
477	<	public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
478	<	Policy savedPolicy = null;
479	<	try {
480	<	savedPolicy = Policy.getPolicy();
481	<	AdjustablePolicy policy = new AdjustablePolicy();
481	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
482	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
483	<	Policy.setPolicy(policy);
484	<	} catch (AccessControlException ok) {
485	<	return;
486	<	}
487	<
488	<
489	<	try {
490	<	ExecutorService e = new ForkJoinPool(1);
491	<	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
477	>	public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
478	>	Runnable r = new CheckedRunnable() {
479	>	public void realRun() throws Exception {
480	>	ExecutorService e = new ForkJoinPool(1);
481	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
482		public Object run() throws Exception {
483		throw new IndexOutOfBoundsException();
484		}}));
485
486	<	Object result = future.get();
487	<	shouldThrow();
488	<	} catch (ExecutionException success) {
489	<	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
490	<	} finally {
491	<	Policy.setPolicy(savedPolicy);
492	<	}
486	>	try {
487	>	future.get();
488	>	shouldThrow();
489	>	} catch (ExecutionException success) {
490	>	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
491	>	}}};
492	>
493	>	runWithPermissions(r, new RuntimePermission("modifyThread"));
494		}
495
496		/**
497		* execute(null runnable) throws NullPointerException
498		*/
499		public void testExecuteNullRunnable() {
500	+	ExecutorService e = new ForkJoinPool(1);
501		try {
502	<	ExecutorService e = new ForkJoinPool(1);
511	<	TrackedShortRunnable task = null;
512	<	Future<?> future = e.submit(task);
502	>	Future<?> future = e.submit((Runnable) null);
503		shouldThrow();
504	<	} catch (NullPointerException success) {}
504	>	} catch (NullPointerException success) {
505	>	} finally {
506	>	joinPool(e);
507	>	}
508		}
509
510
#	Line 519 | Line 512 | public class ForkJoinPoolTest extends JS
512		* submit(null callable) throws NullPointerException
513		*/
514		public void testSubmitNullCallable() {
515	+	ExecutorService e = new ForkJoinPool(1);
516		try {
517	<	ExecutorService e = new ForkJoinPool(1);
524	<	StringTask t = null;
525	<	Future<String> future = e.submit(t);
517	>	Future<String> future = e.submit((Callable) null);
518		shouldThrow();
519	<	} catch (NullPointerException success) {}
519	>	} catch (NullPointerException success) {
520	>	} finally {
521	>	joinPool(e);
522	>	}
523		}
524
525
526		/**
527	<	* Blocking on submit(callable) throws InterruptedException if
533	<	* caller interrupted.
527	>	* submit(callable).get() throws InterruptedException if interrupted
528		*/
529		public void testInterruptedSubmit() throws InterruptedException {
530	<	final ForkJoinPool p = new ForkJoinPool(1);
531	<
532	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
533	<	public void realRun() throws Throwable {
534	<	p.submit(new CheckedCallable<Object>() {
535	<	public Object realCall() throws Throwable {
536	<	try {
537	<	Thread.sleep(MEDIUM_DELAY_MS);
538	<	} catch (InterruptedException ok) {
539	<	}
540	<	return null;
541	<	}}).get();
542	<	}});
543	<
544	<	t.start();
545	<	Thread.sleep(SHORT_DELAY_MS);
546	<	t.interrupt();
547	<	t.join();
548	<	p.shutdownNow();
549	<	joinPool(p);
530	>	final CountDownLatch submitted    = new CountDownLatch(1);
531	>	final CountDownLatch quittingTime = new CountDownLatch(1);
532	>	final ExecutorService p = new ForkJoinPool(1);
533	>	final Callable<Void> awaiter = new CheckedCallable<Void>() {
534	>	public Void realCall() throws InterruptedException {
535	>	assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
536	>	return null;
537	>	}};
538	>	try {
539	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
540	>	public void realRun() throws Exception {
541	>	Future<Void> future = p.submit(awaiter);
542	>	submitted.countDown();
543	>	future.get();
544	>	}});
545	>	t.start();
546	>	assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
547	>	t.interrupt();
548	>	t.join();
549	>	} finally {
550	>	quittingTime.countDown();
551	>	joinPool(p);
552	>	}
553		}
554
555		/**
#	Line 570 | Line 567 | public class ForkJoinPoolTest extends JS
567		shouldThrow();
568		} catch (ExecutionException success) {
569		assertTrue(success.getCause() instanceof ArithmeticException);
570	+	} finally {
571	+	joinPool(p);
572		}
574	–
575	–	joinPool(p);
573		}
574
575		/**
#	Line 761 | Line 758 | public class ForkJoinPoolTest extends JS
758		public void testTimedInvokeAny1() throws Throwable {
759		ExecutorService e = new ForkJoinPool(1);
760		try {
761	<	e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
761	>	e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
762		shouldThrow();
763		} catch (NullPointerException success) {
764		} finally {
#	Line 792 | Line 789 | public class ForkJoinPoolTest extends JS
789		ExecutorService e = new ForkJoinPool(1);
790		try {
791		e.invokeAny(new ArrayList<Callable<String>>(),
792	<	MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
792	>	MEDIUM_DELAY_MS, MILLISECONDS);
793		shouldThrow();
794		} catch (IllegalArgumentException success) {
795		} finally {
#	Line 810 | Line 807 | public class ForkJoinPoolTest extends JS
807		l.add(latchAwaitingStringTask(latch));
808		l.add(null);
809		try {
810	<	e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
810	>	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
811		shouldThrow();
812		} catch (NullPointerException success) {
813		} finally {
#	Line 827 | Line 824 | public class ForkJoinPoolTest extends JS
824		List<Callable<String>> l = new ArrayList<Callable<String>>();
825		l.add(new NPETask());
826		try {
827	<	e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
827	>	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
828		shouldThrow();
829		} catch (ExecutionException success) {
830		assertTrue(success.getCause() instanceof NullPointerException);
#	Line 845 | Line 842 | public class ForkJoinPoolTest extends JS
842		List<Callable<String>> l = new ArrayList<Callable<String>>();
843		l.add(new StringTask());
844		l.add(new StringTask());
845	<	String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
845	>	String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
846		assertSame(TEST_STRING, result);
847		} finally {
848		joinPool(e);
#	Line 858 | Line 855 | public class ForkJoinPoolTest extends JS
855		public void testTimedInvokeAll1() throws Throwable {
856		ExecutorService e = new ForkJoinPool(1);
857		try {
858	<	e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
858	>	e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
859		shouldThrow();
860		} catch (NullPointerException success) {
861		} finally {
#	Line 890 | Line 887 | public class ForkJoinPoolTest extends JS
887		try {
888		List<Future<String>> r
889		= e.invokeAll(new ArrayList<Callable<String>>(),
890	<	MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
890	>	MEDIUM_DELAY_MS, MILLISECONDS);
891		assertTrue(r.isEmpty());
892		} finally {
893		joinPool(e);
#	Line 906 | Line 903 | public class ForkJoinPoolTest extends JS
903		l.add(new StringTask());
904		l.add(null);
905		try {
906	<	e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
906	>	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
907		shouldThrow();
908		} catch (NullPointerException success) {
909		} finally {
#	Line 922 | Line 919 | public class ForkJoinPoolTest extends JS
919		List<Callable<String>> l = new ArrayList<Callable<String>>();
920		l.add(new NPETask());
921		List<Future<String>> futures
922	<	= e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
922	>	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
923		assertEquals(1, futures.size());
924		try {
925		futures.get(0).get();
#	Line 944 | Line 941 | public class ForkJoinPoolTest extends JS
941		l.add(new StringTask());
942		l.add(new StringTask());
943		List<Future<String>> futures
944	<	= e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
944	>	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
945		assertEquals(2, futures.size());
946		for (Future<String> future : futures)
947		assertSame(TEST_STRING, future.get());

Diff Legend

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