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.26 by jsr166, Sat Nov 21 02:33:20 2009 UTC vs.
Revision 1.50 by jsr166, Wed Aug 16 17:18:34 2017 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	–
10	–	import junit.framework.*;
11	–	import java.util.*;
12	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.math.BigInteger;
11	<	import java.security.*;
10	>
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
25	–	static class TimedCallable<T> implements Callable<T> {
26	–	private final ExecutorService exec;
27	–	private final Callable<T> func;
28	–	private final long msecs;
29	–
30	–	TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
31	–	this.exec = exec;
32	–	this.func = func;
33	–	this.msecs = msecs;
34	–	}
35	–
36	–	public T call() throws Exception {
37	–	Future<T> ftask = exec.submit(func);
38	–	try {
39	–	return ftask.get(msecs, MILLISECONDS);
40	–	} finally {
41	–	ftask.cancel(true);
42	–	}
43	–	}
44	–	}
45	–
46	–
47	–	private static class Fib implements Callable<BigInteger> {
48	–	private final BigInteger n;
49	–	Fib(long n) {
50	–	if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
51	–	this.n = BigInteger.valueOf(n);
52	–	}
53	–	public BigInteger call() {
54	–	BigInteger f1 = BigInteger.ONE;
55	–	BigInteger f2 = f1;
56	–	for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
57	–	BigInteger t = f1.add(f2);
58	–	f1 = f2;
59	–	f2 = t;
60	–	}
61	–	return f1;
62	–	}
63	–	};
64	–
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 94 | Line 68 | public class ExecutorsTest extends JSR16
68		} catch (NullPointerException success) {}
69		}
70
97	–
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 131 | 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 {
140	<	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
144	–
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 {
#	Line 175 | Line 151 | public class ExecutorsTest extends JSR16
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 {
#	Line 184 | Line 160 | public class ExecutorsTest extends JSR16
160		} catch (IllegalArgumentException success) {}
161		}
162
187	–
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		shouldThrow();
#	Line 209 | Line 185 | public class ExecutorsTest extends JSR16
185		/**
186		* unconfigurableScheduledExecutorService(null) throws NPE
187		*/
188	<	public void testunconfigurableScheduledExecutorServiceNPE() {
188	>	public void testUnconfigurableScheduledExecutorServiceNPE() {
189		try {
190		ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
191		shouldThrow();
192		} catch (NullPointerException success) {}
193		}
194
219	–
195		/**
196		* a newSingleThreadScheduledExecutor successfully runs delayed task
197		*/
198		public void testNewSingleThreadScheduledExecutor() throws Exception {
199	<	TrackedCallable callable = new TrackedCallable();
200	<	ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
201	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
202	<	assertFalse(callable.done);
203	<	Thread.sleep(MEDIUM_DELAY_MS);
204	<	assertTrue(callable.done);
205	<	assertEquals(Boolean.TRUE, f.get());
206	<	joinPool(p1);
199	>	final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
200	>	try (PoolCleaner cleaner = cleaner(p)) {
201	>	final CountDownLatch proceed = new CountDownLatch(1);
202	>	final Runnable task = new CheckedRunnable() {
203	>	public void realRun() {
204	>	await(proceed);
205	>	}};
206	>	long startTime = System.nanoTime();
207	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
208	>	timeoutMillis(), MILLISECONDS);
209	>	assertFalse(f.isDone());
210	>	proceed.countDown();
211	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
212	>	assertSame(Boolean.TRUE, f.get());
213	>	assertTrue(f.isDone());
214	>	assertFalse(f.isCancelled());
215	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
216	>	}
217		}
218
219		/**
220		* a newScheduledThreadPool successfully runs delayed task
221		*/
222	<	public void testnewScheduledThreadPool() throws Exception {
223	<	TrackedCallable callable = new TrackedCallable();
224	<	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
225	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
226	<	assertFalse(callable.done);
227	<	Thread.sleep(MEDIUM_DELAY_MS);
228	<	assertTrue(callable.done);
229	<	assertEquals(Boolean.TRUE, f.get());
230	<	joinPool(p1);
222	>	public void testNewScheduledThreadPool() throws Exception {
223	>	final ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
224	>	try (PoolCleaner cleaner = cleaner(p)) {
225	>	final CountDownLatch proceed = new CountDownLatch(1);
226	>	final Runnable task = new CheckedRunnable() {
227	>	public void realRun() {
228	>	await(proceed);
229	>	}};
230	>	long startTime = System.nanoTime();
231	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
232	>	timeoutMillis(), MILLISECONDS);
233	>	assertFalse(f.isDone());
234	>	proceed.countDown();
235	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
236	>	assertSame(Boolean.TRUE, f.get());
237	>	assertTrue(f.isDone());
238	>	assertFalse(f.isCancelled());
239	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
240	>	}
241		}
242
243		/**
244		* an unconfigurable newScheduledThreadPool successfully runs delayed task
245		*/
246	<	public void testunconfigurableScheduledExecutorService() throws Exception {
247	<	TrackedCallable callable = new TrackedCallable();
248	<	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
249	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
250	<	assertFalse(callable.done);
251	<	Thread.sleep(MEDIUM_DELAY_MS);
252	<	assertTrue(callable.done);
253	<	assertEquals(Boolean.TRUE, f.get());
254	<	joinPool(p1);
246	>	public void testUnconfigurableScheduledExecutorService() throws Exception {
247	>	final ScheduledExecutorService p =
248	>	Executors.unconfigurableScheduledExecutorService
249	>	(Executors.newScheduledThreadPool(2));
250	>	try (PoolCleaner cleaner = cleaner(p)) {
251	>	final CountDownLatch proceed = new CountDownLatch(1);
252	>	final Runnable task = new CheckedRunnable() {
253	>	public void realRun() {
254	>	await(proceed);
255	>	}};
256	>	long startTime = System.nanoTime();
257	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
258	>	timeoutMillis(), MILLISECONDS);
259	>	assertFalse(f.isDone());
260	>	proceed.countDown();
261	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
262	>	assertSame(Boolean.TRUE, f.get());
263	>	assertTrue(f.isDone());
264	>	assertFalse(f.isCancelled());
265	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
266	>	}
267		}
268
269		/**
270	<	*  timeouts from execute will time out if they compute too long.
270	>	* Future.get on submitted tasks will time out if they compute too long.
271		*/
272		public void testTimedCallable() throws Exception {
273	<	int N = 10000;
274	<	ExecutorService executor = Executors.newSingleThreadExecutor();
275	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
276	<	try {
277	<	long startTime = System.currentTimeMillis();
278	<
279	<	long i = 0;
280	<	while (tasks.size() < N) {
281	<	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
282	<	i += 10;
283	<	}
284	<
285	<	int iters = 0;
286	<	BigInteger sum = BigInteger.ZERO;
287	<	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
288	<	try {
289	<	++iters;
290	<	sum = sum.add(it.next().call());
291	<	}
292	<	catch (TimeoutException success) {
293	<	assertTrue(iters > 0);
294	<	return;
295	<	}
289	<	}
290	<	// if by chance we didn't ever time out, total time must be small
291	<	long elapsed = System.currentTimeMillis() - startTime;
292	<	assertTrue(elapsed < N);
293	<	}
294	<	finally {
273	>	final ExecutorService[] executors = {
274	>	Executors.newSingleThreadExecutor(),
275	>	Executors.newCachedThreadPool(),
276	>	Executors.newFixedThreadPool(2),
277	>	Executors.newScheduledThreadPool(2),
278	>	};
279	>
280	>	final Runnable sleeper = new CheckedInterruptedRunnable() {
281	>	public void realRun() throws InterruptedException {
282	>	delay(LONG_DELAY_MS);
283	>	}};
284	>
285	>	List<Thread> threads = new ArrayList<>();
286	>	for (final ExecutorService executor : executors) {
287	>	threads.add(newStartedThread(new CheckedRunnable() {
288	>	public void realRun() {
289	>	Future future = executor.submit(sleeper);
290	>	assertFutureTimesOut(future);
291	>	}}));
292	>	}
293	>	for (Thread thread : threads)
294	>	awaitTermination(thread);
295	>	for (ExecutorService executor : executors)
296		joinPool(executor);
296	–	}
297		}
298
299	–
299		/**
300		* ThreadPoolExecutor using defaultThreadFactory has
301		* specified group, priority, daemon status, and name
302		*/
303		public void testDefaultThreadFactory() throws Exception {
304		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
305	<	Runnable r = new Runnable() {
306	<	public void run() {
307	<	try {
308	<	Thread current = Thread.currentThread();
309	<	threadAssertTrue(!current.isDaemon());
310	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
311	<	ThreadGroup g = current.getThreadGroup();
312	<	SecurityManager s = System.getSecurityManager();
313	<	if (s != null)
314	<	threadAssertTrue(g == s.getThreadGroup());
315	<	else
316	<	threadAssertTrue(g == egroup);
317	<	String name = current.getName();
319	<	threadAssertTrue(name.endsWith("thread-1"));
320	<	} catch (SecurityException ok) {
321	<	// Also pass if not allowed to change setting
322	<	}
305	>	final CountDownLatch done = new CountDownLatch(1);
306	>	Runnable r = new CheckedRunnable() {
307	>	public void realRun() {
308	>	try {
309	>	Thread current = Thread.currentThread();
310	>	assertFalse(current.isDaemon());
311	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
312	>	SecurityManager s = System.getSecurityManager();
313	>	assertSame(current.getThreadGroup(),
314	>	(s == null) ? egroup : s.getThreadGroup());
315	>	assertTrue(current.getName().endsWith("thread-1"));
316	>	} catch (SecurityException ok) {
317	>	// Also pass if not allowed to change setting
318		}
319	<	};
319	>	done.countDown();
320	>	}};
321		ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
322	<
323	<	e.execute(r);
324	<	try {
329	<	e.shutdown();
330	<	} catch (SecurityException ok) {
331	<	}
332	<
333	<	try {
334	<	Thread.sleep(SHORT_DELAY_MS);
335	<	} finally {
336	<	joinPool(e);
322	>	try (PoolCleaner cleaner = cleaner(e)) {
323	>	e.execute(r);
324	>	await(done);
325		}
326		}
327
#	Line 343 | Line 331 | public class ExecutorsTest extends JSR16
331		* access control context and context class loader
332		*/
333		public void testPrivilegedThreadFactory() throws Exception {
334	<	Policy savedPolicy = null;
335	<	try {
336	<	savedPolicy = Policy.getPolicy();
337	<	AdjustablePolicy policy = new AdjustablePolicy();
338	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
339	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
340	<	Policy.setPolicy(policy);
341	<	} catch (AccessControlException ok) {
354	<	return;
355	<	}
356	<	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
357	<	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
358	<	final AccessControlContext thisacc = AccessController.getContext();
359	<	Runnable r = new Runnable() {
360	<	public void run() {
361	<	try {
334	>	final CountDownLatch done = new CountDownLatch(1);
335	>	Runnable r = new CheckedRunnable() {
336	>	public void realRun() throws Exception {
337	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
338	>	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
339	>	final AccessControlContext thisacc = AccessController.getContext();
340	>	Runnable r = new CheckedRunnable() {
341	>	public void realRun() {
342		Thread current = Thread.currentThread();
343	<	threadAssertTrue(!current.isDaemon());
344	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
365	<	ThreadGroup g = current.getThreadGroup();
343	>	assertFalse(current.isDaemon());
344	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
345		SecurityManager s = System.getSecurityManager();
346	<	if (s != null)
347	<	threadAssertTrue(g == s.getThreadGroup());
348	<	else
349	<	threadAssertTrue(g == egroup);
350	<	String name = current.getName();
351	<	threadAssertTrue(name.endsWith("thread-1"));
352	<	threadAssertTrue(thisccl == current.getContextClassLoader());
353	<	threadAssertTrue(thisacc.equals(AccessController.getContext()));
354	<	} catch (SecurityException ok) {
355	<	// Also pass if not allowed to change settings
356	<	}
346	>	assertSame(current.getThreadGroup(),
347	>	(s == null) ? egroup : s.getThreadGroup());
348	>	assertTrue(current.getName().endsWith("thread-1"));
349	>	assertSame(thisccl, current.getContextClassLoader());
350	>	assertEquals(thisacc, AccessController.getContext());
351	>	done.countDown();
352	>	}};
353	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
354	>	try (PoolCleaner cleaner = cleaner(e)) {
355	>	e.execute(r);
356	>	await(done);
357		}
358	<	};
380	<	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
358	>	}};
359
360	<	Policy.setPolicy(savedPolicy);
361	<	e.execute(r);
362	<	try {
363	<	e.shutdown();
364	<	} catch (SecurityException ok) {
387	<	}
388	<	try {
389	<	Thread.sleep(SHORT_DELAY_MS);
390	<	} finally {
391	<	joinPool(e);
392	<	}
360	>	runWithPermissions(r,
361	>	new RuntimePermission("getClassLoader"),
362	>	new RuntimePermission("setContextClassLoader"),
363	>	new RuntimePermission("modifyThread"));
364	>	}
365
366	+	boolean haveCCLPermissions() {
367	+	SecurityManager sm = System.getSecurityManager();
368	+	if (sm != null) {
369	+	try {
370	+	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
371	+	sm.checkPermission(new RuntimePermission("getClassLoader"));
372	+	} catch (AccessControlException e) {
373	+	return false;
374	+	}
375	+	}
376	+	return true;
377		}
378
379		void checkCCL() {
#	Line 408 | Line 391 | public class ExecutorsTest extends JSR16
391		}
392		}
393
411	–
394		/**
395		* Without class loader permissions, creating
396		* privilegedCallableUsingCurrentClassLoader throws ACE
397		*/
398		public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
399	<	Policy savedPolicy = null;
400	<	try {
401	<	savedPolicy = Policy.getPolicy();
402	<	AdjustablePolicy policy = new AdjustablePolicy();
403	<	Policy.setPolicy(policy);
404	<	} catch (AccessControlException ok) {
405	<	return;
406	<	}
407	<
426	<	// Check if program still has too many permissions to run test
427	<	try {
428	<	checkCCL();
429	<	// too many privileges to test; so return
430	<	Policy.setPolicy(savedPolicy);
431	<	return;
432	<	} catch (AccessControlException ok) {
433	<	}
399	>	Runnable r = new CheckedRunnable() {
400	>	public void realRun() throws Exception {
401	>	if (System.getSecurityManager() == null)
402	>	return;
403	>	try {
404	>	Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
405	>	shouldThrow();
406	>	} catch (AccessControlException success) {}
407	>	}};
408
409	<	try {
436	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
437	<	shouldThrow();
438	<	} catch (AccessControlException success) {
439	<	} finally {
440	<	Policy.setPolicy(savedPolicy);
441	<	}
409	>	runWithoutPermissions(r);
410		}
411
412		/**
413		* With class loader permissions, calling
414		* privilegedCallableUsingCurrentClassLoader does not throw ACE
415		*/
416	<	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
417	<	Policy savedPolicy = null;
418	<	try {
419	<	savedPolicy = Policy.getPolicy();
420	<	AdjustablePolicy policy = new AdjustablePolicy();
421	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
422	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
423	<	Policy.setPolicy(policy);
424	<	} catch (AccessControlException ok) {
425	<	return;
426	<	}
459	<
460	<	try {
461	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
462	<	task.call();
463	<	}
464	<	finally {
465	<	Policy.setPolicy(savedPolicy);
466	<	}
416	>	public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
417	>	Runnable r = new CheckedRunnable() {
418	>	public void realRun() throws Exception {
419	>	Executors.privilegedCallableUsingCurrentClassLoader
420	>	(new NoOpCallable())
421	>	.call();
422	>	}};
423	>
424	>	runWithPermissions(r,
425	>	new RuntimePermission("getClassLoader"),
426	>	new RuntimePermission("setContextClassLoader"));
427		}
428
429		/**
430		* Without permissions, calling privilegedCallable throws ACE
431		*/
432	<	public void testprivilegedCallableWithNoPrivs() throws Exception {
433	<	Callable task;
434	<	Policy savedPolicy = null;
435	<	AdjustablePolicy policy = null;
436	<	AccessControlContext noprivAcc = null;
437	<	try {
438	<	savedPolicy = Policy.getPolicy();
439	<	policy = new AdjustablePolicy();
440	<	Policy.setPolicy(policy);
441	<	noprivAcc = AccessController.getContext();
442	<	task = Executors.privilegedCallable(new CheckCCL());
443	<	Policy.setPolicy(savedPolicy);
444	<	} catch (AccessControlException ok) {
445	<	return; // program has too few permissions to set up test
446	<	}
447	<
448	<	// Make sure that program doesn't have too many permissions
449	<	try {
450	<	AccessController.doPrivileged(new PrivilegedAction() {
451	<	public Object run() {
452	<	checkCCL();
453	<	return null;
454	<	}}, noprivAcc);
455	<	// too many permssions; skip test
456	<	return;
457	<	} catch (AccessControlException ok) {
458	<	}
459	<
460	<	try {
461	<	task.call();
462	<	shouldThrow();
463	<	} catch (AccessControlException success) {}
432	>	public void testPrivilegedCallableWithNoPrivs() throws Exception {
433	>	// Avoid classloader-related SecurityExceptions in swingui.TestRunner
434	>	Executors.privilegedCallable(new CheckCCL());
435	>
436	>	Runnable r = new CheckedRunnable() {
437	>	public void realRun() throws Exception {
438	>	if (System.getSecurityManager() == null)
439	>	return;
440	>	Callable task = Executors.privilegedCallable(new CheckCCL());
441	>	try {
442	>	task.call();
443	>	shouldThrow();
444	>	} catch (AccessControlException success) {}
445	>	}};
446	>
447	>	runWithoutPermissions(r);
448	>
449	>	// It seems rather difficult to test that the
450	>	// AccessControlContext of the privilegedCallable is used
451	>	// instead of its caller.  Below is a failed attempt to do
452	>	// that, which does not work because the AccessController
453	>	// cannot capture the internal state of the current Policy.
454	>	// It would be much more work to differentiate based on,
455	>	// e.g. CodeSource.
456	>
457	>	//         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
458	>	//         final Callable[] task = new Callable[1];
459	>
460	>	//         runWithPermissions
461	>	//             (new CheckedRunnable() {
462	>	//                 public void realRun() {
463	>	//                     if (System.getSecurityManager() == null)
464	>	//                         return;
465	>	//                     noprivAcc[0] = AccessController.getContext();
466	>	//                     task[0] = Executors.privilegedCallable(new CheckCCL());
467	>	//                     try {
468	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
469	>	//                                                           public Void run() {
470	>	//                                                               checkCCL();
471	>	//                                                               return null;
472	>	//                                                           }}, noprivAcc[0]);
473	>	//                         shouldThrow();
474	>	//                     } catch (AccessControlException success) {}
475	>	//                 }});
476	>
477	>	//         runWithPermissions
478	>	//             (new CheckedRunnable() {
479	>	//                 public void realRun() throws Exception {
480	>	//                     if (System.getSecurityManager() == null)
481	>	//                         return;
482	>	//                     // Verify that we have an underprivileged ACC
483	>	//                     try {
484	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
485	>	//                                                           public Void run() {
486	>	//                                                               checkCCL();
487	>	//                                                               return null;
488	>	//                                                           }}, noprivAcc[0]);
489	>	//                         shouldThrow();
490	>	//                     } catch (AccessControlException success) {}
491	>
492	>	//                     try {
493	>	//                         task[0].call();
494	>	//                         shouldThrow();
495	>	//                     } catch (AccessControlException success) {}
496	>	//                 }},
497	>	//              new RuntimePermission("getClassLoader"),
498	>	//              new RuntimePermission("setContextClassLoader"));
499		}
500
501		/**
502		* With permissions, calling privilegedCallable succeeds
503		*/
504	<	public void testprivilegedCallableWithPrivs() throws Exception {
505	<	Policy savedPolicy = null;
506	<	try {
507	<	savedPolicy = Policy.getPolicy();
508	<	AdjustablePolicy policy = new AdjustablePolicy();
509	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
510	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
511	<	Policy.setPolicy(policy);
512	<	} catch (AccessControlException ok) {
518	<	return;
519	<	}
520	<
521	<	Callable task = Executors.privilegedCallable(new CheckCCL());
522	<	try {
523	<	task.call();
524	<	} finally {
525	<	Policy.setPolicy(savedPolicy);
526	<	}
504	>	public void testPrivilegedCallableWithPrivs() throws Exception {
505	>	Runnable r = new CheckedRunnable() {
506	>	public void realRun() throws Exception {
507	>	Executors.privilegedCallable(new CheckCCL()).call();
508	>	}};
509	>
510	>	runWithPermissions(r,
511	>	new RuntimePermission("getClassLoader"),
512	>	new RuntimePermission("setContextClassLoader"));
513		}
514
515		/**
#	Line 539 | Line 525 | public class ExecutorsTest extends JSR16
525		*/
526		public void testCallable2() throws Exception {
527		Callable c = Executors.callable(new NoOpRunnable(), one);
528	<	assertEquals(one, c.call());
528	>	assertSame(one, c.call());
529		}
530
531		/**
#	Line 548 | Line 534 | public class ExecutorsTest extends JSR16
534		public void testCallable3() throws Exception {
535		Callable c = Executors.callable(new PrivilegedAction() {
536		public Object run() { return one; }});
537	<	assertEquals(one, c.call());
537	>	assertSame(one, c.call());
538		}
539
540		/**
#	Line 557 | Line 543 | public class ExecutorsTest extends JSR16
543		public void testCallable4() throws Exception {
544		Callable c = Executors.callable(new PrivilegedExceptionAction() {
545		public Object run() { return one; }});
546	<	assertEquals(one, c.call());
546	>	assertSame(one, c.call());
547		}
548
563	–
549		/**
550		* callable(null Runnable) throws NPE
551		*/
#	Line 601 | Line 586 | public class ExecutorsTest extends JSR16
586		} catch (NullPointerException success) {}
587		}
588
589	+	/**
590	+	* callable(runnable, x).toString() contains toString of wrapped task
591	+	*/
592	+	public void testCallable_withResult_toString() {
593	+	if (testImplementationDetails) {
594	+	Runnable r = () -> {};
595	+	Callable<String> c = Executors.callable(r, "");
596	+	assertEquals(
597	+	identityString(c) + "[Wrapped task = " + r.toString() + "]",
598	+	c.toString());
599	+	}
600	+	}
601
602	+	/**
603	+	* callable(runnable).toString() contains toString of wrapped task
604	+	*/
605	+	public void testCallable_toString() {
606	+	if (testImplementationDetails) {
607	+	Runnable r = () -> {};
608	+	Callable<Object> c = Executors.callable(r);
609	+	assertEquals(
610	+	identityString(c) + "[Wrapped task = " + r.toString() + "]",
611	+	c.toString());
612	+	}
613	+	}
614	+
615	+	/**
616	+	* privilegedCallable(callable).toString() contains toString of wrapped task
617	+	*/
618	+	public void testPrivilegedCallable_toString() {
619	+	if (testImplementationDetails) {
620	+	Callable<String> c = () -> "";
621	+	Callable<String> priv = Executors.privilegedCallable(c);
622	+	assertEquals(
623	+	identityString(priv) + "[Wrapped task = " + c.toString() + "]",
624	+	priv.toString());
625	+	}
626	+	}
627	+
628	+	/**
629	+	* privilegedCallableUsingCurrentClassLoader(callable).toString()
630	+	* contains toString of wrapped task
631	+	*/
632	+	public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
633	+	if (testImplementationDetails) {
634	+	Callable<String> c = () -> "";
635	+	Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
636	+	assertEquals(
637	+	identityString(priv) + "[Wrapped task = " + c.toString() + "]",
638	+	priv.toString());
639	+	}
640	+	}
641		}

Diff Legend

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