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.20 by dl, Wed Aug 11 19:50:02 2010 UTC vs.
Revision 1.35 by dl, Fri Nov 19 00:20: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.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());
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	>	SubFJP p = new SubFJP();
332		try {
333	<	p = new SubFJP();
334	<	ForkJoinTask a = p.submit(new MediumRunnable());
335	<	ForkJoinTask b = p.submit(new MediumRunnable());
336	<	ForkJoinTask c = p.submit(new MediumRunnable());
333	>	ForkJoinTask a = p.submit(new ShortRunnable());
334	>	ForkJoinTask b = p.submit(new ShortRunnable());
335	>	ForkJoinTask c = p.submit(new ShortRunnable());
336		ForkJoinTask r = p.pollSubmission();
337		assertTrue(r == a || r == b || r == c);
338		assertFalse(r.isDone());
#	Line 346 | Line 345 | public class ForkJoinPoolTest extends JS
345		* drainTasksTo transfers unexecuted submitted tasks, if present
346		*/
347		public void testDrainTasksTo() {
348	<	SubFJP p = null;
348	>	SubFJP p = new SubFJP();
349		try {
350	<	p = new SubFJP();
351	<	ForkJoinTask a = p.submit(new MediumRunnable());
352	<	ForkJoinTask b = p.submit(new MediumRunnable());
354	<	ForkJoinTask c = p.submit(new MediumRunnable());
350	>	ForkJoinTask a = p.submit(new ShortRunnable());
351	>	ForkJoinTask b = p.submit(new ShortRunnable());
352	>	ForkJoinTask c = p.submit(new ShortRunnable());
353		ArrayList<ForkJoinTask> al = new ArrayList();
354		p.drainTasksTo(al);
355		assertTrue(al.size() > 0);
#	Line 372 | Line 370 | public class ForkJoinPoolTest extends JS
370		*/
371		public void testExecuteRunnable() throws Throwable {
372		ExecutorService e = new ForkJoinPool(1);
373	<	TrackedShortRunnable task = new TrackedShortRunnable();
374	<	assertFalse(task.done);
375	<	Future<?> future = e.submit(task);
376	<	future.get();
377	<	assertTrue(task.done);
373	>	try {
374	>	TrackedRunnable task = trackedRunnable(SHORT_DELAY_MS);
375	>	assertFalse(task.isDone());
376	>	Future<?> future = e.submit(task);
377	>	assertNull(future.get());
378	>	assertTrue(task.isDone());
379	>	assertFalse(future.isCancelled());
380	>	} finally {
381	>	joinPool(e);
382	>	}
383		}
384
385
#	Line 385 | Line 388 | public class ForkJoinPoolTest extends JS
388		*/
389		public void testSubmitCallable() throws Throwable {
390		ExecutorService e = new ForkJoinPool(1);
391	<	Future<String> future = e.submit(new StringTask());
392	<	String result = future.get();
393	<	assertSame(TEST_STRING, result);
391	>	try {
392	>	Future<String> future = e.submit(new StringTask());
393	>	assertSame(TEST_STRING, future.get());
394	>	assertTrue(future.isDone());
395	>	assertFalse(future.isCancelled());
396	>	} finally {
397	>	joinPool(e);
398	>	}
399		}
400
401		/**
#	Line 395 | Line 403 | public class ForkJoinPoolTest extends JS
403		*/
404		public void testSubmitRunnable() throws Throwable {
405		ExecutorService e = new ForkJoinPool(1);
406	<	Future<?> future = e.submit(new NoOpRunnable());
407	<	future.get();
408	<	assertTrue(future.isDone());
406	>	try {
407	>	Future<?> future = e.submit(new NoOpRunnable());
408	>	assertNull(future.get());
409	>	assertTrue(future.isDone());
410	>	assertFalse(future.isCancelled());
411	>	} finally {
412	>	joinPool(e);
413	>	}
414		}
415
416		/**
#	Line 405 | Line 418 | public class ForkJoinPoolTest extends JS
418		*/
419		public void testSubmitRunnable2() throws Throwable {
420		ExecutorService e = new ForkJoinPool(1);
421	<	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
422	<	String result = future.get();
423	<	assertSame(TEST_STRING, result);
421	>	try {
422	>	Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
423	>	assertSame(TEST_STRING, future.get());
424	>	assertTrue(future.isDone());
425	>	assertFalse(future.isCancelled());
426	>	} finally {
427	>	joinPool(e);
428	>	}
429		}
430
413	–
431		/**
432	<	* A submitted privileged action to completion
432	>	* A submitted privileged action runs to completion
433		*/
434	<	public void testSubmitPrivilegedAction() throws Throwable {
435	<	Policy savedPolicy = null;
436	<	try {
437	<	savedPolicy = Policy.getPolicy();
438	<	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() {
434	>	public void testSubmitPrivilegedAction() throws Exception {
435	>	Runnable r = new CheckedRunnable() {
436	>	public void realRun() throws Exception {
437	>	ExecutorService e = new ForkJoinPool(1);
438	>	Future future = e.submit(Executors.callable(new PrivilegedAction() {
439		public Object run() {
440		return TEST_STRING;
441		}}));
442
443	<	Object result = future.get();
444	<	assertSame(TEST_STRING, result);
445	<	}
446	<	finally {
447	<	Policy.setPolicy(savedPolicy);
440	<	}
443	>	assertSame(TEST_STRING, future.get());
444	>	}};
445	>
446	>	runWithPermissions(r,
447	>	new RuntimePermission("modifyThread"));
448		}
449
450		/**
451	<	* A submitted a privileged exception action runs to completion
451	>	* A submitted privileged exception action runs to completion
452		*/
453	<	public void testSubmitPrivilegedExceptionAction() throws Throwable {
454	<	Policy savedPolicy = null;
455	<	try {
456	<	savedPolicy = Policy.getPolicy();
457	<	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() {
453	>	public void testSubmitPrivilegedExceptionAction() throws Exception {
454	>	Runnable r = new CheckedRunnable() {
455	>	public void realRun() throws Exception {
456	>	ExecutorService e = new ForkJoinPool(1);
457	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
458		public Object run() {
459		return TEST_STRING;
460		}}));
461
462	<	Object result = future.get();
463	<	assertSame(TEST_STRING, result);
464	<	}
465	<	finally {
469	<	Policy.setPolicy(savedPolicy);
470	<	}
462	>	assertSame(TEST_STRING, future.get());
463	>	}};
464	>
465	>	runWithPermissions(r, new RuntimePermission("modifyThread"));
466		}
467
468		/**
469		* A submitted failed privileged exception action reports exception
470		*/
471	<	public void testSubmitFailedPrivilegedExceptionAction() throws Throwable {
472	<	Policy savedPolicy = null;
473	<	try {
474	<	savedPolicy = Policy.getPolicy();
475	<	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() {
471	>	public void testSubmitFailedPrivilegedExceptionAction() throws Exception {
472	>	Runnable r = new CheckedRunnable() {
473	>	public void realRun() throws Exception {
474	>	ExecutorService e = new ForkJoinPool(1);
475	>	Future future = e.submit(Executors.callable(new PrivilegedExceptionAction() {
476		public Object run() throws Exception {
477		throw new IndexOutOfBoundsException();
478		}}));
479
480	<	Object result = future.get();
481	<	shouldThrow();
482	<	} catch (ExecutionException success) {
483	<	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
484	<	} finally {
485	<	Policy.setPolicy(savedPolicy);
486	<	}
480	>	try {
481	>	future.get();
482	>	shouldThrow();
483	>	} catch (ExecutionException success) {
484	>	assertTrue(success.getCause() instanceof IndexOutOfBoundsException);
485	>	}}};
486	>
487	>	runWithPermissions(r, new RuntimePermission("modifyThread"));
488		}
489
490		/**
491		* execute(null runnable) throws NullPointerException
492		*/
493		public void testExecuteNullRunnable() {
494	+	ExecutorService e = new ForkJoinPool(1);
495		try {
496	<	ExecutorService e = new ForkJoinPool(1);
511	<	TrackedShortRunnable task = null;
512	<	Future<?> future = e.submit(task);
496	>	Future<?> future = e.submit((Runnable) null);
497		shouldThrow();
498	<	} catch (NullPointerException success) {}
498	>	} catch (NullPointerException success) {
499	>	} finally {
500	>	joinPool(e);
501	>	}
502		}
503
504
#	Line 519 | Line 506 | public class ForkJoinPoolTest extends JS
506		* submit(null callable) throws NullPointerException
507		*/
508		public void testSubmitNullCallable() {
509	+	ExecutorService e = new ForkJoinPool(1);
510		try {
511	<	ExecutorService e = new ForkJoinPool(1);
524	<	StringTask t = null;
525	<	Future<String> future = e.submit(t);
511	>	Future<String> future = e.submit((Callable) null);
512		shouldThrow();
513	<	} catch (NullPointerException success) {}
513	>	} catch (NullPointerException success) {
514	>	} finally {
515	>	joinPool(e);
516	>	}
517		}
518
519
520		/**
521	<	* Blocking on submit(callable) throws InterruptedException if
533	<	* caller interrupted.
521	>	* submit(callable).get() throws InterruptedException if interrupted
522		*/
523		public void testInterruptedSubmit() throws InterruptedException {
524	<	final ForkJoinPool p = new ForkJoinPool(1);
525	<
526	<	Thread t = new Thread(new CheckedInterruptedRunnable() {
527	<	public void realRun() throws Throwable {
528	<	p.submit(new CheckedCallable<Object>() {
529	<	public Object realCall() throws Throwable {
530	<	try {
531	<	Thread.sleep(MEDIUM_DELAY_MS);
532	<	} catch (InterruptedException ok) {
533	<	}
534	<	return null;
535	<	}}).get();
536	<	}});
537	<
538	<	t.start();
539	<	Thread.sleep(SHORT_DELAY_MS);
540	<	t.interrupt();
541	<	t.join();
542	<	p.shutdownNow();
543	<	joinPool(p);
524	>	final CountDownLatch submitted    = new CountDownLatch(1);
525	>	final CountDownLatch quittingTime = new CountDownLatch(1);
526	>	final ExecutorService p = new ForkJoinPool(1);
527	>	final Callable<Void> awaiter = new CheckedCallable<Void>() {
528	>	public Void realCall() throws InterruptedException {
529	>	assertTrue(quittingTime.await(MEDIUM_DELAY_MS, MILLISECONDS));
530	>	return null;
531	>	}};
532	>	try {
533	>	Thread t = new Thread(new CheckedInterruptedRunnable() {
534	>	public void realRun() throws Exception {
535	>	Future<Void> future = p.submit(awaiter);
536	>	submitted.countDown();
537	>	future.get();
538	>	}});
539	>	t.start();
540	>	assertTrue(submitted.await(MEDIUM_DELAY_MS, MILLISECONDS));
541	>	t.interrupt();
542	>	t.join();
543	>	} finally {
544	>	quittingTime.countDown();
545	>	joinPool(p);
546	>	}
547		}
548
549		/**
#	Line 570 | Line 561 | public class ForkJoinPoolTest extends JS
561		shouldThrow();
562		} catch (ExecutionException success) {
563		assertTrue(success.getCause() instanceof ArithmeticException);
564	+	} finally {
565	+	joinPool(p);
566		}
574	–
575	–	joinPool(p);
567		}
568
569		/**
#	Line 761 | Line 752 | public class ForkJoinPoolTest extends JS
752		public void testTimedInvokeAny1() throws Throwable {
753		ExecutorService e = new ForkJoinPool(1);
754		try {
755	<	e.invokeAny(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
755	>	e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
756		shouldThrow();
757		} catch (NullPointerException success) {
758		} finally {
#	Line 792 | Line 783 | public class ForkJoinPoolTest extends JS
783		ExecutorService e = new ForkJoinPool(1);
784		try {
785		e.invokeAny(new ArrayList<Callable<String>>(),
786	<	MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
786	>	MEDIUM_DELAY_MS, MILLISECONDS);
787		shouldThrow();
788		} catch (IllegalArgumentException success) {
789		} finally {
#	Line 810 | Line 801 | public class ForkJoinPoolTest extends JS
801		l.add(latchAwaitingStringTask(latch));
802		l.add(null);
803		try {
804	<	e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
804	>	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
805		shouldThrow();
806		} catch (NullPointerException success) {
807		} finally {
#	Line 827 | Line 818 | public class ForkJoinPoolTest extends JS
818		List<Callable<String>> l = new ArrayList<Callable<String>>();
819		l.add(new NPETask());
820		try {
821	<	e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
821	>	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
822		shouldThrow();
823		} catch (ExecutionException success) {
824		assertTrue(success.getCause() instanceof NullPointerException);
#	Line 845 | Line 836 | public class ForkJoinPoolTest extends JS
836		List<Callable<String>> l = new ArrayList<Callable<String>>();
837		l.add(new StringTask());
838		l.add(new StringTask());
839	<	String result = e.invokeAny(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
839	>	String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
840		assertSame(TEST_STRING, result);
841		} finally {
842		joinPool(e);
#	Line 858 | Line 849 | public class ForkJoinPoolTest extends JS
849		public void testTimedInvokeAll1() throws Throwable {
850		ExecutorService e = new ForkJoinPool(1);
851		try {
852	<	e.invokeAll(null, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
852	>	e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
853		shouldThrow();
854		} catch (NullPointerException success) {
855		} finally {
#	Line 890 | Line 881 | public class ForkJoinPoolTest extends JS
881		try {
882		List<Future<String>> r
883		= e.invokeAll(new ArrayList<Callable<String>>(),
884	<	MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
884	>	MEDIUM_DELAY_MS, MILLISECONDS);
885		assertTrue(r.isEmpty());
886		} finally {
887		joinPool(e);
#	Line 906 | Line 897 | public class ForkJoinPoolTest extends JS
897		l.add(new StringTask());
898		l.add(null);
899		try {
900	<	e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
900	>	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
901		shouldThrow();
902		} catch (NullPointerException success) {
903		} finally {
#	Line 922 | Line 913 | public class ForkJoinPoolTest extends JS
913		List<Callable<String>> l = new ArrayList<Callable<String>>();
914		l.add(new NPETask());
915		List<Future<String>> futures
916	<	= e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
916	>	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
917		assertEquals(1, futures.size());
918		try {
919		futures.get(0).get();
#	Line 944 | Line 935 | public class ForkJoinPoolTest extends JS
935		l.add(new StringTask());
936		l.add(new StringTask());
937		List<Future<String>> futures
938	<	= e.invokeAll(l, MEDIUM_DELAY_MS, TimeUnit.MILLISECONDS);
938	>	= e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
939		assertEquals(2, futures.size());
940		for (Future<String> future : futures)
941		assertSame(TEST_STRING, future.get());

Diff Legend

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