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.118 by jsr166, Mon May 29 19:15:03 2017 UTC vs.
Revision 1.127 by dl, Tue Jan 26 13:33:06 2021 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 282 | Line 290 | public class ThreadPoolExecutorTest exte
290		LONG_DELAY_MS, MILLISECONDS,
291		new ArrayBlockingQueue<Runnable>(10));
292		try (PoolCleaner cleaner = cleaner(p)) {
293	<	assertTrue(p.getRejectedExecutionHandler()
286	<	instanceof ThreadPoolExecutor.AbortPolicy);
293	>	assertTrue(p.getRejectedExecutionHandler() instanceof AbortPolicy);
294		}
295		}
296
#	Line 556 | Line 563 | public class ThreadPoolExecutorTest exte
563		q);
564		try (PoolCleaner cleaner = cleaner(p, done)) {
565		final CountDownLatch threadStarted = new CountDownLatch(1);
566	<	FutureTask[] tasks = new FutureTask[5];
566	>	FutureTask[] rtasks = new FutureTask[5];
567	>	@SuppressWarnings("unchecked")
568	>	FutureTask<Boolean>[] tasks = (FutureTask<Boolean>[])rtasks;
569		for (int i = 0; i < tasks.length; i++) {
570	<	Callable task = new CheckedCallable<Boolean>() {
570	>	Callable<Boolean> task = new CheckedCallable<Boolean>() {
571		public Boolean realCall() throws InterruptedException {
572		threadStarted.countDown();
573		assertSame(q, p.getQueue());
574		await(done);
575		return Boolean.TRUE;
576		}};
577	<	tasks[i] = new FutureTask(task);
577	>	tasks[i] = new FutureTask<Boolean>(task);
578		p.execute(tasks[i]);
579		}
580		await(threadStarted);
#	Line 622 | Line 631 | public class ThreadPoolExecutorTest exte
631		LONG_DELAY_MS, MILLISECONDS,
632		q);
633		try (PoolCleaner cleaner = cleaner(p, done)) {
634	<	FutureTask[] tasks = new FutureTask[5];
634	>	FutureTask[] rtasks = new FutureTask[5];
635	>	@SuppressWarnings("unchecked")
636	>	FutureTask<Boolean>[] tasks = (FutureTask<Boolean>[])rtasks;
637		for (int i = 0; i < tasks.length; i++) {
638	<	Callable task = new CheckedCallable<Boolean>() {
638	>	Callable<Boolean> task = new CheckedCallable<Boolean>() {
639		public Boolean realCall() throws InterruptedException {
640		threadStarted.countDown();
641		await(done);
642		return Boolean.TRUE;
643		}};
644	<	tasks[i] = new FutureTask(task);
644	>	tasks[i] = new FutureTask<Boolean>(task);
645		p.execute(tasks[i]);
646		}
647		await(threadStarted);
#	Line 665 | Line 676 | public class ThreadPoolExecutorTest exte
676		Runnable waiter = new CheckedRunnable() { public void realRun() {
677		threadsStarted.countDown();
678		try {
679	<	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
679	>	MILLISECONDS.sleep(LONGER_DELAY_MS);
680		} catch (InterruptedException success) {}
681		ran.getAndIncrement();
682		}};
#	Line 752 | Line 763 | public class ThreadPoolExecutorTest exte
763		public void testConstructorNullPointerException() {
764		try {
765		new ThreadPoolExecutor(1, 2, 1L, SECONDS,
766	<	(BlockingQueue) null);
766	>	(BlockingQueue<Runnable>) null);
767		shouldThrow();
768		} catch (NullPointerException success) {}
769		}
#	Line 823 | Line 834 | public class ThreadPoolExecutorTest exte
834		public void testConstructorNullPointerException2() {
835		try {
836		new ThreadPoolExecutor(1, 2, 1L, SECONDS,
837	<	(BlockingQueue) null,
837	>	(BlockingQueue<Runnable>) null,
838		new SimpleThreadFactory());
839		shouldThrow();
840		} catch (NullPointerException success) {}
#	Line 907 | Line 918 | public class ThreadPoolExecutorTest exte
918		public void testConstructorNullPointerException4() {
919		try {
920		new ThreadPoolExecutor(1, 2, 1L, SECONDS,
921	<	(BlockingQueue) null,
921	>	(BlockingQueue<Runnable>) null,
922		new NoOpREHandler());
923		shouldThrow();
924		} catch (NullPointerException success) {}
#	Line 996 | Line 1007 | public class ThreadPoolExecutorTest exte
1007		public void testConstructorNullPointerException6() {
1008		try {
1009		new ThreadPoolExecutor(1, 2, 1L, SECONDS,
1010	<	(BlockingQueue) null,
1010	>	(BlockingQueue<Runnable>) null,
1011		new SimpleThreadFactory(),
1012		new NoOpREHandler());
1013		shouldThrow();
#	Line 1043 | Line 1054 | public class ThreadPoolExecutorTest exte
1054		final CountDownLatch threadStarted = new CountDownLatch(1);
1055		Thread t = newStartedThread(new CheckedInterruptedRunnable() {
1056		public void realRun() throws Exception {
1057	<	Callable task = new CheckedCallable<Boolean>() {
1057	>	Callable<Boolean> task = new CheckedCallable<Boolean>() {
1058		public Boolean realCall() throws InterruptedException {
1059		threadStarted.countDown();
1060		await(done);
#	Line 1052 | Line 1063 | public class ThreadPoolExecutorTest exte
1063		p.submit(task).get();
1064		}});
1065
1066	<	await(threadStarted);
1066	>	await(threadStarted); // ensure quiescence
1067		t.interrupt();
1068		awaitTermination(t);
1069		}
1070		}
1071
1072		/**
1073	<	* execute throws RejectedExecutionException if saturated.
1073	>	* Submitted tasks are rejected when saturated or shutdown
1074		*/
1075	<	public void testSaturatedExecute() {
1075	>	public void testSubmittedTasksRejectedWhenSaturatedOrShutdown() throws InterruptedException {
1076	>	final ThreadPoolExecutor p = new ThreadPoolExecutor(
1077	>	1, 1, 1, SECONDS, new ArrayBlockingQueue<Runnable>(1));
1078	>	final int saturatedSize = saturatedSize(p);
1079	>	final ThreadLocalRandom rnd = ThreadLocalRandom.current();
1080	>	final CountDownLatch threadsStarted = new CountDownLatch(p.getMaximumPoolSize());
1081		final CountDownLatch done = new CountDownLatch(1);
1082	<	final ThreadPoolExecutor p =
1083	<	new ThreadPoolExecutor(1, 1,
1084	<	LONG_DELAY_MS, MILLISECONDS,
1069	<	new ArrayBlockingQueue<Runnable>(1));
1070	<	try (PoolCleaner cleaner = cleaner(p, done)) {
1071	<	Runnable task = new CheckedRunnable() {
1072	<	public void realRun() throws InterruptedException {
1073	<	await(done);
1074	<	}};
1075	<	for (int i = 0; i < 2; ++i)
1076	<	p.execute(task);
1077	<	for (int i = 0; i < 2; ++i) {
1082	>	final Runnable r = () -> {
1083	>	threadsStarted.countDown();
1084	>	for (;;) {
1085		try {
1086	<	p.execute(task);
1087	<	shouldThrow();
1088	<	} catch (RejectedExecutionException success) {}
1089	<	assertTrue(p.getTaskCount() <= 2);
1090	<	}
1091	<	}
1092	<	}
1086	<
1087	<	/**
1088	<	* submit(runnable) throws RejectedExecutionException if saturated.
1089	<	*/
1090	<	public void testSaturatedSubmitRunnable() {
1091	<	final CountDownLatch done = new CountDownLatch(1);
1092	<	final ThreadPoolExecutor p =
1093	<	new ThreadPoolExecutor(1, 1,
1094	<	LONG_DELAY_MS, MILLISECONDS,
1095	<	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.submit(task);
1103	<	for (int i = 0; i < 2; ++i) {
1086	>	done.await();
1087	>	return;
1088	>	} catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
1089	>	}};
1090	>	final Callable<Boolean> c = () -> {
1091	>	threadsStarted.countDown();
1092	>	for (;;) {
1093		try {
1094	<	p.execute(task);
1095	<	shouldThrow();
1096	<	} catch (RejectedExecutionException success) {}
1097	<	assertTrue(p.getTaskCount() <= 2);
1098	<	}
1110	<	}
1111	<	}
1094	>	done.await();
1095	>	return Boolean.TRUE;
1096	>	} catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
1097	>	}};
1098	>	final boolean shutdownNow = rnd.nextBoolean();
1099
1113	–	/**
1114	–	* submit(callable) throws RejectedExecutionException if saturated.
1115	–	*/
1116	–	public void testSaturatedSubmitCallable() {
1117	–	final CountDownLatch done = new CountDownLatch(1);
1118	–	final ThreadPoolExecutor p =
1119	–	new ThreadPoolExecutor(1, 1,
1120	–	LONG_DELAY_MS, MILLISECONDS,
1121	–	new ArrayBlockingQueue<Runnable>(1));
1100		try (PoolCleaner cleaner = cleaner(p, done)) {
1101	<	Runnable task = new CheckedRunnable() {
1102	<	public void realRun() throws InterruptedException {
1103	<	await(done);
1104	<	}};
1105	<	for (int i = 0; i < 2; ++i)
1106	<	p.execute(task);
1107	<	for (int i = 0; i < 2; ++i) {
1108	<	try {
1131	<	p.execute(task);
1132	<	shouldThrow();
1133	<	} catch (RejectedExecutionException success) {}
1134	<	assertTrue(p.getTaskCount() <= 2);
1101	>	// saturate
1102	>	for (int i = saturatedSize; i--> 0; ) {
1103	>	switch (rnd.nextInt(4)) {
1104	>	case 0: p.execute(r); break;
1105	>	case 1: assertFalse(p.submit(r).isDone()); break;
1106	>	case 2: assertFalse(p.submit(r, Boolean.TRUE).isDone()); break;
1107	>	case 3: assertFalse(p.submit(c).isDone()); break;
1108	>	}
1109		}
1136	–	}
1137	–	}
1110
1111	<	/**
1112	<	* executor using CallerRunsPolicy runs task if saturated.
1141	<	*/
1142	<	public void testSaturatedExecute2() {
1143	<	final ThreadPoolExecutor p =
1144	<	new ThreadPoolExecutor(1, 1,
1145	<	LONG_DELAY_MS,
1146	<	MILLISECONDS,
1147	<	new ArrayBlockingQueue<Runnable>(1),
1148	<	new ThreadPoolExecutor.CallerRunsPolicy());
1149	<	try (PoolCleaner cleaner = cleaner(p)) {
1150	<	final CountDownLatch done = new CountDownLatch(1);
1151	<	Runnable blocker = new CheckedRunnable() {
1152	<	public void realRun() throws InterruptedException {
1153	<	await(done);
1154	<	}};
1155	<	p.execute(blocker);
1156	<	TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1157	<	for (int i = 0; i < tasks.length; i++)
1158	<	tasks[i] = new TrackedNoOpRunnable();
1159	<	for (int i = 0; i < tasks.length; i++)
1160	<	p.execute(tasks[i]);
1161	<	for (int i = 1; i < tasks.length; i++)
1162	<	assertTrue(tasks[i].done);
1163	<	assertFalse(tasks[0].done); // waiting in queue
1164	<	done.countDown();
1165	<	}
1166	<	}
1111	>	await(threadsStarted);
1112	>	assertTaskSubmissionsAreRejected(p);
1113
1114	<	/**
1115	<	* executor using DiscardPolicy drops task if saturated.
1116	<	*/
1117	<	public void testSaturatedExecute3() {
1118	<	final CountDownLatch done = new CountDownLatch(1);
1119	<	final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1120	<	for (int i = 0; i < tasks.length; ++i)
1175	<	tasks[i] = new TrackedNoOpRunnable();
1176	<	final ThreadPoolExecutor p =
1177	<	new ThreadPoolExecutor(1, 1,
1178	<	LONG_DELAY_MS, MILLISECONDS,
1179	<	new ArrayBlockingQueue<Runnable>(1),
1180	<	new ThreadPoolExecutor.DiscardPolicy());
1181	<	try (PoolCleaner cleaner = cleaner(p, done)) {
1182	<	p.execute(awaiter(done));
1114	>	if (shutdownNow)
1115	>	p.shutdownNow();
1116	>	else
1117	>	p.shutdown();
1118	>	// Pool is shutdown, but not yet terminated
1119	>	assertTaskSubmissionsAreRejected(p);
1120	>	assertFalse(p.isTerminated());
1121
1122	<	for (TrackedNoOpRunnable task : tasks)
1123	<	p.execute(task);
1124	<	for (int i = 1; i < tasks.length; i++)
1125	<	assertFalse(tasks[i].done);
1126	<	}
1127	<	for (int i = 1; i < tasks.length; i++)
1128	<	assertFalse(tasks[i].done);
1129	<	assertTrue(tasks[0].done); // was waiting in queue
1122	>	done.countDown();   // release blocking tasks
1123	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
1124	>
1125	>	assertTaskSubmissionsAreRejected(p);
1126	>	}
1127	>	assertEquals(saturatedSize(p)
1128	>	- (shutdownNow ? p.getQueue().remainingCapacity() : 0),
1129	>	p.getCompletedTaskCount());
1130		}
1131
1132		/**
1133		* executor using DiscardOldestPolicy drops oldest task if saturated.
1134		*/
1135	<	public void testSaturatedExecute4() {
1135	>	public void testSaturatedExecute_DiscardOldestPolicy() {
1136		final CountDownLatch done = new CountDownLatch(1);
1137		LatchAwaiter r1 = awaiter(done);
1138		LatchAwaiter r2 = awaiter(done);
#	Line 1203 | Line 1141 | public class ThreadPoolExecutorTest exte
1141		new ThreadPoolExecutor(1, 1,
1142		LONG_DELAY_MS, MILLISECONDS,
1143		new ArrayBlockingQueue<Runnable>(1),
1144	<	new ThreadPoolExecutor.DiscardOldestPolicy());
1144	>	new DiscardOldestPolicy());
1145		try (PoolCleaner cleaner = cleaner(p, done)) {
1146		assertEquals(LatchAwaiter.NEW, r1.state);
1147		assertEquals(LatchAwaiter.NEW, r2.state);
#	Line 1221 | Line 1159 | public class ThreadPoolExecutorTest exte
1159		}
1160
1161		/**
1224	–	* execute throws RejectedExecutionException if shutdown
1225	–	*/
1226	–	public void testRejectedExecutionExceptionOnShutdown() {
1227	–	final ThreadPoolExecutor p =
1228	–	new ThreadPoolExecutor(1, 1,
1229	–	LONG_DELAY_MS, MILLISECONDS,
1230	–	new ArrayBlockingQueue<Runnable>(1));
1231	–	try { p.shutdown(); } catch (SecurityException ok) { return; }
1232	–	try (PoolCleaner cleaner = cleaner(p)) {
1233	–	try {
1234	–	p.execute(new NoOpRunnable());
1235	–	shouldThrow();
1236	–	} catch (RejectedExecutionException success) {}
1237	–	}
1238	–	}
1239	–
1240	–	/**
1241	–	* execute using CallerRunsPolicy drops task on shutdown
1242	–	*/
1243	–	public void testCallerRunsOnShutdown() {
1244	–	RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1245	–	final ThreadPoolExecutor p =
1246	–	new ThreadPoolExecutor(1, 1,
1247	–	LONG_DELAY_MS, MILLISECONDS,
1248	–	new ArrayBlockingQueue<Runnable>(1), h);
1249	–
1250	–	try { p.shutdown(); } catch (SecurityException ok) { return; }
1251	–	try (PoolCleaner cleaner = cleaner(p)) {
1252	–	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1253	–	p.execute(r);
1254	–	assertFalse(r.done);
1255	–	}
1256	–	}
1257	–
1258	–	/**
1259	–	* execute using DiscardPolicy drops task on shutdown
1260	–	*/
1261	–	public void testDiscardOnShutdown() {
1262	–	final ThreadPoolExecutor p =
1263	–	new ThreadPoolExecutor(1, 1,
1264	–	LONG_DELAY_MS, MILLISECONDS,
1265	–	new ArrayBlockingQueue<Runnable>(1),
1266	–	new ThreadPoolExecutor.DiscardPolicy());
1267	–
1268	–	try { p.shutdown(); } catch (SecurityException ok) { return; }
1269	–	try (PoolCleaner cleaner = cleaner(p)) {
1270	–	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1271	–	p.execute(r);
1272	–	assertFalse(r.done);
1273	–	}
1274	–	}
1275	–
1276	–	/**
1162		* execute using DiscardOldestPolicy drops task on shutdown
1163		*/
1164		public void testDiscardOldestOnShutdown() {
#	Line 1281 | Line 1166 | public class ThreadPoolExecutorTest exte
1166		new ThreadPoolExecutor(1, 1,
1167		LONG_DELAY_MS, MILLISECONDS,
1168		new ArrayBlockingQueue<Runnable>(1),
1169	<	new ThreadPoolExecutor.DiscardOldestPolicy());
1169	>	new DiscardOldestPolicy());
1170
1171		try { p.shutdown(); } catch (SecurityException ok) { return; }
1172		try (PoolCleaner cleaner = cleaner(p)) {
#	Line 1292 | Line 1177 | public class ThreadPoolExecutorTest exte
1177		}
1178
1179		/**
1180	<	* execute(null) throws NPE
1180	>	* Submitting null tasks throws NullPointerException
1181		*/
1182	<	public void testExecuteNull() {
1182	>	public void testNullTaskSubmission() {
1183		final ThreadPoolExecutor p =
1184		new ThreadPoolExecutor(1, 2,
1185		1L, SECONDS,
1186		new ArrayBlockingQueue<Runnable>(10));
1187		try (PoolCleaner cleaner = cleaner(p)) {
1188	<	try {
1304	<	p.execute(null);
1305	<	shouldThrow();
1306	<	} catch (NullPointerException success) {}
1188	>	assertNullTaskSubmissionThrowsNullPointerException(p);
1189		}
1190		}
1191
#	Line 1495 | Line 1377 | public class ThreadPoolExecutorTest exte
1377		}
1378
1379		/**
1380	<	* invokeAny(empty collection) throws IAE
1380	>	* invokeAny(empty collection) throws IllegalArgumentException
1381		*/
1382		public void testInvokeAny2() throws Exception {
1383		final ExecutorService e =
#	Line 1585 | Line 1467 | public class ThreadPoolExecutorTest exte
1467		}
1468
1469		/**
1470	<	* invokeAll(empty collection) returns empty collection
1470	>	* invokeAll(empty collection) returns empty list
1471		*/
1472		public void testInvokeAll2() throws InterruptedException {
1473		final ExecutorService e =
1474		new ThreadPoolExecutor(2, 2,
1475		LONG_DELAY_MS, MILLISECONDS,
1476		new ArrayBlockingQueue<Runnable>(10));
1477	+	final Collection<Callable<String>> emptyCollection
1478	+	= Collections.emptyList();
1479		try (PoolCleaner cleaner = cleaner(e)) {
1480	<	List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1480	>	List<Future<String>> r = e.invokeAll(emptyCollection);
1481		assertTrue(r.isEmpty());
1482		}
1483		}
#	Line 1668 | Line 1552 | public class ThreadPoolExecutorTest exte
1552		new ArrayBlockingQueue<Runnable>(10));
1553		try (PoolCleaner cleaner = cleaner(e)) {
1554		try {
1555	<	e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1555	>	e.invokeAny(null, randomTimeout(), randomTimeUnit());
1556		shouldThrow();
1557		} catch (NullPointerException success) {}
1558		}
#	Line 1686 | Line 1570 | public class ThreadPoolExecutorTest exte
1570		List<Callable<String>> l = new ArrayList<>();
1571		l.add(new StringTask());
1572		try {
1573	<	e.invokeAny(l, MEDIUM_DELAY_MS, null);
1573	>	e.invokeAny(l, randomTimeout(), null);
1574		shouldThrow();
1575		} catch (NullPointerException success) {}
1576		}
1577		}
1578
1579		/**
1580	<	* timed invokeAny(empty collection) throws IAE
1580	>	* timed invokeAny(empty collection) throws IllegalArgumentException
1581		*/
1582		public void testTimedInvokeAny2() throws Exception {
1583		final ExecutorService e =
#	Line 1703 | Line 1587 | public class ThreadPoolExecutorTest exte
1587		try (PoolCleaner cleaner = cleaner(e)) {
1588		try {
1589		e.invokeAny(new ArrayList<Callable<String>>(),
1590	<	MEDIUM_DELAY_MS, MILLISECONDS);
1590	>	randomTimeout(), randomTimeUnit());
1591		shouldThrow();
1592		} catch (IllegalArgumentException success) {}
1593		}
1594		}
1595
1596		/**
1597	<	* timed invokeAny(c) throws NPE if c has null elements
1597	>	* timed invokeAny(c) throws NullPointerException if c has null elements
1598		*/
1599		public void testTimedInvokeAny3() throws Exception {
1600		final CountDownLatch latch = new CountDownLatch(1);
#	Line 1723 | Line 1607 | public class ThreadPoolExecutorTest exte
1607		l.add(latchAwaitingStringTask(latch));
1608		l.add(null);
1609		try {
1610	<	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1610	>	e.invokeAny(l, randomTimeout(), randomTimeUnit());
1611		shouldThrow();
1612		} catch (NullPointerException success) {}
1613		latch.countDown();
#	Line 1781 | Line 1665 | public class ThreadPoolExecutorTest exte
1665		new ArrayBlockingQueue<Runnable>(10));
1666		try (PoolCleaner cleaner = cleaner(e)) {
1667		try {
1668	<	e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1668	>	e.invokeAll(null, randomTimeout(), randomTimeUnit());
1669		shouldThrow();
1670		} catch (NullPointerException success) {}
1671		}
#	Line 1799 | Line 1683 | public class ThreadPoolExecutorTest exte
1683		List<Callable<String>> l = new ArrayList<>();
1684		l.add(new StringTask());
1685		try {
1686	<	e.invokeAll(l, MEDIUM_DELAY_MS, null);
1686	>	e.invokeAll(l, randomTimeout(), null);
1687		shouldThrow();
1688		} catch (NullPointerException success) {}
1689		}
1690		}
1691
1692		/**
1693	<	* timed invokeAll(empty collection) returns empty collection
1693	>	* timed invokeAll(empty collection) returns empty list
1694		*/
1695		public void testTimedInvokeAll2() throws InterruptedException {
1696		final ExecutorService e =
1697		new ThreadPoolExecutor(2, 2,
1698		LONG_DELAY_MS, MILLISECONDS,
1699		new ArrayBlockingQueue<Runnable>(10));
1700	+	final Collection<Callable<String>> emptyCollection
1701	+	= Collections.emptyList();
1702		try (PoolCleaner cleaner = cleaner(e)) {
1703	<	List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1704	<	MEDIUM_DELAY_MS, MILLISECONDS);
1703	>	List<Future<String>> r =
1704	>	e.invokeAll(emptyCollection, randomTimeout(), randomTimeUnit());
1705		assertTrue(r.isEmpty());
1706		}
1707		}
#	Line 1833 | Line 1719 | public class ThreadPoolExecutorTest exte
1719		l.add(new StringTask());
1720		l.add(null);
1721		try {
1722	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1722	>	e.invokeAll(l, randomTimeout(), randomTimeUnit());
1723		shouldThrow();
1724		} catch (NullPointerException success) {}
1725		}
#	Line 1907 | Line 1793 | public class ThreadPoolExecutorTest exte
1793		p.invokeAll(tasks, timeout, MILLISECONDS);
1794		assertEquals(tasks.size(), futures.size());
1795		assertTrue(millisElapsedSince(startTime) >= timeout);
1796	<	for (Future future : futures)
1796	>	for (Future<?> future : futures)
1797		assertTrue(future.isDone());
1798		assertTrue(futures.get(1).isCancelled());
1799		try {
#	Line 2022 | Line 1908 | public class ThreadPoolExecutorTest exte
1908		final ThreadPoolExecutor p =
1909		new ThreadPoolExecutor(1, 30,
1910		60, SECONDS,
1911	<	new ArrayBlockingQueue(30));
1911	>	new ArrayBlockingQueue<Runnable>(30));
1912		try (PoolCleaner cleaner = cleaner(p)) {
1913		for (int i = 0; i < nTasks; ++i) {
1914		for (;;) {
#	Line 2075 | Line 1961 | public class ThreadPoolExecutorTest exte
1961		}
1962		}
1963
1964	+	/** Directly test simple ThreadPoolExecutor RejectedExecutionHandlers. */
1965	+	public void testStandardRejectedExecutionHandlers() {
1966	+	final ThreadPoolExecutor p =
1967	+	new ThreadPoolExecutor(1, 1, 1, SECONDS,
1968	+	new ArrayBlockingQueue<Runnable>(1));
1969	+	final AtomicReference<Thread> thread = new AtomicReference<>();
1970	+	final Runnable r = new Runnable() { public void run() {
1971	+	thread.set(Thread.currentThread()); }};
1972	+
1973	+	try {
1974	+	new AbortPolicy().rejectedExecution(r, p);
1975	+	shouldThrow();
1976	+	} catch (RejectedExecutionException success) {}
1977	+	assertNull(thread.get());
1978	+
1979	+	new DiscardPolicy().rejectedExecution(r, p);
1980	+	assertNull(thread.get());
1981	+
1982	+	new CallerRunsPolicy().rejectedExecution(r, p);
1983	+	assertSame(Thread.currentThread(), thread.get());
1984	+
1985	+	// check that pool was not perturbed by handlers
1986	+	assertTrue(p.getRejectedExecutionHandler() instanceof AbortPolicy);
1987	+	assertEquals(0, p.getTaskCount());
1988	+	assertTrue(p.getQueue().isEmpty());
1989	+	}
1990	+
1991	+	public void testThreadFactoryReturnsTerminatedThread_shouldThrow() {
1992	+	if (!testImplementationDetails)
1993	+	return;
1994	+
1995	+	ThreadFactory returnsTerminatedThread = runnableIgnored -> {
1996	+	Thread thread = new Thread(() -> {});
1997	+	thread.start();
1998	+	try { thread.join(); }
1999	+	catch (InterruptedException ex) { throw new Error(ex); }
2000	+	return thread;
2001	+	};
2002	+	ThreadPoolExecutor p =
2003	+	new ThreadPoolExecutor(1, 1, 1, SECONDS,
2004	+	new ArrayBlockingQueue<Runnable>(1),
2005	+	returnsTerminatedThread);
2006	+	try (PoolCleaner cleaner = cleaner(p)) {
2007	+	assertThrows(IllegalThreadStateException.class,
2008	+	() -> p.execute(() -> {}));
2009	+	}
2010	+	}
2011	+
2012	+	public void testThreadFactoryReturnsStartedThread_shouldThrow() {
2013	+	if (!testImplementationDetails)
2014	+	return;
2015	+
2016	+	CountDownLatch latch = new CountDownLatch(1);
2017	+	Runnable awaitLatch = () -> {
2018	+	try { latch.await(); }
2019	+	catch (InterruptedException ex) { throw new Error(ex); }};
2020	+	ThreadFactory returnsStartedThread = runnable -> {
2021	+	Thread thread = new Thread(awaitLatch);
2022	+	thread.start();
2023	+	return thread;
2024	+	};
2025	+	ThreadPoolExecutor p =
2026	+	new ThreadPoolExecutor(1, 1, 1, SECONDS,
2027	+	new ArrayBlockingQueue<Runnable>(1),
2028	+	returnsStartedThread);
2029	+	try (PoolCleaner cleaner = cleaner(p)) {
2030	+	assertThrows(IllegalThreadStateException.class,
2031	+	() -> p.execute(() -> {}));
2032	+	latch.countDown();
2033	+	}
2034	+	}
2035	+
2036		}

Diff Legend

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