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.48 by jsr166, Sun Oct 4 00:18:49 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 222 | Line 230 | public class ThreadPoolExecutorSubclassT
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,
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();
241	<	}};
234	<	try {
233	>	try (PoolCloser<CustomTPE> poolCloser = new PoolCloser<>
234	>	(new CustomTPE(1, 1,
235	>	2 * LONG_DELAY_MS, MILLISECONDS,
236	>	new ArrayBlockingQueue<Runnable>(10)))) {
237	>	final ThreadPoolExecutor p = poolCloser.pool;
238	>	final CountDownLatch done = new CountDownLatch(1);
239	>	final Runnable task = new CheckedRunnable() {
240	>	public void realRun() { done.countDown();
241	>	}};
242		p.execute(task);
243	<	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
237	<	} finally {
238	<	joinPool(p);
243	>	assertTrue(done.await(LONG_DELAY_MS, MILLISECONDS));
244		}
245		}
246
#	Line 344 | Line 349 | public class ThreadPoolExecutorSubclassT
349		*/
350		public void testGetKeepAliveTime() {
351		ThreadPoolExecutor p = new CustomTPE(2, 2, 1000, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
352	<	assertEquals(1, p.getKeepAliveTime(TimeUnit.SECONDS));
352	>	assertEquals(1, p.getKeepAliveTime(SECONDS));
353		joinPool(p);
354		}
355
#	Line 697 | Line 702 | public class ThreadPoolExecutorSubclassT
702		}
703
704		/**
705	<	* shutdownNow returns a list containing tasks that were not run
705	>	* shutdownNow returns a list containing tasks that were not run,
706	>	* and those tasks are drained from the queue
707		*/
708	<	public void testShutdownNow() {
709	<	ThreadPoolExecutor p = new CustomTPE(1, 1, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
710	<	List l;
711	<	try {
712	<	for (int i = 0; i < 5; i++)
713	<	p.execute(new MediumPossiblyInterruptedRunnable());
714	<	}
715	<	finally {
708	>	public void testShutdownNow() throws InterruptedException {
709	>	final int poolSize = 2;
710	>	final int count = 5;
711	>	final AtomicInteger ran = new AtomicInteger(0);
712	>	ThreadPoolExecutor p =
713	>	new CustomTPE(poolSize, poolSize, LONG_DELAY_MS, MILLISECONDS,
714	>	new ArrayBlockingQueue<Runnable>(10));
715	>	CountDownLatch threadsStarted = new CountDownLatch(poolSize);
716	>	Runnable waiter = new CheckedRunnable() { public void realRun() {
717	>	threadsStarted.countDown();
718		try {
719	<	l = p.shutdownNow();
720	<	} catch (SecurityException ok) { return; }
719	>	MILLISECONDS.sleep(2 * LONG_DELAY_MS);
720	>	} catch (InterruptedException success) {}
721	>	ran.getAndIncrement();
722	>	}};
723	>	for (int i = 0; i < count; i++)
724	>	p.execute(waiter);
725	>	assertTrue(threadsStarted.await(LONG_DELAY_MS, MILLISECONDS));
726	>	assertEquals(poolSize, p.getActiveCount());
727	>	assertEquals(0, p.getCompletedTaskCount());
728	>	final List<Runnable> queuedTasks;
729	>	try {
730	>	queuedTasks = p.shutdownNow();
731	>	} catch (SecurityException ok) {
732	>	return; // Allowed in case test doesn't have privs
733		}
734		assertTrue(p.isShutdown());
735	<	assertTrue(l.size() <= 4);
735	>	assertTrue(p.getQueue().isEmpty());
736	>	assertEquals(count - poolSize, queuedTasks.size());
737	>	assertTrue(p.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
738	>	assertTrue(p.isTerminated());
739	>	assertEquals(poolSize, ran.get());
740	>	assertEquals(poolSize, p.getCompletedTaskCount());
741		}
742
743		// Exception Tests
#	Line 722 | Line 747 | public class ThreadPoolExecutorSubclassT
747		*/
748		public void testConstructor1() {
749		try {
750	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
750	>	new CustomTPE(-1, 1, 1L, SECONDS,
751	>	new ArrayBlockingQueue<Runnable>(10));
752		shouldThrow();
753		} catch (IllegalArgumentException success) {}
754		}
#	Line 732 | Line 758 | public class ThreadPoolExecutorSubclassT
758		*/
759		public void testConstructor2() {
760		try {
761	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
761	>	new CustomTPE(1, -1, 1L, SECONDS,
762	>	new ArrayBlockingQueue<Runnable>(10));
763		shouldThrow();
764		} catch (IllegalArgumentException success) {}
765		}
#	Line 742 | Line 769 | public class ThreadPoolExecutorSubclassT
769		*/
770		public void testConstructor3() {
771		try {
772	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
772	>	new CustomTPE(1, 0, 1L, SECONDS,
773	>	new ArrayBlockingQueue<Runnable>(10));
774		shouldThrow();
775		} catch (IllegalArgumentException success) {}
776		}
#	Line 752 | Line 780 | public class ThreadPoolExecutorSubclassT
780		*/
781		public void testConstructor4() {
782		try {
783	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
783	>	new CustomTPE(1, 2, -1L, SECONDS,
784	>	new ArrayBlockingQueue<Runnable>(10));
785		shouldThrow();
786		} catch (IllegalArgumentException success) {}
787		}
#	Line 762 | Line 791 | public class ThreadPoolExecutorSubclassT
791		*/
792		public void testConstructor5() {
793		try {
794	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
794	>	new CustomTPE(2, 1, 1L, SECONDS,
795	>	new ArrayBlockingQueue<Runnable>(10));
796		shouldThrow();
797		} catch (IllegalArgumentException success) {}
798		}
#	Line 772 | Line 802 | public class ThreadPoolExecutorSubclassT
802		*/
803		public void testConstructorNullPointerException() {
804		try {
805	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null);
805	>	new CustomTPE(1, 2, 1L, SECONDS, null);
806		shouldThrow();
807		} catch (NullPointerException success) {}
808		}
#	Line 782 | Line 812 | public class ThreadPoolExecutorSubclassT
812		*/
813		public void testConstructor6() {
814		try {
815	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
815	>	new CustomTPE(-1, 1, 1L, SECONDS,
816	>	new ArrayBlockingQueue<Runnable>(10),
817	>	new SimpleThreadFactory());
818		shouldThrow();
819		} catch (IllegalArgumentException success) {}
820		}
#	Line 792 | Line 824 | public class ThreadPoolExecutorSubclassT
824		*/
825		public void testConstructor7() {
826		try {
827	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
827	>	new CustomTPE(1,-1, 1L, SECONDS,
828	>	new ArrayBlockingQueue<Runnable>(10),
829	>	new SimpleThreadFactory());
830		shouldThrow();
831		} catch (IllegalArgumentException success) {}
832		}
#	Line 802 | Line 836 | public class ThreadPoolExecutorSubclassT
836		*/
837		public void testConstructor8() {
838		try {
839	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
839	>	new CustomTPE(1, 0, 1L, SECONDS,
840	>	new ArrayBlockingQueue<Runnable>(10),
841	>	new SimpleThreadFactory());
842		shouldThrow();
843		} catch (IllegalArgumentException success) {}
844		}
#	Line 812 | Line 848 | public class ThreadPoolExecutorSubclassT
848		*/
849		public void testConstructor9() {
850		try {
851	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
851	>	new CustomTPE(1, 2, -1L, SECONDS,
852	>	new ArrayBlockingQueue<Runnable>(10),
853	>	new SimpleThreadFactory());
854		shouldThrow();
855		} catch (IllegalArgumentException success) {}
856		}
#	Line 822 | Line 860 | public class ThreadPoolExecutorSubclassT
860		*/
861		public void testConstructor10() {
862		try {
863	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory());
863	>	new CustomTPE(2, 1, 1L, SECONDS,
864	>	new ArrayBlockingQueue<Runnable>(10),
865	>	new SimpleThreadFactory());
866		shouldThrow();
867		} catch (IllegalArgumentException success) {}
868		}
#	Line 832 | Line 872 | public class ThreadPoolExecutorSubclassT
872		*/
873		public void testConstructorNullPointerException2() {
874		try {
875	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory());
875	>	new CustomTPE(1, 2, 1L, SECONDS, null, new SimpleThreadFactory());
876		shouldThrow();
877		} catch (NullPointerException success) {}
878		}
#	Line 842 | Line 882 | public class ThreadPoolExecutorSubclassT
882		*/
883		public void testConstructorNullPointerException3() {
884		try {
885	<	ThreadFactory f = null;
886	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),f);
885	>	new CustomTPE(1, 2, 1L, SECONDS,
886	>	new ArrayBlockingQueue<Runnable>(10),
887	>	(ThreadFactory) null);
888		shouldThrow();
889		} catch (NullPointerException success) {}
890		}
#	Line 853 | Line 894 | public class ThreadPoolExecutorSubclassT
894		*/
895		public void testConstructor11() {
896		try {
897	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
897	>	new CustomTPE(-1, 1, 1L, SECONDS,
898	>	new ArrayBlockingQueue<Runnable>(10),
899	>	new NoOpREHandler());
900		shouldThrow();
901		} catch (IllegalArgumentException success) {}
902		}
#	Line 863 | Line 906 | public class ThreadPoolExecutorSubclassT
906		*/
907		public void testConstructor12() {
908		try {
909	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
909	>	new CustomTPE(1, -1, 1L, SECONDS,
910	>	new ArrayBlockingQueue<Runnable>(10),
911	>	new NoOpREHandler());
912		shouldThrow();
913		} catch (IllegalArgumentException success) {}
914		}
#	Line 873 | Line 918 | public class ThreadPoolExecutorSubclassT
918		*/
919		public void testConstructor13() {
920		try {
921	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
921	>	new CustomTPE(1, 0, 1L, SECONDS,
922	>	new ArrayBlockingQueue<Runnable>(10),
923	>	new NoOpREHandler());
924		shouldThrow();
925		} catch (IllegalArgumentException success) {}
926		}
#	Line 883 | Line 930 | public class ThreadPoolExecutorSubclassT
930		*/
931		public void testConstructor14() {
932		try {
933	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
933	>	new CustomTPE(1, 2, -1L, SECONDS,
934	>	new ArrayBlockingQueue<Runnable>(10),
935	>	new NoOpREHandler());
936		shouldThrow();
937		} catch (IllegalArgumentException success) {}
938		}
#	Line 893 | Line 942 | public class ThreadPoolExecutorSubclassT
942		*/
943		public void testConstructor15() {
944		try {
945	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new NoOpREHandler());
945	>	new CustomTPE(2, 1, 1L, SECONDS,
946	>	new ArrayBlockingQueue<Runnable>(10),
947	>	new NoOpREHandler());
948		shouldThrow();
949		} catch (IllegalArgumentException success) {}
950		}
#	Line 903 | Line 954 | public class ThreadPoolExecutorSubclassT
954		*/
955		public void testConstructorNullPointerException4() {
956		try {
957	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new NoOpREHandler());
957	>	new CustomTPE(1, 2, 1L, SECONDS,
958	>	null,
959	>	new NoOpREHandler());
960		shouldThrow();
961		} catch (NullPointerException success) {}
962		}
#	Line 913 | Line 966 | public class ThreadPoolExecutorSubclassT
966		*/
967		public void testConstructorNullPointerException5() {
968		try {
969	<	RejectedExecutionHandler r = null;
970	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),r);
969	>	new CustomTPE(1, 2, 1L, SECONDS,
970	>	new ArrayBlockingQueue<Runnable>(10),
971	>	(RejectedExecutionHandler) null);
972		shouldThrow();
973		} catch (NullPointerException success) {}
974		}
#	Line 924 | Line 978 | public class ThreadPoolExecutorSubclassT
978		*/
979		public void testConstructor16() {
980		try {
981	<	new CustomTPE(-1,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
981	>	new CustomTPE(-1, 1, 1L, SECONDS,
982	>	new ArrayBlockingQueue<Runnable>(10),
983	>	new SimpleThreadFactory(),
984	>	new NoOpREHandler());
985		shouldThrow();
986		} catch (IllegalArgumentException success) {}
987		}
#	Line 934 | Line 991 | public class ThreadPoolExecutorSubclassT
991		*/
992		public void testConstructor17() {
993		try {
994	<	new CustomTPE(1,-1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
994	>	new CustomTPE(1, -1, 1L, SECONDS,
995	>	new ArrayBlockingQueue<Runnable>(10),
996	>	new SimpleThreadFactory(),
997	>	new NoOpREHandler());
998		shouldThrow();
999		} catch (IllegalArgumentException success) {}
1000		}
#	Line 944 | Line 1004 | public class ThreadPoolExecutorSubclassT
1004		*/
1005		public void testConstructor18() {
1006		try {
1007	<	new CustomTPE(1,0,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1007	>	new CustomTPE(1, 0, 1L, SECONDS,
1008	>	new ArrayBlockingQueue<Runnable>(10),
1009	>	new SimpleThreadFactory(),
1010	>	new NoOpREHandler());
1011		shouldThrow();
1012		} catch (IllegalArgumentException success) {}
1013		}
#	Line 954 | Line 1017 | public class ThreadPoolExecutorSubclassT
1017		*/
1018		public void testConstructor19() {
1019		try {
1020	<	new CustomTPE(1,2,-1L,MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1020	>	new CustomTPE(1, 2, -1L, SECONDS,
1021	>	new ArrayBlockingQueue<Runnable>(10),
1022	>	new SimpleThreadFactory(),
1023	>	new NoOpREHandler());
1024		shouldThrow();
1025		} catch (IllegalArgumentException success) {}
1026		}
#	Line 964 | Line 1030 | public class ThreadPoolExecutorSubclassT
1030		*/
1031		public void testConstructor20() {
1032		try {
1033	<	new CustomTPE(2,1,LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),new NoOpREHandler());
1033	>	new CustomTPE(2, 1, 1L, SECONDS,
1034	>	new ArrayBlockingQueue<Runnable>(10),
1035	>	new SimpleThreadFactory(),
1036	>	new NoOpREHandler());
1037		shouldThrow();
1038		} catch (IllegalArgumentException success) {}
1039		}
#	Line 974 | Line 1043 | public class ThreadPoolExecutorSubclassT
1043		*/
1044		public void testConstructorNullPointerException6() {
1045		try {
1046	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,null,new SimpleThreadFactory(),new NoOpREHandler());
1046	>	new CustomTPE(1, 2, 1L, SECONDS,
1047	>	null,
1048	>	new SimpleThreadFactory(),
1049	>	new NoOpREHandler());
1050		shouldThrow();
1051		} catch (NullPointerException success) {}
1052		}
#	Line 984 | Line 1056 | public class ThreadPoolExecutorSubclassT
1056		*/
1057		public void testConstructorNullPointerException7() {
1058		try {
1059	<	RejectedExecutionHandler r = null;
1060	<	new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10),new SimpleThreadFactory(),r);
1059	>	new CustomTPE(1, 2, 1L, SECONDS,
1060	>	new ArrayBlockingQueue<Runnable>(10),
1061	>	new SimpleThreadFactory(),
1062	>	(RejectedExecutionHandler) null);
1063		shouldThrow();
1064		} catch (NullPointerException success) {}
1065		}
#	Line 995 | Line 1069 | public class ThreadPoolExecutorSubclassT
1069		*/
1070		public void testConstructorNullPointerException8() {
1071		try {
1072	<	new CustomTPE(1, 2,
999	<	LONG_DELAY_MS, MILLISECONDS,
1072	>	new CustomTPE(1, 2, 1L, SECONDS,
1073		new ArrayBlockingQueue<Runnable>(10),
1074		(ThreadFactory) null,
1075		new NoOpREHandler());
#	Line 1174 | Line 1247 | public class ThreadPoolExecutorSubclassT
1247		* execute(null) throws NPE
1248		*/
1249		public void testExecuteNull() {
1250	<	ThreadPoolExecutor p = null;
1250	>	ThreadPoolExecutor p =
1251	>	new CustomTPE(1, 2, 1L, SECONDS,
1252	>	new ArrayBlockingQueue<Runnable>(10));
1253		try {
1179	–	p = new CustomTPE(1,2,LONG_DELAY_MS, MILLISECONDS,new ArrayBlockingQueue<Runnable>(10));
1254		p.execute(null);
1255		shouldThrow();
1256		} catch (NullPointerException success) {}
#	Line 1672 | Line 1746 | public class ThreadPoolExecutorSubclassT
1746		l.add(new StringTask());
1747		l.add(new StringTask());
1748		List<Future<String>> futures =
1749	<	e.invokeAll(l, MEDIUM_DELAY_MS, MILLISECONDS);
1749	>	e.invokeAll(l, LONG_DELAY_MS, MILLISECONDS);
1750		assertEquals(2, futures.size());
1751		for (Future<String> future : futures)
1752		assertSame(TEST_STRING, future.get());
#	Line 1687 | Line 1761 | public class ThreadPoolExecutorSubclassT
1761		public void testTimedInvokeAll6() throws Exception {
1762		ExecutorService e = new CustomTPE(2, 2, LONG_DELAY_MS, MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
1763		try {
1764	<	List<Callable<String>> l = new ArrayList<Callable<String>>();
1765	<	l.add(new StringTask());
1766	<	l.add(Executors.callable(new MediumPossiblyInterruptedRunnable(), TEST_STRING));
1767	<	l.add(new StringTask());
1768	<	List<Future<String>> futures =
1769	<	e.invokeAll(l, SHORT_DELAY_MS, MILLISECONDS);
1770	<	assertEquals(l.size(), futures.size());
1771	<	for (Future future : futures)
1772	<	assertTrue(future.isDone());
1773	<	assertFalse(futures.get(0).isCancelled());
1774	<	assertTrue(futures.get(1).isCancelled());
1764	>	for (long timeout = timeoutMillis();;) {
1765	>	List<Callable<String>> tasks = new ArrayList<>();
1766	>	tasks.add(new StringTask("0"));
1767	>	tasks.add(Executors.callable(new LongPossiblyInterruptedRunnable(), TEST_STRING));
1768	>	tasks.add(new StringTask("2"));
1769	>	long startTime = System.nanoTime();
1770	>	List<Future<String>> futures =
1771	>	e.invokeAll(tasks, timeout, MILLISECONDS);
1772	>	assertEquals(tasks.size(), futures.size());
1773	>	assertTrue(millisElapsedSince(startTime) >= timeout);
1774	>	for (Future future : futures)
1775	>	assertTrue(future.isDone());
1776	>	assertTrue(futures.get(1).isCancelled());
1777	>	try {
1778	>	assertEquals("0", futures.get(0).get());
1779	>	assertEquals("2", futures.get(2).get());
1780	>	break;
1781	>	} catch (CancellationException retryWithLongerTimeout) {
1782	>	timeout *= 2;
1783	>	if (timeout >= LONG_DELAY_MS / 2)
1784	>	fail("expected exactly one task to be cancelled");
1785	>	}
1786	>	}
1787		} finally {
1788		joinPool(e);
1789		}
#	Line 1740 | Line 1826 | public class ThreadPoolExecutorSubclassT
1826		* allowCoreThreadTimeOut(true) causes idle threads to time out
1827		*/
1828		public void testAllowCoreThreadTimeOut_true() throws Exception {
1829	<	long coreThreadTimeOut = SHORT_DELAY_MS;
1829	>	long keepAliveTime = timeoutMillis();
1830		final ThreadPoolExecutor p =
1831		new CustomTPE(2, 10,
1832	<	coreThreadTimeOut, MILLISECONDS,
1832	>	keepAliveTime, MILLISECONDS,
1833		new ArrayBlockingQueue<Runnable>(10));
1834		final CountDownLatch threadStarted = new CountDownLatch(1);
1835		try {
1836		p.allowCoreThreadTimeOut(true);
1837		p.execute(new CheckedRunnable() {
1838	<	public void realRun() throws InterruptedException {
1838	>	public void realRun() {
1839		threadStarted.countDown();
1840		assertEquals(1, p.getPoolSize());
1841		}});
1842		await(threadStarted);
1843	<	delay(coreThreadTimeOut);
1843	>	delay(keepAliveTime);
1844		long startTime = System.nanoTime();
1845		while (p.getPoolSize() > 0
1846		&& millisElapsedSince(startTime) < LONG_DELAY_MS)
#	Line 1770 | Line 1856 | public class ThreadPoolExecutorSubclassT
1856		* allowCoreThreadTimeOut(false) causes idle threads not to time out
1857		*/
1858		public void testAllowCoreThreadTimeOut_false() throws Exception {
1859	<	long coreThreadTimeOut = SHORT_DELAY_MS;
1859	>	long keepAliveTime = timeoutMillis();
1860		final ThreadPoolExecutor p =
1861		new CustomTPE(2, 10,
1862	<	coreThreadTimeOut, MILLISECONDS,
1862	>	keepAliveTime, MILLISECONDS,
1863		new ArrayBlockingQueue<Runnable>(10));
1864		final CountDownLatch threadStarted = new CountDownLatch(1);
1865		try {
#	Line 1783 | Line 1869 | public class ThreadPoolExecutorSubclassT
1869		threadStarted.countDown();
1870		assertTrue(p.getPoolSize() >= 1);
1871		}});
1872	<	delay(2 * coreThreadTimeOut);
1872	>	delay(2 * keepAliveTime);
1873		assertTrue(p.getPoolSize() >= 1);
1874		} finally {
1875		joinPool(p);
1876		}
1877		}
1878
1879	+	/**
1880	+	* get(cancelled task) throws CancellationException
1881	+	* (in part, a test of CustomTPE itself)
1882	+	*/
1883	+	public void testGet_cancelled() throws Exception {
1884	+	final ExecutorService e =
1885	+	new CustomTPE(1, 1,
1886	+	LONG_DELAY_MS, MILLISECONDS,
1887	+	new LinkedBlockingQueue<Runnable>());
1888	+	try {
1889	+	final CountDownLatch blockerStarted = new CountDownLatch(1);
1890	+	final CountDownLatch done = new CountDownLatch(1);
1891	+	final List<Future<?>> futures = new ArrayList<>();
1892	+	for (int i = 0; i < 2; i++) {
1893	+	Runnable r = new CheckedRunnable() { public void realRun()
1894	+	throws Throwable {
1895	+	blockerStarted.countDown();
1896	+	assertTrue(done.await(2 * LONG_DELAY_MS, MILLISECONDS));
1897	+	}};
1898	+	futures.add(e.submit(r));
1899	+	}
1900	+	assertTrue(blockerStarted.await(LONG_DELAY_MS, MILLISECONDS));
1901	+	for (Future<?> future : futures) future.cancel(false);
1902	+	for (Future<?> future : futures) {
1903	+	try {
1904	+	future.get();
1905	+	shouldThrow();
1906	+	} catch (CancellationException success) {}
1907	+	try {
1908	+	future.get(LONG_DELAY_MS, MILLISECONDS);
1909	+	shouldThrow();
1910	+	} catch (CancellationException success) {}
1911	+	assertTrue(future.isCancelled());
1912	+	assertTrue(future.isDone());
1913	+	}
1914	+	done.countDown();
1915	+	} finally {
1916	+	joinPool(e);
1917	+	}
1918	+	}
1919	+
1920		}

Diff Legend

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