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.113 by jsr166, Wed Aug 24 22:22:39 2016 UTC

#	Line 28 | Line 28 | import java.util.concurrent.RejectedExec
28		import java.util.concurrent.SynchronousQueue;
29		import java.util.concurrent.ThreadFactory;
30		import java.util.concurrent.ThreadPoolExecutor;
31	–	import java.util.concurrent.TimeUnit;
31		import java.util.concurrent.atomic.AtomicInteger;
32
33		import junit.framework.Test;
#	Line 1727 | Line 1726 | public class ThreadPoolExecutorTest exte
1726		LONG_DELAY_MS, MILLISECONDS,
1727		new ArrayBlockingQueue<Runnable>(10));
1728		try (PoolCleaner cleaner = cleaner(e)) {
1729	+	long startTime = System.nanoTime();
1730		List<Callable<String>> l = new ArrayList<Callable<String>>();
1731		l.add(new NPETask());
1732		try {
1733	<	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1733	>	e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1734		shouldThrow();
1735		} catch (ExecutionException success) {
1736		assertTrue(success.getCause() instanceof NullPointerException);
1737		}
1738	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1739		}
1740		}
1741
#	Line 1747 | Line 1748 | public class ThreadPoolExecutorTest exte
1748		LONG_DELAY_MS, MILLISECONDS,
1749		new ArrayBlockingQueue<Runnable>(10));
1750		try (PoolCleaner cleaner = cleaner(e)) {
1751	+	long startTime = System.nanoTime();
1752		List<Callable<String>> l = new ArrayList<Callable<String>>();
1753		l.add(new StringTask());
1754		l.add(new StringTask());
1755	<	String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1755	>	String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1756		assertSame(TEST_STRING, result);
1757	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1758		}
1759		}
1760

Diff Legend

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