ViewVC Help

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

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

Comparing jsr166/src/test/tck/ThreadPoolExecutorSubclassTest.java (file contents):
Revision 1.80 by jsr166, Sun Oct 4 06:39:13 2015 UTC vs.
Revision 1.96 by jsr166, Wed Aug 24 22:22:39 2016 UTC

#	Line 17 | Line 17 | import java.util.concurrent.Callable;
17		import java.util.concurrent.CancellationException;
18		import java.util.concurrent.CountDownLatch;
19		import java.util.concurrent.ExecutionException;
20	–	import java.util.concurrent.Executors;
20		import java.util.concurrent.ExecutorService;
21		import java.util.concurrent.Future;
22		import java.util.concurrent.FutureTask;
#	Line 248 | Line 247 | public class ThreadPoolExecutorSubclassT
247		* thread becomes active
248		*/
249		public void testGetActiveCount() throws InterruptedException {
250	+	final CountDownLatch done = new CountDownLatch(1);
251		final ThreadPoolExecutor p =
252		new CustomTPE(2, 2,
253		LONG_DELAY_MS, MILLISECONDS,
254		new ArrayBlockingQueue<Runnable>(10));
255	<	try (PoolCleaner cleaner = cleaner(p)) {
255	>	try (PoolCleaner cleaner = cleaner(p, done)) {
256		final CountDownLatch threadStarted = new CountDownLatch(1);
257	–	final CountDownLatch done = new CountDownLatch(1);
257		assertEquals(0, p.getActiveCount());
258		p.execute(new CheckedRunnable() {
259		public void realRun() throws InterruptedException {
260		threadStarted.countDown();
261		assertEquals(1, p.getActiveCount());
262	<	done.await();
262	>	await(done);
263		}});
264	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
264	>	await(threadStarted);
265		assertEquals(1, p.getActiveCount());
267	–	done.countDown();
266		}
267		}
268
#	Line 476 | Line 474 | public class ThreadPoolExecutorSubclassT
474		*/
475		public void testGetLargestPoolSize() throws InterruptedException {
476		final int THREADS = 3;
477	+	final CountDownLatch done = new CountDownLatch(1);
478		final ThreadPoolExecutor p =
479		new CustomTPE(THREADS, THREADS,
480		LONG_DELAY_MS, MILLISECONDS,
481		new ArrayBlockingQueue<Runnable>(10));
482	<	try (PoolCleaner cleaner = cleaner(p)) {
484	<	final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
485	<	final CountDownLatch done = new CountDownLatch(1);
482	>	try (PoolCleaner cleaner = cleaner(p, done)) {
483		assertEquals(0, p.getLargestPoolSize());
484	+	final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
485		for (int i = 0; i < THREADS; i++)
486		p.execute(new CheckedRunnable() {
487		public void realRun() throws InterruptedException {
488		threadsStarted.countDown();
489	<	done.await();
489	>	await(done);
490		assertEquals(THREADS, p.getLargestPoolSize());
491		}});
492	<	assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
492	>	await(threadsStarted);
493		assertEquals(THREADS, p.getLargestPoolSize());
496	–	done.countDown();   // release pool
494		}
495		assertEquals(THREADS, p.getLargestPoolSize());
496		}
#	Line 521 | Line 518 | public class ThreadPoolExecutorSubclassT
518		* become active
519		*/
520		public void testGetPoolSize() throws InterruptedException {
521	+	final CountDownLatch done = new CountDownLatch(1);
522		final ThreadPoolExecutor p =
523		new CustomTPE(1, 1,
524		LONG_DELAY_MS, MILLISECONDS,
525		new ArrayBlockingQueue<Runnable>(10));
526	<	try (PoolCleaner cleaner = cleaner(p)) {
529	<	final CountDownLatch threadStarted = new CountDownLatch(1);
530	<	final CountDownLatch done = new CountDownLatch(1);
526	>	try (PoolCleaner cleaner = cleaner(p, done)) {
527		assertEquals(0, p.getPoolSize());
528	+	final CountDownLatch threadStarted = new CountDownLatch(1);
529		p.execute(new CheckedRunnable() {
530		public void realRun() throws InterruptedException {
531		threadStarted.countDown();
532		assertEquals(1, p.getPoolSize());
533	<	done.await();
533	>	await(done);
534		}});
535	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
535	>	await(threadStarted);
536		assertEquals(1, p.getPoolSize());
540	–	done.countDown();   // release pool
537		}
538		}
539
#	Line 545 | Line 541 | public class ThreadPoolExecutorSubclassT
541		* getTaskCount increases, but doesn't overestimate, when tasks submitted
542		*/
543		public void testGetTaskCount() throws InterruptedException {
544	+	final int TASKS = 3;
545	+	final CountDownLatch done = new CountDownLatch(1);
546		final ThreadPoolExecutor p =
547		new CustomTPE(1, 1,
548		LONG_DELAY_MS, MILLISECONDS,
549		new ArrayBlockingQueue<Runnable>(10));
550	<	try (PoolCleaner cleaner = cleaner(p)) {
550	>	try (PoolCleaner cleaner = cleaner(p, done)) {
551		final CountDownLatch threadStarted = new CountDownLatch(1);
554	–	final CountDownLatch done = new CountDownLatch(1);
552		assertEquals(0, p.getTaskCount());
553	+	assertEquals(0, p.getCompletedTaskCount());
554		p.execute(new CheckedRunnable() {
555		public void realRun() throws InterruptedException {
556		threadStarted.countDown();
557	<	assertEquals(1, p.getTaskCount());
560	<	done.await();
557	>	await(done);
558		}});
559	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
559	>	await(threadStarted);
560		assertEquals(1, p.getTaskCount());
561	<	done.countDown();
561	>	assertEquals(0, p.getCompletedTaskCount());
562	>	for (int i = 0; i < TASKS; i++) {
563	>	assertEquals(1 + i, p.getTaskCount());
564	>	p.execute(new CheckedRunnable() {
565	>	public void realRun() throws InterruptedException {
566	>	threadStarted.countDown();
567	>	assertEquals(1 + TASKS, p.getTaskCount());
568	>	await(done);
569	>	}});
570	>	}
571	>	assertEquals(1 + TASKS, p.getTaskCount());
572	>	assertEquals(0, p.getCompletedTaskCount());
573		}
574	+	assertEquals(1 + TASKS, p.getTaskCount());
575	+	assertEquals(1 + TASKS, p.getCompletedTaskCount());
576		}
577
578		/**
#	Line 596 | Line 606 | public class ThreadPoolExecutorSubclassT
606		public void realRun() throws InterruptedException {
607		assertFalse(p.isTerminating());
608		threadStarted.countDown();
609	<	done.await();
609	>	await(done);
610		}});
611	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
611	>	await(threadStarted);
612		assertFalse(p.isTerminating());
613		done.countDown();
614		try { p.shutdown(); } catch (SecurityException ok) { return; }
#	Line 624 | Line 634 | public class ThreadPoolExecutorSubclassT
634		public void realRun() throws InterruptedException {
635		assertFalse(p.isTerminating());
636		threadStarted.countDown();
637	<	done.await();
637	>	await(done);
638		}});
639	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
639	>	await(threadStarted);
640		assertFalse(p.isTerminating());
641		done.countDown();
642		try { p.shutdown(); } catch (SecurityException ok) { return; }
#	Line 640 | Line 650 | public class ThreadPoolExecutorSubclassT
650		* getQueue returns the work queue, which contains queued tasks
651		*/
652		public void testGetQueue() throws InterruptedException {
653	+	final CountDownLatch done = new CountDownLatch(1);
654		final BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
655		final ThreadPoolExecutor p =
656		new CustomTPE(1, 1,
657		LONG_DELAY_MS, MILLISECONDS,
658		q);
659	<	try (PoolCleaner cleaner = cleaner(p)) {
659	>	try (PoolCleaner cleaner = cleaner(p, done)) {
660		final CountDownLatch threadStarted = new CountDownLatch(1);
650	–	final CountDownLatch done = new CountDownLatch(1);
661		FutureTask[] tasks = new FutureTask[5];
662		for (int i = 0; i < tasks.length; i++) {
663		Callable task = new CheckedCallable<Boolean>() {
664		public Boolean realCall() throws InterruptedException {
665		threadStarted.countDown();
666		assertSame(q, p.getQueue());
667	<	done.await();
667	>	await(done);
668		return Boolean.TRUE;
669		}};
670		tasks[i] = new FutureTask(task);
671		p.execute(tasks[i]);
672		}
673	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
673	>	await(threadStarted);
674		assertSame(q, p.getQueue());
675		assertFalse(q.contains(tasks[0]));
676		assertTrue(q.contains(tasks[tasks.length - 1]));
677		assertEquals(tasks.length - 1, q.size());
668	–	done.countDown();
678		}
679		}
680
#	Line 673 | Line 682 | public class ThreadPoolExecutorSubclassT
682		* remove(task) removes queued task, and fails to remove active task
683		*/
684		public void testRemove() throws InterruptedException {
685	+	final CountDownLatch done = new CountDownLatch(1);
686		BlockingQueue<Runnable> q = new ArrayBlockingQueue<Runnable>(10);
687		final ThreadPoolExecutor p =
688		new CustomTPE(1, 1,
689		LONG_DELAY_MS, MILLISECONDS,
690		q);
691	<	try (PoolCleaner cleaner = cleaner(p)) {
691	>	try (PoolCleaner cleaner = cleaner(p, done)) {
692		Runnable[] tasks = new Runnable[6];
693		final CountDownLatch threadStarted = new CountDownLatch(1);
684	–	final CountDownLatch done = new CountDownLatch(1);
694		for (int i = 0; i < tasks.length; i++) {
695		tasks[i] = new CheckedRunnable() {
696		public void realRun() throws InterruptedException {
697		threadStarted.countDown();
698	<	done.await();
698	>	await(done);
699		}};
700		p.execute(tasks[i]);
701		}
702	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
702	>	await(threadStarted);
703		assertFalse(p.remove(tasks[0]));
704		assertTrue(q.contains(tasks[4]));
705		assertTrue(q.contains(tasks[3]));
#	Line 700 | Line 709 | public class ThreadPoolExecutorSubclassT
709		assertTrue(q.contains(tasks[3]));
710		assertTrue(p.remove(tasks[3]));
711		assertFalse(q.contains(tasks[3]));
703	–	done.countDown();
712		}
713		}
714
#	Line 715 | Line 723 | public class ThreadPoolExecutorSubclassT
723		new CustomTPE(1, 1,
724		LONG_DELAY_MS, MILLISECONDS,
725		q);
726	<	try (PoolCleaner cleaner = cleaner(p)) {
726	>	try (PoolCleaner cleaner = cleaner(p, done)) {
727		FutureTask[] tasks = new FutureTask[5];
728		for (int i = 0; i < tasks.length; i++) {
729		Callable task = new CheckedCallable<Boolean>() {
730		public Boolean realCall() throws InterruptedException {
731		threadStarted.countDown();
732	<	done.await();
732	>	await(done);
733		return Boolean.TRUE;
734		}};
735		tasks[i] = new FutureTask(task);
736		p.execute(tasks[i]);
737		}
738	<	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
738	>	await(threadStarted);
739		assertEquals(tasks.length, p.getTaskCount());
740		assertEquals(tasks.length - 1, q.size());
741		assertEquals(1L, p.getActiveCount());
#	Line 740 | Line 748 | public class ThreadPoolExecutorSubclassT
748		p.purge();         // Nothing to do
749		assertEquals(tasks.length - 3, q.size());
750		assertEquals(tasks.length - 2, p.getTaskCount());
743	–	done.countDown();
751		}
752		}
753
#	Line 753 | Line 760 | public class ThreadPoolExecutorSubclassT
760		final int count = 5;
761		final AtomicInteger ran = new AtomicInteger(0);
762		final ThreadPoolExecutor p =
763	<	new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
763	>	new CustomTPE(poolSize, poolSize,
764	>	LONG_DELAY_MS, MILLISECONDS,
765		new ArrayBlockingQueue<Runnable>(10));
766	<	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
766	>	final CountDownLatch threadsStarted = new CountDownLatch(poolSize);
767		Runnable waiter = new CheckedRunnable() { public void realRun() {
768		threadsStarted.countDown();
769		try {
#	Line 765 | Line 773 | public class ThreadPoolExecutorSubclassT
773		}};
774		for (int i = 0; i < count; i++)
775		p.execute(waiter);
776	<	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
776	>	await(threadsStarted);
777		assertEquals(poolSize, p.getActiveCount());
778		assertEquals(0, p.getCompletedTaskCount());
779		final List<Runnable> queuedTasks;
#	Line 1124 | Line 1132 | public class ThreadPoolExecutorSubclassT
1132		* execute throws RejectedExecutionException if saturated.
1133		*/
1134		public void testSaturatedExecute() {
1135	+	final CountDownLatch done = new CountDownLatch(1);
1136		final ThreadPoolExecutor p =
1137		new CustomTPE(1, 1,
1138		LONG_DELAY_MS, MILLISECONDS,
1139		new ArrayBlockingQueue<Runnable>(1));
1140	<	try (PoolCleaner cleaner = cleaner(p)) {
1132	<	final CountDownLatch done = new CountDownLatch(1);
1140	>	try (PoolCleaner cleaner = cleaner(p, done)) {
1141		Runnable task = new CheckedRunnable() {
1142		public void realRun() throws InterruptedException {
1143	<	done.await();
1143	>	await(done);
1144		}};
1145		for (int i = 0; i < 2; ++i)
1146		p.execute(task);
#	Line 1143 | Line 1151 | public class ThreadPoolExecutorSubclassT
1151		} catch (RejectedExecutionException success) {}
1152		assertTrue(p.getTaskCount() <= 2);
1153		}
1146	–	done.countDown();
1154		}
1155		}
1156
#	Line 1151 | Line 1158 | public class ThreadPoolExecutorSubclassT
1158		* executor using CallerRunsPolicy runs task if saturated.
1159		*/
1160		public void testSaturatedExecute2() {
1161	+	final CountDownLatch done = new CountDownLatch(1);
1162		final ThreadPoolExecutor p =
1163		new CustomTPE(1, 1,
1164		LONG_DELAY_MS, MILLISECONDS,
1165		new ArrayBlockingQueue<Runnable>(1),
1166		new CustomTPE.CallerRunsPolicy());
1167	<	try (PoolCleaner cleaner = cleaner(p)) {
1160	<	final CountDownLatch done = new CountDownLatch(1);
1167	>	try (PoolCleaner cleaner = cleaner(p, done)) {
1168		Runnable blocker = new CheckedRunnable() {
1169		public void realRun() throws InterruptedException {
1170	<	done.await();
1170	>	await(done);
1171		}};
1172		p.execute(blocker);
1173		TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
#	Line 1171 | Line 1178 | public class ThreadPoolExecutorSubclassT
1178		for (int i = 1; i < tasks.length; i++)
1179		assertTrue(tasks[i].done);
1180		assertFalse(tasks[0].done); // waiting in queue
1174	–	done.countDown();
1181		}
1182		}
1183
#	Line 1182 | Line 1188 | public class ThreadPoolExecutorSubclassT
1188		final TrackedNoOpRunnable[] tasks = new TrackedNoOpRunnable[5];
1189		for (int i = 0; i < tasks.length; ++i)
1190		tasks[i] = new TrackedNoOpRunnable();
1191	+	final CountDownLatch done = new CountDownLatch(1);
1192		final ThreadPoolExecutor p =
1193		new CustomTPE(1, 1,
1194		LONG_DELAY_MS, MILLISECONDS,
1195		new ArrayBlockingQueue<Runnable>(1),
1196		new CustomTPE.DiscardPolicy());
1197	<	try (PoolCleaner cleaner = cleaner(p)) {
1191	<	final CountDownLatch done = new CountDownLatch(1);
1197	>	try (PoolCleaner cleaner = cleaner(p, done)) {
1198		p.execute(awaiter(done));
1199
1200		for (TrackedNoOpRunnable task : tasks)
1201		p.execute(task);
1202		for (int i = 1; i < tasks.length; i++)
1203		assertFalse(tasks[i].done);
1198	–	done.countDown();
1204		}
1205		for (int i = 1; i < tasks.length; i++)
1206		assertFalse(tasks[i].done);
#	Line 1215 | Line 1220 | public class ThreadPoolExecutorSubclassT
1220		LONG_DELAY_MS, MILLISECONDS,
1221		new ArrayBlockingQueue<Runnable>(1),
1222		new CustomTPE.DiscardOldestPolicy());
1223	<	try (PoolCleaner cleaner = cleaner(p)) {
1223	>	try (PoolCleaner cleaner = cleaner(p, done)) {
1224		assertEquals(LatchAwaiter.NEW, r1.state);
1225		assertEquals(LatchAwaiter.NEW, r2.state);
1226		assertEquals(LatchAwaiter.NEW, r3.state);
#	Line 1225 | Line 1230 | public class ThreadPoolExecutorSubclassT
1230		p.execute(r3);
1231		assertFalse(p.getQueue().contains(r2));
1232		assertTrue(p.getQueue().contains(r3));
1228	–	done.countDown();
1233		}
1234		assertEquals(LatchAwaiter.DONE, r1.state);
1235		assertEquals(LatchAwaiter.NEW, r2.state);
#	Line 1322 | Line 1326 | public class ThreadPoolExecutorSubclassT
1326		*/
1327		public void testCorePoolSizeIllegalArgumentException() {
1328		final ThreadPoolExecutor p =
1329	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1330	<	try {
1331	<	p.setCorePoolSize(-1);
1332	<	shouldThrow();
1333	<	} catch (IllegalArgumentException success) {
1334	<	} finally {
1335	<	try { p.shutdown(); } catch (SecurityException ok) { return; }
1329	>	new CustomTPE(1, 2,
1330	>	LONG_DELAY_MS, MILLISECONDS,
1331	>	new ArrayBlockingQueue<Runnable>(10));
1332	>	try (PoolCleaner cleaner = cleaner(p)) {
1333	>	try {
1334	>	p.setCorePoolSize(-1);
1335	>	shouldThrow();
1336	>	} catch (IllegalArgumentException success) {}
1337		}
1333	–	joinPool(p);
1338		}
1339
1340		/**
#	Line 1339 | Line 1343 | public class ThreadPoolExecutorSubclassT
1343		*/
1344		public void testMaximumPoolSizeIllegalArgumentException() {
1345		final ThreadPoolExecutor p =
1346	<	new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1347	<	try {
1348	<	p.setMaximumPoolSize(1);
1349	<	shouldThrow();
1350	<	} catch (IllegalArgumentException success) {
1351	<	} finally {
1352	<	try { p.shutdown(); } catch (SecurityException ok) { return; }
1346	>	new CustomTPE(2, 3,
1347	>	LONG_DELAY_MS, MILLISECONDS,
1348	>	new ArrayBlockingQueue<Runnable>(10));
1349	>	try (PoolCleaner cleaner = cleaner(p)) {
1350	>	try {
1351	>	p.setMaximumPoolSize(1);
1352	>	shouldThrow();
1353	>	} catch (IllegalArgumentException success) {}
1354		}
1350	–	joinPool(p);
1355		}
1356
1357		/**
#	Line 1356 | Line 1360 | public class ThreadPoolExecutorSubclassT
1360		*/
1361		public void testMaximumPoolSizeIllegalArgumentException2() {
1362		final ThreadPoolExecutor p =
1363	<	new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1364	<	try {
1365	<	p.setMaximumPoolSize(-1);
1366	<	shouldThrow();
1367	<	} catch (IllegalArgumentException success) {
1368	<	} finally {
1369	<	try { p.shutdown(); } catch (SecurityException ok) { return; }
1363	>	new CustomTPE(2, 3,
1364	>	LONG_DELAY_MS,
1365	>	MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1366	>	try (PoolCleaner cleaner = cleaner(p)) {
1367	>	try {
1368	>	p.setMaximumPoolSize(-1);
1369	>	shouldThrow();
1370	>	} catch (IllegalArgumentException success) {}
1371		}
1367	–	joinPool(p);
1372		}
1373
1374		/**
#	Line 1373 | Line 1377 | public class ThreadPoolExecutorSubclassT
1377		*/
1378		public void testKeepAliveTimeIllegalArgumentException() {
1379		final ThreadPoolExecutor p =
1380	<	new CustomTPE(2,3,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1381	<
1382	<	try {
1383	<	p.setKeepAliveTime(-1,MILLISECONDS);
1384	<	shouldThrow();
1385	<	} catch (IllegalArgumentException success) {
1386	<	} finally {
1387	<	try { p.shutdown(); } catch (SecurityException ok) { return; }
1380	>	new CustomTPE(2, 3,
1381	>	LONG_DELAY_MS, MILLISECONDS,
1382	>	new ArrayBlockingQueue<Runnable>(10));
1383	>	try (PoolCleaner cleaner = cleaner(p)) {
1384	>	try {
1385	>	p.setKeepAliveTime(-1, MILLISECONDS);
1386	>	shouldThrow();
1387	>	} catch (IllegalArgumentException success) {}
1388		}
1385	–	joinPool(p);
1389		}
1390
1391		/**
#	Line 1390 | Line 1393 | public class ThreadPoolExecutorSubclassT
1393		*/
1394		public void testTerminated() {
1395		CustomTPE p = new CustomTPE();
1396	<	try { p.shutdown(); } catch (SecurityException ok) { return; }
1397	<	assertTrue(p.terminatedCalled());
1398	<	joinPool(p);
1396	>	try (PoolCleaner cleaner = cleaner(p)) {
1397	>	try { p.shutdown(); } catch (SecurityException ok) { return; }
1398	>	assertTrue(p.terminatedCalled());
1399	>	assertTrue(p.isShutdown());
1400	>	}
1401		}
1402
1403		/**
#	Line 1400 | Line 1405 | public class ThreadPoolExecutorSubclassT
1405		*/
1406		public void testBeforeAfter() throws InterruptedException {
1407		CustomTPE p = new CustomTPE();
1408	<	try {
1408	>	try (PoolCleaner cleaner = cleaner(p)) {
1409		final CountDownLatch done = new CountDownLatch(1);
1410		p.execute(new CheckedRunnable() {
1411		public void realRun() {
#	Line 1410 | Line 1415 | public class ThreadPoolExecutorSubclassT
1415		assertEquals(0, done.getCount());
1416		assertTrue(p.afterCalled());
1417		assertTrue(p.beforeCalled());
1413	–	try { p.shutdown(); } catch (SecurityException ok) { return; }
1414	–	} finally {
1415	–	joinPool(p);
1418		}
1419		}
1420
#	Line 1424 | Line 1426 | public class ThreadPoolExecutorSubclassT
1426		new CustomTPE(2, 2,
1427		LONG_DELAY_MS, MILLISECONDS,
1428		new ArrayBlockingQueue<Runnable>(10));
1429	<	try {
1429	>	try (PoolCleaner cleaner = cleaner(e)) {
1430		Future<String> future = e.submit(new StringTask());
1431		String result = future.get();
1432		assertSame(TEST_STRING, result);
1431	–	} finally {
1432	–	joinPool(e);
1433		}
1434		}
1435
#	Line 1441 | Line 1441 | public class ThreadPoolExecutorSubclassT
1441		new CustomTPE(2, 2,
1442		LONG_DELAY_MS, MILLISECONDS,
1443		new ArrayBlockingQueue<Runnable>(10));
1444	<	try {
1444	>	try (PoolCleaner cleaner = cleaner(e)) {
1445		Future<?> future = e.submit(new NoOpRunnable());
1446		future.get();
1447		assertTrue(future.isDone());
1448	–	} finally {
1449	–	joinPool(e);
1448		}
1449		}
1450
#	Line 1458 | Line 1456 | public class ThreadPoolExecutorSubclassT
1456		new CustomTPE(2, 2,
1457		LONG_DELAY_MS, MILLISECONDS,
1458		new ArrayBlockingQueue<Runnable>(10));
1459	<	try {
1459	>	try (PoolCleaner cleaner = cleaner(e)) {
1460		Future<String> future = e.submit(new NoOpRunnable(), TEST_STRING);
1461		String result = future.get();
1462		assertSame(TEST_STRING, result);
1465	–	} finally {
1466	–	joinPool(e);
1463		}
1464		}
1465
#	Line 1475 | Line 1471 | public class ThreadPoolExecutorSubclassT
1471		new CustomTPE(2, 2,
1472		LONG_DELAY_MS, MILLISECONDS,
1473		new ArrayBlockingQueue<Runnable>(10));
1474	<	try {
1475	<	e.invokeAny(null);
1476	<	shouldThrow();
1477	<	} catch (NullPointerException success) {
1478	<	} finally {
1483	<	joinPool(e);
1474	>	try (PoolCleaner cleaner = cleaner(e)) {
1475	>	try {
1476	>	e.invokeAny(null);
1477	>	shouldThrow();
1478	>	} catch (NullPointerException success) {}
1479		}
1480		}
1481
#	Line 1492 | Line 1487 | public class ThreadPoolExecutorSubclassT
1487		new CustomTPE(2, 2,
1488		LONG_DELAY_MS, MILLISECONDS,
1489		new ArrayBlockingQueue<Runnable>(10));
1490	<	try {
1491	<	e.invokeAny(new ArrayList<Callable<String>>());
1492	<	shouldThrow();
1493	<	} catch (IllegalArgumentException success) {
1494	<	} finally {
1500	<	joinPool(e);
1490	>	try (PoolCleaner cleaner = cleaner(e)) {
1491	>	try {
1492	>	e.invokeAny(new ArrayList<Callable<String>>());
1493	>	shouldThrow();
1494	>	} catch (IllegalArgumentException success) {}
1495		}
1496		}
1497
#	Line 1510 | Line 1504 | public class ThreadPoolExecutorSubclassT
1504		new CustomTPE(2, 2,
1505		LONG_DELAY_MS, MILLISECONDS,
1506		new ArrayBlockingQueue<Runnable>(10));
1507	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1508	<	l.add(latchAwaitingStringTask(latch));
1509	<	l.add(null);
1510	<	try {
1511	<	e.invokeAny(l);
1512	<	shouldThrow();
1513	<	} catch (NullPointerException success) {
1514	<	} finally {
1507	>	try (PoolCleaner cleaner = cleaner(e)) {
1508	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
1509	>	l.add(latchAwaitingStringTask(latch));
1510	>	l.add(null);
1511	>	try {
1512	>	e.invokeAny(l);
1513	>	shouldThrow();
1514	>	} catch (NullPointerException success) {}
1515		latch.countDown();
1522	–	joinPool(e);
1516		}
1517		}
1518
#	Line 1531 | Line 1524 | public class ThreadPoolExecutorSubclassT
1524		new CustomTPE(2, 2,
1525		LONG_DELAY_MS, MILLISECONDS,
1526		new ArrayBlockingQueue<Runnable>(10));
1527	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1528	<	l.add(new NPETask());
1529	<	try {
1530	<	e.invokeAny(l);
1531	<	shouldThrow();
1532	<	} catch (ExecutionException success) {
1533	<	assertTrue(success.getCause() instanceof NullPointerException);
1534	<	} finally {
1535	<	joinPool(e);
1527	>	try (PoolCleaner cleaner = cleaner(e)) {
1528	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
1529	>	l.add(new NPETask());
1530	>	try {
1531	>	e.invokeAny(l);
1532	>	shouldThrow();
1533	>	} catch (ExecutionException success) {
1534	>	assertTrue(success.getCause() instanceof NullPointerException);
1535	>	}
1536		}
1537		}
1538
#	Line 1551 | Line 1544 | public class ThreadPoolExecutorSubclassT
1544		new CustomTPE(2, 2,
1545		LONG_DELAY_MS, MILLISECONDS,
1546		new ArrayBlockingQueue<Runnable>(10));
1547	<	try {
1547	>	try (PoolCleaner cleaner = cleaner(e)) {
1548		List<Callable<String>> l = new ArrayList<Callable<String>>();
1549		l.add(new StringTask());
1550		l.add(new StringTask());
1551		String result = e.invokeAny(l);
1552		assertSame(TEST_STRING, result);
1560	–	} finally {
1561	–	joinPool(e);
1553		}
1554		}
1555
#	Line 1570 | Line 1561 | public class ThreadPoolExecutorSubclassT
1561		new CustomTPE(2, 2,
1562		LONG_DELAY_MS, MILLISECONDS,
1563		new ArrayBlockingQueue<Runnable>(10));
1564	<	try {
1565	<	e.invokeAll(null);
1566	<	shouldThrow();
1567	<	} catch (NullPointerException success) {
1568	<	} finally {
1578	<	joinPool(e);
1564	>	try (PoolCleaner cleaner = cleaner(e)) {
1565	>	try {
1566	>	e.invokeAll(null);
1567	>	shouldThrow();
1568	>	} catch (NullPointerException success) {}
1569		}
1570		}
1571
#	Line 1587 | Line 1577 | public class ThreadPoolExecutorSubclassT
1577		new CustomTPE(2, 2,
1578		LONG_DELAY_MS, MILLISECONDS,
1579		new ArrayBlockingQueue<Runnable>(10));
1580	<	try {
1580	>	try (PoolCleaner cleaner = cleaner(e)) {
1581		List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>());
1582		assertTrue(r.isEmpty());
1593	–	} finally {
1594	–	joinPool(e);
1583		}
1584		}
1585
#	Line 1603 | Line 1591 | public class ThreadPoolExecutorSubclassT
1591		new CustomTPE(2, 2,
1592		LONG_DELAY_MS, MILLISECONDS,
1593		new ArrayBlockingQueue<Runnable>(10));
1594	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1595	<	l.add(new StringTask());
1596	<	l.add(null);
1597	<	try {
1598	<	e.invokeAll(l);
1599	<	shouldThrow();
1600	<	} catch (NullPointerException success) {
1601	<	} finally {
1614	<	joinPool(e);
1594	>	try (PoolCleaner cleaner = cleaner(e)) {
1595	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
1596	>	l.add(new StringTask());
1597	>	l.add(null);
1598	>	try {
1599	>	e.invokeAll(l);
1600	>	shouldThrow();
1601	>	} catch (NullPointerException success) {}
1602		}
1603		}
1604
#	Line 1623 | Line 1610 | public class ThreadPoolExecutorSubclassT
1610		new CustomTPE(2, 2,
1611		LONG_DELAY_MS, MILLISECONDS,
1612		new ArrayBlockingQueue<Runnable>(10));
1613	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1614	<	l.add(new NPETask());
1615	<	List<Future<String>> futures = e.invokeAll(l);
1616	<	assertEquals(1, futures.size());
1617	<	try {
1618	<	futures.get(0).get();
1619	<	shouldThrow();
1620	<	} catch (ExecutionException success) {
1621	<	assertTrue(success.getCause() instanceof NullPointerException);
1622	<	} finally {
1623	<	joinPool(e);
1613	>	try (PoolCleaner cleaner = cleaner(e)) {
1614	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
1615	>	l.add(new NPETask());
1616	>	List<Future<String>> futures = e.invokeAll(l);
1617	>	assertEquals(1, futures.size());
1618	>	try {
1619	>	futures.get(0).get();
1620	>	shouldThrow();
1621	>	} catch (ExecutionException success) {
1622	>	assertTrue(success.getCause() instanceof NullPointerException);
1623	>	}
1624		}
1625		}
1626
#	Line 1645 | Line 1632 | public class ThreadPoolExecutorSubclassT
1632		new CustomTPE(2, 2,
1633		LONG_DELAY_MS, MILLISECONDS,
1634		new ArrayBlockingQueue<Runnable>(10));
1635	<	try {
1635	>	try (PoolCleaner cleaner = cleaner(e)) {
1636		List<Callable<String>> l = new ArrayList<Callable<String>>();
1637		l.add(new StringTask());
1638		l.add(new StringTask());
#	Line 1653 | Line 1640 | public class ThreadPoolExecutorSubclassT
1640		assertEquals(2, futures.size());
1641		for (Future<String> future : futures)
1642		assertSame(TEST_STRING, future.get());
1656	–	} finally {
1657	–	joinPool(e);
1643		}
1644		}
1645
#	Line 1666 | Line 1651 | public class ThreadPoolExecutorSubclassT
1651		new CustomTPE(2, 2,
1652		LONG_DELAY_MS, MILLISECONDS,
1653		new ArrayBlockingQueue<Runnable>(10));
1654	<	try {
1655	<	e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1656	<	shouldThrow();
1657	<	} catch (NullPointerException success) {
1658	<	} finally {
1674	<	joinPool(e);
1654	>	try (PoolCleaner cleaner = cleaner(e)) {
1655	>	try {
1656	>	e.invokeAny(null, MEDIUM_DELAY_MS, MILLISECONDS);
1657	>	shouldThrow();
1658	>	} catch (NullPointerException success) {}
1659		}
1660		}
1661
#	Line 1683 | Line 1667 | public class ThreadPoolExecutorSubclassT
1667		new CustomTPE(2, 2,
1668		LONG_DELAY_MS, MILLISECONDS,
1669		new ArrayBlockingQueue<Runnable>(10));
1670	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1671	<	l.add(new StringTask());
1672	<	try {
1673	<	e.invokeAny(l, MEDIUM_DELAY_MS, null);
1674	<	shouldThrow();
1675	<	} catch (NullPointerException success) {
1676	<	} finally {
1693	<	joinPool(e);
1670	>	try (PoolCleaner cleaner = cleaner(e)) {
1671	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
1672	>	l.add(new StringTask());
1673	>	try {
1674	>	e.invokeAny(l, MEDIUM_DELAY_MS, null);
1675	>	shouldThrow();
1676	>	} catch (NullPointerException success) {}
1677		}
1678		}
1679
#	Line 1702 | Line 1685 | public class ThreadPoolExecutorSubclassT
1685		new CustomTPE(2, 2,
1686		LONG_DELAY_MS, MILLISECONDS,
1687		new ArrayBlockingQueue<Runnable>(10));
1688	<	try {
1689	<	e.invokeAny(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1690	<	shouldThrow();
1691	<	} catch (IllegalArgumentException success) {
1692	<	} finally {
1693	<	joinPool(e);
1688	>	try (PoolCleaner cleaner = cleaner(e)) {
1689	>	try {
1690	>	e.invokeAny(new ArrayList<Callable<String>>(),
1691	>	MEDIUM_DELAY_MS, MILLISECONDS);
1692	>	shouldThrow();
1693	>	} catch (IllegalArgumentException success) {}
1694		}
1695		}
1696
#	Line 1720 | Line 1703 | public class ThreadPoolExecutorSubclassT
1703		new CustomTPE(2, 2,
1704		LONG_DELAY_MS, MILLISECONDS,
1705		new ArrayBlockingQueue<Runnable>(10));
1706	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1707	<	l.add(latchAwaitingStringTask(latch));
1708	<	l.add(null);
1709	<	try {
1710	<	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1711	<	shouldThrow();
1712	<	} catch (NullPointerException success) {
1713	<	} finally {
1706	>	try (PoolCleaner cleaner = cleaner(e)) {
1707	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
1708	>	l.add(latchAwaitingStringTask(latch));
1709	>	l.add(null);
1710	>	try {
1711	>	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1712	>	shouldThrow();
1713	>	} catch (NullPointerException success) {}
1714		latch.countDown();
1732	–	joinPool(e);
1715		}
1716		}
1717
#	Line 1741 | Line 1723 | public class ThreadPoolExecutorSubclassT
1723		new CustomTPE(2, 2,
1724		LONG_DELAY_MS, MILLISECONDS,
1725		new ArrayBlockingQueue<Runnable>(10));
1726	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1727	<	l.add(new NPETask());
1728	<	try {
1729	<	e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1730	<	shouldThrow();
1731	<	} catch (ExecutionException success) {
1732	<	assertTrue(success.getCause() instanceof NullPointerException);
1733	<	} finally {
1734	<	joinPool(e);
1726	>	try (PoolCleaner cleaner = cleaner(e)) {
1727	>	long startTime = System.nanoTime();
1728	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
1729	>	l.add(new NPETask());
1730	>	try {
1731	>	e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1732	>	shouldThrow();
1733	>	} catch (ExecutionException success) {
1734	>	assertTrue(success.getCause() instanceof NullPointerException);
1735	>	}
1736	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1737		}
1738		}
1739
#	Line 1761 | Line 1745 | public class ThreadPoolExecutorSubclassT
1745		new CustomTPE(2, 2,
1746		LONG_DELAY_MS, MILLISECONDS,
1747		new ArrayBlockingQueue<Runnable>(10));
1748	<	try {
1748	>	try (PoolCleaner cleaner = cleaner(e)) {
1749	>	long startTime = System.nanoTime();
1750		List<Callable<String>> l = new ArrayList<Callable<String>>();
1751		l.add(new StringTask());
1752		l.add(new StringTask());
1753	<	String result = e.invokeAny(l, MEDIUM_DELAY_MS, MILLISECONDS);
1753	>	String result = e.invokeAny(l, LONG_DELAY_MS, MILLISECONDS);
1754		assertSame(TEST_STRING, result);
1755	<	} finally {
1771	<	joinPool(e);
1755	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1756		}
1757		}
1758
#	Line 1780 | Line 1764 | public class ThreadPoolExecutorSubclassT
1764		new CustomTPE(2, 2,
1765		LONG_DELAY_MS, MILLISECONDS,
1766		new ArrayBlockingQueue<Runnable>(10));
1767	<	try {
1768	<	e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1769	<	shouldThrow();
1770	<	} catch (NullPointerException success) {
1771	<	} finally {
1788	<	joinPool(e);
1767	>	try (PoolCleaner cleaner = cleaner(e)) {
1768	>	try {
1769	>	e.invokeAll(null, MEDIUM_DELAY_MS, MILLISECONDS);
1770	>	shouldThrow();
1771	>	} catch (NullPointerException success) {}
1772		}
1773		}
1774
#	Line 1797 | Line 1780 | public class ThreadPoolExecutorSubclassT
1780		new CustomTPE(2, 2,
1781		LONG_DELAY_MS, MILLISECONDS,
1782		new ArrayBlockingQueue<Runnable>(10));
1783	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1784	<	l.add(new StringTask());
1785	<	try {
1786	<	e.invokeAll(l, MEDIUM_DELAY_MS, null);
1787	<	shouldThrow();
1788	<	} catch (NullPointerException success) {
1789	<	} finally {
1807	<	joinPool(e);
1783	>	try (PoolCleaner cleaner = cleaner(e)) {
1784	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
1785	>	l.add(new StringTask());
1786	>	try {
1787	>	e.invokeAll(l, MEDIUM_DELAY_MS, null);
1788	>	shouldThrow();
1789	>	} catch (NullPointerException success) {}
1790		}
1791		}
1792
#	Line 1816 | Line 1798 | public class ThreadPoolExecutorSubclassT
1798		new CustomTPE(2, 2,
1799		LONG_DELAY_MS, MILLISECONDS,
1800		new ArrayBlockingQueue<Runnable>(10));
1801	<	try {
1802	<	List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(), MEDIUM_DELAY_MS, MILLISECONDS);
1801	>	try (PoolCleaner cleaner = cleaner(e)) {
1802	>	List<Future<String>> r = e.invokeAll(new ArrayList<Callable<String>>(),
1803	>	MEDIUM_DELAY_MS, MILLISECONDS);
1804		assertTrue(r.isEmpty());
1822	–	} finally {
1823	–	joinPool(e);
1805		}
1806		}
1807
#	Line 1832 | Line 1813 | public class ThreadPoolExecutorSubclassT
1813		new CustomTPE(2, 2,
1814		LONG_DELAY_MS, MILLISECONDS,
1815		new ArrayBlockingQueue<Runnable>(10));
1816	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1817	<	l.add(new StringTask());
1818	<	l.add(null);
1819	<	try {
1820	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1821	<	shouldThrow();
1822	<	} catch (NullPointerException success) {
1823	<	} finally {
1843	<	joinPool(e);
1816	>	try (PoolCleaner cleaner = cleaner(e)) {
1817	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
1818	>	l.add(new StringTask());
1819	>	l.add(null);
1820	>	try {
1821	>	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1822	>	shouldThrow();
1823	>	} catch (NullPointerException success) {}
1824		}
1825		}
1826
#	Line 1852 | Line 1832 | public class ThreadPoolExecutorSubclassT
1832		new CustomTPE(2, 2,
1833		LONG_DELAY_MS, MILLISECONDS,
1834		new ArrayBlockingQueue<Runnable>(10));
1835	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1836	<	l.add(new NPETask());
1837	<	List<Future<String>> futures =
1838	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1839	<	assertEquals(1, futures.size());
1840	<	try {
1841	<	futures.get(0).get();
1842	<	shouldThrow();
1843	<	} catch (ExecutionException success) {
1844	<	assertTrue(success.getCause() instanceof NullPointerException);
1845	<	} finally {
1846	<	joinPool(e);
1835	>	try (PoolCleaner cleaner = cleaner(e)) {
1836	>	List<Callable<String>> l = new ArrayList<Callable<String>>();
1837	>	l.add(new NPETask());
1838	>	List<Future<String>> futures =
1839	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1840	>	assertEquals(1, futures.size());
1841	>	try {
1842	>	futures.get(0).get();
1843	>	shouldThrow();
1844	>	} catch (ExecutionException success) {
1845	>	assertTrue(success.getCause() instanceof NullPointerException);
1846	>	}
1847		}
1848		}
1849
#	Line 1875 | Line 1855 | public class ThreadPoolExecutorSubclassT
1855		new CustomTPE(2, 2,
1856		LONG_DELAY_MS, MILLISECONDS,
1857		new ArrayBlockingQueue<Runnable>(10));
1858	<	try {
1858	>	try (PoolCleaner cleaner = cleaner(e)) {
1859		List<Callable<String>> l = new ArrayList<Callable<String>>();
1860		l.add(new StringTask());
1861		l.add(new StringTask());
#	Line 1884 | Line 1864 | public class ThreadPoolExecutorSubclassT
1864		assertEquals(2, futures.size());
1865		for (Future<String> future : futures)
1866		assertSame(TEST_STRING, future.get());
1887	–	} finally {
1888	–	joinPool(e);
1867		}
1868		}
1869
#	Line 1893 | Line 1871 | public class ThreadPoolExecutorSubclassT
1871		* timed invokeAll(c) cancels tasks not completed by timeout
1872		*/
1873		public void testTimedInvokeAll6() throws Exception {
1874	<	final ExecutorService e =
1875	<	new CustomTPE(2, 2,
1876	<	LONG_DELAY_MS, MILLISECONDS,
1877	<	new ArrayBlockingQueue<Runnable>(10));
1878	<	try {
1879	<	for (long timeout = timeoutMillis();;) {
1874	>	for (long timeout = timeoutMillis();;) {
1875	>	final CountDownLatch done = new CountDownLatch(1);
1876	>	final Callable<String> waiter = new CheckedCallable<String>() {
1877	>	public String realCall() {
1878	>	try { done.await(LONG_DELAY_MS, MILLISECONDS); }
1879	>	catch (InterruptedException ok) {}
1880	>	return "1"; }};
1881	>	final ExecutorService p =
1882	>	new CustomTPE(2, 2,
1883	>	LONG_DELAY_MS, MILLISECONDS,
1884	>	new ArrayBlockingQueue<Runnable>(10));
1885	>	try (PoolCleaner cleaner = cleaner(p, done)) {
1886		List<Callable<String>> tasks = new ArrayList<>();
1887		tasks.add(new StringTask("0"));
1888	<	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1888	>	tasks.add(waiter);
1889		tasks.add(new StringTask("2"));
1890		long startTime = System.nanoTime();
1891		List<Future<String>> futures =
1892	<	e.invokeAll(tasks, timeout, MILLISECONDS);
1892	>	p.invokeAll(tasks, timeout, MILLISECONDS);
1893		assertEquals(tasks.size(), futures.size());
1894		assertTrue(millisElapsedSince(startTime) >= timeout);
1895		for (Future future : futures)
#	Line 1921 | Line 1905 | public class ThreadPoolExecutorSubclassT
1905		fail("expected exactly one task to be cancelled");
1906		}
1907		}
1924	–	} finally {
1925	–	joinPool(e);
1908		}
1909		}
1910
#	Line 1936 | Line 1918 | public class ThreadPoolExecutorSubclassT
1918		LONG_DELAY_MS, MILLISECONDS,
1919		new LinkedBlockingQueue<Runnable>(),
1920		new FailingThreadFactory());
1921	<	try {
1921	>	try (PoolCleaner cleaner = cleaner(e)) {
1922		final int TASKS = 100;
1923		final CountDownLatch done = new CountDownLatch(TASKS);
1924		for (int k = 0; k < TASKS; ++k)
#	Line 1945 | Line 1927 | public class ThreadPoolExecutorSubclassT
1927		done.countDown();
1928		}});
1929		assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
1948	–	} finally {
1949	–	joinPool(e);
1930		}
1931		}
1932
#	Line 1958 | Line 1938 | public class ThreadPoolExecutorSubclassT
1938		new CustomTPE(2, 2,
1939		1000, MILLISECONDS,
1940		new ArrayBlockingQueue<Runnable>(10));
1941	<	assertFalse(p.allowsCoreThreadTimeOut());
1942	<	joinPool(p);
1941	>	try (PoolCleaner cleaner = cleaner(p)) {
1942	>	assertFalse(p.allowsCoreThreadTimeOut());
1943	>	}
1944		}
1945
1946		/**
#	Line 1971 | Line 1952 | public class ThreadPoolExecutorSubclassT
1952		new CustomTPE(2, 10,
1953		keepAliveTime, MILLISECONDS,
1954		new ArrayBlockingQueue<Runnable>(10));
1955	<	final CountDownLatch threadStarted = new CountDownLatch(1);
1956	<	try {
1955	>	try (PoolCleaner cleaner = cleaner(p)) {
1956	>	final CountDownLatch threadStarted = new CountDownLatch(1);
1957		p.allowCoreThreadTimeOut(true);
1958		p.execute(new CheckedRunnable() {
1959		public void realRun() {
#	Line 1987 | Line 1968 | public class ThreadPoolExecutorSubclassT
1968		Thread.yield();
1969		assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1970		assertEquals(0, p.getPoolSize());
1990	–	} finally {
1991	–	joinPool(p);
1971		}
1972		}
1973
#	Line 2001 | Line 1980 | public class ThreadPoolExecutorSubclassT
1980		new CustomTPE(2, 10,
1981		keepAliveTime, MILLISECONDS,
1982		new ArrayBlockingQueue<Runnable>(10));
1983	<	final CountDownLatch threadStarted = new CountDownLatch(1);
1984	<	try {
1983	>	try (PoolCleaner cleaner = cleaner(p)) {
1984	>	final CountDownLatch threadStarted = new CountDownLatch(1);
1985		p.allowCoreThreadTimeOut(false);
1986		p.execute(new CheckedRunnable() {
1987		public void realRun() throws InterruptedException {
#	Line 2011 | Line 1990 | public class ThreadPoolExecutorSubclassT
1990		}});
1991		delay(2 * keepAliveTime);
1992		assertTrue(p.getPoolSize() >= 1);
2014	–	} finally {
2015	–	joinPool(p);
1993		}
1994		}
1995
#	Line 2021 | Line 1998 | public class ThreadPoolExecutorSubclassT
1998		* (in part, a test of CustomTPE itself)
1999		*/
2000		public void testGet_cancelled() throws Exception {
2001	+	final CountDownLatch done = new CountDownLatch(1);
2002		final ExecutorService e =
2003		new CustomTPE(1, 1,
2004		LONG_DELAY_MS, MILLISECONDS,
2005		new LinkedBlockingQueue<Runnable>());
2006	<	try {
2006	>	try (PoolCleaner cleaner = cleaner(e, done)) {
2007		final CountDownLatch blockerStarted = new CountDownLatch(1);
2030	–	final CountDownLatch done = new CountDownLatch(1);
2008		final List<Future<?>> futures = new ArrayList<>();
2009		for (int i = 0; i < 2; i++) {
2010		Runnable r = new CheckedRunnable() { public void realRun()
#	Line 2037 | Line 2014 | public class ThreadPoolExecutorSubclassT
2014		}};
2015		futures.add(e.submit(r));
2016		}
2017	<	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
2017	>	await(blockerStarted);
2018		for (Future<?> future : futures) future.cancel(false);
2019		for (Future<?> future : futures) {
2020		try {
#	Line 2051 | Line 2028 | public class ThreadPoolExecutorSubclassT
2028		assertTrue(future.isCancelled());
2029		assertTrue(future.isDone());
2030		}
2054	–	done.countDown();
2055	–	} finally {
2056	–	joinPool(e);
2031		}
2032		}
2033

Diff Legend

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