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.33 by jsr166, Wed Dec 31 19:05:43 2014 UTC vs.
Revision 1.59 by jsr166, Sun Oct 4 01:56:51 2015 UTC

#	Line 7 | Line 7
7		*/
8
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	+	import static java.util.concurrent.TimeUnit.SECONDS;
11
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;
#	Line 28 | Line 30 | import java.util.concurrent.ThreadFactor
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
#	Line 36 | Line 39 | 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 58 | 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 98 | 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 111 | 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 122 | Line 129 | public class ThreadPoolExecutorSubclassT
129		long nanos = unit.toNanos(timeout);
130		lock.lock();
131		try {
132	<	for (;;) {
133	<	if (done) break;
127	<	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 224 | 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();
233	<	}};
234	<	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));
237	<	} finally {
238	<	joinPool(p);
242	>	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
243		}
244		}
245
#	Line 250 | 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 260 | Line 264 | public class ThreadPoolExecutorSubclassT
264		}});
265		assertTrue(threadStarted.await(SMALL_DELAY_MS, MILLISECONDS));
266		assertEquals(1, p.getActiveCount());
263	–	} finally {
267		done.countDown();
265	–	joinPool(p);
268		}
269		}
270
#	Line 270 | 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 303 | 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 325 | Line 347 | public class ThreadPoolExecutorSubclassT
347		fail("timed out");
348		Thread.yield();
349		}
328	–	} finally {
329	–	joinPool(p);
350		}
351		}
352
#	Line 334 | 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
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
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 387 | 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 h = new NoOpREHandler();
431	>	final ThreadPoolExecutor p =
432	>	new CustomTPE(1, 2,
433	>	LONG_DELAY_MS, MILLISECONDS,
434	>	new ArrayBlockingQueue<Runnable>(10),
435	>	h);
436	>	try (PoolCleaner cleaner = cleaner(p)) {
437	>	assertSame(h, p.getRejectedExecutionHandler());
438	>	}
439		}
440
441		/**
#	Line 697 | Line 742 | public class ThreadPoolExecutorSubclassT
742		}
743
744		/**
745	<	* shutdownNow returns a list containing tasks that were not run
745	>	* shutdownNow returns a list containing tasks that were not run,
746	>	* and those tasks are drained from the queue
747		*/
748	<	public void testShutdownNow() {
749	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
750	<	List l;
751	<	try {
752	<	for (int i = 0; i < 5; i++)
753	<	p.execute(new MediumPossiblyInterruptedRunnable());
754	<	}
755	<	finally {
748	>	public void testShutdownNow() throws InterruptedException {
749	>	final int poolSize = 2;
750	>	final int count = 5;
751	>	final AtomicInteger ran = new AtomicInteger(0);
752	>	ThreadPoolExecutor p =
753	>	new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
754	>	new ArrayBlockingQueue<Runnable>(10));
755	>	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
756	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
757	>	threadsStarted.countDown();
758		try {
759	<	l = p.shutdownNow();
760	<	} catch (SecurityException ok) { return; }
759	>	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
760	>	} catch (InterruptedException success) {}
761	>	ran.getAndIncrement();
762	>	}};
763	>	for (int i = 0; i < count; i++)
764	>	p.execute(waiter);
765	>	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
766	>	assertEquals(poolSize, p.getActiveCount());
767	>	assertEquals(0, p.getCompletedTaskCount());
768	>	final List<Runnable> queuedTasks;
769	>	try {
770	>	queuedTasks = p.shutdownNow();
771	>	} catch (SecurityException ok) {
772	>	return; // Allowed in case test doesn't have privs
773		}
774		assertTrue(p.isShutdown());
775	<	assertTrue(l.size() <= 4);
775	>	assertTrue(p.getQueue().isEmpty());
776	>	assertEquals(count - poolSize, queuedTasks.size());
777	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
778	>	assertTrue(p.isTerminated());
779	>	assertEquals(poolSize, ran.get());
780	>	assertEquals(poolSize, p.getCompletedTaskCount());
781		}
782
783		// Exception Tests
#	Line 722 | Line 787 | public class ThreadPoolExecutorSubclassT
787		*/
788		public void testConstructor1() {
789		try {
790	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
790	>	new CustomTPE(-1, 1, 1L, SECONDS,
791	>	new ArrayBlockingQueue<Runnable>(10));
792		shouldThrow();
793		} catch (IllegalArgumentException success) {}
794		}
#	Line 732 | Line 798 | public class ThreadPoolExecutorSubclassT
798		*/
799		public void testConstructor2() {
800		try {
801	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
801	>	new CustomTPE(1, -1, 1L, SECONDS,
802	>	new ArrayBlockingQueue<Runnable>(10));
803		shouldThrow();
804		} catch (IllegalArgumentException success) {}
805		}
#	Line 742 | Line 809 | public class ThreadPoolExecutorSubclassT
809		*/
810		public void testConstructor3() {
811		try {
812	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
812	>	new CustomTPE(1, 0, 1L, SECONDS,
813	>	new ArrayBlockingQueue<Runnable>(10));
814		shouldThrow();
815		} catch (IllegalArgumentException success) {}
816		}
#	Line 752 | Line 820 | public class ThreadPoolExecutorSubclassT
820		*/
821		public void testConstructor4() {
822		try {
823	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
823	>	new CustomTPE(1, 2, -1L, SECONDS,
824	>	new ArrayBlockingQueue<Runnable>(10));
825		shouldThrow();
826		} catch (IllegalArgumentException success) {}
827		}
#	Line 762 | Line 831 | public class ThreadPoolExecutorSubclassT
831		*/
832		public void testConstructor5() {
833		try {
834	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
834	>	new CustomTPE(2, 1, 1L, SECONDS,
835	>	new ArrayBlockingQueue<Runnable>(10));
836		shouldThrow();
837		} catch (IllegalArgumentException success) {}
838		}
#	Line 772 | Line 842 | public class ThreadPoolExecutorSubclassT
842		*/
843		public void testConstructorNullPointerException() {
844		try {
845	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
845	>	new CustomTPE(1, 2, 1L, SECONDS, null);
846		shouldThrow();
847		} catch (NullPointerException success) {}
848		}
#	Line 782 | Line 852 | public class ThreadPoolExecutorSubclassT
852		*/
853		public void testConstructor6() {
854		try {
855	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
855	>	new CustomTPE(-1, 1, 1L, SECONDS,
856	>	new ArrayBlockingQueue<Runnable>(10),
857	>	new SimpleThreadFactory());
858		shouldThrow();
859		} catch (IllegalArgumentException success) {}
860		}
#	Line 792 | Line 864 | public class ThreadPoolExecutorSubclassT
864		*/
865		public void testConstructor7() {
866		try {
867	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
867	>	new CustomTPE(1,-1, 1L, SECONDS,
868	>	new ArrayBlockingQueue<Runnable>(10),
869	>	new SimpleThreadFactory());
870		shouldThrow();
871		} catch (IllegalArgumentException success) {}
872		}
#	Line 802 | Line 876 | public class ThreadPoolExecutorSubclassT
876		*/
877		public void testConstructor8() {
878		try {
879	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
879	>	new CustomTPE(1, 0, 1L, SECONDS,
880	>	new ArrayBlockingQueue<Runnable>(10),
881	>	new SimpleThreadFactory());
882		shouldThrow();
883		} catch (IllegalArgumentException success) {}
884		}
#	Line 812 | Line 888 | public class ThreadPoolExecutorSubclassT
888		*/
889		public void testConstructor9() {
890		try {
891	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
891	>	new CustomTPE(1, 2, -1L, SECONDS,
892	>	new ArrayBlockingQueue<Runnable>(10),
893	>	new SimpleThreadFactory());
894		shouldThrow();
895		} catch (IllegalArgumentException success) {}
896		}
#	Line 822 | Line 900 | public class ThreadPoolExecutorSubclassT
900		*/
901		public void testConstructor10() {
902		try {
903	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
903	>	new CustomTPE(2, 1, 1L, SECONDS,
904	>	new ArrayBlockingQueue<Runnable>(10),
905	>	new SimpleThreadFactory());
906		shouldThrow();
907		} catch (IllegalArgumentException success) {}
908		}
#	Line 832 | Line 912 | public class ThreadPoolExecutorSubclassT
912		*/
913		public void testConstructorNullPointerException2() {
914		try {
915	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
915	>	new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
916		shouldThrow();
917		} catch (NullPointerException success) {}
918		}
#	Line 842 | Line 922 | public class ThreadPoolExecutorSubclassT
922		*/
923		public void testConstructorNullPointerException3() {
924		try {
925	<	ThreadFactory f = null;
926	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
925	>	new CustomTPE(1, 2, 1L, SECONDS,
926	>	new ArrayBlockingQueue<Runnable>(10),
927	>	(ThreadFactory) null);
928		shouldThrow();
929		} catch (NullPointerException success) {}
930		}
#	Line 853 | Line 934 | public class ThreadPoolExecutorSubclassT
934		*/
935		public void testConstructor11() {
936		try {
937	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
937	>	new CustomTPE(-1, 1, 1L, SECONDS,
938	>	new ArrayBlockingQueue<Runnable>(10),
939	>	new NoOpREHandler());
940		shouldThrow();
941		} catch (IllegalArgumentException success) {}
942		}
#	Line 863 | Line 946 | public class ThreadPoolExecutorSubclassT
946		*/
947		public void testConstructor12() {
948		try {
949	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
949	>	new CustomTPE(1, -1, 1L, SECONDS,
950	>	new ArrayBlockingQueue<Runnable>(10),
951	>	new NoOpREHandler());
952		shouldThrow();
953		} catch (IllegalArgumentException success) {}
954		}
#	Line 873 | Line 958 | public class ThreadPoolExecutorSubclassT
958		*/
959		public void testConstructor13() {
960		try {
961	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
961	>	new CustomTPE(1, 0, 1L, SECONDS,
962	>	new ArrayBlockingQueue<Runnable>(10),
963	>	new NoOpREHandler());
964		shouldThrow();
965		} catch (IllegalArgumentException success) {}
966		}
#	Line 883 | Line 970 | public class ThreadPoolExecutorSubclassT
970		*/
971		public void testConstructor14() {
972		try {
973	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
973	>	new CustomTPE(1, 2, -1L, SECONDS,
974	>	new ArrayBlockingQueue<Runnable>(10),
975	>	new NoOpREHandler());
976		shouldThrow();
977		} catch (IllegalArgumentException success) {}
978		}
#	Line 893 | Line 982 | public class ThreadPoolExecutorSubclassT
982		*/
983		public void testConstructor15() {
984		try {
985	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
985	>	new CustomTPE(2, 1, 1L, SECONDS,
986	>	new ArrayBlockingQueue<Runnable>(10),
987	>	new NoOpREHandler());
988		shouldThrow();
989		} catch (IllegalArgumentException success) {}
990		}
#	Line 903 | Line 994 | public class ThreadPoolExecutorSubclassT
994		*/
995		public void testConstructorNullPointerException4() {
996		try {
997	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
997	>	new CustomTPE(1, 2, 1L, SECONDS,
998	>	null,
999	>	new NoOpREHandler());
1000		shouldThrow();
1001		} catch (NullPointerException success) {}
1002		}
#	Line 913 | Line 1006 | public class ThreadPoolExecutorSubclassT
1006		*/
1007		public void testConstructorNullPointerException5() {
1008		try {
1009	<	RejectedExecutionHandler r = null;
1010	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
1009	>	new CustomTPE(1, 2, 1L, SECONDS,
1010	>	new ArrayBlockingQueue<Runnable>(10),
1011	>	(RejectedExecutionHandler) null);
1012		shouldThrow();
1013		} catch (NullPointerException success) {}
1014		}
#	Line 924 | Line 1018 | public class ThreadPoolExecutorSubclassT
1018		*/
1019		public void testConstructor16() {
1020		try {
1021	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1021	>	new CustomTPE(-1, 1, 1L, SECONDS,
1022	>	new ArrayBlockingQueue<Runnable>(10),
1023	>	new SimpleThreadFactory(),
1024	>	new NoOpREHandler());
1025		shouldThrow();
1026		} catch (IllegalArgumentException success) {}
1027		}
#	Line 934 | Line 1031 | public class ThreadPoolExecutorSubclassT
1031		*/
1032		public void testConstructor17() {
1033		try {
1034	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1034	>	new CustomTPE(1, -1, 1L, SECONDS,
1035	>	new ArrayBlockingQueue<Runnable>(10),
1036	>	new SimpleThreadFactory(),
1037	>	new NoOpREHandler());
1038		shouldThrow();
1039		} catch (IllegalArgumentException success) {}
1040		}
#	Line 944 | Line 1044 | public class ThreadPoolExecutorSubclassT
1044		*/
1045		public void testConstructor18() {
1046		try {
1047	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1047	>	new CustomTPE(1, 0, 1L, SECONDS,
1048	>	new ArrayBlockingQueue<Runnable>(10),
1049	>	new SimpleThreadFactory(),
1050	>	new NoOpREHandler());
1051		shouldThrow();
1052		} catch (IllegalArgumentException success) {}
1053		}
#	Line 954 | Line 1057 | public class ThreadPoolExecutorSubclassT
1057		*/
1058		public void testConstructor19() {
1059		try {
1060	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1060	>	new CustomTPE(1, 2, -1L, SECONDS,
1061	>	new ArrayBlockingQueue<Runnable>(10),
1062	>	new SimpleThreadFactory(),
1063	>	new NoOpREHandler());
1064		shouldThrow();
1065		} catch (IllegalArgumentException success) {}
1066		}
#	Line 964 | Line 1070 | public class ThreadPoolExecutorSubclassT
1070		*/
1071		public void testConstructor20() {
1072		try {
1073	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1073	>	new CustomTPE(2, 1, 1L, SECONDS,
1074	>	new ArrayBlockingQueue<Runnable>(10),
1075	>	new SimpleThreadFactory(),
1076	>	new NoOpREHandler());
1077		shouldThrow();
1078		} catch (IllegalArgumentException success) {}
1079		}
#	Line 974 | Line 1083 | public class ThreadPoolExecutorSubclassT
1083		*/
1084		public void testConstructorNullPointerException6() {
1085		try {
1086	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1086	>	new CustomTPE(1, 2, 1L, SECONDS,
1087	>	null,
1088	>	new SimpleThreadFactory(),
1089	>	new NoOpREHandler());
1090		shouldThrow();
1091		} catch (NullPointerException success) {}
1092		}
#	Line 984 | Line 1096 | public class ThreadPoolExecutorSubclassT
1096		*/
1097		public void testConstructorNullPointerException7() {
1098		try {
1099	<	RejectedExecutionHandler r = null;
1100	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1099	>	new CustomTPE(1, 2, 1L, SECONDS,
1100	>	new ArrayBlockingQueue<Runnable>(10),
1101	>	new SimpleThreadFactory(),
1102	>	(RejectedExecutionHandler) null);
1103		shouldThrow();
1104		} catch (NullPointerException success) {}
1105		}
#	Line 995 | Line 1109 | public class ThreadPoolExecutorSubclassT
1109		*/
1110		public void testConstructorNullPointerException8() {
1111		try {
1112	<	new CustomTPE(1, 2,
999	<	LONG_DELAY_MS, MILLISECONDS,
1112	>	new CustomTPE(1, 2, 1L, SECONDS,
1113		new ArrayBlockingQueue<Runnable>(10),
1114		(ThreadFactory) null,
1115		new NoOpREHandler());
#	Line 1174 | Line 1287 | public class ThreadPoolExecutorSubclassT
1287		* execute(null) throws NPE
1288		*/
1289		public void testExecuteNull() {
1290	<	ThreadPoolExecutor p = null;
1290	>	ThreadPoolExecutor p =
1291	>	new CustomTPE(1, 2, 1L, SECONDS,
1292	>	new ArrayBlockingQueue<Runnable>(10));
1293		try {
1179	–	p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1294		p.execute(null);
1295		shouldThrow();
1296		} catch (NullPointerException success) {}
#	Line 1672 | Line 1786 | public class ThreadPoolExecutorSubclassT
1786		l.add(new StringTask());
1787		l.add(new StringTask());
1788		List<Future<String>> futures =
1789	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1789	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1790		assertEquals(2, futures.size());
1791		for (Future<String> future : futures)
1792		assertSame(TEST_STRING, future.get());
#	Line 1687 | Line 1801 | public class ThreadPoolExecutorSubclassT
1801		public void testTimedInvokeAll6() throws Exception {
1802		ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1803		try {
1804	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1805	<	l.add(new StringTask());
1806	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1807	<	l.add(new StringTask());
1808	<	List<Future<String>> futures =
1809	<	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1810	<	assertEquals(l.size(), futures.size());
1811	<	for (Future future : futures)
1812	<	assertTrue(future.isDone());
1813	<	assertFalse(futures.get(0).isCancelled());
1814	<	assertTrue(futures.get(1).isCancelled());
1804	>	for (long timeout = timeoutMillis();;) {
1805	>	List<Callable<String>> tasks = new ArrayList<>();
1806	>	tasks.add(new StringTask("0"));
1807	>	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1808	>	tasks.add(new StringTask("2"));
1809	>	long startTime = System.nanoTime();
1810	>	List<Future<String>> futures =
1811	>	e.invokeAll(tasks, timeout, MILLISECONDS);
1812	>	assertEquals(tasks.size(), futures.size());
1813	>	assertTrue(millisElapsedSince(startTime) >= timeout);
1814	>	for (Future future : futures)
1815	>	assertTrue(future.isDone());
1816	>	assertTrue(futures.get(1).isCancelled());
1817	>	try {
1818	>	assertEquals("0", futures.get(0).get());
1819	>	assertEquals("2", futures.get(2).get());
1820	>	break;
1821	>	} catch (CancellationException retryWithLongerTimeout) {
1822	>	timeout *= 2;
1823	>	if (timeout >= LONG_DELAY_MS / 2)
1824	>	fail("expected exactly one task to be cancelled");
1825	>	}
1826	>	}
1827		} finally {
1828		joinPool(e);
1829		}
#	Line 1740 | Line 1866 | public class ThreadPoolExecutorSubclassT
1866		* allowCoreThreadTimeOut(true) causes idle threads to time out
1867		*/
1868		public void testAllowCoreThreadTimeOut_true() throws Exception {
1869	<	long coreThreadTimeOut = SHORT_DELAY_MS;
1869	>	long keepAliveTime = timeoutMillis();
1870		final ThreadPoolExecutor p =
1871		new CustomTPE(2, 10,
1872	<	coreThreadTimeOut, MILLISECONDS,
1872	>	keepAliveTime, MILLISECONDS,
1873		new ArrayBlockingQueue<Runnable>(10));
1874		final CountDownLatch threadStarted = new CountDownLatch(1);
1875		try {
1876		p.allowCoreThreadTimeOut(true);
1877		p.execute(new CheckedRunnable() {
1878	<	public void realRun() throws InterruptedException {
1878	>	public void realRun() {
1879		threadStarted.countDown();
1880		assertEquals(1, p.getPoolSize());
1881		}});
1882		await(threadStarted);
1883	<	delay(coreThreadTimeOut);
1883	>	delay(keepAliveTime);
1884		long startTime = System.nanoTime();
1885		while (p.getPoolSize() > 0
1886		&& millisElapsedSince(startTime) < LONG_DELAY_MS)
#	Line 1770 | Line 1896 | public class ThreadPoolExecutorSubclassT
1896		* allowCoreThreadTimeOut(false) causes idle threads not to time out
1897		*/
1898		public void testAllowCoreThreadTimeOut_false() throws Exception {
1899	<	long coreThreadTimeOut = SHORT_DELAY_MS;
1899	>	long keepAliveTime = timeoutMillis();
1900		final ThreadPoolExecutor p =
1901		new CustomTPE(2, 10,
1902	<	coreThreadTimeOut, MILLISECONDS,
1902	>	keepAliveTime, MILLISECONDS,
1903		new ArrayBlockingQueue<Runnable>(10));
1904		final CountDownLatch threadStarted = new CountDownLatch(1);
1905		try {
#	Line 1783 | Line 1909 | public class ThreadPoolExecutorSubclassT
1909		threadStarted.countDown();
1910		assertTrue(p.getPoolSize() >= 1);
1911		}});
1912	<	delay(2 * coreThreadTimeOut);
1912	>	delay(2 * keepAliveTime);
1913		assertTrue(p.getPoolSize() >= 1);
1914		} finally {
1915		joinPool(p);
1916		}
1917		}
1918
1919	+	/**
1920	+	* get(cancelled task) throws CancellationException
1921	+	* (in part, a test of CustomTPE itself)
1922	+	*/
1923	+	public void testGet_cancelled() throws Exception {
1924	+	final ExecutorService e =
1925	+	new CustomTPE(1, 1,
1926	+	LONG_DELAY_MS, MILLISECONDS,
1927	+	new LinkedBlockingQueue<Runnable>());
1928	+	try {
1929	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
1930	+	final CountDownLatch done = new CountDownLatch(1);
1931	+	final List<Future<?>> futures = new ArrayList<>();
1932	+	for (int i = 0; i < 2; i++) {
1933	+	Runnable r = new CheckedRunnable() { public void realRun()
1934	+	throws Throwable {
1935	+	blockerStarted.countDown();
1936	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1937	+	}};
1938	+	futures.add(e.submit(r));
1939	+	}
1940	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1941	+	for (Future<?> future : futures) future.cancel(false);
1942	+	for (Future<?> future : futures) {
1943	+	try {
1944	+	future.get();
1945	+	shouldThrow();
1946	+	} catch (CancellationException success) {}
1947	+	try {
1948	+	future.get(LONG_DELAY_MS, MILLISECONDS);
1949	+	shouldThrow();
1950	+	} catch (CancellationException success) {}
1951	+	assertTrue(future.isCancelled());
1952	+	assertTrue(future.isDone());
1953	+	}
1954	+	done.countDown();
1955	+	} finally {
1956	+	joinPool(e);
1957	+	}
1958	+	}
1959	+
1960		}

Diff Legend

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