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.115 by jsr166, Mon Mar 20 00:21:54 2017 UTC vs.
Revision 1.126 by jsr166, Fri Sep 6 18:43:35 2019 UTC

#	Line 11 | Line 11 | import static java.util.concurrent.TimeU
11		import static java.util.concurrent.TimeUnit.SECONDS;
12
13		import java.util.ArrayList;
14	+	import java.util.Collection;
15	+	import java.util.Collections;
16		import java.util.List;
17		import java.util.concurrent.ArrayBlockingQueue;
18		import java.util.concurrent.BlockingQueue;
#	Line 26 | Line 28 | import java.util.concurrent.RejectedExec
28		import java.util.concurrent.RejectedExecutionHandler;
29		import java.util.concurrent.SynchronousQueue;
30		import java.util.concurrent.ThreadFactory;
31	+	import java.util.concurrent.ThreadLocalRandom;
32		import java.util.concurrent.ThreadPoolExecutor;
33	+	import java.util.concurrent.ThreadPoolExecutor.AbortPolicy;
34	+	import java.util.concurrent.ThreadPoolExecutor.CallerRunsPolicy;
35	+	import java.util.concurrent.ThreadPoolExecutor.DiscardPolicy;
36	+	import java.util.concurrent.ThreadPoolExecutor.DiscardOldestPolicy;
37		import java.util.concurrent.atomic.AtomicInteger;
38	+	import java.util.concurrent.atomic.AtomicReference;
39
40		import junit.framework.Test;
41		import junit.framework.TestSuite;
#	Line 90 | Line 98 | public class ThreadPoolExecutorTest exte
98		final Runnable task = new CheckedRunnable() {
99		public void realRun() { done.countDown(); }};
100		p.execute(task);
101	<	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
101	>	await(done);
102		}
103		}
104
#	Line 184 | Line 192 | public class ThreadPoolExecutorTest exte
192		public void realRun() throws InterruptedException {
193		threadStarted.countDown();
194		assertEquals(0, p.getCompletedTaskCount());
195	<	threadProceed.await();
195	>	await(threadProceed);
196		threadDone.countDown();
197		}});
198		await(threadStarted);
199		assertEquals(0, p.getCompletedTaskCount());
200		threadProceed.countDown();
201	<	threadDone.await();
201	>	await(threadDone);
202		long startTime = System.nanoTime();
203		while (p.getCompletedTaskCount() != 1) {
204		if (millisElapsedSince(startTime) > LONG_DELAY_MS)
#	Line 274 | Line 282 | public class ThreadPoolExecutorTest exte
282		}
283
284		/**
285	+	* The default rejected execution handler is AbortPolicy.
286	+	*/
287	+	public void testDefaultRejectedExecutionHandler() {
288	+	final ThreadPoolExecutor p =
289	+	new ThreadPoolExecutor(1, 2,
290	+	LONG_DELAY_MS, MILLISECONDS,
291	+	new ArrayBlockingQueue<Runnable>(10));
292	+	try (PoolCleaner cleaner = cleaner(p)) {
293	+	assertTrue(p.getRejectedExecutionHandler() instanceof AbortPolicy);
294	+	}
295	+	}
296	+
297	+	/**
298		* getRejectedExecutionHandler returns handler in constructor if not set
299		*/
300		public void testGetRejectedExecutionHandler() {
#	Line 456 | Line 477 | public class ThreadPoolExecutorTest exte
477		assertFalse(p.awaitTermination(Long.MIN_VALUE, MILLISECONDS));
478		assertFalse(p.awaitTermination(-1L, NANOSECONDS));
479		assertFalse(p.awaitTermination(-1L, MILLISECONDS));
480	<	assertFalse(p.awaitTermination(0L, NANOSECONDS));
481	<	assertFalse(p.awaitTermination(0L, MILLISECONDS));
480	>	assertFalse(p.awaitTermination(randomExpiredTimeout(),
481	>	randomTimeUnit()));
482		long timeoutNanos = 999999L;
483		long startTime = System.nanoTime();
484		assertFalse(p.awaitTermination(timeoutNanos, NANOSECONDS));
#	Line 651 | Line 672 | public class ThreadPoolExecutorTest exte
672		Runnable waiter = new CheckedRunnable() { public void realRun() {
673		threadsStarted.countDown();
674		try {
675	<	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
675	>	MILLISECONDS.sleep(LONGER_DELAY_MS);
676		} catch (InterruptedException success) {}
677		ran.getAndIncrement();
678		}};
#	Line 1038 | Line 1059 | public class ThreadPoolExecutorTest exte
1059		p.submit(task).get();
1060		}});
1061
1062	<	await(threadStarted);
1062	>	await(threadStarted); // ensure quiescence
1063		t.interrupt();
1064		awaitTermination(t);
1065		}
1066		}
1067
1068		/**
1069	<	* execute throws RejectedExecutionException if saturated.
1069	>	* Submitted tasks are rejected when saturated or shutdown
1070		*/
1071	<	public void testSaturatedExecute() {
1071	>	public void testSubmittedTasksRejectedWhenSaturatedOrShutdown() throws InterruptedException {
1072	>	final ThreadPoolExecutor p = new ThreadPoolExecutor(
1073	>	1, 1, 1, SECONDS, new ArrayBlockingQueue<Runnable>(1));
1074	>	final int saturatedSize = saturatedSize(p);
1075	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
1076	>	final CountDownLatch threadsStarted = new CountDownLatch(p.getMaximumPoolSize());
1077		final CountDownLatch done = new CountDownLatch(1);
1078	<	final ThreadPoolExecutor p =
1079	<	new ThreadPoolExecutor(1, 1,
1080	<	LONG_DELAY_MS, MILLISECONDS,
1055	<	new ArrayBlockingQueue<Runnable>(1));
1056	<	try (PoolCleaner cleaner = cleaner(p, done)) {
1057	<	Runnable task = new CheckedRunnable() {
1058	<	public void realRun() throws InterruptedException {
1059	<	await(done);
1060	<	}};
1061	<	for (int i = 0; i < 2; ++i)
1062	<	p.execute(task);
1063	<	for (int i = 0; i < 2; ++i) {
1078	>	final Runnable r = () -> {
1079	>	threadsStarted.countDown();
1080	>	for (;;) {
1081		try {
1082	<	p.execute(task);
1083	<	shouldThrow();
1084	<	} catch (RejectedExecutionException success) {}
1085	<	assertTrue(p.getTaskCount() <= 2);
1086	<	}
1087	<	}
1088	<	}
1072	<
1073	<	/**
1074	<	* submit(runnable) throws RejectedExecutionException if saturated.
1075	<	*/
1076	<	public void testSaturatedSubmitRunnable() {
1077	<	final CountDownLatch done = new CountDownLatch(1);
1078	<	final ThreadPoolExecutor p =
1079	<	new ThreadPoolExecutor(1, 1,
1080	<	LONG_DELAY_MS, MILLISECONDS,
1081	<	new ArrayBlockingQueue<Runnable>(1));
1082	<	try (PoolCleaner cleaner = cleaner(p, done)) {
1083	<	Runnable task = new CheckedRunnable() {
1084	<	public void realRun() throws InterruptedException {
1085	<	await(done);
1086	<	}};
1087	<	for (int i = 0; i < 2; ++i)
1088	<	p.submit(task);
1089	<	for (int i = 0; i < 2; ++i) {
1082	>	done.await();
1083	>	return;
1084	>	} catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
1085	>	}};
1086	>	final Callable<Boolean> c = () -> {
1087	>	threadsStarted.countDown();
1088	>	for (;;) {
1089		try {
1090	<	p.execute(task);
1091	<	shouldThrow();
1092	<	} catch (RejectedExecutionException success) {}
1093	<	assertTrue(p.getTaskCount() <= 2);
1094	<	}
1096	<	}
1097	<	}
1090	>	done.await();
1091	>	return Boolean.TRUE;
1092	>	} catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
1093	>	}};
1094	>	final boolean shutdownNow = rnd.nextBoolean();
1095
1099	–	/**
1100	–	* submit(callable) throws RejectedExecutionException if saturated.
1101	–	*/
1102	–	public void testSaturatedSubmitCallable() {
1103	–	final CountDownLatch done = new CountDownLatch(1);
1104	–	final ThreadPoolExecutor p =
1105	–	new ThreadPoolExecutor(1, 1,
1106	–	LONG_DELAY_MS, MILLISECONDS,
1107	–	new ArrayBlockingQueue<Runnable>(1));
1096		try (PoolCleaner cleaner = cleaner(p, done)) {
1097	<	Runnable task = new CheckedRunnable() {
1098	<	public void realRun() throws InterruptedException {
1099	<	await(done);
1100	<	}};
1101	<	for (int i = 0; i < 2; ++i)
1102	<	p.execute(task);
1103	<	for (int i = 0; i < 2; ++i) {
1104	<	try {
1117	<	p.execute(task);
1118	<	shouldThrow();
1119	<	} catch (RejectedExecutionException success) {}
1120	<	assertTrue(p.getTaskCount() <= 2);
1097	>	// saturate
1098	>	for (int i = saturatedSize; i--> 0; ) {
1099	>	switch (rnd.nextInt(4)) {
1100	>	case 0: p.execute(r); break;
1101	>	case 1: assertFalse(p.submit(r).isDone()); break;
1102	>	case 2: assertFalse(p.submit(r, Boolean.TRUE).isDone()); break;
1103	>	case 3: assertFalse(p.submit(c).isDone()); break;
1104	>	}
1105		}
1122	–	}
1123	–	}
1106
1107	<	/**
1108	<	* executor using CallerRunsPolicy runs task if saturated.
1127	<	*/
1128	<	public void testSaturatedExecute2() {
1129	<	final ThreadPoolExecutor p =
1130	<	new ThreadPoolExecutor(1, 1,
1131	<	LONG_DELAY_MS,
1132	<	MILLISECONDS,
1133	<	new ArrayBlockingQueue<Runnable>(1),
1134	<	new ThreadPoolExecutor.CallerRunsPolicy());
1135	<	try (PoolCleaner cleaner = cleaner(p)) {
1136	<	final CountDownLatch done = new CountDownLatch(1);
1137	<	Runnable blocker = new CheckedRunnable() {
1138	<	public void realRun() throws InterruptedException {
1139	<	await(done);
1140	<	}};
1141	<	p.execute(blocker);
1142	<	TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1143	<	for (int i = 0; i < tasks.length; i++)
1144	<	tasks[i] = new TrackedNoOpRunnable();
1145	<	for (int i = 0; i < tasks.length; i++)
1146	<	p.execute(tasks[i]);
1147	<	for (int i = 1; i < tasks.length; i++)
1148	<	assertTrue(tasks[i].done);
1149	<	assertFalse(tasks[0].done); // waiting in queue
1150	<	done.countDown();
1151	<	}
1152	<	}
1107	>	await(threadsStarted);
1108	>	assertTaskSubmissionsAreRejected(p);
1109
1110	<	/**
1111	<	* executor using DiscardPolicy drops task if saturated.
1112	<	*/
1113	<	public void testSaturatedExecute3() {
1114	<	final CountDownLatch done = new CountDownLatch(1);
1115	<	final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1116	<	for (int i = 0; i < tasks.length; ++i)
1161	<	tasks[i] = new TrackedNoOpRunnable();
1162	<	final ThreadPoolExecutor p =
1163	<	new ThreadPoolExecutor(1, 1,
1164	<	LONG_DELAY_MS, MILLISECONDS,
1165	<	new ArrayBlockingQueue<Runnable>(1),
1166	<	new ThreadPoolExecutor.DiscardPolicy());
1167	<	try (PoolCleaner cleaner = cleaner(p, done)) {
1168	<	p.execute(awaiter(done));
1110	>	if (shutdownNow)
1111	>	p.shutdownNow();
1112	>	else
1113	>	p.shutdown();
1114	>	// Pool is shutdown, but not yet terminated
1115	>	assertTaskSubmissionsAreRejected(p);
1116	>	assertFalse(p.isTerminated());
1117
1118	<	for (TrackedNoOpRunnable task : tasks)
1119	<	p.execute(task);
1120	<	for (int i = 1; i < tasks.length; i++)
1121	<	assertFalse(tasks[i].done);
1122	<	}
1123	<	for (int i = 1; i < tasks.length; i++)
1124	<	assertFalse(tasks[i].done);
1125	<	assertTrue(tasks[0].done); // was waiting in queue
1118	>	done.countDown();   // release blocking tasks
1119	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
1120	>
1121	>	assertTaskSubmissionsAreRejected(p);
1122	>	}
1123	>	assertEquals(saturatedSize(p)
1124	>	- (shutdownNow ? p.getQueue().remainingCapacity() : 0),
1125	>	p.getCompletedTaskCount());
1126		}
1127
1128		/**
1129		* executor using DiscardOldestPolicy drops oldest task if saturated.
1130		*/
1131	<	public void testSaturatedExecute4() {
1131	>	public void testSaturatedExecute_DiscardOldestPolicy() {
1132		final CountDownLatch done = new CountDownLatch(1);
1133		LatchAwaiter r1 = awaiter(done);
1134		LatchAwaiter r2 = awaiter(done);
#	Line 1189 | Line 1137 | public class ThreadPoolExecutorTest exte
1137		new ThreadPoolExecutor(1, 1,
1138		LONG_DELAY_MS, MILLISECONDS,
1139		new ArrayBlockingQueue<Runnable>(1),
1140	<	new ThreadPoolExecutor.DiscardOldestPolicy());
1140	>	new DiscardOldestPolicy());
1141		try (PoolCleaner cleaner = cleaner(p, done)) {
1142		assertEquals(LatchAwaiter.NEW, r1.state);
1143		assertEquals(LatchAwaiter.NEW, r2.state);
#	Line 1207 | Line 1155 | public class ThreadPoolExecutorTest exte
1155		}
1156
1157		/**
1210	–	* execute throws RejectedExecutionException if shutdown
1211	–	*/
1212	–	public void testRejectedExecutionExceptionOnShutdown() {
1213	–	final ThreadPoolExecutor p =
1214	–	new ThreadPoolExecutor(1, 1,
1215	–	LONG_DELAY_MS, MILLISECONDS,
1216	–	new ArrayBlockingQueue<Runnable>(1));
1217	–	try { p.shutdown(); } catch (SecurityException ok) { return; }
1218	–	try (PoolCleaner cleaner = cleaner(p)) {
1219	–	try {
1220	–	p.execute(new NoOpRunnable());
1221	–	shouldThrow();
1222	–	} catch (RejectedExecutionException success) {}
1223	–	}
1224	–	}
1225	–
1226	–	/**
1227	–	* execute using CallerRunsPolicy drops task on shutdown
1228	–	*/
1229	–	public void testCallerRunsOnShutdown() {
1230	–	RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1231	–	final ThreadPoolExecutor p =
1232	–	new ThreadPoolExecutor(1, 1,
1233	–	LONG_DELAY_MS, MILLISECONDS,
1234	–	new ArrayBlockingQueue<Runnable>(1), h);
1235	–
1236	–	try { p.shutdown(); } catch (SecurityException ok) { return; }
1237	–	try (PoolCleaner cleaner = cleaner(p)) {
1238	–	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1239	–	p.execute(r);
1240	–	assertFalse(r.done);
1241	–	}
1242	–	}
1243	–
1244	–	/**
1245	–	* execute using DiscardPolicy drops task on shutdown
1246	–	*/
1247	–	public void testDiscardOnShutdown() {
1248	–	final ThreadPoolExecutor p =
1249	–	new ThreadPoolExecutor(1, 1,
1250	–	LONG_DELAY_MS, MILLISECONDS,
1251	–	new ArrayBlockingQueue<Runnable>(1),
1252	–	new ThreadPoolExecutor.DiscardPolicy());
1253	–
1254	–	try { p.shutdown(); } catch (SecurityException ok) { return; }
1255	–	try (PoolCleaner cleaner = cleaner(p)) {
1256	–	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1257	–	p.execute(r);
1258	–	assertFalse(r.done);
1259	–	}
1260	–	}
1261	–
1262	–	/**
1158		* execute using DiscardOldestPolicy drops task on shutdown
1159		*/
1160		public void testDiscardOldestOnShutdown() {
#	Line 1267 | Line 1162 | public class ThreadPoolExecutorTest exte
1162		new ThreadPoolExecutor(1, 1,
1163		LONG_DELAY_MS, MILLISECONDS,
1164		new ArrayBlockingQueue<Runnable>(1),
1165	<	new ThreadPoolExecutor.DiscardOldestPolicy());
1165	>	new DiscardOldestPolicy());
1166
1167		try { p.shutdown(); } catch (SecurityException ok) { return; }
1168		try (PoolCleaner cleaner = cleaner(p)) {
#	Line 1278 | Line 1173 | public class ThreadPoolExecutorTest exte
1173		}
1174
1175		/**
1176	<	* execute(null) throws NPE
1176	>	* Submitting null tasks throws NullPointerException
1177		*/
1178	<	public void testExecuteNull() {
1178	>	public void testNullTaskSubmission() {
1179		final ThreadPoolExecutor p =
1180		new ThreadPoolExecutor(1, 2,
1181		1L, SECONDS,
1182		new ArrayBlockingQueue<Runnable>(10));
1183		try (PoolCleaner cleaner = cleaner(p)) {
1184	<	try {
1290	<	p.execute(null);
1291	<	shouldThrow();
1292	<	} catch (NullPointerException success) {}
1184	>	assertNullTaskSubmissionThrowsNullPointerException(p);
1185		}
1186		}
1187
#	Line 1481 | Line 1373 | public class ThreadPoolExecutorTest exte
1373		}
1374
1375		/**
1376	<	* invokeAny(empty collection) throws IAE
1376	>	* invokeAny(empty collection) throws IllegalArgumentException
1377		*/
1378		public void testInvokeAny2() throws Exception {
1379		final ExecutorService e =
#	Line 1571 | Line 1463 | public class ThreadPoolExecutorTest exte
1463		}
1464
1465		/**
1466	<	* invokeAll(empty collection) returns empty collection
1466	>	* invokeAll(empty collection) returns empty list
1467		*/
1468		public void testInvokeAll2() throws InterruptedException {
1469		final ExecutorService e =
1470		new ThreadPoolExecutor(2, 2,
1471		LONG_DELAY_MS, MILLISECONDS,
1472		new ArrayBlockingQueue<Runnable>(10));
1473	+	final Collection<Callable<String>> emptyCollection
1474	+	= Collections.emptyList();
1475		try (PoolCleaner cleaner = cleaner(e)) {
1476	<	List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1476	>	List<Future<String>> r = e.invokeAll(emptyCollection);
1477		assertTrue(r.isEmpty());
1478		}
1479		}
#	Line 1654 | Line 1548 | public class ThreadPoolExecutorTest exte
1548		new ArrayBlockingQueue<Runnable>(10));
1549		try (PoolCleaner cleaner = cleaner(e)) {
1550		try {
1551	<	e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1551	>	e.invokeAny(null, randomTimeout(), randomTimeUnit());
1552		shouldThrow();
1553		} catch (NullPointerException success) {}
1554		}
#	Line 1672 | Line 1566 | public class ThreadPoolExecutorTest exte
1566		List<Callable<String>> l = new ArrayList<>();
1567		l.add(new StringTask());
1568		try {
1569	<	e.invokeAny(l, MEDIUM_DELAY_MS, null);
1569	>	e.invokeAny(l, randomTimeout(), null);
1570		shouldThrow();
1571		} catch (NullPointerException success) {}
1572		}
1573		}
1574
1575		/**
1576	<	* timed invokeAny(empty collection) throws IAE
1576	>	* timed invokeAny(empty collection) throws IllegalArgumentException
1577		*/
1578		public void testTimedInvokeAny2() throws Exception {
1579		final ExecutorService e =
#	Line 1689 | Line 1583 | public class ThreadPoolExecutorTest exte
1583		try (PoolCleaner cleaner = cleaner(e)) {
1584		try {
1585		e.invokeAny(new ArrayList<Callable<String>>(),
1586	<	MEDIUM_DELAY_MS, MILLISECONDS);
1586	>	randomTimeout(), randomTimeUnit());
1587		shouldThrow();
1588		} catch (IllegalArgumentException success) {}
1589		}
1590		}
1591
1592		/**
1593	<	* timed invokeAny(c) throws NPE if c has null elements
1593	>	* timed invokeAny(c) throws NullPointerException if c has null elements
1594		*/
1595		public void testTimedInvokeAny3() throws Exception {
1596		final CountDownLatch latch = new CountDownLatch(1);
#	Line 1709 | Line 1603 | public class ThreadPoolExecutorTest exte
1603		l.add(latchAwaitingStringTask(latch));
1604		l.add(null);
1605		try {
1606	<	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1606	>	e.invokeAny(l, randomTimeout(), randomTimeUnit());
1607		shouldThrow();
1608		} catch (NullPointerException success) {}
1609		latch.countDown();
#	Line 1767 | Line 1661 | public class ThreadPoolExecutorTest exte
1661		new ArrayBlockingQueue<Runnable>(10));
1662		try (PoolCleaner cleaner = cleaner(e)) {
1663		try {
1664	<	e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1664	>	e.invokeAll(null, randomTimeout(), randomTimeUnit());
1665		shouldThrow();
1666		} catch (NullPointerException success) {}
1667		}
#	Line 1785 | Line 1679 | public class ThreadPoolExecutorTest exte
1679		List<Callable<String>> l = new ArrayList<>();
1680		l.add(new StringTask());
1681		try {
1682	<	e.invokeAll(l, MEDIUM_DELAY_MS, null);
1682	>	e.invokeAll(l, randomTimeout(), null);
1683		shouldThrow();
1684		} catch (NullPointerException success) {}
1685		}
1686		}
1687
1688		/**
1689	<	* timed invokeAll(empty collection) returns empty collection
1689	>	* timed invokeAll(empty collection) returns empty list
1690		*/
1691		public void testTimedInvokeAll2() throws InterruptedException {
1692		final ExecutorService e =
1693		new ThreadPoolExecutor(2, 2,
1694		LONG_DELAY_MS, MILLISECONDS,
1695		new ArrayBlockingQueue<Runnable>(10));
1696	+	final Collection<Callable<String>> emptyCollection
1697	+	= Collections.emptyList();
1698		try (PoolCleaner cleaner = cleaner(e)) {
1699	<	List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1700	<	MEDIUM_DELAY_MS, MILLISECONDS);
1699	>	List<Future<String>> r =
1700	>	e.invokeAll(emptyCollection, randomTimeout(), randomTimeUnit());
1701		assertTrue(r.isEmpty());
1702		}
1703		}
#	Line 1819 | Line 1715 | public class ThreadPoolExecutorTest exte
1715		l.add(new StringTask());
1716		l.add(null);
1717		try {
1718	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1718	>	e.invokeAll(l, randomTimeout(), randomTimeUnit());
1719		shouldThrow();
1720		} catch (NullPointerException success) {}
1721		}
#	Line 1927 | Line 1823 | public class ThreadPoolExecutorTest exte
1823		public void realRun() {
1824		done.countDown();
1825		}});
1826	<	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1826	>	await(done);
1827		}
1828		}
1829
#	Line 2020 | Line 1916 | public class ThreadPoolExecutorTest exte
1916		}
1917		}
1918		// enough time to run all tasks
1919	<	assertTrue(done.await(nTasks * SHORT_DELAY_MS, MILLISECONDS));
1919	>	await(done, nTasks * SHORT_DELAY_MS);
1920		}
1921		}
1922
#	Line 2061 | Line 1957 | public class ThreadPoolExecutorTest exte
1957		}
1958		}
1959
1960	+	/** Directly test simple ThreadPoolExecutor RejectedExecutionHandlers. */
1961	+	public void testStandardRejectedExecutionHandlers() {
1962	+	final ThreadPoolExecutor p =
1963	+	new ThreadPoolExecutor(1, 1, 1, SECONDS,
1964	+	new ArrayBlockingQueue<Runnable>(1));
1965	+	final AtomicReference<Thread> thread = new AtomicReference<>();
1966	+	final Runnable r = new Runnable() { public void run() {
1967	+	thread.set(Thread.currentThread()); }};
1968	+
1969	+	try {
1970	+	new AbortPolicy().rejectedExecution(r, p);
1971	+	shouldThrow();
1972	+	} catch (RejectedExecutionException success) {}
1973	+	assertNull(thread.get());
1974	+
1975	+	new DiscardPolicy().rejectedExecution(r, p);
1976	+	assertNull(thread.get());
1977	+
1978	+	new CallerRunsPolicy().rejectedExecution(r, p);
1979	+	assertSame(Thread.currentThread(), thread.get());
1980	+
1981	+	// check that pool was not perturbed by handlers
1982	+	assertTrue(p.getRejectedExecutionHandler() instanceof AbortPolicy);
1983	+	assertEquals(0, p.getTaskCount());
1984	+	assertTrue(p.getQueue().isEmpty());
1985	+	}
1986	+
1987	+	public void testThreadFactoryReturnsTerminatedThread_shouldThrow() {
1988	+	if (!testImplementationDetails)
1989	+	return;
1990	+
1991	+	ThreadFactory returnsTerminatedThread = runnableIgnored -> {
1992	+	Thread thread = new Thread(() -> {});
1993	+	thread.start();
1994	+	try { thread.join(); }
1995	+	catch (InterruptedException ex) { throw new Error(ex); }
1996	+	return thread;
1997	+	};
1998	+	ThreadPoolExecutor p =
1999	+	new ThreadPoolExecutor(1, 1, 1, SECONDS,
2000	+	new ArrayBlockingQueue<Runnable>(1),
2001	+	returnsTerminatedThread);
2002	+	try (PoolCleaner cleaner = cleaner(p)) {
2003	+	assertThrows(IllegalThreadStateException.class,
2004	+	() -> p.execute(() -> {}));
2005	+	}
2006	+	}
2007	+
2008	+	public void testThreadFactoryReturnsStartedThread_shouldThrow() {
2009	+	if (!testImplementationDetails)
2010	+	return;
2011	+
2012	+	CountDownLatch latch = new CountDownLatch(1);
2013	+	Runnable awaitLatch = () -> {
2014	+	try { latch.await(); }
2015	+	catch (InterruptedException ex) { throw new Error(ex); }};
2016	+	ThreadFactory returnsStartedThread = runnable -> {
2017	+	Thread thread = new Thread(awaitLatch);
2018	+	thread.start();
2019	+	return thread;
2020	+	};
2021	+	ThreadPoolExecutor p =
2022	+	new ThreadPoolExecutor(1, 1, 1, SECONDS,
2023	+	new ArrayBlockingQueue<Runnable>(1),
2024	+	returnsStartedThread);
2025	+	try (PoolCleaner cleaner = cleaner(p)) {
2026	+	assertThrows(IllegalThreadStateException.class,
2027	+	() -> p.execute(() -> {}));
2028	+	latch.countDown();
2029	+	}
2030	+	}
2031	+
2032		}

Diff Legend

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