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.27 by jsr166, Sat May 7 19:34:51 2011 UTC vs.
Revision 1.55 by jsr166, Sun Oct 4 01:29:09 2015 UTC

#	Line 6 | Line 6
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.util.concurrent.locks.*;
10	>	import static java.util.concurrent.TimeUnit.SECONDS;
11
12	<	import junit.framework.*;
13	<	import java.util.*;
12	>	import java.util.ArrayList;
13	>	import java.util.List;
14	>	import java.util.concurrent.ArrayBlockingQueue;
15	>	import java.util.concurrent.BlockingQueue;
16	>	import java.util.concurrent.Callable;
17	>	import java.util.concurrent.CancellationException;
18	>	import java.util.concurrent.CountDownLatch;
19	>	import java.util.concurrent.ExecutionException;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.Future;
23	>	import java.util.concurrent.FutureTask;
24	>	import java.util.concurrent.LinkedBlockingQueue;
25	>	import java.util.concurrent.RejectedExecutionException;
26	>	import java.util.concurrent.RejectedExecutionHandler;
27	>	import java.util.concurrent.RunnableFuture;
28	>	import java.util.concurrent.SynchronousQueue;
29	>	import java.util.concurrent.ThreadFactory;
30	>	import java.util.concurrent.ThreadPoolExecutor;
31	>	import java.util.concurrent.TimeoutException;
32	>	import java.util.concurrent.TimeUnit;
33	>	import java.util.concurrent.atomic.AtomicInteger;
34	>	import java.util.concurrent.locks.Condition;
35	>	import java.util.concurrent.locks.ReentrantLock;
36	>
37	>	import junit.framework.Test;
38	>	import junit.framework.TestSuite;
39
40		public class ThreadPoolExecutorSubclassTest extends JSR166TestCase {
41		public static void main(String[] args) {
42	<	junit.textui.TestRunner.run(suite());
42	>	main(suite(), args);
43		}
44		public static Test suite() {
45		return new TestSuite(ThreadPoolExecutorSubclassTest.class);
#	Line 37 | Line 61 | public class ThreadPoolExecutorSubclassT
61		CustomTask(final Runnable r, final V res) {
62		if (r == null) throw new NullPointerException();
63		callable = new Callable<V>() {
64	<	public V call() throws Exception { r.run(); return res; }};
64	>	public V call() throws Exception { r.run(); return res; }};
65		}
66		public boolean isDone() {
67		lock.lock(); try { return done; } finally { lock.unlock() ; }
#	Line 77 | Line 101 | public class ThreadPoolExecutorSubclassT
101		}
102		lock.lock();
103		try {
104	<	result = v;
105	<	exception = e;
106	<	done = true;
107	<	thread = null;
108	<	cond.signalAll();
104	>	if (!done) {
105	>	result = v;
106	>	exception = e;
107	>	done = true;
108	>	thread = null;
109	>	cond.signalAll();
110	>	}
111		}
112		finally { lock.unlock(); }
113		}
#	Line 90 | Line 116 | public class ThreadPoolExecutorSubclassT
116		try {
117		while (!done)
118		cond.await();
119	+	if (cancelled)
120	+	throw new CancellationException();
121		if (exception != null)
122		throw new ExecutionException(exception);
123		return result;
#	Line 101 | Line 129 | public class ThreadPoolExecutorSubclassT
129		long nanos = unit.toNanos(timeout);
130		lock.lock();
131		try {
132	<	for (;;) {
133	<	if (done) break;
106	<	if (nanos < 0)
132	>	while (!done) {
133	>	if (nanos <= 0L)
134		throw new TimeoutException();
135		nanos = cond.awaitNanos(nanos);
136		}
137	+	if (cancelled)
138	+	throw new CancellationException();
139		if (exception != null)
140		throw new ExecutionException(exception);
141		return result;
#	Line 115 | Line 144 | public class ThreadPoolExecutorSubclassT
144		}
145		}
146
118	–
147		static class CustomTPE extends ThreadPoolExecutor {
148		protected <V> RunnableFuture<V> newTaskFor(Callable<V> c) {
149		return new CustomTask<V>(c);
#	Line 162 | Line 190 | public class ThreadPoolExecutorSubclassT
190		workQueue, threadFactory, handler);
191		}
192
193	<	volatile boolean beforeCalled = false;
194	<	volatile boolean afterCalled = false;
195	<	volatile boolean terminatedCalled = false;
193	>	final CountDownLatch beforeCalled = new CountDownLatch(1);
194	>	final CountDownLatch afterCalled = new CountDownLatch(1);
195	>	final CountDownLatch terminatedCalled = new CountDownLatch(1);
196	>
197		public CustomTPE() {
198		super(1, 1, LONG_DELAY_MS, MILLISECONDS, new SynchronousQueue<Runnable>());
199		}
200		protected void beforeExecute(Thread t, Runnable r) {
201	<	beforeCalled = true;
201	>	beforeCalled.countDown();
202		}
203		protected void afterExecute(Runnable r, Throwable t) {
204	<	afterCalled = true;
204	>	afterCalled.countDown();
205		}
206		protected void terminated() {
207	<	terminatedCalled = true;
207	>	terminatedCalled.countDown();
208		}
209
210	+	public boolean beforeCalled() {
211	+	return beforeCalled.getCount() == 0;
212	+	}
213	+	public boolean afterCalled() {
214	+	return afterCalled.getCount() == 0;
215	+	}
216	+	public boolean terminatedCalled() {
217	+	return terminatedCalled.getCount() == 0;
218	+	}
219		}
220
221		static class FailingThreadFactory implements ThreadFactory {
#	Line 188 | Line 226 | public class ThreadPoolExecutorSubclassT
226		}
227		}
228
191	–
229		/**
230		* execute successfully executes a runnable
231		*/
232		public void testExecute() throws InterruptedException {
233		final ThreadPoolExecutor p =
234		new CustomTPE(1, 1,
235	<	LONG_DELAY_MS, MILLISECONDS,
235	>	2 * LONG_DELAY_MS, MILLISECONDS,
236		new ArrayBlockingQueue<Runnable>(10));
237	<	final CountDownLatch done = new CountDownLatch(1);
238	<	final Runnable task = new CheckedRunnable() {
239	<	public void realRun() {
240	<	done.countDown();
204	<	}};
205	<	try {
237	>	try (PoolCleaner cleaner = cleaner(p)) {
238	>	final CountDownLatch done = new CountDownLatch(1);
239	>	final Runnable task = new CheckedRunnable() {
240	>	public void realRun() { done.countDown(); }};
241		p.execute(task);
242	<	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
208	<	} finally {
209	<	joinPool(p);
242	>	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243		}
244		}
245
#	Line 221 | Line 254 | public class ThreadPoolExecutorSubclassT
254		new ArrayBlockingQueue<Runnable>(10));
255		final CountDownLatch threadStarted = new CountDownLatch(1);
256		final CountDownLatch done = new CountDownLatch(1);
257	<	try {
257	>	try (PoolCleaner cleaner = cleaner(p)) {
258		assertEquals(0, p.getActiveCount());
259		p.execute(new CheckedRunnable() {
260		public void realRun() throws InterruptedException {
#	Line 231 | Line 264 | public class ThreadPoolExecutorSubclassT
264		}});
265		assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
266		assertEquals(1, p.getActiveCount());
234	–	} finally {
267		done.countDown();
236	–	joinPool(p);
268		}
269		}
270
#	Line 241 | Line 272 | public class ThreadPoolExecutorSubclassT
272		* prestartCoreThread starts a thread if under corePoolSize, else doesn't
273		*/
274		public void testPrestartCoreThread() {
275	<	ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
276	<	assertEquals(0, p.getPoolSize());
277	<	assertTrue(p.prestartCoreThread());
278	<	assertEquals(1, p.getPoolSize());
279	<	assertTrue(p.prestartCoreThread());
280	<	assertEquals(2, p.getPoolSize());
281	<	assertFalse(p.prestartCoreThread());
282	<	assertEquals(2, p.getPoolSize());
283	<	joinPool(p);
275	>	ThreadPoolExecutor p =
276	>	new CustomTPE(2, 6,
277	>	LONG_DELAY_MS, MILLISECONDS,
278	>	new ArrayBlockingQueue<Runnable>(10));
279	>	try (PoolCleaner cleaner = cleaner(p)) {
280	>	assertEquals(0, p.getPoolSize());
281	>	assertTrue(p.prestartCoreThread());
282	>	assertEquals(1, p.getPoolSize());
283	>	assertTrue(p.prestartCoreThread());
284	>	assertEquals(2, p.getPoolSize());
285	>	assertFalse(p.prestartCoreThread());
286	>	assertEquals(2, p.getPoolSize());
287	>	p.setCorePoolSize(4);
288	>	assertTrue(p.prestartCoreThread());
289	>	assertEquals(3, p.getPoolSize());
290	>	assertTrue(p.prestartCoreThread());
291	>	assertEquals(4, p.getPoolSize());
292	>	assertFalse(p.prestartCoreThread());
293	>	assertEquals(4, p.getPoolSize());
294	>	}
295		}
296
297		/**
298		* prestartAllCoreThreads starts all corePoolSize threads
299		*/
300		public void testPrestartAllCoreThreads() {
301	<	ThreadPoolExecutor p = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
302	<	assertEquals(0, p.getPoolSize());
303	<	p.prestartAllCoreThreads();
304	<	assertEquals(2, p.getPoolSize());
305	<	p.prestartAllCoreThreads();
306	<	assertEquals(2, p.getPoolSize());
307	<	joinPool(p);
301	>	ThreadPoolExecutor p =
302	>	new CustomTPE(2, 6,
303	>	LONG_DELAY_MS, MILLISECONDS,
304	>	new ArrayBlockingQueue<Runnable>(10));
305	>	try (PoolCleaner cleaner = cleaner(p)) {
306	>	assertEquals(0, p.getPoolSize());
307	>	p.prestartAllCoreThreads();
308	>	assertEquals(2, p.getPoolSize());
309	>	p.prestartAllCoreThreads();
310	>	assertEquals(2, p.getPoolSize());
311	>	p.setCorePoolSize(4);
312	>	p.prestartAllCoreThreads();
313	>	assertEquals(4, p.getPoolSize());
314	>	p.prestartAllCoreThreads();
315	>	assertEquals(4, p.getPoolSize());
316	>	}
317		}
318
319		/**
#	Line 274 | Line 325 | public class ThreadPoolExecutorSubclassT
325		new CustomTPE(2, 2,
326		LONG_DELAY_MS, MILLISECONDS,
327		new ArrayBlockingQueue<Runnable>(10));
328	<	final CountDownLatch threadStarted = new CountDownLatch(1);
329	<	final CountDownLatch threadProceed = new CountDownLatch(1);
330	<	final CountDownLatch threadDone = new CountDownLatch(1);
331	<	try {
328	>	try (PoolCleaner cleaner = cleaner(p)) {
329	>	final CountDownLatch threadStarted = new CountDownLatch(1);
330	>	final CountDownLatch threadProceed = new CountDownLatch(1);
331	>	final CountDownLatch threadDone = new CountDownLatch(1);
332		assertEquals(0, p.getCompletedTaskCount());
333		p.execute(new CheckedRunnable() {
334		public void realRun() throws InterruptedException {
#	Line 286 | Line 337 | public class ThreadPoolExecutorSubclassT
337		threadProceed.await();
338		threadDone.countDown();
339		}});
340	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
340	>	await(threadStarted);
341		assertEquals(0, p.getCompletedTaskCount());
342		threadProceed.countDown();
343		threadDone.await();
344	<	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	>	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		/**
#	Line 311 | Line 368 | public class ThreadPoolExecutorSubclassT
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));
371	>	assertEquals(1, p.getKeepAliveTime(SECONDS));
372		joinPool(p);
373		}
374
318	–
375		/**
376		* getThreadFactory returns factory in constructor if not set
377		*/
#	Line 337 | Line 393 | public class ThreadPoolExecutorSubclassT
393		joinPool(p);
394		}
395
340	–
396		/**
397		* setThreadFactory(null) throws NPE
398		*/
#	Line 374 | Line 429 | public class ThreadPoolExecutorSubclassT
429		joinPool(p);
430		}
431
377	–
432		/**
433		* setRejectedExecutionHandler(null) throws NPE
434		*/
#	Line 389 | Line 443 | public class ThreadPoolExecutorSubclassT
443		}
444		}
445
392	–
446		/**
447		* getLargestPoolSize increases, but doesn't overestimate, when
448		* multiple threads active
#	Line 484 | Line 537 | public class ThreadPoolExecutorSubclassT
537		}
538
539		/**
540	<	* isShutDown is false before shutdown, true after
540	>	* isShutdown is false before shutdown, true after
541		*/
542		public void testIsShutdown() {
543
#	Line 495 | Line 548 | public class ThreadPoolExecutorSubclassT
548		joinPool(p);
549		}
550
498	–
551		/**
552		* isTerminated is false before termination, true after
553		*/
#	Line 669 | Line 721 | public class ThreadPoolExecutorSubclassT
721		}
722
723		/**
724	<	* shutDownNow returns a list containing tasks that were not run
724	>	* shutdownNow returns a list containing tasks that were not run,
725	>	* and those tasks are drained from the queue
726		*/
727	<	public void testShutdownNow() {
728	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
729	<	List l;
730	<	try {
731	<	for (int i = 0; i < 5; i++)
732	<	p.execute(new MediumPossiblyInterruptedRunnable());
733	<	}
734	<	finally {
727	>	public void testShutdownNow() throws InterruptedException {
728	>	final int poolSize = 2;
729	>	final int count = 5;
730	>	final AtomicInteger ran = new AtomicInteger(0);
731	>	ThreadPoolExecutor p =
732	>	new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
733	>	new ArrayBlockingQueue<Runnable>(10));
734	>	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
735	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
736	>	threadsStarted.countDown();
737		try {
738	<	l = p.shutdownNow();
739	<	} catch (SecurityException ok) { return; }
738	>	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
739	>	} catch (InterruptedException success) {}
740	>	ran.getAndIncrement();
741	>	}};
742	>	for (int i = 0; i < count; i++)
743	>	p.execute(waiter);
744	>	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
745	>	assertEquals(poolSize, p.getActiveCount());
746	>	assertEquals(0, p.getCompletedTaskCount());
747	>	final List<Runnable> queuedTasks;
748	>	try {
749	>	queuedTasks = p.shutdownNow();
750	>	} catch (SecurityException ok) {
751	>	return; // Allowed in case test doesn't have privs
752		}
753		assertTrue(p.isShutdown());
754	<	assertTrue(l.size() <= 4);
754	>	assertTrue(p.getQueue().isEmpty());
755	>	assertEquals(count - poolSize, queuedTasks.size());
756	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
757	>	assertTrue(p.isTerminated());
758	>	assertEquals(poolSize, ran.get());
759	>	assertEquals(poolSize, p.getCompletedTaskCount());
760		}
761
762		// Exception Tests
763
692	–
764		/**
765		* Constructor throws if corePoolSize argument is less than zero
766		*/
767		public void testConstructor1() {
768		try {
769	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
769	>	new CustomTPE(-1, 1, 1L, SECONDS,
770	>	new ArrayBlockingQueue<Runnable>(10));
771		shouldThrow();
772		} catch (IllegalArgumentException success) {}
773		}
#	Line 705 | Line 777 | public class ThreadPoolExecutorSubclassT
777		*/
778		public void testConstructor2() {
779		try {
780	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
780	>	new CustomTPE(1, -1, 1L, SECONDS,
781	>	new ArrayBlockingQueue<Runnable>(10));
782		shouldThrow();
783		} catch (IllegalArgumentException success) {}
784		}
#	Line 715 | Line 788 | public class ThreadPoolExecutorSubclassT
788		*/
789		public void testConstructor3() {
790		try {
791	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
791	>	new CustomTPE(1, 0, 1L, SECONDS,
792	>	new ArrayBlockingQueue<Runnable>(10));
793		shouldThrow();
794		} catch (IllegalArgumentException success) {}
795		}
#	Line 725 | Line 799 | public class ThreadPoolExecutorSubclassT
799		*/
800		public void testConstructor4() {
801		try {
802	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
802	>	new CustomTPE(1, 2, -1L, SECONDS,
803	>	new ArrayBlockingQueue<Runnable>(10));
804		shouldThrow();
805		} catch (IllegalArgumentException success) {}
806		}
#	Line 735 | Line 810 | public class ThreadPoolExecutorSubclassT
810		*/
811		public void testConstructor5() {
812		try {
813	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
813	>	new CustomTPE(2, 1, 1L, SECONDS,
814	>	new ArrayBlockingQueue<Runnable>(10));
815		shouldThrow();
816		} catch (IllegalArgumentException success) {}
817		}
#	Line 745 | Line 821 | public class ThreadPoolExecutorSubclassT
821		*/
822		public void testConstructorNullPointerException() {
823		try {
824	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
824	>	new CustomTPE(1, 2, 1L, SECONDS, null);
825		shouldThrow();
826		} catch (NullPointerException success) {}
827		}
828
753	–
754	–
829		/**
830		* Constructor throws if corePoolSize argument is less than zero
831		*/
832		public void testConstructor6() {
833		try {
834	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
834	>	new CustomTPE(-1, 1, 1L, SECONDS,
835	>	new ArrayBlockingQueue<Runnable>(10),
836	>	new SimpleThreadFactory());
837		shouldThrow();
838		} catch (IllegalArgumentException success) {}
839		}
#	Line 767 | Line 843 | public class ThreadPoolExecutorSubclassT
843		*/
844		public void testConstructor7() {
845		try {
846	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
846	>	new CustomTPE(1,-1, 1L, SECONDS,
847	>	new ArrayBlockingQueue<Runnable>(10),
848	>	new SimpleThreadFactory());
849		shouldThrow();
850		} catch (IllegalArgumentException success) {}
851		}
#	Line 777 | Line 855 | public class ThreadPoolExecutorSubclassT
855		*/
856		public void testConstructor8() {
857		try {
858	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
858	>	new CustomTPE(1, 0, 1L, SECONDS,
859	>	new ArrayBlockingQueue<Runnable>(10),
860	>	new SimpleThreadFactory());
861		shouldThrow();
862		} catch (IllegalArgumentException success) {}
863		}
#	Line 787 | Line 867 | public class ThreadPoolExecutorSubclassT
867		*/
868		public void testConstructor9() {
869		try {
870	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
870	>	new CustomTPE(1, 2, -1L, SECONDS,
871	>	new ArrayBlockingQueue<Runnable>(10),
872	>	new SimpleThreadFactory());
873		shouldThrow();
874		} catch (IllegalArgumentException success) {}
875		}
#	Line 797 | Line 879 | public class ThreadPoolExecutorSubclassT
879		*/
880		public void testConstructor10() {
881		try {
882	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
882	>	new CustomTPE(2, 1, 1L, SECONDS,
883	>	new ArrayBlockingQueue<Runnable>(10),
884	>	new SimpleThreadFactory());
885		shouldThrow();
886		} catch (IllegalArgumentException success) {}
887		}
#	Line 807 | Line 891 | public class ThreadPoolExecutorSubclassT
891		*/
892		public void testConstructorNullPointerException2() {
893		try {
894	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
894	>	new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
895		shouldThrow();
896		} catch (NullPointerException success) {}
897		}
#	Line 817 | Line 901 | public class ThreadPoolExecutorSubclassT
901		*/
902		public void testConstructorNullPointerException3() {
903		try {
904	<	ThreadFactory f = null;
905	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
904	>	new CustomTPE(1, 2, 1L, SECONDS,
905	>	new ArrayBlockingQueue<Runnable>(10),
906	>	(ThreadFactory) null);
907		shouldThrow();
908		} catch (NullPointerException success) {}
909		}
910
826	–
911		/**
912		* Constructor throws if corePoolSize argument is less than zero
913		*/
914		public void testConstructor11() {
915		try {
916	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
916	>	new CustomTPE(-1, 1, 1L, SECONDS,
917	>	new ArrayBlockingQueue<Runnable>(10),
918	>	new NoOpREHandler());
919		shouldThrow();
920		} catch (IllegalArgumentException success) {}
921		}
#	Line 839 | Line 925 | public class ThreadPoolExecutorSubclassT
925		*/
926		public void testConstructor12() {
927		try {
928	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
928	>	new CustomTPE(1, -1, 1L, SECONDS,
929	>	new ArrayBlockingQueue<Runnable>(10),
930	>	new NoOpREHandler());
931		shouldThrow();
932		} catch (IllegalArgumentException success) {}
933		}
#	Line 849 | Line 937 | public class ThreadPoolExecutorSubclassT
937		*/
938		public void testConstructor13() {
939		try {
940	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
940	>	new CustomTPE(1, 0, 1L, SECONDS,
941	>	new ArrayBlockingQueue<Runnable>(10),
942	>	new NoOpREHandler());
943		shouldThrow();
944		} catch (IllegalArgumentException success) {}
945		}
#	Line 859 | Line 949 | public class ThreadPoolExecutorSubclassT
949		*/
950		public void testConstructor14() {
951		try {
952	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
952	>	new CustomTPE(1, 2, -1L, SECONDS,
953	>	new ArrayBlockingQueue<Runnable>(10),
954	>	new NoOpREHandler());
955		shouldThrow();
956		} catch (IllegalArgumentException success) {}
957		}
#	Line 869 | Line 961 | public class ThreadPoolExecutorSubclassT
961		*/
962		public void testConstructor15() {
963		try {
964	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
964	>	new CustomTPE(2, 1, 1L, SECONDS,
965	>	new ArrayBlockingQueue<Runnable>(10),
966	>	new NoOpREHandler());
967		shouldThrow();
968		} catch (IllegalArgumentException success) {}
969		}
#	Line 879 | Line 973 | public class ThreadPoolExecutorSubclassT
973		*/
974		public void testConstructorNullPointerException4() {
975		try {
976	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
976	>	new CustomTPE(1, 2, 1L, SECONDS,
977	>	null,
978	>	new NoOpREHandler());
979		shouldThrow();
980		} catch (NullPointerException success) {}
981		}
#	Line 889 | Line 985 | public class ThreadPoolExecutorSubclassT
985		*/
986		public void testConstructorNullPointerException5() {
987		try {
988	<	RejectedExecutionHandler r = null;
989	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
988	>	new CustomTPE(1, 2, 1L, SECONDS,
989	>	new ArrayBlockingQueue<Runnable>(10),
990	>	(RejectedExecutionHandler) null);
991		shouldThrow();
992		} catch (NullPointerException success) {}
993		}
994
898	–
995		/**
996		* Constructor throws if corePoolSize argument is less than zero
997		*/
998		public void testConstructor16() {
999		try {
1000	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1000	>	new CustomTPE(-1, 1, 1L, SECONDS,
1001	>	new ArrayBlockingQueue<Runnable>(10),
1002	>	new SimpleThreadFactory(),
1003	>	new NoOpREHandler());
1004		shouldThrow();
1005		} catch (IllegalArgumentException success) {}
1006		}
#	Line 911 | Line 1010 | public class ThreadPoolExecutorSubclassT
1010		*/
1011		public void testConstructor17() {
1012		try {
1013	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1013	>	new CustomTPE(1, -1, 1L, SECONDS,
1014	>	new ArrayBlockingQueue<Runnable>(10),
1015	>	new SimpleThreadFactory(),
1016	>	new NoOpREHandler());
1017		shouldThrow();
1018		} catch (IllegalArgumentException success) {}
1019		}
#	Line 921 | Line 1023 | public class ThreadPoolExecutorSubclassT
1023		*/
1024		public void testConstructor18() {
1025		try {
1026	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1026	>	new CustomTPE(1, 0, 1L, SECONDS,
1027	>	new ArrayBlockingQueue<Runnable>(10),
1028	>	new SimpleThreadFactory(),
1029	>	new NoOpREHandler());
1030		shouldThrow();
1031		} catch (IllegalArgumentException success) {}
1032		}
#	Line 931 | Line 1036 | public class ThreadPoolExecutorSubclassT
1036		*/
1037		public void testConstructor19() {
1038		try {
1039	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1039	>	new CustomTPE(1, 2, -1L, SECONDS,
1040	>	new ArrayBlockingQueue<Runnable>(10),
1041	>	new SimpleThreadFactory(),
1042	>	new NoOpREHandler());
1043		shouldThrow();
1044		} catch (IllegalArgumentException success) {}
1045		}
#	Line 941 | Line 1049 | public class ThreadPoolExecutorSubclassT
1049		*/
1050		public void testConstructor20() {
1051		try {
1052	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1052	>	new CustomTPE(2, 1, 1L, SECONDS,
1053	>	new ArrayBlockingQueue<Runnable>(10),
1054	>	new SimpleThreadFactory(),
1055	>	new NoOpREHandler());
1056		shouldThrow();
1057		} catch (IllegalArgumentException success) {}
1058		}
#	Line 951 | Line 1062 | public class ThreadPoolExecutorSubclassT
1062		*/
1063		public void testConstructorNullPointerException6() {
1064		try {
1065	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1065	>	new CustomTPE(1, 2, 1L, SECONDS,
1066	>	null,
1067	>	new SimpleThreadFactory(),
1068	>	new NoOpREHandler());
1069		shouldThrow();
1070		} catch (NullPointerException success) {}
1071		}
#	Line 961 | Line 1075 | public class ThreadPoolExecutorSubclassT
1075		*/
1076		public void testConstructorNullPointerException7() {
1077		try {
1078	<	RejectedExecutionHandler r = null;
1079	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1078	>	new CustomTPE(1, 2, 1L, SECONDS,
1079	>	new ArrayBlockingQueue<Runnable>(10),
1080	>	new SimpleThreadFactory(),
1081	>	(RejectedExecutionHandler) null);
1082		shouldThrow();
1083		} catch (NullPointerException success) {}
1084		}
#	Line 972 | Line 1088 | public class ThreadPoolExecutorSubclassT
1088		*/
1089		public void testConstructorNullPointerException8() {
1090		try {
1091	<	new CustomTPE(1, 2,
976	<	LONG_DELAY_MS, MILLISECONDS,
1091	>	new CustomTPE(1, 2, 1L, SECONDS,
1092		new ArrayBlockingQueue<Runnable>(10),
1093		(ThreadFactory) null,
1094		new NoOpREHandler());
#	Line 981 | Line 1096 | public class ThreadPoolExecutorSubclassT
1096		} catch (NullPointerException success) {}
1097		}
1098
984	–
1099		/**
1100		* execute throws RejectedExecutionException if saturated.
1101		*/
#	Line 1131 | Line 1245 | public class ThreadPoolExecutorSubclassT
1245		}
1246		}
1247
1134	–
1248		/**
1249		* execute using DiscardOldestPolicy drops task on shutdown
1250		*/
#	Line 1149 | Line 1262 | public class ThreadPoolExecutorSubclassT
1262		}
1263		}
1264
1152	–
1265		/**
1266		* execute(null) throws NPE
1267		*/
1268		public void testExecuteNull() {
1269	<	ThreadPoolExecutor p = null;
1269	>	ThreadPoolExecutor p =
1270	>	new CustomTPE(1, 2, 1L, SECONDS,
1271	>	new ArrayBlockingQueue<Runnable>(10));
1272		try {
1159	–	p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1273		p.execute(null);
1274		shouldThrow();
1275		} catch (NullPointerException success) {}
#	Line 1214 | Line 1327 | public class ThreadPoolExecutorSubclassT
1327		joinPool(p);
1328		}
1329
1217	–
1330		/**
1331		* setKeepAliveTime throws IllegalArgumentException
1332		* when given a negative value
#	Line 1239 | Line 1351 | public class ThreadPoolExecutorSubclassT
1351		public void testTerminated() {
1352		CustomTPE p = new CustomTPE();
1353		try { p.shutdown(); } catch (SecurityException ok) { return; }
1354	<	assertTrue(p.terminatedCalled);
1354	>	assertTrue(p.terminatedCalled());
1355		joinPool(p);
1356		}
1357
#	Line 1249 | Line 1361 | public class ThreadPoolExecutorSubclassT
1361		public void testBeforeAfter() throws InterruptedException {
1362		CustomTPE p = new CustomTPE();
1363		try {
1364	<	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1365	<	p.execute(r);
1366	<	delay(SHORT_DELAY_MS);
1367	<	assertTrue(r.done);
1368	<	assertTrue(p.beforeCalled);
1369	<	assertTrue(p.afterCalled);
1364	>	final CountDownLatch done = new CountDownLatch(1);
1365	>	p.execute(new CheckedRunnable() {
1366	>	public void realRun() {
1367	>	done.countDown();
1368	>	}});
1369	>	await(p.afterCalled);
1370	>	assertEquals(0, done.getCount());
1371	>	assertTrue(p.afterCalled());
1372	>	assertTrue(p.beforeCalled());
1373		try { p.shutdown(); } catch (SecurityException ok) { return; }
1374		} finally {
1375		joinPool(p);
#	Line 1303 | Line 1418 | public class ThreadPoolExecutorSubclassT
1418		}
1419		}
1420
1306	–
1421		/**
1422		* invokeAny(null) throws NPE
1423		*/
#	Line 1465 | Line 1579 | public class ThreadPoolExecutorSubclassT
1579		}
1580		}
1581
1468	–
1469	–
1582		/**
1583		* timed invokeAny(null) throws NPE
1584		*/
#	Line 1653 | Line 1765 | public class ThreadPoolExecutorSubclassT
1765		l.add(new StringTask());
1766		l.add(new StringTask());
1767		List<Future<String>> futures =
1768	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1768	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1769		assertEquals(2, futures.size());
1770		for (Future<String> future : futures)
1771		assertSame(TEST_STRING, future.get());
#	Line 1668 | Line 1780 | public class ThreadPoolExecutorSubclassT
1780		public void testTimedInvokeAll6() throws Exception {
1781		ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1782		try {
1783	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1784	<	l.add(new StringTask());
1785	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1786	<	l.add(new StringTask());
1787	<	List<Future<String>> futures =
1788	<	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1789	<	assertEquals(3, futures.size());
1790	<	Iterator<Future<String>> it = futures.iterator();
1791	<	Future<String> f1 = it.next();
1792	<	Future<String> f2 = it.next();
1793	<	Future<String> f3 = it.next();
1794	<	assertTrue(f1.isDone());
1795	<	assertTrue(f2.isDone());
1796	<	assertTrue(f3.isDone());
1797	<	assertFalse(f1.isCancelled());
1798	<	assertTrue(f2.isCancelled());
1783	>	for (long timeout = timeoutMillis();;) {
1784	>	List<Callable<String>> tasks = new ArrayList<>();
1785	>	tasks.add(new StringTask("0"));
1786	>	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1787	>	tasks.add(new StringTask("2"));
1788	>	long startTime = System.nanoTime();
1789	>	List<Future<String>> futures =
1790	>	e.invokeAll(tasks, timeout, MILLISECONDS);
1791	>	assertEquals(tasks.size(), futures.size());
1792	>	assertTrue(millisElapsedSince(startTime) >= timeout);
1793	>	for (Future future : futures)
1794	>	assertTrue(future.isDone());
1795	>	assertTrue(futures.get(1).isCancelled());
1796	>	try {
1797	>	assertEquals("0", futures.get(0).get());
1798	>	assertEquals("2", futures.get(2).get());
1799	>	break;
1800	>	} catch (CancellationException retryWithLongerTimeout) {
1801	>	timeout *= 2;
1802	>	if (timeout >= LONG_DELAY_MS / 2)
1803	>	fail("expected exactly one task to be cancelled");
1804	>	}
1805	>	}
1806		} finally {
1807		joinPool(e);
1808		}
#	Line 1726 | Line 1845 | public class ThreadPoolExecutorSubclassT
1845		* allowCoreThreadTimeOut(true) causes idle threads to time out
1846		*/
1847		public void testAllowCoreThreadTimeOut_true() throws Exception {
1848	+	long keepAliveTime = timeoutMillis();
1849		final ThreadPoolExecutor p =
1850		new CustomTPE(2, 10,
1851	<	SHORT_DELAY_MS, MILLISECONDS,
1851	>	keepAliveTime, MILLISECONDS,
1852		new ArrayBlockingQueue<Runnable>(10));
1853		final CountDownLatch threadStarted = new CountDownLatch(1);
1854		try {
1855		p.allowCoreThreadTimeOut(true);
1856		p.execute(new CheckedRunnable() {
1857	<	public void realRun() throws InterruptedException {
1857	>	public void realRun() {
1858		threadStarted.countDown();
1859		assertEquals(1, p.getPoolSize());
1860		}});
1861	<	assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
1862	<	for (int i = 0; i < (MEDIUM_DELAY_MS/10); i++) {
1863	<	if (p.getPoolSize() == 0)
1864	<	break;
1865	<	delay(10);
1866	<	}
1861	>	await(threadStarted);
1862	>	delay(keepAliveTime);
1863	>	long startTime = System.nanoTime();
1864	>	while (p.getPoolSize() > 0
1865	>	&& millisElapsedSince(startTime) < LONG_DELAY_MS)
1866	>	Thread.yield();
1867	>	assertTrue(millisElapsedSince(startTime) < LONG_DELAY_MS);
1868		assertEquals(0, p.getPoolSize());
1869		} finally {
1870		joinPool(p);
#	Line 1754 | Line 1875 | public class ThreadPoolExecutorSubclassT
1875		* allowCoreThreadTimeOut(false) causes idle threads not to time out
1876		*/
1877		public void testAllowCoreThreadTimeOut_false() 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 {
#	Line 1766 | Line 1888 | public class ThreadPoolExecutorSubclassT
1888		threadStarted.countDown();
1889		assertTrue(p.getPoolSize() >= 1);
1890		}});
1891	<	delay(SMALL_DELAY_MS);
1891	>	delay(2 * keepAliveTime);
1892		assertTrue(p.getPoolSize() >= 1);
1893		} finally {
1894		joinPool(p);
1895		}
1896		}
1897
1898	+	/**
1899	+	* get(cancelled task) throws CancellationException
1900	+	* (in part, a test of CustomTPE itself)
1901	+	*/
1902	+	public void testGet_cancelled() throws Exception {
1903	+	final ExecutorService e =
1904	+	new CustomTPE(1, 1,
1905	+	LONG_DELAY_MS, MILLISECONDS,
1906	+	new LinkedBlockingQueue<Runnable>());
1907	+	try {
1908	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
1909	+	final CountDownLatch done = new CountDownLatch(1);
1910	+	final List<Future<?>> futures = new ArrayList<>();
1911	+	for (int i = 0; i < 2; i++) {
1912	+	Runnable r = new CheckedRunnable() { public void realRun()
1913	+	throws Throwable {
1914	+	blockerStarted.countDown();
1915	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1916	+	}};
1917	+	futures.add(e.submit(r));
1918	+	}
1919	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1920	+	for (Future<?> future : futures) future.cancel(false);
1921	+	for (Future<?> future : futures) {
1922	+	try {
1923	+	future.get();
1924	+	shouldThrow();
1925	+	} catch (CancellationException success) {}
1926	+	try {
1927	+	future.get(LONG_DELAY_MS, MILLISECONDS);
1928	+	shouldThrow();
1929	+	} catch (CancellationException success) {}
1930	+	assertTrue(future.isCancelled());
1931	+	assertTrue(future.isDone());
1932	+	}
1933	+	done.countDown();
1934	+	} finally {
1935	+	joinPool(e);
1936	+	}
1937	+	}
1938	+
1939		}

Diff Legend

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