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.109 by jsr166, Tue Oct 6 06:11:32 2015 UTC vs.
Revision 1.124 by jsr166, Mon Jul 17 22:27:31 2017 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 18 | Line 20 | import java.util.concurrent.Callable;
20		import java.util.concurrent.CancellationException;
21		import java.util.concurrent.CountDownLatch;
22		import java.util.concurrent.ExecutionException;
21	–	import java.util.concurrent.Executors;
23		import java.util.concurrent.ExecutorService;
24		import java.util.concurrent.Future;
25		import java.util.concurrent.FutureTask;
#	Line 27 | 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.TimeUnit;
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 92 | 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 186 | 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 276 | 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 458 | 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 537 | Line 556 | public class ThreadPoolExecutorTest exte
556		*/
557		public void testGetQueue() throws InterruptedException {
558		final CountDownLatch done = new CountDownLatch(1);
559	<	final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
559	>	final BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
560		final ThreadPoolExecutor p =
561		new ThreadPoolExecutor(1, 1,
562		LONG_DELAY_MS, MILLISECONDS,
#	Line 569 | Line 588 | public class ThreadPoolExecutorTest exte
588		*/
589		public void testRemove() throws InterruptedException {
590		final CountDownLatch done = new CountDownLatch(1);
591	<	BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
591	>	BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
592		final ThreadPoolExecutor p =
593		new ThreadPoolExecutor(1, 1,
594		LONG_DELAY_MS, MILLISECONDS,
#	Line 604 | Line 623 | public class ThreadPoolExecutorTest exte
623		public void testPurge() throws InterruptedException {
624		final CountDownLatch threadStarted = new CountDownLatch(1);
625		final CountDownLatch done = new CountDownLatch(1);
626	<	final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
626	>	final BlockingQueue<Runnable> q = new ArrayBlockingQueue<>(10);
627		final ThreadPoolExecutor p =
628		new ThreadPoolExecutor(1, 1,
629		LONG_DELAY_MS, MILLISECONDS,
#	Line 1040 | 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,
1057	<	new ArrayBlockingQueue<Runnable>(1));
1058	<	try (PoolCleaner cleaner = cleaner(p, done)) {
1059	<	Runnable task = new CheckedRunnable() {
1060	<	public void realRun() throws InterruptedException {
1061	<	await(done);
1062	<	}};
1063	<	for (int i = 0; i < 2; ++i)
1064	<	p.execute(task);
1065	<	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	<	}
1074	<
1075	<	/**
1076	<	* submit(runnable) throws RejectedExecutionException if saturated.
1077	<	*/
1078	<	public void testSaturatedSubmitRunnable() {
1079	<	final CountDownLatch done = new CountDownLatch(1);
1080	<	final ThreadPoolExecutor p =
1081	<	new ThreadPoolExecutor(1, 1,
1082	<	LONG_DELAY_MS, MILLISECONDS,
1083	<	new ArrayBlockingQueue<Runnable>(1));
1084	<	try (PoolCleaner cleaner = cleaner(p, done)) {
1085	<	Runnable task = new CheckedRunnable() {
1086	<	public void realRun() throws InterruptedException {
1087	<	await(done);
1088	<	}};
1089	<	for (int i = 0; i < 2; ++i)
1090	<	p.submit(task);
1091	<	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	<	}
1098	<	}
1099	<	}
1090	>	done.await();
1091	>	return Boolean.TRUE;
1092	>	} catch (InterruptedException shutdownNowDeliberatelyIgnored) {}
1093	>	}};
1094	>	final boolean shutdownNow = rnd.nextBoolean();
1095
1101	–	/**
1102	–	* submit(callable) throws RejectedExecutionException if saturated.
1103	–	*/
1104	–	public void testSaturatedSubmitCallable() {
1105	–	final CountDownLatch done = new CountDownLatch(1);
1106	–	final ThreadPoolExecutor p =
1107	–	new ThreadPoolExecutor(1, 1,
1108	–	LONG_DELAY_MS, MILLISECONDS,
1109	–	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(Executors.callable(task));
1103	<	for (int i = 0; i < 2; ++i) {
1104	<	try {
1119	<	p.execute(task);
1120	<	shouldThrow();
1121	<	} catch (RejectedExecutionException success) {}
1122	<	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		}
1124	–	}
1125	–	}
1106
1107	<	/**
1108	<	* executor using CallerRunsPolicy runs task if saturated.
1129	<	*/
1130	<	public void testSaturatedExecute2() {
1131	<	final ThreadPoolExecutor p =
1132	<	new ThreadPoolExecutor(1, 1,
1133	<	LONG_DELAY_MS,
1134	<	MILLISECONDS,
1135	<	new ArrayBlockingQueue<Runnable>(1),
1136	<	new ThreadPoolExecutor.CallerRunsPolicy());
1137	<	try (PoolCleaner cleaner = cleaner(p)) {
1138	<	final CountDownLatch done = new CountDownLatch(1);
1139	<	Runnable blocker = new CheckedRunnable() {
1140	<	public void realRun() throws InterruptedException {
1141	<	await(done);
1142	<	}};
1143	<	p.execute(blocker);
1144	<	TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1145	<	for (int i = 0; i < tasks.length; i++)
1146	<	tasks[i] = new TrackedNoOpRunnable();
1147	<	for (int i = 0; i < tasks.length; i++)
1148	<	p.execute(tasks[i]);
1149	<	for (int i = 1; i < tasks.length; i++)
1150	<	assertTrue(tasks[i].done);
1151	<	assertFalse(tasks[0].done); // waiting in queue
1152	<	done.countDown();
1153	<	}
1154	<	}
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)
1163	<	tasks[i] = new TrackedNoOpRunnable();
1164	<	final ThreadPoolExecutor p =
1165	<	new ThreadPoolExecutor(1, 1,
1166	<	LONG_DELAY_MS, MILLISECONDS,
1167	<	new ArrayBlockingQueue<Runnable>(1),
1168	<	new ThreadPoolExecutor.DiscardPolicy());
1169	<	try (PoolCleaner cleaner = cleaner(p, done)) {
1170	<	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 1191 | 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 1209 | Line 1155 | public class ThreadPoolExecutorTest exte
1155		}
1156
1157		/**
1212	–	* execute throws RejectedExecutionException if shutdown
1213	–	*/
1214	–	public void testRejectedExecutionExceptionOnShutdown() {
1215	–	final ThreadPoolExecutor p =
1216	–	new ThreadPoolExecutor(1, 1,
1217	–	LONG_DELAY_MS, MILLISECONDS,
1218	–	new ArrayBlockingQueue<Runnable>(1));
1219	–	try { p.shutdown(); } catch (SecurityException ok) { return; }
1220	–	try (PoolCleaner cleaner = cleaner(p)) {
1221	–	try {
1222	–	p.execute(new NoOpRunnable());
1223	–	shouldThrow();
1224	–	} catch (RejectedExecutionException success) {}
1225	–	}
1226	–	}
1227	–
1228	–	/**
1229	–	* execute using CallerRunsPolicy drops task on shutdown
1230	–	*/
1231	–	public void testCallerRunsOnShutdown() {
1232	–	RejectedExecutionHandler h = new ThreadPoolExecutor.CallerRunsPolicy();
1233	–	final ThreadPoolExecutor p =
1234	–	new ThreadPoolExecutor(1, 1,
1235	–	LONG_DELAY_MS, MILLISECONDS,
1236	–	new ArrayBlockingQueue<Runnable>(1), h);
1237	–
1238	–	try { p.shutdown(); } catch (SecurityException ok) { return; }
1239	–	try (PoolCleaner cleaner = cleaner(p)) {
1240	–	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1241	–	p.execute(r);
1242	–	assertFalse(r.done);
1243	–	}
1244	–	}
1245	–
1246	–	/**
1247	–	* execute using DiscardPolicy drops task on shutdown
1248	–	*/
1249	–	public void testDiscardOnShutdown() {
1250	–	final ThreadPoolExecutor p =
1251	–	new ThreadPoolExecutor(1, 1,
1252	–	LONG_DELAY_MS, MILLISECONDS,
1253	–	new ArrayBlockingQueue<Runnable>(1),
1254	–	new ThreadPoolExecutor.DiscardPolicy());
1255	–
1256	–	try { p.shutdown(); } catch (SecurityException ok) { return; }
1257	–	try (PoolCleaner cleaner = cleaner(p)) {
1258	–	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1259	–	p.execute(r);
1260	–	assertFalse(r.done);
1261	–	}
1262	–	}
1263	–
1264	–	/**
1158		* execute using DiscardOldestPolicy drops task on shutdown
1159		*/
1160		public void testDiscardOldestOnShutdown() {
#	Line 1269 | 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 1280 | 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 {
1292	<	p.execute(null);
1293	<	shouldThrow();
1294	<	} catch (NullPointerException success) {}
1184	>	assertNullTaskSubmissionThrowsNullPointerException(p);
1185		}
1186		}
1187
#	Line 1483 | 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 1508 | Line 1398 | public class ThreadPoolExecutorTest exte
1398		LONG_DELAY_MS, MILLISECONDS,
1399		new ArrayBlockingQueue<Runnable>(10));
1400		try (PoolCleaner cleaner = cleaner(e)) {
1401	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1401	>	List<Callable<String>> l = new ArrayList<>();
1402		l.add(latchAwaitingStringTask(latch));
1403		l.add(null);
1404		try {
#	Line 1528 | Line 1418 | public class ThreadPoolExecutorTest exte
1418		LONG_DELAY_MS, MILLISECONDS,
1419		new ArrayBlockingQueue<Runnable>(10));
1420		try (PoolCleaner cleaner = cleaner(e)) {
1421	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1421	>	List<Callable<String>> l = new ArrayList<>();
1422		l.add(new NPETask());
1423		try {
1424		e.invokeAny(l);
#	Line 1548 | Line 1438 | public class ThreadPoolExecutorTest exte
1438		LONG_DELAY_MS, MILLISECONDS,
1439		new ArrayBlockingQueue<Runnable>(10));
1440		try (PoolCleaner cleaner = cleaner(e)) {
1441	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1441	>	List<Callable<String>> l = new ArrayList<>();
1442		l.add(new StringTask());
1443		l.add(new StringTask());
1444		String result = e.invokeAny(l);
#	Line 1573 | 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 1595 | Line 1487 | public class ThreadPoolExecutorTest exte
1487		LONG_DELAY_MS, MILLISECONDS,
1488		new ArrayBlockingQueue<Runnable>(10));
1489		try (PoolCleaner cleaner = cleaner(e)) {
1490	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1490	>	List<Callable<String>> l = new ArrayList<>();
1491		l.add(new StringTask());
1492		l.add(null);
1493		try {
#	Line 1614 | Line 1506 | public class ThreadPoolExecutorTest exte
1506		LONG_DELAY_MS, MILLISECONDS,
1507		new ArrayBlockingQueue<Runnable>(10));
1508		try (PoolCleaner cleaner = cleaner(e)) {
1509	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1509	>	List<Callable<String>> l = new ArrayList<>();
1510		l.add(new NPETask());
1511		List<Future<String>> futures = e.invokeAll(l);
1512		assertEquals(1, futures.size());
#	Line 1636 | Line 1528 | public class ThreadPoolExecutorTest exte
1528		LONG_DELAY_MS, MILLISECONDS,
1529		new ArrayBlockingQueue<Runnable>(10));
1530		try (PoolCleaner cleaner = cleaner(e)) {
1531	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1531	>	List<Callable<String>> l = new ArrayList<>();
1532		l.add(new StringTask());
1533		l.add(new StringTask());
1534		List<Future<String>> futures = e.invokeAll(l);
#	Line 1656 | 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 1671 | Line 1563 | public class ThreadPoolExecutorTest exte
1563		LONG_DELAY_MS, MILLISECONDS,
1564		new ArrayBlockingQueue<Runnable>(10));
1565		try (PoolCleaner cleaner = cleaner(e)) {
1566	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
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 1691 | 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 1707 | Line 1599 | public class ThreadPoolExecutorTest exte
1599		LONG_DELAY_MS, MILLISECONDS,
1600		new ArrayBlockingQueue<Runnable>(10));
1601		try (PoolCleaner cleaner = cleaner(e)) {
1602	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1602	>	List<Callable<String>> l = new ArrayList<>();
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 1727 | Line 1619 | public class ThreadPoolExecutorTest exte
1619		LONG_DELAY_MS, MILLISECONDS,
1620		new ArrayBlockingQueue<Runnable>(10));
1621		try (PoolCleaner cleaner = cleaner(e)) {
1622	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1622	>	long startTime = System.nanoTime();
1623	>	List<Callable<String>> l = new ArrayList<>();
1624		l.add(new NPETask());
1625		try {
1626	<	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1626	>	e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1627		shouldThrow();
1628		} catch (ExecutionException success) {
1629		assertTrue(success.getCause() instanceof NullPointerException);
1630		}
1631	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1632		}
1633		}
1634
#	Line 1747 | Line 1641 | public class ThreadPoolExecutorTest exte
1641		LONG_DELAY_MS, MILLISECONDS,
1642		new ArrayBlockingQueue<Runnable>(10));
1643		try (PoolCleaner cleaner = cleaner(e)) {
1644	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1644	>	long startTime = System.nanoTime();
1645	>	List<Callable<String>> l = new ArrayList<>();
1646		l.add(new StringTask());
1647		l.add(new StringTask());
1648	<	String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1648	>	String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1649		assertSame(TEST_STRING, result);
1650	+	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1651		}
1652		}
1653
#	Line 1765 | 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 1780 | Line 1676 | public class ThreadPoolExecutorTest exte
1676		LONG_DELAY_MS, MILLISECONDS,
1677		new ArrayBlockingQueue<Runnable>(10));
1678		try (PoolCleaner cleaner = cleaner(e)) {
1679	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
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 1813 | Line 1711 | public class ThreadPoolExecutorTest exte
1711		LONG_DELAY_MS, MILLISECONDS,
1712		new ArrayBlockingQueue<Runnable>(10));
1713		try (PoolCleaner cleaner = cleaner(e)) {
1714	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1714	>	List<Callable<String>> l = new ArrayList<>();
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 1832 | Line 1730 | public class ThreadPoolExecutorTest exte
1730		LONG_DELAY_MS, MILLISECONDS,
1731		new ArrayBlockingQueue<Runnable>(10));
1732		try (PoolCleaner cleaner = cleaner(e)) {
1733	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1733	>	List<Callable<String>> l = new ArrayList<>();
1734		l.add(new NPETask());
1735		List<Future<String>> futures =
1736		e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
#	Line 1855 | Line 1753 | public class ThreadPoolExecutorTest exte
1753		LONG_DELAY_MS, MILLISECONDS,
1754		new ArrayBlockingQueue<Runnable>(10));
1755		try (PoolCleaner cleaner = cleaner(e)) {
1756	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1756	>	List<Callable<String>> l = new ArrayList<>();
1757		l.add(new StringTask());
1758		l.add(new StringTask());
1759		List<Future<String>> futures =
#	Line 1870 | Line 1768 | public class ThreadPoolExecutorTest exte
1768		* timed invokeAll(c) cancels tasks not completed by timeout
1769		*/
1770		public void testTimedInvokeAll6() throws Exception {
1771	<	final ExecutorService e =
1772	<	new ThreadPoolExecutor(2, 2,
1773	<	LONG_DELAY_MS, MILLISECONDS,
1774	<	new ArrayBlockingQueue<Runnable>(10));
1775	<	try (PoolCleaner cleaner = cleaner(e)) {
1776	<	for (long timeout = timeoutMillis();;) {
1771	>	for (long timeout = timeoutMillis();;) {
1772	>	final CountDownLatch done = new CountDownLatch(1);
1773	>	final Callable<String> waiter = new CheckedCallable<String>() {
1774	>	public String realCall() {
1775	>	try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1776	>	catch (InterruptedException ok) {}
1777	>	return "1"; }};
1778	>	final ExecutorService p =
1779	>	new ThreadPoolExecutor(2, 2,
1780	>	LONG_DELAY_MS, MILLISECONDS,
1781	>	new ArrayBlockingQueue<Runnable>(10));
1782	>	try (PoolCleaner cleaner = cleaner(p, done)) {
1783		List<Callable<String>> tasks = new ArrayList<>();
1784		tasks.add(new StringTask("0"));
1785	<	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1785	>	tasks.add(waiter);
1786		tasks.add(new StringTask("2"));
1787		long startTime = System.nanoTime();
1788		List<Future<String>> futures =
1789	<	e.invokeAll(tasks, timeout, MILLISECONDS);
1789	>	p.invokeAll(tasks, timeout, MILLISECONDS);
1790		assertEquals(tasks.size(), futures.size());
1791		assertTrue(millisElapsedSince(startTime) >= timeout);
1792		for (Future future : futures)
#	Line 1919 | 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 2012 | 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 2053 | 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		}

Diff Legend

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