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.44 by dl, Tue Jan 10 13:48:27 2012 UTC vs.
Revision 1.47 by jsr166, Mon Jan 14 22:05:39 2013 UTC

#	Line 244 | Line 244 | public class ForkJoinPoolTest extends JS
244		assertSame(eh, p.getUncaughtExceptionHandler());
245		try {
246		p.execute(new FibTask(8));
247	<	assertTrue(uehInvoked.await(10000, MILLISECONDS));
248	<	} catch(RejectedExecutionException ok) {
247	>	assertTrue(uehInvoked.await(MEDIUM_DELAY_MS, MILLISECONDS));
248	>	} catch (RejectedExecutionException ok) {
249		}
250		} finally {
251		p.shutdownNow(); // failure might have prevented processing task
#	Line 575 | Line 575 | public class ForkJoinPoolTest extends JS
575		ForkJoinPool p = new ForkJoinPool(1);
576		try {
577		p.submit(new Callable() {
578	<	public Object call() {
579	<	int i = 5/0;
580	<	return Boolean.TRUE;
581	<	}}).get();
578	>	public Object call() { throw new ArithmeticException(); }})
579	>	.get();
580		shouldThrow();
581		} catch (ExecutionException success) {
582		assertTrue(success.getCause() instanceof ArithmeticException);

Diff Legend

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