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.28 by jsr166, Sat May 7 19:49:37 2011 UTC vs.
Revision 1.72 by jsr166, Sun Oct 4 02:38:45 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 219 | Line 252 | public class ThreadPoolExecutorSubclassT
252		new CustomTPE(2, 2,
253		LONG_DELAY_MS, MILLISECONDS,
254		new ArrayBlockingQueue<Runnable>(10));
255	<	final CountDownLatch threadStarted = new CountDownLatch(1);
256	<	final CountDownLatch done = new CountDownLatch(1);
257	<	try {
255	>	try (PoolCleaner cleaner = cleaner(p)) {
256	>	final CountDownLatch threadStarted = new CountDownLatch(1);
257	>	final CountDownLatch done = new CountDownLatch(1);
258		assertEquals(0, p.getActiveCount());
259		p.execute(new CheckedRunnable() {
260		public void realRun() throws InterruptedException {
#	Line 229 | Line 262 | public class ThreadPoolExecutorSubclassT
262		assertEquals(1, p.getActiveCount());
263		done.await();
264		}});
265	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
265	>	assertTrue(threadStarted.await(MEDIUM_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	<	delay(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 400 | Line 480 | public class ThreadPoolExecutorSubclassT
480		new CustomTPE(THREADS, THREADS,
481		LONG_DELAY_MS, MILLISECONDS,
482		new ArrayBlockingQueue<Runnable>(10));
483	<	final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
484	<	final CountDownLatch done = new CountDownLatch(1);
485	<	try {
483	>	try (PoolCleaner cleaner = cleaner(p)) {
484	>	final CountDownLatch threadsStarted = new CountDownLatch(THREADS);
485	>	final CountDownLatch done = new CountDownLatch(1);
486		assertEquals(0, p.getLargestPoolSize());
487		for (int i = 0; i < THREADS; i++)
488		p.execute(new CheckedRunnable() {
#	Line 411 | Line 491 | public class ThreadPoolExecutorSubclassT
491		done.await();
492		assertEquals(THREADS, p.getLargestPoolSize());
493		}});
494	<	assertTrue(threadsStarted.await(SMALL_DELAY_MS, MILLISECONDS));
415	<	assertEquals(THREADS, p.getLargestPoolSize());
416	<	} finally {
417	<	done.countDown();
418	<	joinPool(p);
494	>	assertTrue(threadsStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
495		assertEquals(THREADS, p.getLargestPoolSize());
496	+	done.countDown();   // release pool
497		}
498	+	assertEquals(THREADS, p.getLargestPoolSize());
499		}
500
501		/**
#	Line 425 | Line 503 | public class ThreadPoolExecutorSubclassT
503		* otherwise set
504		*/
505		public void testGetMaximumPoolSize() {
506	<	ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
507	<	assertEquals(2, p.getMaximumPoolSize());
508	<	joinPool(p);
506	>	final ThreadPoolExecutor p =
507	>	new CustomTPE(2, 3,
508	>	LONG_DELAY_MS, MILLISECONDS,
509	>	new ArrayBlockingQueue<Runnable>(10));
510	>	try (PoolCleaner cleaner = cleaner(p)) {
511	>	assertEquals(3, p.getMaximumPoolSize());
512	>	p.setMaximumPoolSize(5);
513	>	assertEquals(5, p.getMaximumPoolSize());
514	>	p.setMaximumPoolSize(4);
515	>	assertEquals(4, p.getMaximumPoolSize());
516	>	}
517		}
518
519		/**
#	Line 439 | Line 525 | public class ThreadPoolExecutorSubclassT
525		new CustomTPE(1, 1,
526		LONG_DELAY_MS, MILLISECONDS,
527		new ArrayBlockingQueue<Runnable>(10));
528	<	final CountDownLatch threadStarted = new CountDownLatch(1);
529	<	final CountDownLatch done = new CountDownLatch(1);
530	<	try {
528	>	try (PoolCleaner cleaner = cleaner(p)) {
529	>	final CountDownLatch threadStarted = new CountDownLatch(1);
530	>	final CountDownLatch done = new CountDownLatch(1);
531		assertEquals(0, p.getPoolSize());
532		p.execute(new CheckedRunnable() {
533		public void realRun() throws InterruptedException {
#	Line 449 | Line 535 | public class ThreadPoolExecutorSubclassT
535		assertEquals(1, p.getPoolSize());
536		done.await();
537		}});
538	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
538	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
539		assertEquals(1, p.getPoolSize());
540	<	} finally {
455	<	done.countDown();
456	<	joinPool(p);
540	>	done.countDown();   // release pool
541		}
542		}
543
#	Line 465 | Line 549 | public class ThreadPoolExecutorSubclassT
549		new CustomTPE(1, 1,
550		LONG_DELAY_MS, MILLISECONDS,
551		new ArrayBlockingQueue<Runnable>(10));
552	<	final CountDownLatch threadStarted = new CountDownLatch(1);
553	<	final CountDownLatch done = new CountDownLatch(1);
554	<	try {
552	>	try (PoolCleaner cleaner = cleaner(p)) {
553	>	final CountDownLatch threadStarted = new CountDownLatch(1);
554	>	final CountDownLatch done = new CountDownLatch(1);
555		assertEquals(0, p.getTaskCount());
556		p.execute(new CheckedRunnable() {
557		public void realRun() throws InterruptedException {
#	Line 475 | Line 559 | public class ThreadPoolExecutorSubclassT
559		assertEquals(1, p.getTaskCount());
560		done.await();
561		}});
562	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
562	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
563		assertEquals(1, p.getTaskCount());
480	–	} finally {
564		done.countDown();
482	–	joinPool(p);
565		}
566		}
567
#	Line 487 | Line 569 | public class ThreadPoolExecutorSubclassT
569		* isShutdown is false before shutdown, true after
570		*/
571		public void testIsShutdown() {
572	<
573	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
574	<	assertFalse(p.isShutdown());
575	<	try { p.shutdown(); } catch (SecurityException ok) { return; }
576	<	assertTrue(p.isShutdown());
577	<	joinPool(p);
572	>	final ThreadPoolExecutor p =
573	>	new CustomTPE(1, 1,
574	>	LONG_DELAY_MS, MILLISECONDS,
575	>	new ArrayBlockingQueue<Runnable>(10));
576	>	try (PoolCleaner cleaner = cleaner(p)) {
577	>	assertFalse(p.isShutdown());
578	>	try { p.shutdown(); } catch (SecurityException ok) { return; }
579	>	assertTrue(p.isShutdown());
580	>	}
581		}
582
498	–
583		/**
584		* isTerminated is false before termination, true after
585		*/
#	Line 504 | Line 588 | public class ThreadPoolExecutorSubclassT
588		new CustomTPE(1, 1,
589		LONG_DELAY_MS, MILLISECONDS,
590		new ArrayBlockingQueue<Runnable>(10));
591	<	final CountDownLatch threadStarted = new CountDownLatch(1);
592	<	final CountDownLatch done = new CountDownLatch(1);
593	<	try {
591	>	try (PoolCleaner cleaner = cleaner(p)) {
592	>	final CountDownLatch threadStarted = new CountDownLatch(1);
593	>	final CountDownLatch done = new CountDownLatch(1);
594		assertFalse(p.isTerminating());
595		p.execute(new CheckedRunnable() {
596		public void realRun() throws InterruptedException {
#	Line 514 | Line 598 | public class ThreadPoolExecutorSubclassT
598		threadStarted.countDown();
599		done.await();
600		}});
601	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
601	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
602		assertFalse(p.isTerminating());
603		done.countDown();
520	–	} finally {
604		try { p.shutdown(); } catch (SecurityException ok) { return; }
605	+	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
606	+	assertTrue(p.isTerminated());
607	+	assertFalse(p.isTerminating());
608		}
523	–	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
524	–	assertTrue(p.isTerminated());
525	–	assertFalse(p.isTerminating());
609		}
610
611		/**
#	Line 533 | Line 616 | public class ThreadPoolExecutorSubclassT
616		new CustomTPE(1, 1,
617		LONG_DELAY_MS, MILLISECONDS,
618		new ArrayBlockingQueue<Runnable>(10));
619	<	final CountDownLatch threadStarted = new CountDownLatch(1);
620	<	final CountDownLatch done = new CountDownLatch(1);
621	<	try {
619	>	try (PoolCleaner cleaner = cleaner(p)) {
620	>	final CountDownLatch threadStarted = new CountDownLatch(1);
621	>	final CountDownLatch done = new CountDownLatch(1);
622		assertFalse(p.isTerminating());
623		p.execute(new CheckedRunnable() {
624		public void realRun() throws InterruptedException {
#	Line 543 | Line 626 | public class ThreadPoolExecutorSubclassT
626		threadStarted.countDown();
627		done.await();
628		}});
629	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
629	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
630		assertFalse(p.isTerminating());
631		done.countDown();
549	–	} finally {
632		try { p.shutdown(); } catch (SecurityException ok) { return; }
633	+	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
634	+	assertTrue(p.isTerminated());
635	+	assertFalse(p.isTerminating());
636		}
552	–	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
553	–	assertTrue(p.isTerminated());
554	–	assertFalse(p.isTerminating());
637		}
638
639		/**
#	Line 563 | Line 645 | public class ThreadPoolExecutorSubclassT
645		new CustomTPE(1, 1,
646		LONG_DELAY_MS, MILLISECONDS,
647		q);
648	<	final CountDownLatch threadStarted = new CountDownLatch(1);
649	<	final CountDownLatch done = new CountDownLatch(1);
650	<	try {
648	>	try (PoolCleaner cleaner = cleaner(p)) {
649	>	final CountDownLatch threadStarted = new CountDownLatch(1);
650	>	final CountDownLatch done = new CountDownLatch(1);
651		FutureTask[] tasks = new FutureTask[5];
652		for (int i = 0; i < tasks.length; i++) {
653		Callable task = new CheckedCallable<Boolean>() {
#	Line 578 | Line 660 | public class ThreadPoolExecutorSubclassT
660		tasks[i] = new FutureTask(task);
661		p.execute(tasks[i]);
662		}
663	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
663	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
664		assertSame(q, p.getQueue());
665		assertFalse(q.contains(tasks[0]));
666		assertTrue(q.contains(tasks[tasks.length - 1]));
667		assertEquals(tasks.length - 1, q.size());
586	–	} finally {
668		done.countDown();
588	–	joinPool(p);
669		}
670		}
671
#	Line 598 | Line 678 | public class ThreadPoolExecutorSubclassT
678		new CustomTPE(1, 1,
679		LONG_DELAY_MS, MILLISECONDS,
680		q);
681	<	Runnable[] tasks = new Runnable[6];
682	<	final CountDownLatch threadStarted = new CountDownLatch(1);
683	<	final CountDownLatch done = new CountDownLatch(1);
684	<	try {
681	>	try (PoolCleaner cleaner = cleaner(p)) {
682	>	Runnable[] tasks = new Runnable[6];
683	>	final CountDownLatch threadStarted = new CountDownLatch(1);
684	>	final CountDownLatch done = new CountDownLatch(1);
685		for (int i = 0; i < tasks.length; i++) {
686		tasks[i] = new CheckedRunnable() {
687	<	public void realRun() throws InterruptedException {
688	<	threadStarted.countDown();
689	<	done.await();
690	<	}};
687	>	public void realRun() throws InterruptedException {
688	>	threadStarted.countDown();
689	>	done.await();
690	>	}};
691		p.execute(tasks[i]);
692		}
693	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
693	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
694		assertFalse(p.remove(tasks[0]));
695		assertTrue(q.contains(tasks[4]));
696		assertTrue(q.contains(tasks[3]));
#	Line 620 | Line 700 | public class ThreadPoolExecutorSubclassT
700		assertTrue(q.contains(tasks[3]));
701		assertTrue(p.remove(tasks[3]));
702		assertFalse(q.contains(tasks[3]));
623	–	} finally {
703		done.countDown();
625	–	joinPool(p);
704		}
705		}
706
#	Line 637 | Line 715 | public class ThreadPoolExecutorSubclassT
715		new CustomTPE(1, 1,
716		LONG_DELAY_MS, MILLISECONDS,
717		q);
718	<	FutureTask[] tasks = new FutureTask[5];
719	<	try {
718	>	try (PoolCleaner cleaner = cleaner(p)) {
719	>	FutureTask[] tasks = new FutureTask[5];
720		for (int i = 0; i < tasks.length; i++) {
721		Callable task = new CheckedCallable<Boolean>() {
722		public Boolean realCall() throws InterruptedException {
#	Line 649 | Line 727 | public class ThreadPoolExecutorSubclassT
727		tasks[i] = new FutureTask(task);
728		p.execute(tasks[i]);
729		}
730	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
730	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
731		assertEquals(tasks.length, p.getTaskCount());
732		assertEquals(tasks.length - 1, q.size());
733		assertEquals(1L, p.getActiveCount());
#	Line 662 | Line 740 | public class ThreadPoolExecutorSubclassT
740		p.purge();         // Nothing to do
741		assertEquals(tasks.length - 3, q.size());
742		assertEquals(tasks.length - 2, p.getTaskCount());
665	–	} finally {
743		done.countDown();
667	–	joinPool(p);
744		}
745		}
746
747		/**
748	<	* shutdownNow returns a list containing tasks that were not run
748	>	* shutdownNow returns a list containing tasks that were not run,
749	>	* and those tasks are drained from the queue
750		*/
751	<	public void testShutdownNow() {
752	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
753	<	List l;
754	<	try {
755	<	for (int i = 0; i < 5; i++)
756	<	p.execute(new MediumPossiblyInterruptedRunnable());
757	<	}
758	<	finally {
751	>	public void testShutdownNow() throws InterruptedException {
752	>	final int poolSize = 2;
753	>	final int count = 5;
754	>	final AtomicInteger ran = new AtomicInteger(0);
755	>	ThreadPoolExecutor p =
756	>	new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
757	>	new ArrayBlockingQueue<Runnable>(10));
758	>	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
759	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
760	>	threadsStarted.countDown();
761		try {
762	<	l = p.shutdownNow();
763	<	} catch (SecurityException ok) { return; }
762	>	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
763	>	} catch (InterruptedException success) {}
764	>	ran.getAndIncrement();
765	>	}};
766	>	for (int i = 0; i < count; i++)
767	>	p.execute(waiter);
768	>	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
769	>	assertEquals(poolSize, p.getActiveCount());
770	>	assertEquals(0, p.getCompletedTaskCount());
771	>	final List<Runnable> queuedTasks;
772	>	try {
773	>	queuedTasks = p.shutdownNow();
774	>	} catch (SecurityException ok) {
775	>	return; // Allowed in case test doesn't have privs
776		}
777		assertTrue(p.isShutdown());
778	<	assertTrue(l.size() <= 4);
778	>	assertTrue(p.getQueue().isEmpty());
779	>	assertEquals(count - poolSize, queuedTasks.size());
780	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
781	>	assertTrue(p.isTerminated());
782	>	assertEquals(poolSize, ran.get());
783	>	assertEquals(poolSize, p.getCompletedTaskCount());
784		}
785
786		// Exception Tests
787
692	–
788		/**
789		* Constructor throws if corePoolSize argument is less than zero
790		*/
791		public void testConstructor1() {
792		try {
793	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
793	>	new CustomTPE(-1, 1, 1L, SECONDS,
794	>	new ArrayBlockingQueue<Runnable>(10));
795		shouldThrow();
796		} catch (IllegalArgumentException success) {}
797		}
#	Line 705 | Line 801 | public class ThreadPoolExecutorSubclassT
801		*/
802		public void testConstructor2() {
803		try {
804	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
804	>	new CustomTPE(1, -1, 1L, SECONDS,
805	>	new ArrayBlockingQueue<Runnable>(10));
806		shouldThrow();
807		} catch (IllegalArgumentException success) {}
808		}
#	Line 715 | Line 812 | public class ThreadPoolExecutorSubclassT
812		*/
813		public void testConstructor3() {
814		try {
815	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
815	>	new CustomTPE(1, 0, 1L, SECONDS,
816	>	new ArrayBlockingQueue<Runnable>(10));
817		shouldThrow();
818		} catch (IllegalArgumentException success) {}
819		}
#	Line 725 | Line 823 | public class ThreadPoolExecutorSubclassT
823		*/
824		public void testConstructor4() {
825		try {
826	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
826	>	new CustomTPE(1, 2, -1L, SECONDS,
827	>	new ArrayBlockingQueue<Runnable>(10));
828		shouldThrow();
829		} catch (IllegalArgumentException success) {}
830		}
#	Line 735 | Line 834 | public class ThreadPoolExecutorSubclassT
834		*/
835		public void testConstructor5() {
836		try {
837	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
837	>	new CustomTPE(2, 1, 1L, SECONDS,
838	>	new ArrayBlockingQueue<Runnable>(10));
839		shouldThrow();
840		} catch (IllegalArgumentException success) {}
841		}
#	Line 745 | Line 845 | public class ThreadPoolExecutorSubclassT
845		*/
846		public void testConstructorNullPointerException() {
847		try {
848	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
848	>	new CustomTPE(1, 2, 1L, SECONDS, null);
849		shouldThrow();
850		} catch (NullPointerException success) {}
851		}
852
753	–
754	–
853		/**
854		* Constructor throws if corePoolSize argument is less than zero
855		*/
856		public void testConstructor6() {
857		try {
858	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
858	>	new CustomTPE(-1, 1, 1L, SECONDS,
859	>	new ArrayBlockingQueue<Runnable>(10),
860	>	new SimpleThreadFactory());
861		shouldThrow();
862		} catch (IllegalArgumentException success) {}
863		}
#	Line 767 | Line 867 | public class ThreadPoolExecutorSubclassT
867		*/
868		public void testConstructor7() {
869		try {
870	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
870	>	new CustomTPE(1,-1, 1L, SECONDS,
871	>	new ArrayBlockingQueue<Runnable>(10),
872	>	new SimpleThreadFactory());
873		shouldThrow();
874		} catch (IllegalArgumentException success) {}
875		}
#	Line 777 | Line 879 | public class ThreadPoolExecutorSubclassT
879		*/
880		public void testConstructor8() {
881		try {
882	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
882	>	new CustomTPE(1, 0, 1L, SECONDS,
883	>	new ArrayBlockingQueue<Runnable>(10),
884	>	new SimpleThreadFactory());
885		shouldThrow();
886		} catch (IllegalArgumentException success) {}
887		}
#	Line 787 | Line 891 | public class ThreadPoolExecutorSubclassT
891		*/
892		public void testConstructor9() {
893		try {
894	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
894	>	new CustomTPE(1, 2, -1L, SECONDS,
895	>	new ArrayBlockingQueue<Runnable>(10),
896	>	new SimpleThreadFactory());
897		shouldThrow();
898		} catch (IllegalArgumentException success) {}
899		}
#	Line 797 | Line 903 | public class ThreadPoolExecutorSubclassT
903		*/
904		public void testConstructor10() {
905		try {
906	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
906	>	new CustomTPE(2, 1, 1L, SECONDS,
907	>	new ArrayBlockingQueue<Runnable>(10),
908	>	new SimpleThreadFactory());
909		shouldThrow();
910		} catch (IllegalArgumentException success) {}
911		}
#	Line 807 | Line 915 | public class ThreadPoolExecutorSubclassT
915		*/
916		public void testConstructorNullPointerException2() {
917		try {
918	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
918	>	new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
919		shouldThrow();
920		} catch (NullPointerException success) {}
921		}
#	Line 817 | Line 925 | public class ThreadPoolExecutorSubclassT
925		*/
926		public void testConstructorNullPointerException3() {
927		try {
928	<	ThreadFactory f = null;
929	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
928	>	new CustomTPE(1, 2, 1L, SECONDS,
929	>	new ArrayBlockingQueue<Runnable>(10),
930	>	(ThreadFactory) null);
931		shouldThrow();
932		} catch (NullPointerException success) {}
933		}
934
826	–
935		/**
936		* Constructor throws if corePoolSize argument is less than zero
937		*/
938		public void testConstructor11() {
939		try {
940	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
940	>	new CustomTPE(-1, 1, 1L, SECONDS,
941	>	new ArrayBlockingQueue<Runnable>(10),
942	>	new NoOpREHandler());
943		shouldThrow();
944		} catch (IllegalArgumentException success) {}
945		}
#	Line 839 | Line 949 | public class ThreadPoolExecutorSubclassT
949		*/
950		public void testConstructor12() {
951		try {
952	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
952	>	new CustomTPE(1, -1, 1L, SECONDS,
953	>	new ArrayBlockingQueue<Runnable>(10),
954	>	new NoOpREHandler());
955		shouldThrow();
956		} catch (IllegalArgumentException success) {}
957		}
#	Line 849 | Line 961 | public class ThreadPoolExecutorSubclassT
961		*/
962		public void testConstructor13() {
963		try {
964	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
964	>	new CustomTPE(1, 0, 1L, SECONDS,
965	>	new ArrayBlockingQueue<Runnable>(10),
966	>	new NoOpREHandler());
967		shouldThrow();
968		} catch (IllegalArgumentException success) {}
969		}
#	Line 859 | Line 973 | public class ThreadPoolExecutorSubclassT
973		*/
974		public void testConstructor14() {
975		try {
976	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
976	>	new CustomTPE(1, 2, -1L, SECONDS,
977	>	new ArrayBlockingQueue<Runnable>(10),
978	>	new NoOpREHandler());
979		shouldThrow();
980		} catch (IllegalArgumentException success) {}
981		}
#	Line 869 | Line 985 | public class ThreadPoolExecutorSubclassT
985		*/
986		public void testConstructor15() {
987		try {
988	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
988	>	new CustomTPE(2, 1, 1L, SECONDS,
989	>	new ArrayBlockingQueue<Runnable>(10),
990	>	new NoOpREHandler());
991		shouldThrow();
992		} catch (IllegalArgumentException success) {}
993		}
#	Line 879 | Line 997 | public class ThreadPoolExecutorSubclassT
997		*/
998		public void testConstructorNullPointerException4() {
999		try {
1000	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
1000	>	new CustomTPE(1, 2, 1L, SECONDS,
1001	>	null,
1002	>	new NoOpREHandler());
1003		shouldThrow();
1004		} catch (NullPointerException success) {}
1005		}
#	Line 889 | Line 1009 | public class ThreadPoolExecutorSubclassT
1009		*/
1010		public void testConstructorNullPointerException5() {
1011		try {
1012	<	RejectedExecutionHandler r = null;
1013	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
1012	>	new CustomTPE(1, 2, 1L, SECONDS,
1013	>	new ArrayBlockingQueue<Runnable>(10),
1014	>	(RejectedExecutionHandler) null);
1015		shouldThrow();
1016		} catch (NullPointerException success) {}
1017		}
1018
898	–
1019		/**
1020		* Constructor throws if corePoolSize argument is less than zero
1021		*/
1022		public void testConstructor16() {
1023		try {
1024	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1024	>	new CustomTPE(-1, 1, 1L, SECONDS,
1025	>	new ArrayBlockingQueue<Runnable>(10),
1026	>	new SimpleThreadFactory(),
1027	>	new NoOpREHandler());
1028		shouldThrow();
1029		} catch (IllegalArgumentException success) {}
1030		}
#	Line 911 | Line 1034 | public class ThreadPoolExecutorSubclassT
1034		*/
1035		public void testConstructor17() {
1036		try {
1037	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1037	>	new CustomTPE(1, -1, 1L, SECONDS,
1038	>	new ArrayBlockingQueue<Runnable>(10),
1039	>	new SimpleThreadFactory(),
1040	>	new NoOpREHandler());
1041		shouldThrow();
1042		} catch (IllegalArgumentException success) {}
1043		}
#	Line 921 | Line 1047 | public class ThreadPoolExecutorSubclassT
1047		*/
1048		public void testConstructor18() {
1049		try {
1050	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1050	>	new CustomTPE(1, 0, 1L, SECONDS,
1051	>	new ArrayBlockingQueue<Runnable>(10),
1052	>	new SimpleThreadFactory(),
1053	>	new NoOpREHandler());
1054		shouldThrow();
1055		} catch (IllegalArgumentException success) {}
1056		}
#	Line 931 | Line 1060 | public class ThreadPoolExecutorSubclassT
1060		*/
1061		public void testConstructor19() {
1062		try {
1063	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1063	>	new CustomTPE(1, 2, -1L, SECONDS,
1064	>	new ArrayBlockingQueue<Runnable>(10),
1065	>	new SimpleThreadFactory(),
1066	>	new NoOpREHandler());
1067		shouldThrow();
1068		} catch (IllegalArgumentException success) {}
1069		}
#	Line 941 | Line 1073 | public class ThreadPoolExecutorSubclassT
1073		*/
1074		public void testConstructor20() {
1075		try {
1076	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1076	>	new CustomTPE(2, 1, 1L, SECONDS,
1077	>	new ArrayBlockingQueue<Runnable>(10),
1078	>	new SimpleThreadFactory(),
1079	>	new NoOpREHandler());
1080		shouldThrow();
1081		} catch (IllegalArgumentException success) {}
1082		}
#	Line 951 | Line 1086 | public class ThreadPoolExecutorSubclassT
1086		*/
1087		public void testConstructorNullPointerException6() {
1088		try {
1089	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1089	>	new CustomTPE(1, 2, 1L, SECONDS,
1090	>	null,
1091	>	new SimpleThreadFactory(),
1092	>	new NoOpREHandler());
1093		shouldThrow();
1094		} catch (NullPointerException success) {}
1095		}
#	Line 961 | Line 1099 | public class ThreadPoolExecutorSubclassT
1099		*/
1100		public void testConstructorNullPointerException7() {
1101		try {
1102	<	RejectedExecutionHandler r = null;
1103	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1102	>	new CustomTPE(1, 2, 1L, SECONDS,
1103	>	new ArrayBlockingQueue<Runnable>(10),
1104	>	new SimpleThreadFactory(),
1105	>	(RejectedExecutionHandler) null);
1106		shouldThrow();
1107		} catch (NullPointerException success) {}
1108		}
#	Line 972 | Line 1112 | public class ThreadPoolExecutorSubclassT
1112		*/
1113		public void testConstructorNullPointerException8() {
1114		try {
1115	<	new CustomTPE(1, 2,
976	<	LONG_DELAY_MS, MILLISECONDS,
1115	>	new CustomTPE(1, 2, 1L, SECONDS,
1116		new ArrayBlockingQueue<Runnable>(10),
1117		(ThreadFactory) null,
1118		new NoOpREHandler());
#	Line 981 | Line 1120 | public class ThreadPoolExecutorSubclassT
1120		} catch (NullPointerException success) {}
1121		}
1122
984	–
1123		/**
1124		* execute throws RejectedExecutionException if saturated.
1125		*/
#	Line 1131 | Line 1269 | public class ThreadPoolExecutorSubclassT
1269		}
1270		}
1271
1134	–
1272		/**
1273		* execute using DiscardOldestPolicy drops task on shutdown
1274		*/
#	Line 1149 | Line 1286 | public class ThreadPoolExecutorSubclassT
1286		}
1287		}
1288
1152	–
1289		/**
1290		* execute(null) throws NPE
1291		*/
1292		public void testExecuteNull() {
1293	<	ThreadPoolExecutor p = null;
1293	>	ThreadPoolExecutor p =
1294	>	new CustomTPE(1, 2, 1L, SECONDS,
1295	>	new ArrayBlockingQueue<Runnable>(10));
1296		try {
1159	–	p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1297		p.execute(null);
1298		shouldThrow();
1299		} catch (NullPointerException success) {}
#	Line 1214 | Line 1351 | public class ThreadPoolExecutorSubclassT
1351		joinPool(p);
1352		}
1353
1217	–
1354		/**
1355		* setKeepAliveTime throws IllegalArgumentException
1356		* when given a negative value
#	Line 1239 | Line 1375 | public class ThreadPoolExecutorSubclassT
1375		public void testTerminated() {
1376		CustomTPE p = new CustomTPE();
1377		try { p.shutdown(); } catch (SecurityException ok) { return; }
1378	<	assertTrue(p.terminatedCalled);
1378	>	assertTrue(p.terminatedCalled());
1379		joinPool(p);
1380		}
1381
#	Line 1249 | Line 1385 | public class ThreadPoolExecutorSubclassT
1385		public void testBeforeAfter() throws InterruptedException {
1386		CustomTPE p = new CustomTPE();
1387		try {
1388	<	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1389	<	p.execute(r);
1390	<	delay(SHORT_DELAY_MS);
1391	<	assertTrue(r.done);
1392	<	assertTrue(p.beforeCalled);
1393	<	assertTrue(p.afterCalled);
1388	>	final CountDownLatch done = new CountDownLatch(1);
1389	>	p.execute(new CheckedRunnable() {
1390	>	public void realRun() {
1391	>	done.countDown();
1392	>	}});
1393	>	await(p.afterCalled);
1394	>	assertEquals(0, done.getCount());
1395	>	assertTrue(p.afterCalled());
1396	>	assertTrue(p.beforeCalled());
1397		try { p.shutdown(); } catch (SecurityException ok) { return; }
1398		} finally {
1399		joinPool(p);
#	Line 1303 | Line 1442 | public class ThreadPoolExecutorSubclassT
1442		}
1443		}
1444
1306	–
1445		/**
1446		* invokeAny(null) throws NPE
1447		*/
#	Line 1465 | Line 1603 | public class ThreadPoolExecutorSubclassT
1603		}
1604		}
1605
1468	–
1469	–
1606		/**
1607		* timed invokeAny(null) throws NPE
1608		*/
#	Line 1653 | Line 1789 | public class ThreadPoolExecutorSubclassT
1789		l.add(new StringTask());
1790		l.add(new StringTask());
1791		List<Future<String>> futures =
1792	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1792	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1793		assertEquals(2, futures.size());
1794		for (Future<String> future : futures)
1795		assertSame(TEST_STRING, future.get());
#	Line 1668 | Line 1804 | public class ThreadPoolExecutorSubclassT
1804		public void testTimedInvokeAll6() throws Exception {
1805		ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1806		try {
1807	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1808	<	l.add(new StringTask());
1809	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1810	<	l.add(new StringTask());
1811	<	List<Future<String>> futures =
1812	<	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1813	<	assertEquals(3, futures.size());
1814	<	Iterator<Future<String>> it = futures.iterator();
1815	<	Future<String> f1 = it.next();
1816	<	Future<String> f2 = it.next();
1817	<	Future<String> f3 = it.next();
1818	<	assertTrue(f1.isDone());
1819	<	assertTrue(f2.isDone());
1820	<	assertTrue(f3.isDone());
1821	<	assertFalse(f1.isCancelled());
1822	<	assertTrue(f2.isCancelled());
1807	>	for (long timeout = timeoutMillis();;) {
1808	>	List<Callable<String>> tasks = new ArrayList<>();
1809	>	tasks.add(new StringTask("0"));
1810	>	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1811	>	tasks.add(new StringTask("2"));
1812	>	long startTime = System.nanoTime();
1813	>	List<Future<String>> futures =
1814	>	e.invokeAll(tasks, timeout, MILLISECONDS);
1815	>	assertEquals(tasks.size(), futures.size());
1816	>	assertTrue(millisElapsedSince(startTime) >= timeout);
1817	>	for (Future future : futures)
1818	>	assertTrue(future.isDone());
1819	>	assertTrue(futures.get(1).isCancelled());
1820	>	try {
1821	>	assertEquals("0", futures.get(0).get());
1822	>	assertEquals("2", futures.get(2).get());
1823	>	break;
1824	>	} catch (CancellationException retryWithLongerTimeout) {
1825	>	timeout *= 2;
1826	>	if (timeout >= LONG_DELAY_MS / 2)
1827	>	fail("expected exactly one task to be cancelled");
1828	>	}
1829	>	}
1830		} finally {
1831		joinPool(e);
1832		}
#	Line 1726 | Line 1869 | public class ThreadPoolExecutorSubclassT
1869		* allowCoreThreadTimeOut(true) causes idle threads to time out
1870		*/
1871		public void testAllowCoreThreadTimeOut_true() throws Exception {
1872	+	long keepAliveTime = timeoutMillis();
1873		final ThreadPoolExecutor p =
1874		new CustomTPE(2, 10,
1875	<	SHORT_DELAY_MS, MILLISECONDS,
1875	>	keepAliveTime, MILLISECONDS,
1876		new ArrayBlockingQueue<Runnable>(10));
1877		final CountDownLatch threadStarted = new CountDownLatch(1);
1878		try {
1879		p.allowCoreThreadTimeOut(true);
1880		p.execute(new CheckedRunnable() {
1881	<	public void realRun() throws InterruptedException {
1881	>	public void realRun() {
1882		threadStarted.countDown();
1883		assertEquals(1, p.getPoolSize());
1884		}});
1885	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1886	<	for (int i = 0; i < (MEDIUM_DELAY_MS/10); i++) {
1887	<	if (p.getPoolSize() == 0)
1888	<	break;
1889	<	delay(10);
1890	<	}
1885	>	await(threadStarted);
1886	>	delay(keepAliveTime);
1887	>	long startTime = System.nanoTime();
1888	>	while (p.getPoolSize() > 0
1889	>	&& millisElapsedSince(startTime) < LONG_DELAY_MS)
1890	>	Thread.yield();
1891	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1892		assertEquals(0, p.getPoolSize());
1893		} finally {
1894		joinPool(p);
#	Line 1754 | Line 1899 | public class ThreadPoolExecutorSubclassT
1899		* allowCoreThreadTimeOut(false) causes idle threads not to time out
1900		*/
1901		public void testAllowCoreThreadTimeOut_false() throws Exception {
1902	+	long keepAliveTime = timeoutMillis();
1903		final ThreadPoolExecutor p =
1904		new CustomTPE(2, 10,
1905	<	SHORT_DELAY_MS, MILLISECONDS,
1905	>	keepAliveTime, MILLISECONDS,
1906		new ArrayBlockingQueue<Runnable>(10));
1907		final CountDownLatch threadStarted = new CountDownLatch(1);
1908		try {
#	Line 1766 | Line 1912 | public class ThreadPoolExecutorSubclassT
1912		threadStarted.countDown();
1913		assertTrue(p.getPoolSize() >= 1);
1914		}});
1915	<	delay(SMALL_DELAY_MS);
1915	>	delay(2 * keepAliveTime);
1916		assertTrue(p.getPoolSize() >= 1);
1917		} finally {
1918		joinPool(p);
1919		}
1920		}
1921
1922	+	/**
1923	+	* get(cancelled task) throws CancellationException
1924	+	* (in part, a test of CustomTPE itself)
1925	+	*/
1926	+	public void testGet_cancelled() throws Exception {
1927	+	final ExecutorService e =
1928	+	new CustomTPE(1, 1,
1929	+	LONG_DELAY_MS, MILLISECONDS,
1930	+	new LinkedBlockingQueue<Runnable>());
1931	+	try {
1932	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
1933	+	final CountDownLatch done = new CountDownLatch(1);
1934	+	final List<Future<?>> futures = new ArrayList<>();
1935	+	for (int i = 0; i < 2; i++) {
1936	+	Runnable r = new CheckedRunnable() { public void realRun()
1937	+	throws Throwable {
1938	+	blockerStarted.countDown();
1939	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1940	+	}};
1941	+	futures.add(e.submit(r));
1942	+	}
1943	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1944	+	for (Future<?> future : futures) future.cancel(false);
1945	+	for (Future<?> future : futures) {
1946	+	try {
1947	+	future.get();
1948	+	shouldThrow();
1949	+	} catch (CancellationException success) {}
1950	+	try {
1951	+	future.get(LONG_DELAY_MS, MILLISECONDS);
1952	+	shouldThrow();
1953	+	} catch (CancellationException success) {}
1954	+	assertTrue(future.isCancelled());
1955	+	assertTrue(future.isDone());
1956	+	}
1957	+	done.countDown();
1958	+	} finally {
1959	+	joinPool(e);
1960	+	}
1961	+	}
1962	+
1963		}

Diff Legend

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