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.24 by jsr166, Fri Nov 20 22:58:48 2009 UTC vs.
Revision 1.54 by jsr166, Sat Feb 1 18:52:17 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	>	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		} catch (NullPointerException success) {}
69		}
70
96	–
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 121 | 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		} catch (NullPointerException success) {}
103		}
#	Line 130 | Line 106 | public class ExecutorsTest extends JSR16
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	<	shouldThrow();
113	<	} catch (ClassCastException success) {
114	<	} finally {
139	<	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
143	–
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		} 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		} catch (IllegalArgumentException success) {}
161		}
162
186	–
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);
180	>	ExecutorService unused =
181	>	Executors.unconfigurableExecutorService(null);
182		shouldThrow();
183		} catch (NullPointerException success) {}
184		}
#	Line 208 | Line 186 | public class ExecutorsTest extends JSR16
186		/**
187		* unconfigurableScheduledExecutorService(null) throws NPE
188		*/
189	<	public void testunconfigurableScheduledExecutorServiceNPE() {
189	>	public void testUnconfigurableScheduledExecutorServiceNPE() {
190		try {
191	<	ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
191	>	ExecutorService unused =
192	>	Executors.unconfigurableScheduledExecutorService(null);
193		shouldThrow();
194		} catch (NullPointerException success) {}
195		}
196
218	–
197		/**
198		* a newSingleThreadScheduledExecutor successfully runs delayed task
199		*/
200		public void testNewSingleThreadScheduledExecutor() throws Exception {
201	<	TrackedCallable callable = new TrackedCallable();
202	<	ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
203	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
204	<	assertFalse(callable.done);
205	<	Thread.sleep(MEDIUM_DELAY_MS);
206	<	assertTrue(callable.done);
207	<	assertEquals(Boolean.TRUE, f.get());
208	<	joinPool(p1);
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() throws Exception {
225	<	TrackedCallable callable = new TrackedCallable();
226	<	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
227	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
228	<	assertFalse(callable.done);
229	<	Thread.sleep(MEDIUM_DELAY_MS);
230	<	assertTrue(callable.done);
231	<	assertEquals(Boolean.TRUE, f.get());
232	<	joinPool(p1);
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() throws Exception {
249	<	TrackedCallable callable = new TrackedCallable();
250	<	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
251	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
252	<	assertFalse(callable.done);
253	<	Thread.sleep(MEDIUM_DELAY_MS);
254	<	assertTrue(callable.done);
255	<	assertEquals(Boolean.TRUE, f.get());
256	<	joinPool(p1);
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.
272	>	* Future.get on submitted tasks will time out if they compute too long.
273		*/
274		public void testTimedCallable() throws Exception {
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();
280	<
281	<	long i = 0;
282	<	while (tasks.size() < N) {
283	<	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
284	<	i += 10;
285	<	}
286	<
287	<	int iters = 0;
288	<	BigInteger sum = BigInteger.ZERO;
289	<	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
290	<	try {
291	<	++iters;
292	<	sum = sum.add(it.next().call());
293	<	}
294	<	catch (TimeoutException success) {
295	<	assertTrue(iters > 0);
296	<	return;
297	<	}
298	<	}
299	<	// if by chance we didn't ever time out, total time must be small
300	<	long elapsed = System.currentTimeMillis() - startTime;
291	<	assertTrue(elapsed < N);
292	<	}
293	<	finally {
275	>	final ExecutorService[] executors = {
276	>	Executors.newSingleThreadExecutor(),
277	>	Executors.newCachedThreadPool(),
278	>	Executors.newFixedThreadPool(2),
279	>	Executors.newScheduledThreadPool(2),
280	>	};
281	>
282	>	final CountDownLatch done = new CountDownLatch(1);
283	>
284	>	final Runnable sleeper = new CheckedRunnable() {
285	>	public void realRun() throws InterruptedException {
286	>	done.await(LONG_DELAY_MS, MILLISECONDS);
287	>	}};
288	>
289	>	List<Thread> threads = new ArrayList<>();
290	>	for (final ExecutorService executor : executors) {
291	>	threads.add(newStartedThread(new CheckedRunnable() {
292	>	public void realRun() {
293	>	Future future = executor.submit(sleeper);
294	>	assertFutureTimesOut(future);
295	>	}}));
296	>	}
297	>	for (Thread thread : threads)
298	>	awaitTermination(thread);
299	>	done.countDown();
300	>	for (ExecutorService executor : executors)
301		joinPool(executor);
295	–	}
302		}
303
298	–
304		/**
305		* ThreadPoolExecutor using defaultThreadFactory has
306		* specified group, priority, daemon status, and name
307		*/
308		public void testDefaultThreadFactory() throws Exception {
309		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
310	<	Runnable r = new Runnable() {
311	<	public void run() {
312	<	try {
313	<	Thread current = Thread.currentThread();
314	<	threadAssertTrue(!current.isDaemon());
315	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
316	<	ThreadGroup g = current.getThreadGroup();
317	<	SecurityManager s = System.getSecurityManager();
318	<	if (s != null)
319	<	threadAssertTrue(g == s.getThreadGroup());
320	<	else
321	<	threadAssertTrue(g == egroup);
322	<	String name = current.getName();
318	<	threadAssertTrue(name.endsWith("thread-1"));
319	<	} catch (SecurityException ok) {
320	<	// Also pass if not allowed to change setting
321	<	}
310	>	final CountDownLatch done = new CountDownLatch(1);
311	>	Runnable r = new CheckedRunnable() {
312	>	public void realRun() {
313	>	try {
314	>	Thread current = Thread.currentThread();
315	>	assertFalse(current.isDaemon());
316	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
317	>	SecurityManager s = System.getSecurityManager();
318	>	assertSame(current.getThreadGroup(),
319	>	(s == null) ? egroup : s.getThreadGroup());
320	>	assertTrue(current.getName().endsWith("thread-1"));
321	>	} catch (SecurityException ok) {
322	>	// Also pass if not allowed to change setting
323		}
324	<	};
324	>	done.countDown();
325	>	}};
326		ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
327	<
328	<	e.execute(r);
329	<	try {
328	<	e.shutdown();
329	<	} catch (SecurityException ok) {
330	<	}
331	<
332	<	try {
333	<	Thread.sleep(SHORT_DELAY_MS);
334	<	} finally {
335	<	joinPool(e);
327	>	try (PoolCleaner cleaner = cleaner(e)) {
328	>	e.execute(r);
329	>	await(done);
330		}
331		}
332
#	Line 342 | Line 336 | public class ExecutorsTest extends JSR16
336		* access control context and context class loader
337		*/
338		public void testPrivilegedThreadFactory() throws Exception {
339	<	Policy savedPolicy = null;
340	<	try {
341	<	savedPolicy = Policy.getPolicy();
342	<	AdjustablePolicy policy = new AdjustablePolicy();
343	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
344	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
345	<	Policy.setPolicy(policy);
346	<	} catch (AccessControlException ok) {
347	<	return;
348	<	}
349	<	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
350	<	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
351	<	final AccessControlContext thisacc = AccessController.getContext();
352	<	Runnable r = new Runnable() {
353	<	public void run() {
354	<	try {
355	<	Thread current = Thread.currentThread();
356	<	threadAssertTrue(!current.isDaemon());
357	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
358	<	ThreadGroup g = current.getThreadGroup();
359	<	SecurityManager s = System.getSecurityManager();
360	<	if (s != null)
361	<	threadAssertTrue(g == s.getThreadGroup());
368	<	else
369	<	threadAssertTrue(g == egroup);
370	<	String name = current.getName();
371	<	threadAssertTrue(name.endsWith("thread-1"));
372	<	threadAssertTrue(thisccl == current.getContextClassLoader());
373	<	threadAssertTrue(thisacc.equals(AccessController.getContext()));
374	<	} catch (SecurityException ok) {
375	<	// Also pass if not allowed to change settings
376	<	}
339	>	final CountDownLatch done = new CountDownLatch(1);
340	>	Runnable r = new CheckedRunnable() {
341	>	public void realRun() throws Exception {
342	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
343	>	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
344	>	final AccessControlContext thisacc = AccessController.getContext();
345	>	Runnable r = new CheckedRunnable() {
346	>	public void realRun() {
347	>	Thread current = Thread.currentThread();
348	>	assertFalse(current.isDaemon());
349	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
350	>	SecurityManager s = System.getSecurityManager();
351	>	assertSame(current.getThreadGroup(),
352	>	(s == null) ? egroup : s.getThreadGroup());
353	>	assertTrue(current.getName().endsWith("thread-1"));
354	>	assertSame(thisccl, current.getContextClassLoader());
355	>	assertEquals(thisacc, AccessController.getContext());
356	>	done.countDown();
357	>	}};
358	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
359	>	try (PoolCleaner cleaner = cleaner(e)) {
360	>	e.execute(r);
361	>	await(done);
362		}
363	<	};
379	<	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
363	>	}};
364
365	<	Policy.setPolicy(savedPolicy);
366	<	e.execute(r);
367	<	try {
368	<	e.shutdown();
369	<	} catch (SecurityException ok) {
386	<	}
387	<	try {
388	<	Thread.sleep(SHORT_DELAY_MS);
389	<	} finally {
390	<	joinPool(e);
391	<	}
365	>	runWithPermissions(r,
366	>	new RuntimePermission("getClassLoader"),
367	>	new RuntimePermission("setContextClassLoader"),
368	>	new RuntimePermission("modifyThread"));
369	>	}
370
371	+	boolean haveCCLPermissions() {
372	+	SecurityManager sm = System.getSecurityManager();
373	+	if (sm != null) {
374	+	try {
375	+	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
376	+	sm.checkPermission(new RuntimePermission("getClassLoader"));
377	+	} catch (AccessControlException e) {
378	+	return false;
379	+	}
380	+	}
381	+	return true;
382		}
383
384		void checkCCL() {
#	Line 407 | Line 396 | public class ExecutorsTest extends JSR16
396		}
397		}
398
410	–
399		/**
400		* Without class loader permissions, creating
401		* privilegedCallableUsingCurrentClassLoader throws ACE
402		*/
403		public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
404	<	Policy savedPolicy = null;
405	<	try {
406	<	savedPolicy = Policy.getPolicy();
407	<	AdjustablePolicy policy = new AdjustablePolicy();
408	<	Policy.setPolicy(policy);
409	<	} catch (AccessControlException ok) {
410	<	return;
411	<	}
412	<
425	<	// Check if program still has too many permissions to run test
426	<	try {
427	<	checkCCL();
428	<	// too many privileges to test; so return
429	<	Policy.setPolicy(savedPolicy);
430	<	return;
431	<	} catch (AccessControlException ok) {
432	<	}
404	>	Runnable r = new CheckedRunnable() {
405	>	public void realRun() throws Exception {
406	>	if (System.getSecurityManager() == null)
407	>	return;
408	>	try {
409	>	Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
410	>	shouldThrow();
411	>	} catch (AccessControlException success) {}
412	>	}};
413
414	<	try {
435	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
436	<	shouldThrow();
437	<	} catch (AccessControlException success) {
438	<	} finally {
439	<	Policy.setPolicy(savedPolicy);
440	<	}
414	>	runWithoutPermissions(r);
415		}
416
417		/**
418		* With class loader permissions, calling
419		* privilegedCallableUsingCurrentClassLoader does not throw ACE
420		*/
421	<	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
422	<	Policy savedPolicy = null;
423	<	try {
424	<	savedPolicy = Policy.getPolicy();
425	<	AdjustablePolicy policy = new AdjustablePolicy();
426	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
427	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
428	<	Policy.setPolicy(policy);
429	<	} catch (AccessControlException ok) {
430	<	return;
431	<	}
458	<
459	<	try {
460	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
461	<	task.call();
462	<	}
463	<	finally {
464	<	Policy.setPolicy(savedPolicy);
465	<	}
421	>	public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
422	>	Runnable r = new CheckedRunnable() {
423	>	public void realRun() throws Exception {
424	>	Executors.privilegedCallableUsingCurrentClassLoader
425	>	(new NoOpCallable())
426	>	.call();
427	>	}};
428	>
429	>	runWithPermissions(r,
430	>	new RuntimePermission("getClassLoader"),
431	>	new RuntimePermission("setContextClassLoader"));
432		}
433
434		/**
435		* Without permissions, calling privilegedCallable throws ACE
436		*/
437	<	public void testprivilegedCallableWithNoPrivs() throws Exception {
438	<	Callable task;
439	<	Policy savedPolicy = null;
440	<	AdjustablePolicy policy = null;
441	<	AccessControlContext noprivAcc = null;
442	<	try {
443	<	savedPolicy = Policy.getPolicy();
444	<	policy = new AdjustablePolicy();
445	<	Policy.setPolicy(policy);
446	<	noprivAcc = AccessController.getContext();
447	<	task = Executors.privilegedCallable(new CheckCCL());
448	<	Policy.setPolicy(savedPolicy);
449	<	} catch (AccessControlException ok) {
450	<	return; // program has too few permissions to set up test
451	<	}
452	<
453	<	// Make sure that program doesn't have too many permissions
454	<	try {
455	<	AccessController.doPrivileged(new PrivilegedAction() {
456	<	public Object run() {
457	<	checkCCL();
458	<	return null;
459	<	}}, noprivAcc);
460	<	// too many permssions; skip test
461	<	return;
462	<	} catch (AccessControlException ok) {
463	<	}
464	<
465	<	try {
466	<	task.call();
467	<	shouldThrow();
468	<	} catch (AccessControlException success) {}
437	>	public void testPrivilegedCallableWithNoPrivs() throws Exception {
438	>	// Avoid classloader-related SecurityExceptions in swingui.TestRunner
439	>	Executors.privilegedCallable(new CheckCCL());
440	>
441	>	Runnable r = new CheckedRunnable() {
442	>	public void realRun() throws Exception {
443	>	if (System.getSecurityManager() == null)
444	>	return;
445	>	Callable task = Executors.privilegedCallable(new CheckCCL());
446	>	try {
447	>	task.call();
448	>	shouldThrow();
449	>	} catch (AccessControlException success) {}
450	>	}};
451	>
452	>	runWithoutPermissions(r);
453	>
454	>	// It seems rather difficult to test that the
455	>	// AccessControlContext of the privilegedCallable is used
456	>	// instead of its caller.  Below is a failed attempt to do
457	>	// that, which does not work because the AccessController
458	>	// cannot capture the internal state of the current Policy.
459	>	// It would be much more work to differentiate based on,
460	>	// e.g. CodeSource.
461	>
462	>	//         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
463	>	//         final Callable[] task = new Callable[1];
464	>
465	>	//         runWithPermissions
466	>	//             (new CheckedRunnable() {
467	>	//                 public void realRun() {
468	>	//                     if (System.getSecurityManager() == null)
469	>	//                         return;
470	>	//                     noprivAcc[0] = AccessController.getContext();
471	>	//                     task[0] = Executors.privilegedCallable(new CheckCCL());
472	>	//                     try {
473	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
474	>	//                                                           public Void run() {
475	>	//                                                               checkCCL();
476	>	//                                                               return null;
477	>	//                                                           }}, noprivAcc[0]);
478	>	//                         shouldThrow();
479	>	//                     } catch (AccessControlException success) {}
480	>	//                 }});
481	>
482	>	//         runWithPermissions
483	>	//             (new CheckedRunnable() {
484	>	//                 public void realRun() throws Exception {
485	>	//                     if (System.getSecurityManager() == null)
486	>	//                         return;
487	>	//                     // Verify that we have an underprivileged ACC
488	>	//                     try {
489	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
490	>	//                                                           public Void run() {
491	>	//                                                               checkCCL();
492	>	//                                                               return null;
493	>	//                                                           }}, noprivAcc[0]);
494	>	//                         shouldThrow();
495	>	//                     } catch (AccessControlException success) {}
496	>
497	>	//                     try {
498	>	//                         task[0].call();
499	>	//                         shouldThrow();
500	>	//                     } catch (AccessControlException success) {}
501	>	//                 }},
502	>	//              new RuntimePermission("getClassLoader"),
503	>	//              new RuntimePermission("setContextClassLoader"));
504		}
505
506		/**
507		* With permissions, calling privilegedCallable succeeds
508		*/
509	<	public void testprivilegedCallableWithPrivs() throws Exception {
510	<	Policy savedPolicy = null;
511	<	try {
512	<	savedPolicy = Policy.getPolicy();
513	<	AdjustablePolicy policy = new AdjustablePolicy();
514	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
515	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
516	<	Policy.setPolicy(policy);
517	<	} catch (AccessControlException ok) {
517	<	return;
518	<	}
519	<
520	<	Callable task = Executors.privilegedCallable(new CheckCCL());
521	<	try {
522	<	task.call();
523	<	} finally {
524	<	Policy.setPolicy(savedPolicy);
525	<	}
509	>	public void testPrivilegedCallableWithPrivs() throws Exception {
510	>	Runnable r = new CheckedRunnable() {
511	>	public void realRun() throws Exception {
512	>	Executors.privilegedCallable(new CheckCCL()).call();
513	>	}};
514	>
515	>	runWithPermissions(r,
516	>	new RuntimePermission("getClassLoader"),
517	>	new RuntimePermission("setContextClassLoader"));
518		}
519
520		/**
#	Line 538 | Line 530 | public class ExecutorsTest extends JSR16
530		*/
531		public void testCallable2() throws Exception {
532		Callable c = Executors.callable(new NoOpRunnable(), one);
533	<	assertEquals(one, c.call());
533	>	assertSame(one, c.call());
534		}
535
536		/**
#	Line 547 | Line 539 | public class ExecutorsTest extends JSR16
539		public void testCallable3() throws Exception {
540		Callable c = Executors.callable(new PrivilegedAction() {
541		public Object run() { return one; }});
542	<	assertEquals(one, c.call());
542	>	assertSame(one, c.call());
543		}
544
545		/**
#	Line 556 | Line 548 | public class ExecutorsTest extends JSR16
548		public void testCallable4() throws Exception {
549		Callable c = Executors.callable(new PrivilegedExceptionAction() {
550		public Object run() { return one; }});
551	<	assertEquals(one, c.call());
551	>	assertSame(one, c.call());
552		}
553
562	–
554		/**
555		* callable(null Runnable) throws NPE
556		*/
557		public void testCallableNPE1() {
558		try {
559	<	Callable c = Executors.callable((Runnable) null);
559	>	Callable unused = Executors.callable((Runnable) null);
560		shouldThrow();
561		} catch (NullPointerException success) {}
562		}
#	Line 575 | Line 566 | public class ExecutorsTest extends JSR16
566		*/
567		public void testCallableNPE2() {
568		try {
569	<	Callable c = Executors.callable((Runnable) null, one);
569	>	Callable unused = Executors.callable((Runnable) null, one);
570		shouldThrow();
571		} catch (NullPointerException success) {}
572		}
#	Line 585 | Line 576 | public class ExecutorsTest extends JSR16
576		*/
577		public void testCallableNPE3() {
578		try {
579	<	Callable c = Executors.callable((PrivilegedAction) null);
579	>	Callable unused = Executors.callable((PrivilegedAction) null);
580		shouldThrow();
581		} catch (NullPointerException success) {}
582		}
#	Line 595 | Line 586 | public class ExecutorsTest extends JSR16
586		*/
587		public void testCallableNPE4() {
588		try {
589	<	Callable c = Executors.callable((PrivilegedExceptionAction) null);
589	>	Callable unused = Executors.callable((PrivilegedExceptionAction) null);
590		shouldThrow();
591		} catch (NullPointerException success) {}
592		}
593
594	+	/**
595	+	* callable(runnable, x).toString() contains toString of wrapped task
596	+	*/
597	+	public void testCallable_withResult_toString() {
598	+	if (testImplementationDetails) {
599	+	Runnable r = () -> {};
600	+	Callable<String> c = Executors.callable(r, "");
601	+	assertEquals(
602	+	identityString(c) + "[Wrapped task = " + r.toString() + "]",
603	+	c.toString());
604	+	}
605	+	}
606	+
607	+	/**
608	+	* callable(runnable).toString() contains toString of wrapped task
609	+	*/
610	+	public void testCallable_toString() {
611	+	if (testImplementationDetails) {
612	+	Runnable r = () -> {};
613	+	Callable<Object> c = Executors.callable(r);
614	+	assertEquals(
615	+	identityString(c) + "[Wrapped task = " + r.toString() + "]",
616	+	c.toString());
617	+	}
618	+	}
619	+
620	+	/**
621	+	* privilegedCallable(callable).toString() contains toString of wrapped task
622	+	*/
623	+	public void testPrivilegedCallable_toString() {
624	+	if (testImplementationDetails) {
625	+	Callable<String> c = () -> "";
626	+	Callable<String> priv = Executors.privilegedCallable(c);
627	+	assertEquals(
628	+	identityString(priv) + "[Wrapped task = " + c.toString() + "]",
629	+	priv.toString());
630	+	}
631	+	}
632
633	+	/**
634	+	* privilegedCallableUsingCurrentClassLoader(callable).toString()
635	+	* contains toString of wrapped task
636	+	*/
637	+	public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
638	+	if (testImplementationDetails) {
639	+	Callable<String> c = () -> "";
640	+	Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
641	+	assertEquals(
642	+	identityString(priv) + "[Wrapped task = " + c.toString() + "]",
643	+	priv.toString());
644	+	}
645	+	}
646		}

Diff Legend

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