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.25 by jsr166, Tue Mar 15 19:47:07 2011 UTC vs.
Revision 1.61 by jsr166, Sun Oct 4 02:00:19 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.util.concurrent.locks.*;
10	>	import static java.util.concurrent.TimeUnit.SECONDS;
11
12	<	import junit.framework.*;
13	<	import java.util.*;
12	>	import java.util.ArrayList;
13	>	import java.util.List;
14	>	import java.util.concurrent.ArrayBlockingQueue;
15	>	import java.util.concurrent.BlockingQueue;
16	>	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;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.Future;
23	>	import java.util.concurrent.FutureTask;
24	>	import java.util.concurrent.LinkedBlockingQueue;
25	>	import java.util.concurrent.RejectedExecutionException;
26	>	import java.util.concurrent.RejectedExecutionHandler;
27	>	import java.util.concurrent.RunnableFuture;
28	>	import java.util.concurrent.SynchronousQueue;
29	>	import java.util.concurrent.ThreadFactory;
30	>	import java.util.concurrent.ThreadPoolExecutor;
31	>	import java.util.concurrent.TimeoutException;
32	>	import java.util.concurrent.TimeUnit;
33	>	import java.util.concurrent.atomic.AtomicInteger;
34	>	import java.util.concurrent.locks.Condition;
35	>	import java.util.concurrent.locks.ReentrantLock;
36	>
37	>	import junit.framework.Test;
38	>	import junit.framework.TestSuite;
39
40		public class ThreadPoolExecutorSubclassTest extends JSR166TestCase {
41		public static void main(String[] args) {
42	<	junit.textui.TestRunner.run(suite());
42	>	main(suite(), args);
43		}
44		public static Test suite() {
45		return new TestSuite(ThreadPoolExecutorSubclassTest.class);
#	Line 37 | Line 61 | public class ThreadPoolExecutorSubclassT
61		CustomTask(final Runnable r, final V res) {
62		if (r == null) throw new NullPointerException();
63		callable = new Callable<V>() {
64	<	public V call() throws Exception { r.run(); return res; }};
64	>	public V call() throws Exception { r.run(); return res; }};
65		}
66		public boolean isDone() {
67		lock.lock(); try { return done; } finally { lock.unlock() ; }
#	Line 77 | Line 101 | public class ThreadPoolExecutorSubclassT
101		}
102		lock.lock();
103		try {
104	<	result = v;
105	<	exception = e;
106	<	done = true;
107	<	thread = null;
108	<	cond.signalAll();
104	>	if (!done) {
105	>	result = v;
106	>	exception = e;
107	>	done = true;
108	>	thread = null;
109	>	cond.signalAll();
110	>	}
111		}
112		finally { lock.unlock(); }
113		}
#	Line 90 | Line 116 | public class ThreadPoolExecutorSubclassT
116		try {
117		while (!done)
118		cond.await();
119	+	if (cancelled)
120	+	throw new CancellationException();
121		if (exception != null)
122		throw new ExecutionException(exception);
123		return result;
#	Line 101 | Line 129 | public class ThreadPoolExecutorSubclassT
129		long nanos = unit.toNanos(timeout);
130		lock.lock();
131		try {
132	<	for (;;) {
133	<	if (done) break;
106	<	if (nanos < 0)
132	>	while (!done) {
133	>	if (nanos <= 0L)
134		throw new TimeoutException();
135		nanos = cond.awaitNanos(nanos);
136		}
137	+	if (cancelled)
138	+	throw new CancellationException();
139		if (exception != null)
140		throw new ExecutionException(exception);
141		return result;
#	Line 115 | Line 144 | public class ThreadPoolExecutorSubclassT
144		}
145		}
146
118	–
147		static class CustomTPE extends ThreadPoolExecutor {
148		protected <V> RunnableFuture<V> newTaskFor(Callable<V> c) {
149		return new CustomTask<V>(c);
#	Line 162 | Line 190 | public class ThreadPoolExecutorSubclassT
190		workQueue, threadFactory, handler);
191		}
192
193	<	volatile boolean beforeCalled = false;
194	<	volatile boolean afterCalled = false;
195	<	volatile boolean terminatedCalled = false;
193	>	final CountDownLatch beforeCalled = new CountDownLatch(1);
194	>	final CountDownLatch afterCalled = new CountDownLatch(1);
195	>	final CountDownLatch terminatedCalled = new CountDownLatch(1);
196	>
197		public CustomTPE() {
198		super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
199		}
200		protected void beforeExecute(Thread t, Runnable r) {
201	<	beforeCalled = true;
201	>	beforeCalled.countDown();
202		}
203		protected void afterExecute(Runnable r, Throwable t) {
204	<	afterCalled = true;
204	>	afterCalled.countDown();
205		}
206		protected void terminated() {
207	<	terminatedCalled = true;
207	>	terminatedCalled.countDown();
208		}
209
210	+	public boolean beforeCalled() {
211	+	return beforeCalled.getCount() == 0;
212	+	}
213	+	public boolean afterCalled() {
214	+	return afterCalled.getCount() == 0;
215	+	}
216	+	public boolean terminatedCalled() {
217	+	return terminatedCalled.getCount() == 0;
218	+	}
219		}
220
221		static class FailingThreadFactory implements ThreadFactory {
#	Line 188 | Line 226 | public class ThreadPoolExecutorSubclassT
226		}
227		}
228
191	–
229		/**
230		* execute successfully executes a runnable
231		*/
232		public void testExecute() throws InterruptedException {
233		final ThreadPoolExecutor p =
234		new CustomTPE(1, 1,
235	<	LONG_DELAY_MS, MILLISECONDS,
235	>	2 * LONG_DELAY_MS, MILLISECONDS,
236		new ArrayBlockingQueue<Runnable>(10));
237	<	final CountDownLatch done = new CountDownLatch(1);
238	<	final Runnable task = new CheckedRunnable() {
239	<	public void realRun() {
240	<	done.countDown();
204	<	}};
205	<	try {
237	>	try (PoolCleaner cleaner = cleaner(p)) {
238	>	final CountDownLatch done = new CountDownLatch(1);
239	>	final Runnable task = new CheckedRunnable() {
240	>	public void realRun() { done.countDown(); }};
241		p.execute(task);
242	<	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
208	<	} finally {
209	<	joinPool(p);
242	>	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243		}
244		}
245
#	Line 221 | Line 254 | public class ThreadPoolExecutorSubclassT
254		new ArrayBlockingQueue<Runnable>(10));
255		final CountDownLatch threadStarted = new CountDownLatch(1);
256		final CountDownLatch done = new CountDownLatch(1);
257	<	try {
257	>	try (PoolCleaner cleaner = cleaner(p)) {
258		assertEquals(0, p.getActiveCount());
259		p.execute(new CheckedRunnable() {
260		public void realRun() throws InterruptedException {
#	Line 231 | Line 264 | public class ThreadPoolExecutorSubclassT
264		}});
265		assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
266		assertEquals(1, p.getActiveCount());
234	–	} finally {
267		done.countDown();
236	–	joinPool(p);
268		}
269		}
270
#	Line 241 | Line 272 | public class ThreadPoolExecutorSubclassT
272		* prestartCoreThread starts a thread if under corePoolSize, else doesn't
273		*/
274		public void testPrestartCoreThread() {
275	<	ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
276	<	assertEquals(0, p.getPoolSize());
277	<	assertTrue(p.prestartCoreThread());
278	<	assertEquals(1, p.getPoolSize());
279	<	assertTrue(p.prestartCoreThread());
280	<	assertEquals(2, p.getPoolSize());
281	<	assertFalse(p.prestartCoreThread());
282	<	assertEquals(2, p.getPoolSize());
283	<	joinPool(p);
275	>	ThreadPoolExecutor p =
276	>	new CustomTPE(2, 6,
277	>	LONG_DELAY_MS, MILLISECONDS,
278	>	new ArrayBlockingQueue<Runnable>(10));
279	>	try (PoolCleaner cleaner = cleaner(p)) {
280	>	assertEquals(0, p.getPoolSize());
281	>	assertTrue(p.prestartCoreThread());
282	>	assertEquals(1, p.getPoolSize());
283	>	assertTrue(p.prestartCoreThread());
284	>	assertEquals(2, p.getPoolSize());
285	>	assertFalse(p.prestartCoreThread());
286	>	assertEquals(2, p.getPoolSize());
287	>	p.setCorePoolSize(4);
288	>	assertTrue(p.prestartCoreThread());
289	>	assertEquals(3, p.getPoolSize());
290	>	assertTrue(p.prestartCoreThread());
291	>	assertEquals(4, p.getPoolSize());
292	>	assertFalse(p.prestartCoreThread());
293	>	assertEquals(4, p.getPoolSize());
294	>	}
295		}
296
297		/**
298		* prestartAllCoreThreads starts all corePoolSize threads
299		*/
300		public void testPrestartAllCoreThreads() {
301	<	ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
302	<	assertEquals(0, p.getPoolSize());
303	<	p.prestartAllCoreThreads();
304	<	assertEquals(2, p.getPoolSize());
305	<	p.prestartAllCoreThreads();
306	<	assertEquals(2, p.getPoolSize());
307	<	joinPool(p);
301	>	ThreadPoolExecutor p =
302	>	new CustomTPE(2, 6,
303	>	LONG_DELAY_MS, MILLISECONDS,
304	>	new ArrayBlockingQueue<Runnable>(10));
305	>	try (PoolCleaner cleaner = cleaner(p)) {
306	>	assertEquals(0, p.getPoolSize());
307	>	p.prestartAllCoreThreads();
308	>	assertEquals(2, p.getPoolSize());
309	>	p.prestartAllCoreThreads();
310	>	assertEquals(2, p.getPoolSize());
311	>	p.setCorePoolSize(4);
312	>	p.prestartAllCoreThreads();
313	>	assertEquals(4, p.getPoolSize());
314	>	p.prestartAllCoreThreads();
315	>	assertEquals(4, p.getPoolSize());
316	>	}
317		}
318
319		/**
#	Line 274 | Line 325 | public class ThreadPoolExecutorSubclassT
325		new CustomTPE(2, 2,
326		LONG_DELAY_MS, MILLISECONDS,
327		new ArrayBlockingQueue<Runnable>(10));
328	<	final CountDownLatch threadStarted = new CountDownLatch(1);
329	<	final CountDownLatch threadProceed = new CountDownLatch(1);
330	<	final CountDownLatch threadDone = new CountDownLatch(1);
331	<	try {
328	>	try (PoolCleaner cleaner = cleaner(p)) {
329	>	final CountDownLatch threadStarted = new CountDownLatch(1);
330	>	final CountDownLatch threadProceed = new CountDownLatch(1);
331	>	final CountDownLatch threadDone = new CountDownLatch(1);
332		assertEquals(0, p.getCompletedTaskCount());
333		p.execute(new CheckedRunnable() {
334		public void realRun() throws InterruptedException {
#	Line 286 | Line 337 | public class ThreadPoolExecutorSubclassT
337		threadProceed.await();
338		threadDone.countDown();
339		}});
340	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
340	>	await(threadStarted);
341		assertEquals(0, p.getCompletedTaskCount());
342		threadProceed.countDown();
343		threadDone.await();
344	<	Thread.sleep(SHORT_DELAY_MS);
345	<	assertEquals(1, p.getCompletedTaskCount());
346	<	} finally {
347	<	joinPool(p);
344	>	long startTime = System.nanoTime();
345	>	while (p.getCompletedTaskCount() != 1) {
346	>	if (millisElapsedSince(startTime) > LONG_DELAY_MS)
347	>	fail("timed out");
348	>	Thread.yield();
349	>	}
350		}
351		}
352
#	Line 301 | Line 354 | public class ThreadPoolExecutorSubclassT
354		* getCorePoolSize returns size given in constructor if not otherwise set
355		*/
356		public void testGetCorePoolSize() {
357	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
358	<	assertEquals(1, p.getCorePoolSize());
359	<	joinPool(p);
357	>	final ThreadPoolExecutor p =
358	>	new CustomTPE(1, 1,
359	>	LONG_DELAY_MS, MILLISECONDS,
360	>	new ArrayBlockingQueue<Runnable>(10));
361	>	try (PoolCleaner cleaner = cleaner(p)) {
362	>	assertEquals(1, p.getCorePoolSize());
363	>	}
364		}
365
366		/**
367		* getKeepAliveTime returns value given in constructor if not otherwise set
368		*/
369		public void testGetKeepAliveTime() {
370	<	ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
371	<	assertEquals(1, p.getKeepAliveTime(TimeUnit.SECONDS));
372	<	joinPool(p);
370	>	final ThreadPoolExecutor p =
371	>	new CustomTPE(2, 2,
372	>	1000, MILLISECONDS,
373	>	new ArrayBlockingQueue<Runnable>(10));
374	>	try (PoolCleaner cleaner = cleaner(p)) {
375	>	assertEquals(1, p.getKeepAliveTime(SECONDS));
376	>	}
377		}
378
318	–
379		/**
380		* getThreadFactory returns factory in constructor if not set
381		*/
382		public void testGetThreadFactory() {
383	<	ThreadFactory tf = new SimpleThreadFactory();
384	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), tf, new NoOpREHandler());
385	<	assertSame(tf, p.getThreadFactory());
386	<	joinPool(p);
383	>	final ThreadFactory threadFactory = new SimpleThreadFactory();
384	>	final ThreadPoolExecutor p =
385	>	new CustomTPE(1, 2,
386	>	LONG_DELAY_MS, MILLISECONDS,
387	>	new ArrayBlockingQueue<Runnable>(10),
388	>	threadFactory,
389	>	new NoOpREHandler());
390	>	try (PoolCleaner cleaner = cleaner(p)) {
391	>	assertSame(threadFactory, p.getThreadFactory());
392	>	}
393		}
394
395		/**
396		* setThreadFactory sets the thread factory returned by getThreadFactory
397		*/
398		public void testSetThreadFactory() {
399	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
400	<	ThreadFactory tf = new SimpleThreadFactory();
401	<	p.setThreadFactory(tf);
402	<	assertSame(tf, p.getThreadFactory());
403	<	joinPool(p);
399	>	final ThreadPoolExecutor p =
400	>	new CustomTPE(1, 2,
401	>	LONG_DELAY_MS, MILLISECONDS,
402	>	new ArrayBlockingQueue<Runnable>(10));
403	>	try (PoolCleaner cleaner = cleaner(p)) {
404	>	ThreadFactory threadFactory = new SimpleThreadFactory();
405	>	p.setThreadFactory(threadFactory);
406	>	assertSame(threadFactory, p.getThreadFactory());
407	>	}
408		}
409
340	–
410		/**
411		* setThreadFactory(null) throws NPE
412		*/
413		public void testSetThreadFactoryNull() {
414	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
415	<	try {
416	<	p.setThreadFactory(null);
417	<	shouldThrow();
418	<	} catch (NullPointerException success) {
419	<	} finally {
420	<	joinPool(p);
414	>	final ThreadPoolExecutor p =
415	>	new CustomTPE(1, 2,
416	>	LONG_DELAY_MS, MILLISECONDS,
417	>	new ArrayBlockingQueue<Runnable>(10));
418	>	try (PoolCleaner cleaner = cleaner(p)) {
419	>	try {
420	>	p.setThreadFactory(null);
421	>	shouldThrow();
422	>	} catch (NullPointerException success) {}
423		}
424		}
425
#	Line 356 | Line 427 | public class ThreadPoolExecutorSubclassT
427		* getRejectedExecutionHandler returns handler in constructor if not set
428		*/
429		public void testGetRejectedExecutionHandler() {
430	<	RejectedExecutionHandler h = new NoOpREHandler();
431	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10), h);
432	<	assertSame(h, p.getRejectedExecutionHandler());
433	<	joinPool(p);
430	>	final RejectedExecutionHandler handler = new NoOpREHandler();
431	>	final ThreadPoolExecutor p =
432	>	new CustomTPE(1, 2,
433	>	LONG_DELAY_MS, MILLISECONDS,
434	>	new ArrayBlockingQueue<Runnable>(10),
435	>	handler);
436	>	try (PoolCleaner cleaner = cleaner(p)) {
437	>	assertSame(handler, p.getRejectedExecutionHandler());
438	>	}
439		}
440
441		/**
#	Line 367 | Line 443 | public class ThreadPoolExecutorSubclassT
443		* getRejectedExecutionHandler
444		*/
445		public void testSetRejectedExecutionHandler() {
446	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
447	<	RejectedExecutionHandler h = new NoOpREHandler();
448	<	p.setRejectedExecutionHandler(h);
449	<	assertSame(h, p.getRejectedExecutionHandler());
450	<	joinPool(p);
446	>	final ThreadPoolExecutor p =
447	>	new CustomTPE(1, 2,
448	>	LONG_DELAY_MS, MILLISECONDS,
449	>	new ArrayBlockingQueue<Runnable>(10));
450	>	try (PoolCleaner cleaner = cleaner(p)) {
451	>	RejectedExecutionHandler handler = new NoOpREHandler();
452	>	p.setRejectedExecutionHandler(handler);
453	>	assertSame(handler, p.getRejectedExecutionHandler());
454	>	}
455		}
456
377	–
457		/**
458		* setRejectedExecutionHandler(null) throws NPE
459		*/
460		public void testSetRejectedExecutionHandlerNull() {
461	<	ThreadPoolExecutor p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
462	<	try {
463	<	p.setRejectedExecutionHandler(null);
464	<	shouldThrow();
465	<	} catch (NullPointerException success) {
466	<	} finally {
467	<	joinPool(p);
461	>	final ThreadPoolExecutor p =
462	>	new CustomTPE(1, 2,
463	>	LONG_DELAY_MS, MILLISECONDS,
464	>	new ArrayBlockingQueue<Runnable>(10));
465	>	try (PoolCleaner cleaner = cleaner(p)) {
466	>	try {
467	>	p.setRejectedExecutionHandler(null);
468	>	shouldThrow();
469	>	} catch (NullPointerException success) {}
470		}
471		}
472
392	–
473		/**
474		* getLargestPoolSize increases, but doesn't overestimate, when
475		* multiple threads active
#	Line 484 | Line 564 | public class ThreadPoolExecutorSubclassT
564		}
565
566		/**
567	<	* isShutDown is false before shutdown, true after
567	>	* isShutdown is false before shutdown, true after
568		*/
569		public void testIsShutdown() {
570
#	Line 495 | Line 575 | public class ThreadPoolExecutorSubclassT
575		joinPool(p);
576		}
577
498	–
578		/**
579		* isTerminated is false before termination, true after
580		*/
#	Line 669 | Line 748 | public class ThreadPoolExecutorSubclassT
748		}
749
750		/**
751	<	* shutDownNow returns a list containing tasks that were not run
751	>	* shutdownNow returns a list containing tasks that were not run,
752	>	* and those tasks are drained from the queue
753		*/
754	<	public void testShutDownNow() {
755	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
756	<	List l;
757	<	try {
758	<	for (int i = 0; i < 5; i++)
759	<	p.execute(new MediumPossiblyInterruptedRunnable());
760	<	}
761	<	finally {
754	>	public void testShutdownNow() throws InterruptedException {
755	>	final int poolSize = 2;
756	>	final int count = 5;
757	>	final AtomicInteger ran = new AtomicInteger(0);
758	>	ThreadPoolExecutor p =
759	>	new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
760	>	new ArrayBlockingQueue<Runnable>(10));
761	>	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
762	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
763	>	threadsStarted.countDown();
764		try {
765	<	l = p.shutdownNow();
766	<	} catch (SecurityException ok) { return; }
765	>	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
766	>	} catch (InterruptedException success) {}
767	>	ran.getAndIncrement();
768	>	}};
769	>	for (int i = 0; i < count; i++)
770	>	p.execute(waiter);
771	>	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
772	>	assertEquals(poolSize, p.getActiveCount());
773	>	assertEquals(0, p.getCompletedTaskCount());
774	>	final List<Runnable> queuedTasks;
775	>	try {
776	>	queuedTasks = p.shutdownNow();
777	>	} catch (SecurityException ok) {
778	>	return; // Allowed in case test doesn't have privs
779		}
780		assertTrue(p.isShutdown());
781	<	assertTrue(l.size() <= 4);
781	>	assertTrue(p.getQueue().isEmpty());
782	>	assertEquals(count - poolSize, queuedTasks.size());
783	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
784	>	assertTrue(p.isTerminated());
785	>	assertEquals(poolSize, ran.get());
786	>	assertEquals(poolSize, p.getCompletedTaskCount());
787		}
788
789		// Exception Tests
790
692	–
791		/**
792		* Constructor throws if corePoolSize argument is less than zero
793		*/
794		public void testConstructor1() {
795		try {
796	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
796	>	new CustomTPE(-1, 1, 1L, SECONDS,
797	>	new ArrayBlockingQueue<Runnable>(10));
798		shouldThrow();
799		} catch (IllegalArgumentException success) {}
800		}
#	Line 705 | Line 804 | public class ThreadPoolExecutorSubclassT
804		*/
805		public void testConstructor2() {
806		try {
807	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
807	>	new CustomTPE(1, -1, 1L, SECONDS,
808	>	new ArrayBlockingQueue<Runnable>(10));
809		shouldThrow();
810		} catch (IllegalArgumentException success) {}
811		}
#	Line 715 | Line 815 | public class ThreadPoolExecutorSubclassT
815		*/
816		public void testConstructor3() {
817		try {
818	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
818	>	new CustomTPE(1, 0, 1L, SECONDS,
819	>	new ArrayBlockingQueue<Runnable>(10));
820		shouldThrow();
821		} catch (IllegalArgumentException success) {}
822		}
#	Line 725 | Line 826 | public class ThreadPoolExecutorSubclassT
826		*/
827		public void testConstructor4() {
828		try {
829	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
829	>	new CustomTPE(1, 2, -1L, SECONDS,
830	>	new ArrayBlockingQueue<Runnable>(10));
831		shouldThrow();
832		} catch (IllegalArgumentException success) {}
833		}
#	Line 735 | Line 837 | public class ThreadPoolExecutorSubclassT
837		*/
838		public void testConstructor5() {
839		try {
840	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
840	>	new CustomTPE(2, 1, 1L, SECONDS,
841	>	new ArrayBlockingQueue<Runnable>(10));
842		shouldThrow();
843		} catch (IllegalArgumentException success) {}
844		}
#	Line 745 | Line 848 | public class ThreadPoolExecutorSubclassT
848		*/
849		public void testConstructorNullPointerException() {
850		try {
851	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
851	>	new CustomTPE(1, 2, 1L, SECONDS, null);
852		shouldThrow();
853		} catch (NullPointerException success) {}
854		}
855
753	–
754	–
856		/**
857		* Constructor throws if corePoolSize argument is less than zero
858		*/
859		public void testConstructor6() {
860		try {
861	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
861	>	new CustomTPE(-1, 1, 1L, SECONDS,
862	>	new ArrayBlockingQueue<Runnable>(10),
863	>	new SimpleThreadFactory());
864		shouldThrow();
865		} catch (IllegalArgumentException success) {}
866		}
#	Line 767 | Line 870 | public class ThreadPoolExecutorSubclassT
870		*/
871		public void testConstructor7() {
872		try {
873	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
873	>	new CustomTPE(1,-1, 1L, SECONDS,
874	>	new ArrayBlockingQueue<Runnable>(10),
875	>	new SimpleThreadFactory());
876		shouldThrow();
877		} catch (IllegalArgumentException success) {}
878		}
#	Line 777 | Line 882 | public class ThreadPoolExecutorSubclassT
882		*/
883		public void testConstructor8() {
884		try {
885	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
885	>	new CustomTPE(1, 0, 1L, SECONDS,
886	>	new ArrayBlockingQueue<Runnable>(10),
887	>	new SimpleThreadFactory());
888		shouldThrow();
889		} catch (IllegalArgumentException success) {}
890		}
#	Line 787 | Line 894 | public class ThreadPoolExecutorSubclassT
894		*/
895		public void testConstructor9() {
896		try {
897	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
897	>	new CustomTPE(1, 2, -1L, SECONDS,
898	>	new ArrayBlockingQueue<Runnable>(10),
899	>	new SimpleThreadFactory());
900		shouldThrow();
901		} catch (IllegalArgumentException success) {}
902		}
#	Line 797 | Line 906 | public class ThreadPoolExecutorSubclassT
906		*/
907		public void testConstructor10() {
908		try {
909	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
909	>	new CustomTPE(2, 1, 1L, SECONDS,
910	>	new ArrayBlockingQueue<Runnable>(10),
911	>	new SimpleThreadFactory());
912		shouldThrow();
913		} catch (IllegalArgumentException success) {}
914		}
#	Line 807 | Line 918 | public class ThreadPoolExecutorSubclassT
918		*/
919		public void testConstructorNullPointerException2() {
920		try {
921	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
921	>	new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
922		shouldThrow();
923		} catch (NullPointerException success) {}
924		}
#	Line 817 | Line 928 | public class ThreadPoolExecutorSubclassT
928		*/
929		public void testConstructorNullPointerException3() {
930		try {
931	<	ThreadFactory f = null;
932	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
931	>	new CustomTPE(1, 2, 1L, SECONDS,
932	>	new ArrayBlockingQueue<Runnable>(10),
933	>	(ThreadFactory) null);
934		shouldThrow();
935		} catch (NullPointerException success) {}
936		}
937
826	–
938		/**
939		* Constructor throws if corePoolSize argument is less than zero
940		*/
941		public void testConstructor11() {
942		try {
943	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
943	>	new CustomTPE(-1, 1, 1L, SECONDS,
944	>	new ArrayBlockingQueue<Runnable>(10),
945	>	new NoOpREHandler());
946		shouldThrow();
947		} catch (IllegalArgumentException success) {}
948		}
#	Line 839 | Line 952 | public class ThreadPoolExecutorSubclassT
952		*/
953		public void testConstructor12() {
954		try {
955	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
955	>	new CustomTPE(1, -1, 1L, SECONDS,
956	>	new ArrayBlockingQueue<Runnable>(10),
957	>	new NoOpREHandler());
958		shouldThrow();
959		} catch (IllegalArgumentException success) {}
960		}
#	Line 849 | Line 964 | public class ThreadPoolExecutorSubclassT
964		*/
965		public void testConstructor13() {
966		try {
967	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
967	>	new CustomTPE(1, 0, 1L, SECONDS,
968	>	new ArrayBlockingQueue<Runnable>(10),
969	>	new NoOpREHandler());
970		shouldThrow();
971		} catch (IllegalArgumentException success) {}
972		}
#	Line 859 | Line 976 | public class ThreadPoolExecutorSubclassT
976		*/
977		public void testConstructor14() {
978		try {
979	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
979	>	new CustomTPE(1, 2, -1L, SECONDS,
980	>	new ArrayBlockingQueue<Runnable>(10),
981	>	new NoOpREHandler());
982		shouldThrow();
983		} catch (IllegalArgumentException success) {}
984		}
#	Line 869 | Line 988 | public class ThreadPoolExecutorSubclassT
988		*/
989		public void testConstructor15() {
990		try {
991	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
991	>	new CustomTPE(2, 1, 1L, SECONDS,
992	>	new ArrayBlockingQueue<Runnable>(10),
993	>	new NoOpREHandler());
994		shouldThrow();
995		} catch (IllegalArgumentException success) {}
996		}
#	Line 879 | Line 1000 | public class ThreadPoolExecutorSubclassT
1000		*/
1001		public void testConstructorNullPointerException4() {
1002		try {
1003	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
1003	>	new CustomTPE(1, 2, 1L, SECONDS,
1004	>	null,
1005	>	new NoOpREHandler());
1006		shouldThrow();
1007		} catch (NullPointerException success) {}
1008		}
#	Line 889 | Line 1012 | public class ThreadPoolExecutorSubclassT
1012		*/
1013		public void testConstructorNullPointerException5() {
1014		try {
1015	<	RejectedExecutionHandler r = null;
1016	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
1015	>	new CustomTPE(1, 2, 1L, SECONDS,
1016	>	new ArrayBlockingQueue<Runnable>(10),
1017	>	(RejectedExecutionHandler) null);
1018		shouldThrow();
1019		} catch (NullPointerException success) {}
1020		}
1021
898	–
1022		/**
1023		* Constructor throws if corePoolSize argument is less than zero
1024		*/
1025		public void testConstructor16() {
1026		try {
1027	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1027	>	new CustomTPE(-1, 1, 1L, SECONDS,
1028	>	new ArrayBlockingQueue<Runnable>(10),
1029	>	new SimpleThreadFactory(),
1030	>	new NoOpREHandler());
1031		shouldThrow();
1032		} catch (IllegalArgumentException success) {}
1033		}
#	Line 911 | Line 1037 | public class ThreadPoolExecutorSubclassT
1037		*/
1038		public void testConstructor17() {
1039		try {
1040	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1040	>	new CustomTPE(1, -1, 1L, SECONDS,
1041	>	new ArrayBlockingQueue<Runnable>(10),
1042	>	new SimpleThreadFactory(),
1043	>	new NoOpREHandler());
1044		shouldThrow();
1045		} catch (IllegalArgumentException success) {}
1046		}
#	Line 921 | Line 1050 | public class ThreadPoolExecutorSubclassT
1050		*/
1051		public void testConstructor18() {
1052		try {
1053	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1053	>	new CustomTPE(1, 0, 1L, SECONDS,
1054	>	new ArrayBlockingQueue<Runnable>(10),
1055	>	new SimpleThreadFactory(),
1056	>	new NoOpREHandler());
1057		shouldThrow();
1058		} catch (IllegalArgumentException success) {}
1059		}
#	Line 931 | Line 1063 | public class ThreadPoolExecutorSubclassT
1063		*/
1064		public void testConstructor19() {
1065		try {
1066	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1066	>	new CustomTPE(1, 2, -1L, SECONDS,
1067	>	new ArrayBlockingQueue<Runnable>(10),
1068	>	new SimpleThreadFactory(),
1069	>	new NoOpREHandler());
1070		shouldThrow();
1071		} catch (IllegalArgumentException success) {}
1072		}
#	Line 941 | Line 1076 | public class ThreadPoolExecutorSubclassT
1076		*/
1077		public void testConstructor20() {
1078		try {
1079	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1079	>	new CustomTPE(2, 1, 1L, SECONDS,
1080	>	new ArrayBlockingQueue<Runnable>(10),
1081	>	new SimpleThreadFactory(),
1082	>	new NoOpREHandler());
1083		shouldThrow();
1084		} catch (IllegalArgumentException success) {}
1085		}
#	Line 951 | Line 1089 | public class ThreadPoolExecutorSubclassT
1089		*/
1090		public void testConstructorNullPointerException6() {
1091		try {
1092	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1092	>	new CustomTPE(1, 2, 1L, SECONDS,
1093	>	null,
1094	>	new SimpleThreadFactory(),
1095	>	new NoOpREHandler());
1096		shouldThrow();
1097		} catch (NullPointerException success) {}
1098		}
#	Line 961 | Line 1102 | public class ThreadPoolExecutorSubclassT
1102		*/
1103		public void testConstructorNullPointerException7() {
1104		try {
1105	<	RejectedExecutionHandler r = null;
1106	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1105	>	new CustomTPE(1, 2, 1L, SECONDS,
1106	>	new ArrayBlockingQueue<Runnable>(10),
1107	>	new SimpleThreadFactory(),
1108	>	(RejectedExecutionHandler) null);
1109		shouldThrow();
1110		} catch (NullPointerException success) {}
1111		}
#	Line 972 | Line 1115 | public class ThreadPoolExecutorSubclassT
1115		*/
1116		public void testConstructorNullPointerException8() {
1117		try {
1118	<	new CustomTPE(1, 2,
976	<	LONG_DELAY_MS, MILLISECONDS,
1118	>	new CustomTPE(1, 2, 1L, SECONDS,
1119		new ArrayBlockingQueue<Runnable>(10),
1120		(ThreadFactory) null,
1121		new NoOpREHandler());
#	Line 981 | Line 1123 | public class ThreadPoolExecutorSubclassT
1123		} catch (NullPointerException success) {}
1124		}
1125
984	–
1126		/**
1127		* execute throws RejectedExecutionException if saturated.
1128		*/
#	Line 1131 | Line 1272 | public class ThreadPoolExecutorSubclassT
1272		}
1273		}
1274
1134	–
1275		/**
1276		* execute using DiscardOldestPolicy drops task on shutdown
1277		*/
#	Line 1149 | Line 1289 | public class ThreadPoolExecutorSubclassT
1289		}
1290		}
1291
1152	–
1292		/**
1293		* execute(null) throws NPE
1294		*/
1295		public void testExecuteNull() {
1296	<	ThreadPoolExecutor p = null;
1296	>	ThreadPoolExecutor p =
1297	>	new CustomTPE(1, 2, 1L, SECONDS,
1298	>	new ArrayBlockingQueue<Runnable>(10));
1299		try {
1159	–	p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1300		p.execute(null);
1301		shouldThrow();
1302		} catch (NullPointerException success) {}
#	Line 1214 | Line 1354 | public class ThreadPoolExecutorSubclassT
1354		joinPool(p);
1355		}
1356
1217	–
1357		/**
1358		* setKeepAliveTime throws IllegalArgumentException
1359		* when given a negative value
#	Line 1239 | Line 1378 | public class ThreadPoolExecutorSubclassT
1378		public void testTerminated() {
1379		CustomTPE p = new CustomTPE();
1380		try { p.shutdown(); } catch (SecurityException ok) { return; }
1381	<	assertTrue(p.terminatedCalled);
1381	>	assertTrue(p.terminatedCalled());
1382		joinPool(p);
1383		}
1384
#	Line 1249 | Line 1388 | public class ThreadPoolExecutorSubclassT
1388		public void testBeforeAfter() throws InterruptedException {
1389		CustomTPE p = new CustomTPE();
1390		try {
1391	<	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1392	<	p.execute(r);
1393	<	Thread.sleep(SHORT_DELAY_MS);
1394	<	assertTrue(r.done);
1395	<	assertTrue(p.beforeCalled);
1396	<	assertTrue(p.afterCalled);
1391	>	final CountDownLatch done = new CountDownLatch(1);
1392	>	p.execute(new CheckedRunnable() {
1393	>	public void realRun() {
1394	>	done.countDown();
1395	>	}});
1396	>	await(p.afterCalled);
1397	>	assertEquals(0, done.getCount());
1398	>	assertTrue(p.afterCalled());
1399	>	assertTrue(p.beforeCalled());
1400		try { p.shutdown(); } catch (SecurityException ok) { return; }
1401		} finally {
1402		joinPool(p);
#	Line 1303 | Line 1445 | public class ThreadPoolExecutorSubclassT
1445		}
1446		}
1447
1306	–
1448		/**
1449		* invokeAny(null) throws NPE
1450		*/
#	Line 1465 | Line 1606 | public class ThreadPoolExecutorSubclassT
1606		}
1607		}
1608
1468	–
1469	–
1609		/**
1610		* timed invokeAny(null) throws NPE
1611		*/
#	Line 1653 | Line 1792 | public class ThreadPoolExecutorSubclassT
1792		l.add(new StringTask());
1793		l.add(new StringTask());
1794		List<Future<String>> futures =
1795	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1795	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1796		assertEquals(2, futures.size());
1797		for (Future<String> future : futures)
1798		assertSame(TEST_STRING, future.get());
#	Line 1668 | Line 1807 | public class ThreadPoolExecutorSubclassT
1807		public void testTimedInvokeAll6() throws Exception {
1808		ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1809		try {
1810	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1811	<	l.add(new StringTask());
1812	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1813	<	l.add(new StringTask());
1814	<	List<Future<String>> futures =
1815	<	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1816	<	assertEquals(3, futures.size());
1817	<	Iterator<Future<String>> it = futures.iterator();
1818	<	Future<String> f1 = it.next();
1819	<	Future<String> f2 = it.next();
1820	<	Future<String> f3 = it.next();
1821	<	assertTrue(f1.isDone());
1822	<	assertTrue(f2.isDone());
1823	<	assertTrue(f3.isDone());
1824	<	assertFalse(f1.isCancelled());
1825	<	assertTrue(f2.isCancelled());
1810	>	for (long timeout = timeoutMillis();;) {
1811	>	List<Callable<String>> tasks = new ArrayList<>();
1812	>	tasks.add(new StringTask("0"));
1813	>	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1814	>	tasks.add(new StringTask("2"));
1815	>	long startTime = System.nanoTime();
1816	>	List<Future<String>> futures =
1817	>	e.invokeAll(tasks, timeout, MILLISECONDS);
1818	>	assertEquals(tasks.size(), futures.size());
1819	>	assertTrue(millisElapsedSince(startTime) >= timeout);
1820	>	for (Future future : futures)
1821	>	assertTrue(future.isDone());
1822	>	assertTrue(futures.get(1).isCancelled());
1823	>	try {
1824	>	assertEquals("0", futures.get(0).get());
1825	>	assertEquals("2", futures.get(2).get());
1826	>	break;
1827	>	} catch (CancellationException retryWithLongerTimeout) {
1828	>	timeout *= 2;
1829	>	if (timeout >= LONG_DELAY_MS / 2)
1830	>	fail("expected exactly one task to be cancelled");
1831	>	}
1832	>	}
1833		} finally {
1834		joinPool(e);
1835		}
#	Line 1726 | Line 1872 | public class ThreadPoolExecutorSubclassT
1872		* allowCoreThreadTimeOut(true) causes idle threads to time out
1873		*/
1874		public void testAllowCoreThreadTimeOut_true() throws Exception {
1875	+	long keepAliveTime = timeoutMillis();
1876		final ThreadPoolExecutor p =
1877		new CustomTPE(2, 10,
1878	<	SHORT_DELAY_MS, MILLISECONDS,
1878	>	keepAliveTime, MILLISECONDS,
1879		new ArrayBlockingQueue<Runnable>(10));
1880		final CountDownLatch threadStarted = new CountDownLatch(1);
1881		try {
1882		p.allowCoreThreadTimeOut(true);
1883		p.execute(new CheckedRunnable() {
1884	<	public void realRun() throws InterruptedException {
1884	>	public void realRun() {
1885		threadStarted.countDown();
1886		assertEquals(1, p.getPoolSize());
1887		}});
1888	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1889	<	for (int i = 0; i < (MEDIUM_DELAY_MS/10); i++) {
1890	<	if (p.getPoolSize() == 0)
1891	<	break;
1892	<	Thread.sleep(10);
1893	<	}
1888	>	await(threadStarted);
1889	>	delay(keepAliveTime);
1890	>	long startTime = System.nanoTime();
1891	>	while (p.getPoolSize() > 0
1892	>	&& millisElapsedSince(startTime) < LONG_DELAY_MS)
1893	>	Thread.yield();
1894	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1895		assertEquals(0, p.getPoolSize());
1896		} finally {
1897		joinPool(p);
#	Line 1754 | Line 1902 | public class ThreadPoolExecutorSubclassT
1902		* allowCoreThreadTimeOut(false) causes idle threads not to time out
1903		*/
1904		public void testAllowCoreThreadTimeOut_false() throws Exception {
1905	+	long keepAliveTime = timeoutMillis();
1906		final ThreadPoolExecutor p =
1907		new CustomTPE(2, 10,
1908	<	SHORT_DELAY_MS, MILLISECONDS,
1908	>	keepAliveTime, MILLISECONDS,
1909		new ArrayBlockingQueue<Runnable>(10));
1910		final CountDownLatch threadStarted = new CountDownLatch(1);
1911		try {
#	Line 1766 | Line 1915 | public class ThreadPoolExecutorSubclassT
1915		threadStarted.countDown();
1916		assertTrue(p.getPoolSize() >= 1);
1917		}});
1918	<	Thread.sleep(SMALL_DELAY_MS);
1918	>	delay(2 * keepAliveTime);
1919		assertTrue(p.getPoolSize() >= 1);
1920		} finally {
1921		joinPool(p);
1922		}
1923		}
1924
1925	+	/**
1926	+	* get(cancelled task) throws CancellationException
1927	+	* (in part, a test of CustomTPE itself)
1928	+	*/
1929	+	public void testGet_cancelled() throws Exception {
1930	+	final ExecutorService e =
1931	+	new CustomTPE(1, 1,
1932	+	LONG_DELAY_MS, MILLISECONDS,
1933	+	new LinkedBlockingQueue<Runnable>());
1934	+	try {
1935	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
1936	+	final CountDownLatch done = new CountDownLatch(1);
1937	+	final List<Future<?>> futures = new ArrayList<>();
1938	+	for (int i = 0; i < 2; i++) {
1939	+	Runnable r = new CheckedRunnable() { public void realRun()
1940	+	throws Throwable {
1941	+	blockerStarted.countDown();
1942	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1943	+	}};
1944	+	futures.add(e.submit(r));
1945	+	}
1946	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1947	+	for (Future<?> future : futures) future.cancel(false);
1948	+	for (Future<?> future : futures) {
1949	+	try {
1950	+	future.get();
1951	+	shouldThrow();
1952	+	} catch (CancellationException success) {}
1953	+	try {
1954	+	future.get(LONG_DELAY_MS, MILLISECONDS);
1955	+	shouldThrow();
1956	+	} catch (CancellationException success) {}
1957	+	assertTrue(future.isCancelled());
1958	+	assertTrue(future.isDone());
1959	+	}
1960	+	done.countDown();
1961	+	} finally {
1962	+	joinPool(e);
1963	+	}
1964	+	}
1965	+
1966		}

Diff Legend

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