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.29 by jsr166, Fri May 27 19:35:24 2011 UTC vs.
Revision 1.56 by jsr166, Sun Oct 4 01:30:27 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 161 | 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 193 | Line 232 | public class ThreadPoolExecutorSubclassT
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();
202	<	}};
203	<	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));
206	<	} finally {
207	<	joinPool(p);
242	>	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243		}
244		}
245
#	Line 219 | 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 229 | Line 264 | public class ThreadPoolExecutorSubclassT
264		}});
265		assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
266		assertEquals(1, p.getActiveCount());
232	–	} finally {
267		done.countDown();
234	–	joinPool(p);
268		}
269		}
270
#	Line 239 | 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 272 | 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 284 | 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 299 | 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		/**
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	>	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
379		/**
#	Line 662 | Line 725 | public class ThreadPoolExecutorSubclassT
725		}
726
727		/**
728	<	* shutdownNow returns a list containing tasks that were not run
728	>	* shutdownNow returns a list containing tasks that were not run,
729	>	* and those tasks are drained from the queue
730		*/
731	<	public void testShutdownNow() {
732	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
733	<	List l;
734	<	try {
735	<	for (int i = 0; i < 5; i++)
736	<	p.execute(new MediumPossiblyInterruptedRunnable());
737	<	}
738	<	finally {
731	>	public void testShutdownNow() throws InterruptedException {
732	>	final int poolSize = 2;
733	>	final int count = 5;
734	>	final AtomicInteger ran = new AtomicInteger(0);
735	>	ThreadPoolExecutor p =
736	>	new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
737	>	new ArrayBlockingQueue<Runnable>(10));
738	>	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
739	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
740	>	threadsStarted.countDown();
741		try {
742	<	l = p.shutdownNow();
743	<	} catch (SecurityException ok) { return; }
742	>	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
743	>	} catch (InterruptedException success) {}
744	>	ran.getAndIncrement();
745	>	}};
746	>	for (int i = 0; i < count; i++)
747	>	p.execute(waiter);
748	>	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
749	>	assertEquals(poolSize, p.getActiveCount());
750	>	assertEquals(0, p.getCompletedTaskCount());
751	>	final List<Runnable> queuedTasks;
752	>	try {
753	>	queuedTasks = p.shutdownNow();
754	>	} catch (SecurityException ok) {
755	>	return; // Allowed in case test doesn't have privs
756		}
757		assertTrue(p.isShutdown());
758	<	assertTrue(l.size() <= 4);
758	>	assertTrue(p.getQueue().isEmpty());
759	>	assertEquals(count - poolSize, queuedTasks.size());
760	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
761	>	assertTrue(p.isTerminated());
762	>	assertEquals(poolSize, ran.get());
763	>	assertEquals(poolSize, p.getCompletedTaskCount());
764		}
765
766		// Exception Tests
#	Line 687 | Line 770 | public class ThreadPoolExecutorSubclassT
770		*/
771		public void testConstructor1() {
772		try {
773	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
773	>	new CustomTPE(-1, 1, 1L, SECONDS,
774	>	new ArrayBlockingQueue<Runnable>(10));
775		shouldThrow();
776		} catch (IllegalArgumentException success) {}
777		}
#	Line 697 | Line 781 | public class ThreadPoolExecutorSubclassT
781		*/
782		public void testConstructor2() {
783		try {
784	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
784	>	new CustomTPE(1, -1, 1L, SECONDS,
785	>	new ArrayBlockingQueue<Runnable>(10));
786		shouldThrow();
787		} catch (IllegalArgumentException success) {}
788		}
#	Line 707 | Line 792 | public class ThreadPoolExecutorSubclassT
792		*/
793		public void testConstructor3() {
794		try {
795	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
795	>	new CustomTPE(1, 0, 1L, SECONDS,
796	>	new ArrayBlockingQueue<Runnable>(10));
797		shouldThrow();
798		} catch (IllegalArgumentException success) {}
799		}
#	Line 717 | Line 803 | public class ThreadPoolExecutorSubclassT
803		*/
804		public void testConstructor4() {
805		try {
806	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
806	>	new CustomTPE(1, 2, -1L, SECONDS,
807	>	new ArrayBlockingQueue<Runnable>(10));
808		shouldThrow();
809		} catch (IllegalArgumentException success) {}
810		}
#	Line 727 | Line 814 | public class ThreadPoolExecutorSubclassT
814		*/
815		public void testConstructor5() {
816		try {
817	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
817	>	new CustomTPE(2, 1, 1L, SECONDS,
818	>	new ArrayBlockingQueue<Runnable>(10));
819		shouldThrow();
820		} catch (IllegalArgumentException success) {}
821		}
#	Line 737 | Line 825 | public class ThreadPoolExecutorSubclassT
825		*/
826		public void testConstructorNullPointerException() {
827		try {
828	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
828	>	new CustomTPE(1, 2, 1L, SECONDS, null);
829		shouldThrow();
830		} catch (NullPointerException success) {}
831		}
#	Line 747 | Line 835 | public class ThreadPoolExecutorSubclassT
835		*/
836		public void testConstructor6() {
837		try {
838	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
838	>	new CustomTPE(-1, 1, 1L, SECONDS,
839	>	new ArrayBlockingQueue<Runnable>(10),
840	>	new SimpleThreadFactory());
841		shouldThrow();
842		} catch (IllegalArgumentException success) {}
843		}
#	Line 757 | Line 847 | public class ThreadPoolExecutorSubclassT
847		*/
848		public void testConstructor7() {
849		try {
850	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
850	>	new CustomTPE(1,-1, 1L, SECONDS,
851	>	new ArrayBlockingQueue<Runnable>(10),
852	>	new SimpleThreadFactory());
853		shouldThrow();
854		} catch (IllegalArgumentException success) {}
855		}
#	Line 767 | Line 859 | public class ThreadPoolExecutorSubclassT
859		*/
860		public void testConstructor8() {
861		try {
862	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
862	>	new CustomTPE(1, 0, 1L, SECONDS,
863	>	new ArrayBlockingQueue<Runnable>(10),
864	>	new SimpleThreadFactory());
865		shouldThrow();
866		} catch (IllegalArgumentException success) {}
867		}
#	Line 777 | Line 871 | public class ThreadPoolExecutorSubclassT
871		*/
872		public void testConstructor9() {
873		try {
874	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
874	>	new CustomTPE(1, 2, -1L, SECONDS,
875	>	new ArrayBlockingQueue<Runnable>(10),
876	>	new SimpleThreadFactory());
877		shouldThrow();
878		} catch (IllegalArgumentException success) {}
879		}
#	Line 787 | Line 883 | public class ThreadPoolExecutorSubclassT
883		*/
884		public void testConstructor10() {
885		try {
886	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
886	>	new CustomTPE(2, 1, 1L, SECONDS,
887	>	new ArrayBlockingQueue<Runnable>(10),
888	>	new SimpleThreadFactory());
889		shouldThrow();
890		} catch (IllegalArgumentException success) {}
891		}
#	Line 797 | Line 895 | public class ThreadPoolExecutorSubclassT
895		*/
896		public void testConstructorNullPointerException2() {
897		try {
898	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
898	>	new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
899		shouldThrow();
900		} catch (NullPointerException success) {}
901		}
#	Line 807 | Line 905 | public class ThreadPoolExecutorSubclassT
905		*/
906		public void testConstructorNullPointerException3() {
907		try {
908	<	ThreadFactory f = null;
909	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
908	>	new CustomTPE(1, 2, 1L, SECONDS,
909	>	new ArrayBlockingQueue<Runnable>(10),
910	>	(ThreadFactory) null);
911		shouldThrow();
912		} catch (NullPointerException success) {}
913		}
#	Line 818 | Line 917 | public class ThreadPoolExecutorSubclassT
917		*/
918		public void testConstructor11() {
919		try {
920	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
920	>	new CustomTPE(-1, 1, 1L, SECONDS,
921	>	new ArrayBlockingQueue<Runnable>(10),
922	>	new NoOpREHandler());
923		shouldThrow();
924		} catch (IllegalArgumentException success) {}
925		}
#	Line 828 | Line 929 | public class ThreadPoolExecutorSubclassT
929		*/
930		public void testConstructor12() {
931		try {
932	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
932	>	new CustomTPE(1, -1, 1L, SECONDS,
933	>	new ArrayBlockingQueue<Runnable>(10),
934	>	new NoOpREHandler());
935		shouldThrow();
936		} catch (IllegalArgumentException success) {}
937		}
#	Line 838 | Line 941 | public class ThreadPoolExecutorSubclassT
941		*/
942		public void testConstructor13() {
943		try {
944	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
944	>	new CustomTPE(1, 0, 1L, SECONDS,
945	>	new ArrayBlockingQueue<Runnable>(10),
946	>	new NoOpREHandler());
947		shouldThrow();
948		} catch (IllegalArgumentException success) {}
949		}
#	Line 848 | Line 953 | public class ThreadPoolExecutorSubclassT
953		*/
954		public void testConstructor14() {
955		try {
956	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
956	>	new CustomTPE(1, 2, -1L, SECONDS,
957	>	new ArrayBlockingQueue<Runnable>(10),
958	>	new NoOpREHandler());
959		shouldThrow();
960		} catch (IllegalArgumentException success) {}
961		}
#	Line 858 | Line 965 | public class ThreadPoolExecutorSubclassT
965		*/
966		public void testConstructor15() {
967		try {
968	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
968	>	new CustomTPE(2, 1, 1L, SECONDS,
969	>	new ArrayBlockingQueue<Runnable>(10),
970	>	new NoOpREHandler());
971		shouldThrow();
972		} catch (IllegalArgumentException success) {}
973		}
#	Line 868 | Line 977 | public class ThreadPoolExecutorSubclassT
977		*/
978		public void testConstructorNullPointerException4() {
979		try {
980	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
980	>	new CustomTPE(1, 2, 1L, SECONDS,
981	>	null,
982	>	new NoOpREHandler());
983		shouldThrow();
984		} catch (NullPointerException success) {}
985		}
#	Line 878 | Line 989 | public class ThreadPoolExecutorSubclassT
989		*/
990		public void testConstructorNullPointerException5() {
991		try {
992	<	RejectedExecutionHandler r = null;
993	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
992	>	new CustomTPE(1, 2, 1L, SECONDS,
993	>	new ArrayBlockingQueue<Runnable>(10),
994	>	(RejectedExecutionHandler) null);
995		shouldThrow();
996		} catch (NullPointerException success) {}
997		}
#	Line 889 | Line 1001 | public class ThreadPoolExecutorSubclassT
1001		*/
1002		public void testConstructor16() {
1003		try {
1004	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1004	>	new CustomTPE(-1, 1, 1L, SECONDS,
1005	>	new ArrayBlockingQueue<Runnable>(10),
1006	>	new SimpleThreadFactory(),
1007	>	new NoOpREHandler());
1008		shouldThrow();
1009		} catch (IllegalArgumentException success) {}
1010		}
#	Line 899 | Line 1014 | public class ThreadPoolExecutorSubclassT
1014		*/
1015		public void testConstructor17() {
1016		try {
1017	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1017	>	new CustomTPE(1, -1, 1L, SECONDS,
1018	>	new ArrayBlockingQueue<Runnable>(10),
1019	>	new SimpleThreadFactory(),
1020	>	new NoOpREHandler());
1021		shouldThrow();
1022		} catch (IllegalArgumentException success) {}
1023		}
#	Line 909 | Line 1027 | public class ThreadPoolExecutorSubclassT
1027		*/
1028		public void testConstructor18() {
1029		try {
1030	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1030	>	new CustomTPE(1, 0, 1L, SECONDS,
1031	>	new ArrayBlockingQueue<Runnable>(10),
1032	>	new SimpleThreadFactory(),
1033	>	new NoOpREHandler());
1034		shouldThrow();
1035		} catch (IllegalArgumentException success) {}
1036		}
#	Line 919 | Line 1040 | public class ThreadPoolExecutorSubclassT
1040		*/
1041		public void testConstructor19() {
1042		try {
1043	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1043	>	new CustomTPE(1, 2, -1L, SECONDS,
1044	>	new ArrayBlockingQueue<Runnable>(10),
1045	>	new SimpleThreadFactory(),
1046	>	new NoOpREHandler());
1047		shouldThrow();
1048		} catch (IllegalArgumentException success) {}
1049		}
#	Line 929 | Line 1053 | public class ThreadPoolExecutorSubclassT
1053		*/
1054		public void testConstructor20() {
1055		try {
1056	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1056	>	new CustomTPE(2, 1, 1L, SECONDS,
1057	>	new ArrayBlockingQueue<Runnable>(10),
1058	>	new SimpleThreadFactory(),
1059	>	new NoOpREHandler());
1060		shouldThrow();
1061		} catch (IllegalArgumentException success) {}
1062		}
#	Line 939 | Line 1066 | public class ThreadPoolExecutorSubclassT
1066		*/
1067		public void testConstructorNullPointerException6() {
1068		try {
1069	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1069	>	new CustomTPE(1, 2, 1L, SECONDS,
1070	>	null,
1071	>	new SimpleThreadFactory(),
1072	>	new NoOpREHandler());
1073		shouldThrow();
1074		} catch (NullPointerException success) {}
1075		}
#	Line 949 | Line 1079 | public class ThreadPoolExecutorSubclassT
1079		*/
1080		public void testConstructorNullPointerException7() {
1081		try {
1082	<	RejectedExecutionHandler r = null;
1083	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1082	>	new CustomTPE(1, 2, 1L, SECONDS,
1083	>	new ArrayBlockingQueue<Runnable>(10),
1084	>	new SimpleThreadFactory(),
1085	>	(RejectedExecutionHandler) null);
1086		shouldThrow();
1087		} catch (NullPointerException success) {}
1088		}
#	Line 960 | Line 1092 | public class ThreadPoolExecutorSubclassT
1092		*/
1093		public void testConstructorNullPointerException8() {
1094		try {
1095	<	new CustomTPE(1, 2,
964	<	LONG_DELAY_MS, MILLISECONDS,
1095	>	new CustomTPE(1, 2, 1L, SECONDS,
1096		new ArrayBlockingQueue<Runnable>(10),
1097		(ThreadFactory) null,
1098		new NoOpREHandler());
#	Line 1139 | Line 1270 | public class ThreadPoolExecutorSubclassT
1270		* execute(null) throws NPE
1271		*/
1272		public void testExecuteNull() {
1273	<	ThreadPoolExecutor p = null;
1273	>	ThreadPoolExecutor p =
1274	>	new CustomTPE(1, 2, 1L, SECONDS,
1275	>	new ArrayBlockingQueue<Runnable>(10));
1276		try {
1144	–	p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1277		p.execute(null);
1278		shouldThrow();
1279		} catch (NullPointerException success) {}
#	Line 1223 | Line 1355 | public class ThreadPoolExecutorSubclassT
1355		public void testTerminated() {
1356		CustomTPE p = new CustomTPE();
1357		try { p.shutdown(); } catch (SecurityException ok) { return; }
1358	<	assertTrue(p.terminatedCalled);
1358	>	assertTrue(p.terminatedCalled());
1359		joinPool(p);
1360		}
1361
#	Line 1233 | Line 1365 | public class ThreadPoolExecutorSubclassT
1365		public void testBeforeAfter() throws InterruptedException {
1366		CustomTPE p = new CustomTPE();
1367		try {
1368	<	TrackedNoOpRunnable r = new TrackedNoOpRunnable();
1369	<	p.execute(r);
1370	<	delay(SHORT_DELAY_MS);
1371	<	assertTrue(r.done);
1372	<	assertTrue(p.beforeCalled);
1373	<	assertTrue(p.afterCalled);
1368	>	final CountDownLatch done = new CountDownLatch(1);
1369	>	p.execute(new CheckedRunnable() {
1370	>	public void realRun() {
1371	>	done.countDown();
1372	>	}});
1373	>	await(p.afterCalled);
1374	>	assertEquals(0, done.getCount());
1375	>	assertTrue(p.afterCalled());
1376	>	assertTrue(p.beforeCalled());
1377		try { p.shutdown(); } catch (SecurityException ok) { return; }
1378		} finally {
1379		joinPool(p);
#	Line 1634 | Line 1769 | public class ThreadPoolExecutorSubclassT
1769		l.add(new StringTask());
1770		l.add(new StringTask());
1771		List<Future<String>> futures =
1772	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1772	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1773		assertEquals(2, futures.size());
1774		for (Future<String> future : futures)
1775		assertSame(TEST_STRING, future.get());
#	Line 1649 | Line 1784 | public class ThreadPoolExecutorSubclassT
1784		public void testTimedInvokeAll6() throws Exception {
1785		ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1786		try {
1787	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1788	<	l.add(new StringTask());
1789	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1790	<	l.add(new StringTask());
1791	<	List<Future<String>> futures =
1792	<	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1793	<	assertEquals(3, futures.size());
1794	<	Iterator<Future<String>> it = futures.iterator();
1795	<	Future<String> f1 = it.next();
1796	<	Future<String> f2 = it.next();
1797	<	Future<String> f3 = it.next();
1798	<	assertTrue(f1.isDone());
1799	<	assertTrue(f2.isDone());
1800	<	assertTrue(f3.isDone());
1801	<	assertFalse(f1.isCancelled());
1802	<	assertTrue(f2.isCancelled());
1787	>	for (long timeout = timeoutMillis();;) {
1788	>	List<Callable<String>> tasks = new ArrayList<>();
1789	>	tasks.add(new StringTask("0"));
1790	>	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1791	>	tasks.add(new StringTask("2"));
1792	>	long startTime = System.nanoTime();
1793	>	List<Future<String>> futures =
1794	>	e.invokeAll(tasks, timeout, MILLISECONDS);
1795	>	assertEquals(tasks.size(), futures.size());
1796	>	assertTrue(millisElapsedSince(startTime) >= timeout);
1797	>	for (Future future : futures)
1798	>	assertTrue(future.isDone());
1799	>	assertTrue(futures.get(1).isCancelled());
1800	>	try {
1801	>	assertEquals("0", futures.get(0).get());
1802	>	assertEquals("2", futures.get(2).get());
1803	>	break;
1804	>	} catch (CancellationException retryWithLongerTimeout) {
1805	>	timeout *= 2;
1806	>	if (timeout >= LONG_DELAY_MS / 2)
1807	>	fail("expected exactly one task to be cancelled");
1808	>	}
1809	>	}
1810		} finally {
1811		joinPool(e);
1812		}
#	Line 1707 | Line 1849 | public class ThreadPoolExecutorSubclassT
1849		* allowCoreThreadTimeOut(true) causes idle threads to time out
1850		*/
1851		public void testAllowCoreThreadTimeOut_true() throws Exception {
1852	<	long coreThreadTimeOut = SHORT_DELAY_MS;
1852	>	long keepAliveTime = timeoutMillis();
1853		final ThreadPoolExecutor p =
1854		new CustomTPE(2, 10,
1855	<	coreThreadTimeOut, MILLISECONDS,
1855	>	keepAliveTime, MILLISECONDS,
1856		new ArrayBlockingQueue<Runnable>(10));
1857		final CountDownLatch threadStarted = new CountDownLatch(1);
1858		try {
1859		p.allowCoreThreadTimeOut(true);
1860		p.execute(new CheckedRunnable() {
1861	<	public void realRun() throws InterruptedException {
1861	>	public void realRun() {
1862		threadStarted.countDown();
1863		assertEquals(1, p.getPoolSize());
1864		}});
1865		await(threadStarted);
1866	<	delay(coreThreadTimeOut);
1866	>	delay(keepAliveTime);
1867		long startTime = System.nanoTime();
1868		while (p.getPoolSize() > 0
1869		&& millisElapsedSince(startTime) < LONG_DELAY_MS)
#	Line 1737 | Line 1879 | public class ThreadPoolExecutorSubclassT
1879		* allowCoreThreadTimeOut(false) causes idle threads not to time out
1880		*/
1881		public void testAllowCoreThreadTimeOut_false() throws Exception {
1882	<	long coreThreadTimeOut = SHORT_DELAY_MS;
1882	>	long keepAliveTime = timeoutMillis();
1883		final ThreadPoolExecutor p =
1884		new CustomTPE(2, 10,
1885	<	coreThreadTimeOut, MILLISECONDS,
1885	>	keepAliveTime, MILLISECONDS,
1886		new ArrayBlockingQueue<Runnable>(10));
1887		final CountDownLatch threadStarted = new CountDownLatch(1);
1888		try {
#	Line 1750 | Line 1892 | public class ThreadPoolExecutorSubclassT
1892		threadStarted.countDown();
1893		assertTrue(p.getPoolSize() >= 1);
1894		}});
1895	<	delay(2 * coreThreadTimeOut);
1895	>	delay(2 * keepAliveTime);
1896		assertTrue(p.getPoolSize() >= 1);
1897		} finally {
1898		joinPool(p);
1899		}
1900		}
1901
1902	+	/**
1903	+	* get(cancelled task) throws CancellationException
1904	+	* (in part, a test of CustomTPE itself)
1905	+	*/
1906	+	public void testGet_cancelled() throws Exception {
1907	+	final ExecutorService e =
1908	+	new CustomTPE(1, 1,
1909	+	LONG_DELAY_MS, MILLISECONDS,
1910	+	new LinkedBlockingQueue<Runnable>());
1911	+	try {
1912	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
1913	+	final CountDownLatch done = new CountDownLatch(1);
1914	+	final List<Future<?>> futures = new ArrayList<>();
1915	+	for (int i = 0; i < 2; i++) {
1916	+	Runnable r = new CheckedRunnable() { public void realRun()
1917	+	throws Throwable {
1918	+	blockerStarted.countDown();
1919	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1920	+	}};
1921	+	futures.add(e.submit(r));
1922	+	}
1923	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1924	+	for (Future<?> future : futures) future.cancel(false);
1925	+	for (Future<?> future : futures) {
1926	+	try {
1927	+	future.get();
1928	+	shouldThrow();
1929	+	} catch (CancellationException success) {}
1930	+	try {
1931	+	future.get(LONG_DELAY_MS, MILLISECONDS);
1932	+	shouldThrow();
1933	+	} catch (CancellationException success) {}
1934	+	assertTrue(future.isCancelled());
1935	+	assertTrue(future.isDone());
1936	+	}
1937	+	done.countDown();
1938	+	} finally {
1939	+	joinPool(e);
1940	+	}
1941	+	}
1942	+
1943		}

Diff Legend

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