ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ThreadPoolExecutorTest.java

Comparing jsr166/src/test/tck/ThreadPoolExecutorTest.java (file contents):
Revision 1.110 by jsr166, Tue Oct 6 16:39:06 2015 UTC vs.
Revision 1.112 by jsr166, Thu Oct 8 03:08:38 2015 UTC

#	Line 1727 | Line 1727 | public class ThreadPoolExecutorTest exte
1727		LONG_DELAY_MS, MILLISECONDS,
1728		new ArrayBlockingQueue<Runnable>(10));
1729		try (PoolCleaner cleaner = cleaner(e)) {
1730	+	long startTime = System.nanoTime();
1731		List<Callable<String>> l = new ArrayList<Callable<String>>();
1732		l.add(new NPETask());
1733		try {
1734	<	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1734	>	e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1735		shouldThrow();
1736		} catch (ExecutionException success) {
1737		assertTrue(success.getCause() instanceof NullPointerException);
1738		}
1739	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1740		}
1741		}
1742
#	Line 1747 | Line 1749 | public class ThreadPoolExecutorTest exte
1749		LONG_DELAY_MS, MILLISECONDS,
1750		new ArrayBlockingQueue<Runnable>(10));
1751		try (PoolCleaner cleaner = cleaner(e)) {
1752	+	long startTime = System.nanoTime();
1753		List<Callable<String>> l = new ArrayList<Callable<String>>();
1754		l.add(new StringTask());
1755		l.add(new StringTask());
1756	<	String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1756	>	String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1757		assertSame(TEST_STRING, result);
1758	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1759		}
1760		}
1761

Diff Legend

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