ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/src/test/tck/ExecutorsTest.java

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.21 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.53 by jsr166, Sat Feb 1 17:44:35 2020 UTC

#	Line 1 | Line 1
1		/*
2		* Written by Doug Lea with assistance from members of JCP JSR-166
3		* Expert Group and released to the public domain, as explained at
4	<	* http://creativecommons.org/licenses/publicdomain
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9	+	import static java.util.concurrent.TimeUnit.MILLISECONDS;
10
11	<	import junit.framework.*;
12	<	import java.util.*;
13	<	import java.util.concurrent.*;
14	<	import java.math.BigInteger;
15	<	import java.security.*;
11	>	import java.security.AccessControlContext;
12	>	import java.security.AccessControlException;
13	>	import java.security.AccessController;
14	>	import java.security.PrivilegedAction;
15	>	import java.security.PrivilegedExceptionAction;
16	>	import java.util.ArrayList;
17	>	import java.util.List;
18	>	import java.util.concurrent.Callable;
19	>	import java.util.concurrent.CountDownLatch;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.Future;
23	>	import java.util.concurrent.ScheduledExecutorService;
24	>	import java.util.concurrent.ThreadPoolExecutor;
25
26	<	public class ExecutorsTest extends JSR166TestCase{
26	>	import junit.framework.Test;
27	>	import junit.framework.TestSuite;
28	>
29	>	public class ExecutorsTest extends JSR166TestCase {
30		public static void main(String[] args) {
31	<	junit.textui.TestRunner.run (suite());
31	>	main(suite(), args);
32		}
33		public static Test suite() {
34		return new TestSuite(ExecutorsTest.class);
35		}
36
24	–	static class TimedCallable<T> implements Callable<T> {
25	–	private final ExecutorService exec;
26	–	private final Callable<T> func;
27	–	private final long msecs;
28	–
29	–	TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
30	–	this.exec = exec;
31	–	this.func = func;
32	–	this.msecs = msecs;
33	–	}
34	–
35	–	public T call() throws Exception {
36	–	Future<T> ftask = exec.submit(func);
37	–	try {
38	–	return ftask.get(msecs, TimeUnit.MILLISECONDS);
39	–	} finally {
40	–	ftask.cancel(true);
41	–	}
42	–	}
43	–	}
44	–
45	–
46	–	private static class Fib implements Callable<BigInteger> {
47	–	private final BigInteger n;
48	–	Fib(long n) {
49	–	if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
50	–	this.n = BigInteger.valueOf(n);
51	–	}
52	–	public BigInteger call() {
53	–	BigInteger f1 = BigInteger.ONE;
54	–	BigInteger f2 = f1;
55	–	for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
56	–	BigInteger t = f1.add(f2);
57	–	f1 = f2;
58	–	f2 = t;
59	–	}
60	–	return f1;
61	–	}
62	–	};
63	–
37		/**
38		* A newCachedThreadPool can execute runnables
39		*/
40		public void testNewCachedThreadPool1() {
41	<	ExecutorService e = Executors.newCachedThreadPool();
42	<	e.execute(new NoOpRunnable());
43	<	e.execute(new NoOpRunnable());
44	<	e.execute(new NoOpRunnable());
45	<	joinPool(e);
41	>	final ExecutorService e = Executors.newCachedThreadPool();
42	>	try (PoolCleaner cleaner = cleaner(e)) {
43	>	e.execute(new NoOpRunnable());
44	>	e.execute(new NoOpRunnable());
45	>	e.execute(new NoOpRunnable());
46	>	}
47		}
48
49		/**
50		* A newCachedThreadPool with given ThreadFactory can execute runnables
51		*/
52		public void testNewCachedThreadPool2() {
53	<	ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
54	<	e.execute(new NoOpRunnable());
55	<	e.execute(new NoOpRunnable());
56	<	e.execute(new NoOpRunnable());
57	<	joinPool(e);
53	>	final ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
54	>	try (PoolCleaner cleaner = cleaner(e)) {
55	>	e.execute(new NoOpRunnable());
56	>	e.execute(new NoOpRunnable());
57	>	e.execute(new NoOpRunnable());
58	>	}
59		}
60
61		/**
#	Line 88 | Line 63 | public class ExecutorsTest extends JSR16
63		*/
64		public void testNewCachedThreadPool3() {
65		try {
66	<	ExecutorService e = Executors.newCachedThreadPool(null);
66	>	ExecutorService unused = Executors.newCachedThreadPool(null);
67		shouldThrow();
68	<	}
94	<	catch (NullPointerException success) {
95	<	}
68	>	} catch (NullPointerException success) {}
69		}
70
98	–
71		/**
72		* A new SingleThreadExecutor can execute runnables
73		*/
74		public void testNewSingleThreadExecutor1() {
75	<	ExecutorService e = Executors.newSingleThreadExecutor();
76	<	e.execute(new NoOpRunnable());
77	<	e.execute(new NoOpRunnable());
78	<	e.execute(new NoOpRunnable());
79	<	joinPool(e);
75	>	final ExecutorService e = Executors.newSingleThreadExecutor();
76	>	try (PoolCleaner cleaner = cleaner(e)) {
77	>	e.execute(new NoOpRunnable());
78	>	e.execute(new NoOpRunnable());
79	>	e.execute(new NoOpRunnable());
80	>	}
81		}
82
83		/**
84		* A new SingleThreadExecutor with given ThreadFactory can execute runnables
85		*/
86		public void testNewSingleThreadExecutor2() {
87	<	ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
88	<	e.execute(new NoOpRunnable());
89	<	e.execute(new NoOpRunnable());
90	<	e.execute(new NoOpRunnable());
91	<	joinPool(e);
87	>	final ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
88	>	try (PoolCleaner cleaner = cleaner(e)) {
89	>	e.execute(new NoOpRunnable());
90	>	e.execute(new NoOpRunnable());
91	>	e.execute(new NoOpRunnable());
92	>	}
93		}
94
95		/**
#	Line 123 | Line 97 | public class ExecutorsTest extends JSR16
97		*/
98		public void testNewSingleThreadExecutor3() {
99		try {
100	<	ExecutorService e = Executors.newSingleThreadExecutor(null);
100	>	ExecutorService unused = Executors.newSingleThreadExecutor(null);
101		shouldThrow();
102	<	}
129	<	catch (NullPointerException success) {
130	<	}
102	>	} catch (NullPointerException success) {}
103		}
104
105		/**
106		* A new SingleThreadExecutor cannot be casted to concrete implementation
107		*/
108		public void testCastNewSingleThreadExecutor() {
109	<	ExecutorService e = Executors.newSingleThreadExecutor();
110	<	try {
111	<	ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
112	<	} catch (ClassCastException success) {
113	<	} finally {
114	<	joinPool(e);
109	>	final ExecutorService e = Executors.newSingleThreadExecutor();
110	>	try (PoolCleaner cleaner = cleaner(e)) {
111	>	try {
112	>	ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
113	>	shouldThrow();
114	>	} catch (ClassCastException success) {}
115		}
116		}
117
146	–
118		/**
119		* A new newFixedThreadPool can execute runnables
120		*/
121		public void testNewFixedThreadPool1() {
122	<	ExecutorService e = Executors.newFixedThreadPool(2);
123	<	e.execute(new NoOpRunnable());
124	<	e.execute(new NoOpRunnable());
125	<	e.execute(new NoOpRunnable());
126	<	joinPool(e);
122	>	final ExecutorService e = Executors.newFixedThreadPool(2);
123	>	try (PoolCleaner cleaner = cleaner(e)) {
124	>	e.execute(new NoOpRunnable());
125	>	e.execute(new NoOpRunnable());
126	>	e.execute(new NoOpRunnable());
127	>	}
128		}
129
130		/**
131		* A new newFixedThreadPool with given ThreadFactory can execute runnables
132		*/
133		public void testNewFixedThreadPool2() {
134	<	ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
135	<	e.execute(new NoOpRunnable());
136	<	e.execute(new NoOpRunnable());
137	<	e.execute(new NoOpRunnable());
138	<	joinPool(e);
134	>	final ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
135	>	try (PoolCleaner cleaner = cleaner(e)) {
136	>	e.execute(new NoOpRunnable());
137	>	e.execute(new NoOpRunnable());
138	>	e.execute(new NoOpRunnable());
139	>	}
140		}
141
142		/**
143	<	* A new newFixedThreadPool with null ThreadFactory throws NPE
143	>	* A new newFixedThreadPool with null ThreadFactory throws
144	>	* NullPointerException
145		*/
146		public void testNewFixedThreadPool3() {
147		try {
148	<	ExecutorService e = Executors.newFixedThreadPool(2, null);
148	>	ExecutorService unused = Executors.newFixedThreadPool(2, null);
149		shouldThrow();
150	<	}
177	<	catch (NullPointerException success) {
178	<	}
150	>	} catch (NullPointerException success) {}
151		}
152
153		/**
154	<	* A new newFixedThreadPool with 0 threads throws IAE
154	>	* A new newFixedThreadPool with 0 threads throws IllegalArgumentException
155		*/
156		public void testNewFixedThreadPool4() {
157		try {
158	<	ExecutorService e = Executors.newFixedThreadPool(0);
158	>	ExecutorService unused = Executors.newFixedThreadPool(0);
159		shouldThrow();
160	<	}
189	<	catch (IllegalArgumentException success) {
190	<	}
160	>	} catch (IllegalArgumentException success) {}
161		}
162
193	–
163		/**
164		* An unconfigurable newFixedThreadPool can execute runnables
165		*/
166	<	public void testunconfigurableExecutorService() {
167	<	ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
168	<	e.execute(new NoOpRunnable());
169	<	e.execute(new NoOpRunnable());
170	<	e.execute(new NoOpRunnable());
171	<	joinPool(e);
166	>	public void testUnconfigurableExecutorService() {
167	>	final ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
168	>	try (PoolCleaner cleaner = cleaner(e)) {
169	>	e.execute(new NoOpRunnable());
170	>	e.execute(new NoOpRunnable());
171	>	e.execute(new NoOpRunnable());
172	>	}
173		}
174
175		/**
176		* unconfigurableExecutorService(null) throws NPE
177		*/
178	<	public void testunconfigurableExecutorServiceNPE() {
178	>	public void testUnconfigurableExecutorServiceNPE() {
179		try {
180	<	ExecutorService e = Executors.unconfigurableExecutorService(null);
181	<	}
182	<	catch (NullPointerException success) {
183	<	}
180	>	ExecutorService unused =
181	>	Executors.unconfigurableExecutorService(null);
182	>	shouldThrow();
183	>	} catch (NullPointerException success) {}
184		}
185
186		/**
187		* unconfigurableScheduledExecutorService(null) throws NPE
188		*/
189	<	public void testunconfigurableScheduledExecutorServiceNPE() {
189	>	public void testUnconfigurableScheduledExecutorServiceNPE() {
190		try {
191	<	ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
192	<	}
193	<	catch (NullPointerException success) {
194	<	}
191	>	ExecutorService unused =
192	>	Executors.unconfigurableScheduledExecutorService(null);
193	>	shouldThrow();
194	>	} catch (NullPointerException success) {}
195		}
196
227	–
197		/**
198		* a newSingleThreadScheduledExecutor successfully runs delayed task
199		*/
200	<	public void testNewSingleThreadScheduledExecutor() {
201	<	try {
202	<	TrackedCallable callable = new TrackedCallable();
203	<	ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
204	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
205	<	assertFalse(callable.done);
206	<	Thread.sleep(MEDIUM_DELAY_MS);
207	<	assertTrue(callable.done);
208	<	assertEquals(Boolean.TRUE, f.get());
209	<	joinPool(p1);
210	<	} catch (RejectedExecutionException e){}
211	<	catch (Exception e){
212	<	e.printStackTrace();
213	<	unexpectedException();
200	>	public void testNewSingleThreadScheduledExecutor() throws Exception {
201	>	final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
202	>	try (PoolCleaner cleaner = cleaner(p)) {
203	>	final CountDownLatch proceed = new CountDownLatch(1);
204	>	final Runnable task = new CheckedRunnable() {
205	>	public void realRun() {
206	>	await(proceed);
207	>	}};
208	>	long startTime = System.nanoTime();
209	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
210	>	timeoutMillis(), MILLISECONDS);
211	>	assertFalse(f.isDone());
212	>	proceed.countDown();
213	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
214	>	assertSame(Boolean.TRUE, f.get());
215	>	assertTrue(f.isDone());
216	>	assertFalse(f.isCancelled());
217	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
218		}
219		}
220
221		/**
222		* a newScheduledThreadPool successfully runs delayed task
223		*/
224	<	public void testnewScheduledThreadPool() {
225	<	try {
226	<	TrackedCallable callable = new TrackedCallable();
227	<	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
228	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
229	<	assertFalse(callable.done);
230	<	Thread.sleep(MEDIUM_DELAY_MS);
231	<	assertTrue(callable.done);
232	<	assertEquals(Boolean.TRUE, f.get());
233	<	joinPool(p1);
234	<	} catch (RejectedExecutionException e){}
235	<	catch (Exception e){
236	<	e.printStackTrace();
237	<	unexpectedException();
224	>	public void testNewScheduledThreadPool() throws Exception {
225	>	final ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
226	>	try (PoolCleaner cleaner = cleaner(p)) {
227	>	final CountDownLatch proceed = new CountDownLatch(1);
228	>	final Runnable task = new CheckedRunnable() {
229	>	public void realRun() {
230	>	await(proceed);
231	>	}};
232	>	long startTime = System.nanoTime();
233	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
234	>	timeoutMillis(), MILLISECONDS);
235	>	assertFalse(f.isDone());
236	>	proceed.countDown();
237	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
238	>	assertSame(Boolean.TRUE, f.get());
239	>	assertTrue(f.isDone());
240	>	assertFalse(f.isCancelled());
241	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
242		}
243		}
244
245		/**
246	<	* an unconfigurable  newScheduledThreadPool successfully runs delayed task
247	<	*/
248	<	public void testunconfigurableScheduledExecutorService() {
249	<	try {
250	<	TrackedCallable callable = new TrackedCallable();
251	<	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
252	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
253	<	assertFalse(callable.done);
254	<	Thread.sleep(MEDIUM_DELAY_MS);
255	<	assertTrue(callable.done);
256	<	assertEquals(Boolean.TRUE, f.get());
257	<	joinPool(p1);
258	<	} catch (RejectedExecutionException e){}
259	<	catch (Exception e){
260	<	e.printStackTrace();
261	<	unexpectedException();
246	>	* an unconfigurable newScheduledThreadPool successfully runs delayed task
247	>	*/
248	>	public void testUnconfigurableScheduledExecutorService() throws Exception {
249	>	final ScheduledExecutorService p =
250	>	Executors.unconfigurableScheduledExecutorService
251	>	(Executors.newScheduledThreadPool(2));
252	>	try (PoolCleaner cleaner = cleaner(p)) {
253	>	final CountDownLatch proceed = new CountDownLatch(1);
254	>	final Runnable task = new CheckedRunnable() {
255	>	public void realRun() {
256	>	await(proceed);
257	>	}};
258	>	long startTime = System.nanoTime();
259	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
260	>	timeoutMillis(), MILLISECONDS);
261	>	assertFalse(f.isDone());
262	>	proceed.countDown();
263	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
264	>	assertSame(Boolean.TRUE, f.get());
265	>	assertTrue(f.isDone());
266	>	assertFalse(f.isCancelled());
267	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
268		}
269		}
270
271		/**
272	<	*  timeouts from execute will time out if they compute too long.
273	<	*/
274	<	public void testTimedCallable() {
275	<	int N = 10000;
276	<	ExecutorService executor = Executors.newSingleThreadExecutor();
277	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
278	<	try {
279	<	long startTime = System.currentTimeMillis();
272	>	* Future.get on submitted tasks will time out if they compute too long.
273	>	*/
274	>	public void testTimedCallable() throws Exception {
275	>	final ExecutorService[] executors = {
276	>	Executors.newSingleThreadExecutor(),
277	>	Executors.newCachedThreadPool(),
278	>	Executors.newFixedThreadPool(2),
279	>	Executors.newScheduledThreadPool(2),
280	>	};
281
282	<	long i = 0;
283	<	while (tasks.size() < N) {
300	<	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
301	<	i += 10;
302	<	}
303	<
304	<	int iters = 0;
305	<	BigInteger sum = BigInteger.ZERO;
306	<	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
282	>	final Runnable sleeper = new CheckedRunnable() {
283	>	public void realRun() throws InterruptedException {
284		try {
285	<	++iters;
286	<	sum = sum.add(it.next().call());
310	<	}
311	<	catch (TimeoutException success) {
312	<	assertTrue(iters > 0);
313	<	return;
285	>	delay(LONG_DELAY_MS);
286	>	} catch (InterruptedException OK) {
287		}
288	<	catch (Exception e) {
289	<	unexpectedException();
290	<	}
291	<	}
292	<	// if by chance we didn't ever time out, total time must be small
293	<	long elapsed = System.currentTimeMillis() - startTime;
294	<	assertTrue(elapsed < N);
295	<	}
296	<	finally {
288	>	}};
289	>
290	>	List<Thread> threads = new ArrayList<>();
291	>	for (final ExecutorService executor : executors) {
292	>	threads.add(newStartedThread(new CheckedRunnable() {
293	>	public void realRun() {
294	>	Future future = executor.submit(sleeper);
295	>	assertFutureTimesOut(future);
296	>	}}));
297	>	}
298	>	for (Thread thread : threads)
299	>	awaitTermination(thread);
300	>	for (ExecutorService executor : executors)
301	>	executor.shutdownNow(); // assumes shutdownNow interrupts threads
302	>	for (ExecutorService executor : executors)
303		joinPool(executor);
325	–	}
304		}
305
328	–
306		/**
307		* ThreadPoolExecutor using defaultThreadFactory has
308		* specified group, priority, daemon status, and name
309		*/
310	<	public void testDefaultThreadFactory() {
310	>	public void testDefaultThreadFactory() throws Exception {
311		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
312	<	Runnable r = new Runnable() {
313	<	public void run() {
314	<	try {
315	<	Thread current = Thread.currentThread();
316	<	threadAssertTrue(!current.isDaemon());
317	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
318	<	ThreadGroup g = current.getThreadGroup();
319	<	SecurityManager s = System.getSecurityManager();
320	<	if (s != null)
321	<	threadAssertTrue(g == s.getThreadGroup());
322	<	else
323	<	threadAssertTrue(g == egroup);
324	<	String name = current.getName();
348	<	threadAssertTrue(name.endsWith("thread-1"));
349	<	} catch (SecurityException ok) {
350	<	// Also pass if not allowed to change setting
351	<	}
312	>	final CountDownLatch done = new CountDownLatch(1);
313	>	Runnable r = new CheckedRunnable() {
314	>	public void realRun() {
315	>	try {
316	>	Thread current = Thread.currentThread();
317	>	assertFalse(current.isDaemon());
318	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
319	>	SecurityManager s = System.getSecurityManager();
320	>	assertSame(current.getThreadGroup(),
321	>	(s == null) ? egroup : s.getThreadGroup());
322	>	assertTrue(current.getName().endsWith("thread-1"));
323	>	} catch (SecurityException ok) {
324	>	// Also pass if not allowed to change setting
325		}
326	<	};
326	>	done.countDown();
327	>	}};
328		ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
329	<
330	<	e.execute(r);
331	<	try {
358	<	e.shutdown();
359	<	} catch (SecurityException ok) {
360	<	}
361	<
362	<	try {
363	<	Thread.sleep(SHORT_DELAY_MS);
364	<	} catch (Exception eX) {
365	<	unexpectedException();
366	<	} finally {
367	<	joinPool(e);
329	>	try (PoolCleaner cleaner = cleaner(e)) {
330	>	e.execute(r);
331	>	await(done);
332		}
333		}
334
#	Line 373 | Line 337 | public class ExecutorsTest extends JSR16
337		* specified group, priority, daemon status, name,
338		* access control context and context class loader
339		*/
340	<	public void testPrivilegedThreadFactory() {
341	<	Policy savedPolicy = null;
342	<	try {
343	<	savedPolicy = Policy.getPolicy();
344	<	AdjustablePolicy policy = new AdjustablePolicy();
345	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
346	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
347	<	Policy.setPolicy(policy);
348	<	} catch (AccessControlException ok) {
349	<	return;
350	<	}
351	<	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
352	<	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
353	<	final AccessControlContext thisacc = AccessController.getContext();
354	<	Runnable r = new Runnable() {
355	<	public void run() {
356	<	try {
357	<	Thread current = Thread.currentThread();
358	<	threadAssertTrue(!current.isDaemon());
359	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
360	<	ThreadGroup g = current.getThreadGroup();
361	<	SecurityManager s = System.getSecurityManager();
362	<	if (s != null)
363	<	threadAssertTrue(g == s.getThreadGroup());
400	<	else
401	<	threadAssertTrue(g == egroup);
402	<	String name = current.getName();
403	<	threadAssertTrue(name.endsWith("thread-1"));
404	<	threadAssertTrue(thisccl == current.getContextClassLoader());
405	<	threadAssertTrue(thisacc.equals(AccessController.getContext()));
406	<	} catch (SecurityException ok) {
407	<	// Also pass if not allowed to change settings
408	<	}
340	>	public void testPrivilegedThreadFactory() throws Exception {
341	>	final CountDownLatch done = new CountDownLatch(1);
342	>	Runnable r = new CheckedRunnable() {
343	>	public void realRun() throws Exception {
344	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
345	>	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
346	>	final AccessControlContext thisacc = AccessController.getContext();
347	>	Runnable r = new CheckedRunnable() {
348	>	public void realRun() {
349	>	Thread current = Thread.currentThread();
350	>	assertFalse(current.isDaemon());
351	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
352	>	SecurityManager s = System.getSecurityManager();
353	>	assertSame(current.getThreadGroup(),
354	>	(s == null) ? egroup : s.getThreadGroup());
355	>	assertTrue(current.getName().endsWith("thread-1"));
356	>	assertSame(thisccl, current.getContextClassLoader());
357	>	assertEquals(thisacc, AccessController.getContext());
358	>	done.countDown();
359	>	}};
360	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
361	>	try (PoolCleaner cleaner = cleaner(e)) {
362	>	e.execute(r);
363	>	await(done);
364		}
365	<	};
411	<	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
365	>	}};
366
367	<	Policy.setPolicy(savedPolicy);
368	<	e.execute(r);
369	<	try {
370	<	e.shutdown();
371	<	} catch (SecurityException ok) {
418	<	}
419	<	try {
420	<	Thread.sleep(SHORT_DELAY_MS);
421	<	} catch (Exception ex) {
422	<	unexpectedException();
423	<	} finally {
424	<	joinPool(e);
425	<	}
367	>	runWithPermissions(r,
368	>	new RuntimePermission("getClassLoader"),
369	>	new RuntimePermission("setContextClassLoader"),
370	>	new RuntimePermission("modifyThread"));
371	>	}
372
373	+	boolean haveCCLPermissions() {
374	+	SecurityManager sm = System.getSecurityManager();
375	+	if (sm != null) {
376	+	try {
377	+	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
378	+	sm.checkPermission(new RuntimePermission("getClassLoader"));
379	+	} catch (AccessControlException e) {
380	+	return false;
381	+	}
382	+	}
383	+	return true;
384		}
385
386		void checkCCL() {
#	Line 441 | Line 398 | public class ExecutorsTest extends JSR16
398		}
399		}
400
444	–
401		/**
402		* Without class loader permissions, creating
403		* privilegedCallableUsingCurrentClassLoader throws ACE
404		*/
405		public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
406	<	Policy savedPolicy = null;
407	<	try {
408	<	savedPolicy = Policy.getPolicy();
409	<	AdjustablePolicy policy = new AdjustablePolicy();
410	<	Policy.setPolicy(policy);
411	<	} catch (AccessControlException ok) {
412	<	return;
413	<	}
414	<
459	<	// Check if program still has too many permissions to run test
460	<	try {
461	<	checkCCL();
462	<	// too many privileges to test; so return
463	<	Policy.setPolicy(savedPolicy);
464	<	return;
465	<	} catch (AccessControlException ok) {
466	<	}
406	>	Runnable r = new CheckedRunnable() {
407	>	public void realRun() throws Exception {
408	>	if (System.getSecurityManager() == null)
409	>	return;
410	>	try {
411	>	Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
412	>	shouldThrow();
413	>	} catch (AccessControlException success) {}
414	>	}};
415
416	<	try {
469	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
470	<	shouldThrow();
471	<	} catch (AccessControlException success) {
472	<	} catch (Exception ex) {
473	<	unexpectedException();
474	<	}
475	<	finally {
476	<	Policy.setPolicy(savedPolicy);
477	<	}
416	>	runWithoutPermissions(r);
417		}
418
419		/**
420		* With class loader permissions, calling
421		* privilegedCallableUsingCurrentClassLoader does not throw ACE
422		*/
423	<	public void testprivilegedCallableUsingCCLWithPrivs() {
424	<	Policy savedPolicy = null;
425	<	try {
426	<	savedPolicy = Policy.getPolicy();
427	<	AdjustablePolicy policy = new AdjustablePolicy();
428	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
429	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
430	<	Policy.setPolicy(policy);
431	<	} catch (AccessControlException ok) {
432	<	return;
433	<	}
495	<
496	<	try {
497	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
498	<	task.call();
499	<	} catch (Exception ex) {
500	<	unexpectedException();
501	<	}
502	<	finally {
503	<	Policy.setPolicy(savedPolicy);
504	<	}
423	>	public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
424	>	Runnable r = new CheckedRunnable() {
425	>	public void realRun() throws Exception {
426	>	Executors.privilegedCallableUsingCurrentClassLoader
427	>	(new NoOpCallable())
428	>	.call();
429	>	}};
430	>
431	>	runWithPermissions(r,
432	>	new RuntimePermission("getClassLoader"),
433	>	new RuntimePermission("setContextClassLoader"));
434		}
435
436		/**
437		* Without permissions, calling privilegedCallable throws ACE
438		*/
439	<	public void testprivilegedCallableWithNoPrivs() {
440	<	Callable task;
441	<	Policy savedPolicy = null;
442	<	AdjustablePolicy policy = null;
443	<	AccessControlContext noprivAcc = null;
444	<	try {
445	<	savedPolicy = Policy.getPolicy();
446	<	policy = new AdjustablePolicy();
447	<	Policy.setPolicy(policy);
448	<	noprivAcc = AccessController.getContext();
449	<	task = Executors.privilegedCallable(new CheckCCL());
450	<	Policy.setPolicy(savedPolicy);
451	<	} catch (AccessControlException ok) {
452	<	return; // program has too few permissions to set up test
453	<	}
454	<
455	<	// Make sure that program doesn't have too many permissions
456	<	try {
457	<	AccessController.doPrivileged(new PrivilegedAction() {
458	<	public Object run() {
459	<	checkCCL();
460	<	return null;
461	<	}}, noprivAcc);
462	<	// too many permssions; skip test
463	<	return;
464	<	} catch (AccessControlException ok) {
465	<	}
466	<
467	<	try {
468	<	task.call();
469	<	shouldThrow();
470	<	} catch (AccessControlException success) {
471	<	} catch (Exception ex) {
472	<	unexpectedException();
473	<	}
439	>	public void testPrivilegedCallableWithNoPrivs() throws Exception {
440	>	// Avoid classloader-related SecurityExceptions in swingui.TestRunner
441	>	Executors.privilegedCallable(new CheckCCL());
442	>
443	>	Runnable r = new CheckedRunnable() {
444	>	public void realRun() throws Exception {
445	>	if (System.getSecurityManager() == null)
446	>	return;
447	>	Callable task = Executors.privilegedCallable(new CheckCCL());
448	>	try {
449	>	task.call();
450	>	shouldThrow();
451	>	} catch (AccessControlException success) {}
452	>	}};
453	>
454	>	runWithoutPermissions(r);
455	>
456	>	// It seems rather difficult to test that the
457	>	// AccessControlContext of the privilegedCallable is used
458	>	// instead of its caller.  Below is a failed attempt to do
459	>	// that, which does not work because the AccessController
460	>	// cannot capture the internal state of the current Policy.
461	>	// It would be much more work to differentiate based on,
462	>	// e.g. CodeSource.
463	>
464	>	//         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
465	>	//         final Callable[] task = new Callable[1];
466	>
467	>	//         runWithPermissions
468	>	//             (new CheckedRunnable() {
469	>	//                 public void realRun() {
470	>	//                     if (System.getSecurityManager() == null)
471	>	//                         return;
472	>	//                     noprivAcc[0] = AccessController.getContext();
473	>	//                     task[0] = Executors.privilegedCallable(new CheckCCL());
474	>	//                     try {
475	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
476	>	//                                                           public Void run() {
477	>	//                                                               checkCCL();
478	>	//                                                               return null;
479	>	//                                                           }}, noprivAcc[0]);
480	>	//                         shouldThrow();
481	>	//                     } catch (AccessControlException success) {}
482	>	//                 }});
483	>
484	>	//         runWithPermissions
485	>	//             (new CheckedRunnable() {
486	>	//                 public void realRun() throws Exception {
487	>	//                     if (System.getSecurityManager() == null)
488	>	//                         return;
489	>	//                     // Verify that we have an underprivileged ACC
490	>	//                     try {
491	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
492	>	//                                                           public Void run() {
493	>	//                                                               checkCCL();
494	>	//                                                               return null;
495	>	//                                                           }}, noprivAcc[0]);
496	>	//                         shouldThrow();
497	>	//                     } catch (AccessControlException success) {}
498	>
499	>	//                     try {
500	>	//                         task[0].call();
501	>	//                         shouldThrow();
502	>	//                     } catch (AccessControlException success) {}
503	>	//                 }},
504	>	//              new RuntimePermission("getClassLoader"),
505	>	//              new RuntimePermission("setContextClassLoader"));
506		}
507
508		/**
509		* With permissions, calling privilegedCallable succeeds
510		*/
511	<	public void testprivilegedCallableWithPrivs() {
512	<	Policy savedPolicy = null;
513	<	try {
514	<	savedPolicy = Policy.getPolicy();
515	<	AdjustablePolicy policy = new AdjustablePolicy();
516	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
517	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
518	<	Policy.setPolicy(policy);
519	<	} catch (AccessControlException ok) {
559	<	return;
560	<	}
561	<
562	<	Callable task = Executors.privilegedCallable(new CheckCCL());
563	<	try {
564	<	task.call();
565	<	} catch (Exception ex) {
566	<	unexpectedException();
567	<	} finally {
568	<	Policy.setPolicy(savedPolicy);
569	<	}
511	>	public void testPrivilegedCallableWithPrivs() throws Exception {
512	>	Runnable r = new CheckedRunnable() {
513	>	public void realRun() throws Exception {
514	>	Executors.privilegedCallable(new CheckCCL()).call();
515	>	}};
516	>
517	>	runWithPermissions(r,
518	>	new RuntimePermission("getClassLoader"),
519	>	new RuntimePermission("setContextClassLoader"));
520		}
521
522		/**
523		* callable(Runnable) returns null when called
524		*/
525	<	public void testCallable1() {
526	<	try {
527	<	Callable c = Executors.callable(new NoOpRunnable());
578	<	assertNull(c.call());
579	<	} catch (Exception ex) {
580	<	unexpectedException();
581	<	}
582	<
525	>	public void testCallable1() throws Exception {
526	>	Callable c = Executors.callable(new NoOpRunnable());
527	>	assertNull(c.call());
528		}
529
530		/**
531		* callable(Runnable, result) returns result when called
532		*/
533	<	public void testCallable2() {
534	<	try {
535	<	Callable c = Executors.callable(new NoOpRunnable(), one);
591	<	assertEquals(one, c.call());
592	<	} catch (Exception ex) {
593	<	unexpectedException();
594	<	}
533	>	public void testCallable2() throws Exception {
534	>	Callable c = Executors.callable(new NoOpRunnable(), one);
535	>	assertSame(one, c.call());
536		}
537
538		/**
539		* callable(PrivilegedAction) returns its result when called
540		*/
541	<	public void testCallable3() {
542	<	try {
543	<	Callable c = Executors.callable(new PrivilegedAction() {
544	<	public Object run() { return one; }});
604	<	assertEquals(one, c.call());
605	<	} catch (Exception ex) {
606	<	unexpectedException();
607	<	}
541	>	public void testCallable3() throws Exception {
542	>	Callable c = Executors.callable(new PrivilegedAction() {
543	>	public Object run() { return one; }});
544	>	assertSame(one, c.call());
545		}
546
547		/**
548		* callable(PrivilegedExceptionAction) returns its result when called
549		*/
550	<	public void testCallable4() {
551	<	try {
552	<	Callable c = Executors.callable(new PrivilegedExceptionAction() {
553	<	public Object run() { return one; }});
617	<	assertEquals(one, c.call());
618	<	} catch (Exception ex) {
619	<	unexpectedException();
620	<	}
550	>	public void testCallable4() throws Exception {
551	>	Callable c = Executors.callable(new PrivilegedExceptionAction() {
552	>	public Object run() { return one; }});
553	>	assertSame(one, c.call());
554		}
555
623	–
556		/**
557		* callable(null Runnable) throws NPE
558		*/
559		public void testCallableNPE1() {
560		try {
561	<	Runnable r = null;
562	<	Callable c = Executors.callable(r);
563	<	} catch (NullPointerException success) {
632	<	}
561	>	Callable unused = Executors.callable((Runnable) null);
562	>	shouldThrow();
563	>	} catch (NullPointerException success) {}
564		}
565
566		/**
#	Line 637 | Line 568 | public class ExecutorsTest extends JSR16
568		*/
569		public void testCallableNPE2() {
570		try {
571	<	Runnable r = null;
572	<	Callable c = Executors.callable(r, one);
573	<	} catch (NullPointerException success) {
643	<	}
571	>	Callable unused = Executors.callable((Runnable) null, one);
572	>	shouldThrow();
573	>	} catch (NullPointerException success) {}
574		}
575
576		/**
#	Line 648 | Line 578 | public class ExecutorsTest extends JSR16
578		*/
579		public void testCallableNPE3() {
580		try {
581	<	PrivilegedAction r = null;
582	<	Callable c = Executors.callable(r);
583	<	} catch (NullPointerException success) {
654	<	}
581	>	Callable unused = Executors.callable((PrivilegedAction) null);
582	>	shouldThrow();
583	>	} catch (NullPointerException success) {}
584		}
585
586		/**
#	Line 659 | Line 588 | public class ExecutorsTest extends JSR16
588		*/
589		public void testCallableNPE4() {
590		try {
591	<	PrivilegedExceptionAction r = null;
592	<	Callable c = Executors.callable(r);
593	<	} catch (NullPointerException success) {
591	>	Callable unused = Executors.callable((PrivilegedExceptionAction) null);
592	>	shouldThrow();
593	>	} catch (NullPointerException success) {}
594	>	}
595	>
596	>	/**
597	>	* callable(runnable, x).toString() contains toString of wrapped task
598	>	*/
599	>	public void testCallable_withResult_toString() {
600	>	if (testImplementationDetails) {
601	>	Runnable r = () -> {};
602	>	Callable<String> c = Executors.callable(r, "");
603	>	assertEquals(
604	>	identityString(c) + "[Wrapped task = " + r.toString() + "]",
605	>	c.toString());
606		}
607		}
608
609	+	/**
610	+	* callable(runnable).toString() contains toString of wrapped task
611	+	*/
612	+	public void testCallable_toString() {
613	+	if (testImplementationDetails) {
614	+	Runnable r = () -> {};
615	+	Callable<Object> c = Executors.callable(r);
616	+	assertEquals(
617	+	identityString(c) + "[Wrapped task = " + r.toString() + "]",
618	+	c.toString());
619	+	}
620	+	}
621
622	+	/**
623	+	* privilegedCallable(callable).toString() contains toString of wrapped task
624	+	*/
625	+	public void testPrivilegedCallable_toString() {
626	+	if (testImplementationDetails) {
627	+	Callable<String> c = () -> "";
628	+	Callable<String> priv = Executors.privilegedCallable(c);
629	+	assertEquals(
630	+	identityString(priv) + "[Wrapped task = " + c.toString() + "]",
631	+	priv.toString());
632	+	}
633	+	}
634	+
635	+	/**
636	+	* privilegedCallableUsingCurrentClassLoader(callable).toString()
637	+	* contains toString of wrapped task
638	+	*/
639	+	public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
640	+	if (testImplementationDetails) {
641	+	Callable<String> c = () -> "";
642	+	Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
643	+	assertEquals(
644	+	identityString(priv) + "[Wrapped task = " + c.toString() + "]",
645	+	priv.toString());
646	+	}
647	+	}
648		}

Diff Legend

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