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.24 by jsr166, Tue Nov 30 02:12:52 2010 UTC vs.
Revision 1.70 by jsr166, Sun Oct 4 02:33:09 2015 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
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	<	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 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
568		/**
569	<	* isShutDown is false before shutdown, true after
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 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]));
#	Line 610 | Line 692 | public class ThreadPoolExecutorSubclassT
692		}};
693		p.execute(tasks[i]);
694		}
695	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
695	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
696		assertFalse(p.remove(tasks[0]));
697		assertTrue(q.contains(tasks[4]));
698		assertTrue(q.contains(tasks[3]));
#	Line 649 | Line 731 | public class ThreadPoolExecutorSubclassT
731		tasks[i] = new FutureTask(task);
732		p.execute(tasks[i]);
733		}
734	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
734	>	assertTrue(threadStarted.await(MEDIUM_DELAY_MS, MILLISECONDS));
735		assertEquals(tasks.length, p.getTaskCount());
736		assertEquals(tasks.length - 1, q.size());
737		assertEquals(1L, p.getActiveCount());
#	Line 669 | Line 751 | public class ThreadPoolExecutorSubclassT
751		}
752
753		/**
754	<	* shutDownNow returns a list containing tasks that were not run
754	>	* shutdownNow returns a list containing tasks that were not run,
755	>	* and those tasks are drained from the queue
756		*/
757	<	public void testShutDownNow() {
758	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
759	<	List l;
760	<	try {
761	<	for (int i = 0; i < 5; i++)
762	<	p.execute(new MediumPossiblyInterruptedRunnable());
763	<	}
764	<	finally {
757	>	public void testShutdownNow() throws InterruptedException {
758	>	final int poolSize = 2;
759	>	final int count = 5;
760	>	final AtomicInteger ran = new AtomicInteger(0);
761	>	ThreadPoolExecutor p =
762	>	new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
763	>	new ArrayBlockingQueue<Runnable>(10));
764	>	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
765	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
766	>	threadsStarted.countDown();
767		try {
768	<	l = p.shutdownNow();
769	<	} catch (SecurityException ok) { return; }
768	>	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
769	>	} catch (InterruptedException success) {}
770	>	ran.getAndIncrement();
771	>	}};
772	>	for (int i = 0; i < count; i++)
773	>	p.execute(waiter);
774	>	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
775	>	assertEquals(poolSize, p.getActiveCount());
776	>	assertEquals(0, p.getCompletedTaskCount());
777	>	final List<Runnable> queuedTasks;
778	>	try {
779	>	queuedTasks = p.shutdownNow();
780	>	} catch (SecurityException ok) {
781	>	return; // Allowed in case test doesn't have privs
782		}
783		assertTrue(p.isShutdown());
784	<	assertTrue(l.size() <= 4);
784	>	assertTrue(p.getQueue().isEmpty());
785	>	assertEquals(count - poolSize, queuedTasks.size());
786	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
787	>	assertTrue(p.isTerminated());
788	>	assertEquals(poolSize, ran.get());
789	>	assertEquals(poolSize, p.getCompletedTaskCount());
790		}
791
792		// Exception Tests
793
692	–
794		/**
795		* Constructor throws if corePoolSize argument is less than zero
796		*/
797		public void testConstructor1() {
798		try {
799	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
799	>	new CustomTPE(-1, 1, 1L, SECONDS,
800	>	new ArrayBlockingQueue<Runnable>(10));
801		shouldThrow();
802		} catch (IllegalArgumentException success) {}
803		}
#	Line 705 | Line 807 | public class ThreadPoolExecutorSubclassT
807		*/
808		public void testConstructor2() {
809		try {
810	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
810	>	new CustomTPE(1, -1, 1L, SECONDS,
811	>	new ArrayBlockingQueue<Runnable>(10));
812		shouldThrow();
813		} catch (IllegalArgumentException success) {}
814		}
#	Line 715 | Line 818 | public class ThreadPoolExecutorSubclassT
818		*/
819		public void testConstructor3() {
820		try {
821	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
821	>	new CustomTPE(1, 0, 1L, SECONDS,
822	>	new ArrayBlockingQueue<Runnable>(10));
823		shouldThrow();
824		} catch (IllegalArgumentException success) {}
825		}
#	Line 725 | Line 829 | public class ThreadPoolExecutorSubclassT
829		*/
830		public void testConstructor4() {
831		try {
832	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
832	>	new CustomTPE(1, 2, -1L, SECONDS,
833	>	new ArrayBlockingQueue<Runnable>(10));
834		shouldThrow();
835		} catch (IllegalArgumentException success) {}
836		}
#	Line 735 | Line 840 | public class ThreadPoolExecutorSubclassT
840		*/
841		public void testConstructor5() {
842		try {
843	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
843	>	new CustomTPE(2, 1, 1L, SECONDS,
844	>	new ArrayBlockingQueue<Runnable>(10));
845		shouldThrow();
846		} catch (IllegalArgumentException success) {}
847		}
#	Line 745 | Line 851 | public class ThreadPoolExecutorSubclassT
851		*/
852		public void testConstructorNullPointerException() {
853		try {
854	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
854	>	new CustomTPE(1, 2, 1L, SECONDS, null);
855		shouldThrow();
856		} catch (NullPointerException success) {}
857		}
858
753	–
754	–
859		/**
860		* Constructor throws if corePoolSize argument is less than zero
861		*/
862		public void testConstructor6() {
863		try {
864	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
864	>	new CustomTPE(-1, 1, 1L, SECONDS,
865	>	new ArrayBlockingQueue<Runnable>(10),
866	>	new SimpleThreadFactory());
867		shouldThrow();
868		} catch (IllegalArgumentException success) {}
869		}
#	Line 767 | Line 873 | public class ThreadPoolExecutorSubclassT
873		*/
874		public void testConstructor7() {
875		try {
876	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
876	>	new CustomTPE(1,-1, 1L, SECONDS,
877	>	new ArrayBlockingQueue<Runnable>(10),
878	>	new SimpleThreadFactory());
879		shouldThrow();
880		} catch (IllegalArgumentException success) {}
881		}
#	Line 777 | Line 885 | public class ThreadPoolExecutorSubclassT
885		*/
886		public void testConstructor8() {
887		try {
888	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
888	>	new CustomTPE(1, 0, 1L, SECONDS,
889	>	new ArrayBlockingQueue<Runnable>(10),
890	>	new SimpleThreadFactory());
891		shouldThrow();
892		} catch (IllegalArgumentException success) {}
893		}
#	Line 787 | Line 897 | public class ThreadPoolExecutorSubclassT
897		*/
898		public void testConstructor9() {
899		try {
900	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
900	>	new CustomTPE(1, 2, -1L, SECONDS,
901	>	new ArrayBlockingQueue<Runnable>(10),
902	>	new SimpleThreadFactory());
903		shouldThrow();
904		} catch (IllegalArgumentException success) {}
905		}
#	Line 797 | Line 909 | public class ThreadPoolExecutorSubclassT
909		*/
910		public void testConstructor10() {
911		try {
912	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
912	>	new CustomTPE(2, 1, 1L, SECONDS,
913	>	new ArrayBlockingQueue<Runnable>(10),
914	>	new SimpleThreadFactory());
915		shouldThrow();
916		} catch (IllegalArgumentException success) {}
917		}
#	Line 807 | Line 921 | public class ThreadPoolExecutorSubclassT
921		*/
922		public void testConstructorNullPointerException2() {
923		try {
924	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
924	>	new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
925		shouldThrow();
926		} catch (NullPointerException success) {}
927		}
#	Line 817 | Line 931 | public class ThreadPoolExecutorSubclassT
931		*/
932		public void testConstructorNullPointerException3() {
933		try {
934	<	ThreadFactory f = null;
935	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
934	>	new CustomTPE(1, 2, 1L, SECONDS,
935	>	new ArrayBlockingQueue<Runnable>(10),
936	>	(ThreadFactory) null);
937		shouldThrow();
938		} catch (NullPointerException success) {}
939		}
940
826	–
941		/**
942		* Constructor throws if corePoolSize argument is less than zero
943		*/
944		public void testConstructor11() {
945		try {
946	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
946	>	new CustomTPE(-1, 1, 1L, SECONDS,
947	>	new ArrayBlockingQueue<Runnable>(10),
948	>	new NoOpREHandler());
949		shouldThrow();
950		} catch (IllegalArgumentException success) {}
951		}
#	Line 839 | Line 955 | public class ThreadPoolExecutorSubclassT
955		*/
956		public void testConstructor12() {
957		try {
958	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
958	>	new CustomTPE(1, -1, 1L, SECONDS,
959	>	new ArrayBlockingQueue<Runnable>(10),
960	>	new NoOpREHandler());
961		shouldThrow();
962		} catch (IllegalArgumentException success) {}
963		}
#	Line 849 | Line 967 | public class ThreadPoolExecutorSubclassT
967		*/
968		public void testConstructor13() {
969		try {
970	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
970	>	new CustomTPE(1, 0, 1L, SECONDS,
971	>	new ArrayBlockingQueue<Runnable>(10),
972	>	new NoOpREHandler());
973		shouldThrow();
974		} catch (IllegalArgumentException success) {}
975		}
#	Line 859 | Line 979 | public class ThreadPoolExecutorSubclassT
979		*/
980		public void testConstructor14() {
981		try {
982	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
982	>	new CustomTPE(1, 2, -1L, SECONDS,
983	>	new ArrayBlockingQueue<Runnable>(10),
984	>	new NoOpREHandler());
985		shouldThrow();
986		} catch (IllegalArgumentException success) {}
987		}
#	Line 869 | Line 991 | public class ThreadPoolExecutorSubclassT
991		*/
992		public void testConstructor15() {
993		try {
994	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
994	>	new CustomTPE(2, 1, 1L, SECONDS,
995	>	new ArrayBlockingQueue<Runnable>(10),
996	>	new NoOpREHandler());
997		shouldThrow();
998		} catch (IllegalArgumentException success) {}
999		}
#	Line 879 | Line 1003 | public class ThreadPoolExecutorSubclassT
1003		*/
1004		public void testConstructorNullPointerException4() {
1005		try {
1006	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
1006	>	new CustomTPE(1, 2, 1L, SECONDS,
1007	>	null,
1008	>	new NoOpREHandler());
1009		shouldThrow();
1010		} catch (NullPointerException success) {}
1011		}
#	Line 889 | Line 1015 | public class ThreadPoolExecutorSubclassT
1015		*/
1016		public void testConstructorNullPointerException5() {
1017		try {
1018	<	RejectedExecutionHandler r = null;
1019	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
1018	>	new CustomTPE(1, 2, 1L, SECONDS,
1019	>	new ArrayBlockingQueue<Runnable>(10),
1020	>	(RejectedExecutionHandler) null);
1021		shouldThrow();
1022		} catch (NullPointerException success) {}
1023		}
1024
898	–
1025		/**
1026		* Constructor throws if corePoolSize argument is less than zero
1027		*/
1028		public void testConstructor16() {
1029		try {
1030	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1030	>	new CustomTPE(-1, 1, 1L, SECONDS,
1031	>	new ArrayBlockingQueue<Runnable>(10),
1032	>	new SimpleThreadFactory(),
1033	>	new NoOpREHandler());
1034		shouldThrow();
1035		} catch (IllegalArgumentException success) {}
1036		}
#	Line 911 | Line 1040 | public class ThreadPoolExecutorSubclassT
1040		*/
1041		public void testConstructor17() {
1042		try {
1043	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1043	>	new CustomTPE(1, -1, 1L, SECONDS,
1044	>	new ArrayBlockingQueue<Runnable>(10),
1045	>	new SimpleThreadFactory(),
1046	>	new NoOpREHandler());
1047		shouldThrow();
1048		} catch (IllegalArgumentException success) {}
1049		}
#	Line 921 | Line 1053 | public class ThreadPoolExecutorSubclassT
1053		*/
1054		public void testConstructor18() {
1055		try {
1056	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1056	>	new CustomTPE(1, 0, 1L, SECONDS,
1057	>	new ArrayBlockingQueue<Runnable>(10),
1058	>	new SimpleThreadFactory(),
1059	>	new NoOpREHandler());
1060		shouldThrow();
1061		} catch (IllegalArgumentException success) {}
1062		}
#	Line 931 | Line 1066 | public class ThreadPoolExecutorSubclassT
1066		*/
1067		public void testConstructor19() {
1068		try {
1069	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1069	>	new CustomTPE(1, 2, -1L, SECONDS,
1070	>	new ArrayBlockingQueue<Runnable>(10),
1071	>	new SimpleThreadFactory(),
1072	>	new NoOpREHandler());
1073		shouldThrow();
1074		} catch (IllegalArgumentException success) {}
1075		}
#	Line 941 | Line 1079 | public class ThreadPoolExecutorSubclassT
1079		*/
1080		public void testConstructor20() {
1081		try {
1082	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1082	>	new CustomTPE(2, 1, 1L, SECONDS,
1083	>	new ArrayBlockingQueue<Runnable>(10),
1084	>	new SimpleThreadFactory(),
1085	>	new NoOpREHandler());
1086		shouldThrow();
1087		} catch (IllegalArgumentException success) {}
1088		}
#	Line 951 | Line 1092 | public class ThreadPoolExecutorSubclassT
1092		*/
1093		public void testConstructorNullPointerException6() {
1094		try {
1095	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1095	>	new CustomTPE(1, 2, 1L, SECONDS,
1096	>	null,
1097	>	new SimpleThreadFactory(),
1098	>	new NoOpREHandler());
1099		shouldThrow();
1100		} catch (NullPointerException success) {}
1101		}
#	Line 961 | Line 1105 | public class ThreadPoolExecutorSubclassT
1105		*/
1106		public void testConstructorNullPointerException7() {
1107		try {
1108	<	RejectedExecutionHandler r = null;
1109	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1108	>	new CustomTPE(1, 2, 1L, SECONDS,
1109	>	new ArrayBlockingQueue<Runnable>(10),
1110	>	new SimpleThreadFactory(),
1111	>	(RejectedExecutionHandler) null);
1112		shouldThrow();
1113		} catch (NullPointerException success) {}
1114		}
#	Line 972 | Line 1118 | public class ThreadPoolExecutorSubclassT
1118		*/
1119		public void testConstructorNullPointerException8() {
1120		try {
1121	<	new CustomTPE(1, 2,
976	<	LONG_DELAY_MS, MILLISECONDS,
1121	>	new CustomTPE(1, 2, 1L, SECONDS,
1122		new ArrayBlockingQueue<Runnable>(10),
1123		(ThreadFactory) null,
1124		new NoOpREHandler());
#	Line 981 | Line 1126 | public class ThreadPoolExecutorSubclassT
1126		} catch (NullPointerException success) {}
1127		}
1128
984	–
1129		/**
1130		* execute throws RejectedExecutionException if saturated.
1131		*/
#	Line 1131 | Line 1275 | public class ThreadPoolExecutorSubclassT
1275		}
1276		}
1277
1134	–
1278		/**
1279		* execute using DiscardOldestPolicy drops task on shutdown
1280		*/
#	Line 1149 | Line 1292 | public class ThreadPoolExecutorSubclassT
1292		}
1293		}
1294
1152	–
1295		/**
1296		* execute(null) throws NPE
1297		*/
1298		public void testExecuteNull() {
1299	<	ThreadPoolExecutor p = null;
1299	>	ThreadPoolExecutor p =
1300	>	new CustomTPE(1, 2, 1L, SECONDS,
1301	>	new ArrayBlockingQueue<Runnable>(10));
1302		try {
1159	–	p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1303		p.execute(null);
1304		shouldThrow();
1305		} catch (NullPointerException success) {}
#	Line 1214 | Line 1357 | public class ThreadPoolExecutorSubclassT
1357		joinPool(p);
1358		}
1359
1217	–
1360		/**
1361		* setKeepAliveTime throws IllegalArgumentException
1362		* when given a negative value
#	Line 1239 | Line 1381 | public class ThreadPoolExecutorSubclassT
1381		public void testTerminated() {
1382		CustomTPE p = new CustomTPE();
1383		try { p.shutdown(); } catch (SecurityException ok) { return; }
1384	<	assertTrue(p.terminatedCalled);
1384	>	assertTrue(p.terminatedCalled());
1385		joinPool(p);
1386		}
1387
#	Line 1249 | Line 1391 | public class ThreadPoolExecutorSubclassT
1391		public void testBeforeAfter() throws InterruptedException {
1392		CustomTPE p = new CustomTPE();
1393		try {
1394	<	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1395	<	p.execute(r);
1396	<	Thread.sleep(SHORT_DELAY_MS);
1397	<	assertTrue(r.done);
1398	<	assertTrue(p.beforeCalled);
1399	<	assertTrue(p.afterCalled);
1394	>	final CountDownLatch done = new CountDownLatch(1);
1395	>	p.execute(new CheckedRunnable() {
1396	>	public void realRun() {
1397	>	done.countDown();
1398	>	}});
1399	>	await(p.afterCalled);
1400	>	assertEquals(0, done.getCount());
1401	>	assertTrue(p.afterCalled());
1402	>	assertTrue(p.beforeCalled());
1403		try { p.shutdown(); } catch (SecurityException ok) { return; }
1404		} finally {
1405		joinPool(p);
#	Line 1303 | Line 1448 | public class ThreadPoolExecutorSubclassT
1448		}
1449		}
1450
1306	–
1451		/**
1452		* invokeAny(null) throws NPE
1453		*/
#	Line 1465 | Line 1609 | public class ThreadPoolExecutorSubclassT
1609		}
1610		}
1611
1468	–
1469	–
1612		/**
1613		* timed invokeAny(null) throws NPE
1614		*/
#	Line 1653 | Line 1795 | public class ThreadPoolExecutorSubclassT
1795		l.add(new StringTask());
1796		l.add(new StringTask());
1797		List<Future<String>> futures =
1798	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1798	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1799		assertEquals(2, futures.size());
1800		for (Future<String> future : futures)
1801		assertSame(TEST_STRING, future.get());
#	Line 1668 | Line 1810 | public class ThreadPoolExecutorSubclassT
1810		public void testTimedInvokeAll6() throws Exception {
1811		ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1812		try {
1813	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1814	<	l.add(new StringTask());
1815	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1816	<	l.add(new StringTask());
1817	<	List<Future<String>> futures =
1818	<	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1819	<	assertEquals(3, futures.size());
1820	<	Iterator<Future<String>> it = futures.iterator();
1821	<	Future<String> f1 = it.next();
1822	<	Future<String> f2 = it.next();
1823	<	Future<String> f3 = it.next();
1824	<	assertTrue(f1.isDone());
1825	<	assertTrue(f2.isDone());
1826	<	assertTrue(f3.isDone());
1827	<	assertFalse(f1.isCancelled());
1828	<	assertTrue(f2.isCancelled());
1813	>	for (long timeout = timeoutMillis();;) {
1814	>	List<Callable<String>> tasks = new ArrayList<>();
1815	>	tasks.add(new StringTask("0"));
1816	>	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1817	>	tasks.add(new StringTask("2"));
1818	>	long startTime = System.nanoTime();
1819	>	List<Future<String>> futures =
1820	>	e.invokeAll(tasks, timeout, MILLISECONDS);
1821	>	assertEquals(tasks.size(), futures.size());
1822	>	assertTrue(millisElapsedSince(startTime) >= timeout);
1823	>	for (Future future : futures)
1824	>	assertTrue(future.isDone());
1825	>	assertTrue(futures.get(1).isCancelled());
1826	>	try {
1827	>	assertEquals("0", futures.get(0).get());
1828	>	assertEquals("2", futures.get(2).get());
1829	>	break;
1830	>	} catch (CancellationException retryWithLongerTimeout) {
1831	>	timeout *= 2;
1832	>	if (timeout >= LONG_DELAY_MS / 2)
1833	>	fail("expected exactly one task to be cancelled");
1834	>	}
1835	>	}
1836		} finally {
1837		joinPool(e);
1838		}
#	Line 1726 | Line 1875 | public class ThreadPoolExecutorSubclassT
1875		* allowCoreThreadTimeOut(true) causes idle threads to time out
1876		*/
1877		public void testAllowCoreThreadTimeOut_true() throws Exception {
1878	+	long keepAliveTime = timeoutMillis();
1879		final ThreadPoolExecutor p =
1880		new CustomTPE(2, 10,
1881	<	SHORT_DELAY_MS, MILLISECONDS,
1881	>	keepAliveTime, MILLISECONDS,
1882		new ArrayBlockingQueue<Runnable>(10));
1883		final CountDownLatch threadStarted = new CountDownLatch(1);
1884		try {
1885		p.allowCoreThreadTimeOut(true);
1886		p.execute(new CheckedRunnable() {
1887	<	public void realRun() throws InterruptedException {
1887	>	public void realRun() {
1888		threadStarted.countDown();
1889		assertEquals(1, p.getPoolSize());
1890		}});
1891	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1892	<	for (int i = 0; i < (MEDIUM_DELAY_MS/10); i++) {
1893	<	if (p.getPoolSize() == 0)
1894	<	break;
1895	<	Thread.sleep(10);
1896	<	}
1891	>	await(threadStarted);
1892	>	delay(keepAliveTime);
1893	>	long startTime = System.nanoTime();
1894	>	while (p.getPoolSize() > 0
1895	>	&& millisElapsedSince(startTime) < LONG_DELAY_MS)
1896	>	Thread.yield();
1897	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1898		assertEquals(0, p.getPoolSize());
1899		} finally {
1900		joinPool(p);
#	Line 1754 | Line 1905 | public class ThreadPoolExecutorSubclassT
1905		* allowCoreThreadTimeOut(false) causes idle threads not to time out
1906		*/
1907		public void testAllowCoreThreadTimeOut_false() throws Exception {
1908	+	long keepAliveTime = timeoutMillis();
1909		final ThreadPoolExecutor p =
1910		new CustomTPE(2, 10,
1911	<	SHORT_DELAY_MS, MILLISECONDS,
1911	>	keepAliveTime, MILLISECONDS,
1912		new ArrayBlockingQueue<Runnable>(10));
1913		final CountDownLatch threadStarted = new CountDownLatch(1);
1914		try {
#	Line 1766 | Line 1918 | public class ThreadPoolExecutorSubclassT
1918		threadStarted.countDown();
1919		assertTrue(p.getPoolSize() >= 1);
1920		}});
1921	<	Thread.sleep(SMALL_DELAY_MS);
1921	>	delay(2 * keepAliveTime);
1922		assertTrue(p.getPoolSize() >= 1);
1923		} finally {
1924		joinPool(p);
1925		}
1926		}
1927
1928	+	/**
1929	+	* get(cancelled task) throws CancellationException
1930	+	* (in part, a test of CustomTPE itself)
1931	+	*/
1932	+	public void testGet_cancelled() throws Exception {
1933	+	final ExecutorService e =
1934	+	new CustomTPE(1, 1,
1935	+	LONG_DELAY_MS, MILLISECONDS,
1936	+	new LinkedBlockingQueue<Runnable>());
1937	+	try {
1938	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
1939	+	final CountDownLatch done = new CountDownLatch(1);
1940	+	final List<Future<?>> futures = new ArrayList<>();
1941	+	for (int i = 0; i < 2; i++) {
1942	+	Runnable r = new CheckedRunnable() { public void realRun()
1943	+	throws Throwable {
1944	+	blockerStarted.countDown();
1945	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1946	+	}};
1947	+	futures.add(e.submit(r));
1948	+	}
1949	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1950	+	for (Future<?> future : futures) future.cancel(false);
1951	+	for (Future<?> future : futures) {
1952	+	try {
1953	+	future.get();
1954	+	shouldThrow();
1955	+	} catch (CancellationException success) {}
1956	+	try {
1957	+	future.get(LONG_DELAY_MS, MILLISECONDS);
1958	+	shouldThrow();
1959	+	} catch (CancellationException success) {}
1960	+	assertTrue(future.isCancelled());
1961	+	assertTrue(future.isDone());
1962	+	}
1963	+	done.countDown();
1964	+	} finally {
1965	+	joinPool(e);
1966	+	}
1967	+	}
1968	+
1969		}

Diff Legend

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