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.48 by jsr166, Sat Mar 18 20:42:20 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	+	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 93 | Line 68 | public class ExecutorsTest extends JSR16
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 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		/**
#	Line 183 | Line 159 | public class ExecutorsTest extends JSR16
159		} catch (IllegalArgumentException success) {}
160		}
161
186	–
162		/**
163		* An unconfigurable newFixedThreadPool can execute runnables
164		*/
165	<	public void testunconfigurableExecutorService() {
166	<	ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
167	<	e.execute(new NoOpRunnable());
168	<	e.execute(new NoOpRunnable());
169	<	e.execute(new NoOpRunnable());
170	<	joinPool(e);
165	>	public void testUnconfigurableExecutorService() {
166	>	final ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
167	>	try (PoolCleaner cleaner = cleaner(e)) {
168	>	e.execute(new NoOpRunnable());
169	>	e.execute(new NoOpRunnable());
170	>	e.execute(new NoOpRunnable());
171	>	}
172		}
173
174		/**
175		* unconfigurableExecutorService(null) throws NPE
176		*/
177	<	public void testunconfigurableExecutorServiceNPE() {
177	>	public void testUnconfigurableExecutorServiceNPE() {
178		try {
179		ExecutorService e = Executors.unconfigurableExecutorService(null);
180		shouldThrow();
#	Line 208 | Line 184 | public class ExecutorsTest extends JSR16
184		/**
185		* unconfigurableScheduledExecutorService(null) throws NPE
186		*/
187	<	public void testunconfigurableScheduledExecutorServiceNPE() {
187	>	public void testUnconfigurableScheduledExecutorServiceNPE() {
188		try {
189		ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
190		shouldThrow();
191		} catch (NullPointerException success) {}
192		}
193
218	–
194		/**
195		* a newSingleThreadScheduledExecutor successfully runs delayed task
196		*/
197		public void testNewSingleThreadScheduledExecutor() throws Exception {
198	<	TrackedCallable callable = new TrackedCallable();
199	<	ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
200	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
201	<	assertFalse(callable.done);
202	<	Thread.sleep(MEDIUM_DELAY_MS);
203	<	assertTrue(callable.done);
204	<	assertEquals(Boolean.TRUE, f.get());
205	<	joinPool(p1);
198	>	final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
199	>	try (PoolCleaner cleaner = cleaner(p)) {
200	>	final CountDownLatch proceed = new CountDownLatch(1);
201	>	final Runnable task = new CheckedRunnable() {
202	>	public void realRun() {
203	>	await(proceed);
204	>	}};
205	>	long startTime = System.nanoTime();
206	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
207	>	timeoutMillis(), MILLISECONDS);
208	>	assertFalse(f.isDone());
209	>	proceed.countDown();
210	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
211	>	assertSame(Boolean.TRUE, f.get());
212	>	assertTrue(f.isDone());
213	>	assertFalse(f.isCancelled());
214	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
215	>	}
216		}
217
218		/**
219		* a newScheduledThreadPool successfully runs delayed task
220		*/
221	<	public void testnewScheduledThreadPool() throws Exception {
222	<	TrackedCallable callable = new TrackedCallable();
223	<	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
224	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
225	<	assertFalse(callable.done);
226	<	Thread.sleep(MEDIUM_DELAY_MS);
227	<	assertTrue(callable.done);
228	<	assertEquals(Boolean.TRUE, f.get());
229	<	joinPool(p1);
221	>	public void testNewScheduledThreadPool() throws Exception {
222	>	final ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
223	>	try (PoolCleaner cleaner = cleaner(p)) {
224	>	final CountDownLatch proceed = new CountDownLatch(1);
225	>	final Runnable task = new CheckedRunnable() {
226	>	public void realRun() {
227	>	await(proceed);
228	>	}};
229	>	long startTime = System.nanoTime();
230	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
231	>	timeoutMillis(), MILLISECONDS);
232	>	assertFalse(f.isDone());
233	>	proceed.countDown();
234	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
235	>	assertSame(Boolean.TRUE, f.get());
236	>	assertTrue(f.isDone());
237	>	assertFalse(f.isCancelled());
238	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
239	>	}
240		}
241
242		/**
243		* an unconfigurable newScheduledThreadPool successfully runs delayed task
244		*/
245	<	public void testunconfigurableScheduledExecutorService() throws Exception {
246	<	TrackedCallable callable = new TrackedCallable();
247	<	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
248	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
249	<	assertFalse(callable.done);
250	<	Thread.sleep(MEDIUM_DELAY_MS);
251	<	assertTrue(callable.done);
252	<	assertEquals(Boolean.TRUE, f.get());
253	<	joinPool(p1);
245	>	public void testUnconfigurableScheduledExecutorService() throws Exception {
246	>	final ScheduledExecutorService p =
247	>	Executors.unconfigurableScheduledExecutorService
248	>	(Executors.newScheduledThreadPool(2));
249	>	try (PoolCleaner cleaner = cleaner(p)) {
250	>	final CountDownLatch proceed = new CountDownLatch(1);
251	>	final Runnable task = new CheckedRunnable() {
252	>	public void realRun() {
253	>	await(proceed);
254	>	}};
255	>	long startTime = System.nanoTime();
256	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
257	>	timeoutMillis(), MILLISECONDS);
258	>	assertFalse(f.isDone());
259	>	proceed.countDown();
260	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
261	>	assertSame(Boolean.TRUE, f.get());
262	>	assertTrue(f.isDone());
263	>	assertFalse(f.isCancelled());
264	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
265	>	}
266		}
267
268		/**
269	<	*  timeouts from execute will time out if they compute too long.
269	>	* Future.get on submitted tasks will time out if they compute too long.
270		*/
271		public void testTimedCallable() throws Exception {
272	<	int N = 10000;
273	<	ExecutorService executor = Executors.newSingleThreadExecutor();
274	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
275	<	try {
276	<	long startTime = System.currentTimeMillis();
277	<
278	<	long i = 0;
279	<	while (tasks.size() < N) {
280	<	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
281	<	i += 10;
282	<	}
283	<
284	<	int iters = 0;
285	<	BigInteger sum = BigInteger.ZERO;
286	<	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
287	<	try {
288	<	++iters;
289	<	sum = sum.add(it.next().call());
290	<	}
291	<	catch (TimeoutException success) {
292	<	assertTrue(iters > 0);
293	<	return;
294	<	}
288	<	}
289	<	// if by chance we didn't ever time out, total time must be small
290	<	long elapsed = System.currentTimeMillis() - startTime;
291	<	assertTrue(elapsed < N);
292	<	}
293	<	finally {
272	>	final ExecutorService[] executors = {
273	>	Executors.newSingleThreadExecutor(),
274	>	Executors.newCachedThreadPool(),
275	>	Executors.newFixedThreadPool(2),
276	>	Executors.newScheduledThreadPool(2),
277	>	};
278	>
279	>	final Runnable sleeper = new CheckedInterruptedRunnable() {
280	>	public void realRun() throws InterruptedException {
281	>	delay(LONG_DELAY_MS);
282	>	}};
283	>
284	>	List<Thread> threads = new ArrayList<>();
285	>	for (final ExecutorService executor : executors) {
286	>	threads.add(newStartedThread(new CheckedRunnable() {
287	>	public void realRun() {
288	>	Future future = executor.submit(sleeper);
289	>	assertFutureTimesOut(future);
290	>	}}));
291	>	}
292	>	for (Thread thread : threads)
293	>	awaitTermination(thread);
294	>	for (ExecutorService executor : executors)
295		joinPool(executor);
295	–	}
296		}
297
298	–
298		/**
299		* ThreadPoolExecutor using defaultThreadFactory has
300		* specified group, priority, daemon status, and name
301		*/
302		public void testDefaultThreadFactory() throws Exception {
303		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
304	<	Runnable r = new Runnable() {
305	<	public void run() {
306	<	try {
307	<	Thread current = Thread.currentThread();
308	<	threadAssertTrue(!current.isDaemon());
309	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
310	<	ThreadGroup g = current.getThreadGroup();
311	<	SecurityManager s = System.getSecurityManager();
312	<	if (s != null)
313	<	threadAssertTrue(g == s.getThreadGroup());
314	<	else
315	<	threadAssertTrue(g == egroup);
316	<	String name = current.getName();
318	<	threadAssertTrue(name.endsWith("thread-1"));
319	<	} catch (SecurityException ok) {
320	<	// Also pass if not allowed to change setting
321	<	}
304	>	final CountDownLatch done = new CountDownLatch(1);
305	>	Runnable r = new CheckedRunnable() {
306	>	public void realRun() {
307	>	try {
308	>	Thread current = Thread.currentThread();
309	>	assertFalse(current.isDaemon());
310	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
311	>	SecurityManager s = System.getSecurityManager();
312	>	assertSame(current.getThreadGroup(),
313	>	(s == null) ? egroup : s.getThreadGroup());
314	>	assertTrue(current.getName().endsWith("thread-1"));
315	>	} catch (SecurityException ok) {
316	>	// Also pass if not allowed to change setting
317		}
318	<	};
318	>	done.countDown();
319	>	}};
320		ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
321	<
322	<	e.execute(r);
323	<	try {
328	<	e.shutdown();
329	<	} catch (SecurityException ok) {
330	<	}
331	<
332	<	try {
333	<	Thread.sleep(SHORT_DELAY_MS);
334	<	} finally {
335	<	joinPool(e);
321	>	try (PoolCleaner cleaner = cleaner(e)) {
322	>	e.execute(r);
323	>	await(done);
324		}
325		}
326
#	Line 342 | Line 330 | public class ExecutorsTest extends JSR16
330		* access control context and context class loader
331		*/
332		public void testPrivilegedThreadFactory() throws Exception {
333	<	Policy savedPolicy = null;
334	<	try {
335	<	savedPolicy = Policy.getPolicy();
336	<	AdjustablePolicy policy = new AdjustablePolicy();
337	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
338	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
339	<	Policy.setPolicy(policy);
340	<	} catch (AccessControlException ok) {
341	<	return;
342	<	}
343	<	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
344	<	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
345	<	final AccessControlContext thisacc = AccessController.getContext();
346	<	Runnable r = new Runnable() {
347	<	public void run() {
348	<	try {
349	<	Thread current = Thread.currentThread();
350	<	threadAssertTrue(!current.isDaemon());
351	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
352	<	ThreadGroup g = current.getThreadGroup();
353	<	SecurityManager s = System.getSecurityManager();
354	<	if (s != null)
355	<	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	<	}
333	>	final CountDownLatch done = new CountDownLatch(1);
334	>	Runnable r = new CheckedRunnable() {
335	>	public void realRun() throws Exception {
336	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
337	>	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
338	>	final AccessControlContext thisacc = AccessController.getContext();
339	>	Runnable r = new CheckedRunnable() {
340	>	public void realRun() {
341	>	Thread current = Thread.currentThread();
342	>	assertFalse(current.isDaemon());
343	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
344	>	SecurityManager s = System.getSecurityManager();
345	>	assertSame(current.getThreadGroup(),
346	>	(s == null) ? egroup : s.getThreadGroup());
347	>	assertTrue(current.getName().endsWith("thread-1"));
348	>	assertSame(thisccl, current.getContextClassLoader());
349	>	assertEquals(thisacc, AccessController.getContext());
350	>	done.countDown();
351	>	}};
352	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
353	>	try (PoolCleaner cleaner = cleaner(e)) {
354	>	e.execute(r);
355	>	await(done);
356		}
357	<	};
379	<	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
357	>	}};
358
359	<	Policy.setPolicy(savedPolicy);
360	<	e.execute(r);
361	<	try {
362	<	e.shutdown();
363	<	} catch (SecurityException ok) {
386	<	}
387	<	try {
388	<	Thread.sleep(SHORT_DELAY_MS);
389	<	} finally {
390	<	joinPool(e);
391	<	}
359	>	runWithPermissions(r,
360	>	new RuntimePermission("getClassLoader"),
361	>	new RuntimePermission("setContextClassLoader"),
362	>	new RuntimePermission("modifyThread"));
363	>	}
364
365	+	boolean haveCCLPermissions() {
366	+	SecurityManager sm = System.getSecurityManager();
367	+	if (sm != null) {
368	+	try {
369	+	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
370	+	sm.checkPermission(new RuntimePermission("getClassLoader"));
371	+	} catch (AccessControlException e) {
372	+	return false;
373	+	}
374	+	}
375	+	return true;
376		}
377
378		void checkCCL() {
#	Line 407 | Line 390 | public class ExecutorsTest extends JSR16
390		}
391		}
392
410	–
393		/**
394		* Without class loader permissions, creating
395		* privilegedCallableUsingCurrentClassLoader throws ACE
396		*/
397		public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
398	<	Policy savedPolicy = null;
399	<	try {
400	<	savedPolicy = Policy.getPolicy();
401	<	AdjustablePolicy policy = new AdjustablePolicy();
402	<	Policy.setPolicy(policy);
403	<	} catch (AccessControlException ok) {
404	<	return;
405	<	}
406	<
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	<	}
398	>	Runnable r = new CheckedRunnable() {
399	>	public void realRun() throws Exception {
400	>	if (System.getSecurityManager() == null)
401	>	return;
402	>	try {
403	>	Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
404	>	shouldThrow();
405	>	} catch (AccessControlException success) {}
406	>	}};
407
408	<	try {
435	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
436	<	shouldThrow();
437	<	} catch (AccessControlException success) {
438	<	} finally {
439	<	Policy.setPolicy(savedPolicy);
440	<	}
408	>	runWithoutPermissions(r);
409		}
410
411		/**
412		* With class loader permissions, calling
413		* privilegedCallableUsingCurrentClassLoader does not throw ACE
414		*/
415	<	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
416	<	Policy savedPolicy = null;
417	<	try {
418	<	savedPolicy = Policy.getPolicy();
419	<	AdjustablePolicy policy = new AdjustablePolicy();
420	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
421	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
422	<	Policy.setPolicy(policy);
423	<	} catch (AccessControlException ok) {
424	<	return;
425	<	}
458	<
459	<	try {
460	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
461	<	task.call();
462	<	}
463	<	finally {
464	<	Policy.setPolicy(savedPolicy);
465	<	}
415	>	public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
416	>	Runnable r = new CheckedRunnable() {
417	>	public void realRun() throws Exception {
418	>	Executors.privilegedCallableUsingCurrentClassLoader
419	>	(new NoOpCallable())
420	>	.call();
421	>	}};
422	>
423	>	runWithPermissions(r,
424	>	new RuntimePermission("getClassLoader"),
425	>	new RuntimePermission("setContextClassLoader"));
426		}
427
428		/**
429		* Without permissions, calling privilegedCallable throws ACE
430		*/
431	<	public void testprivilegedCallableWithNoPrivs() throws Exception {
432	<	Callable task;
433	<	Policy savedPolicy = null;
434	<	AdjustablePolicy policy = null;
435	<	AccessControlContext noprivAcc = null;
436	<	try {
437	<	savedPolicy = Policy.getPolicy();
438	<	policy = new AdjustablePolicy();
439	<	Policy.setPolicy(policy);
440	<	noprivAcc = AccessController.getContext();
441	<	task = Executors.privilegedCallable(new CheckCCL());
442	<	Policy.setPolicy(savedPolicy);
443	<	} catch (AccessControlException ok) {
444	<	return; // program has too few permissions to set up test
445	<	}
446	<
447	<	// Make sure that program doesn't have too many permissions
448	<	try {
449	<	AccessController.doPrivileged(new PrivilegedAction() {
450	<	public Object run() {
451	<	checkCCL();
452	<	return null;
453	<	}}, noprivAcc);
454	<	// too many permssions; skip test
455	<	return;
456	<	} catch (AccessControlException ok) {
457	<	}
458	<
459	<	try {
460	<	task.call();
461	<	shouldThrow();
462	<	} catch (AccessControlException success) {}
431	>	public void testPrivilegedCallableWithNoPrivs() throws Exception {
432	>	// Avoid classloader-related SecurityExceptions in swingui.TestRunner
433	>	Executors.privilegedCallable(new CheckCCL());
434	>
435	>	Runnable r = new CheckedRunnable() {
436	>	public void realRun() throws Exception {
437	>	if (System.getSecurityManager() == null)
438	>	return;
439	>	Callable task = Executors.privilegedCallable(new CheckCCL());
440	>	try {
441	>	task.call();
442	>	shouldThrow();
443	>	} catch (AccessControlException success) {}
444	>	}};
445	>
446	>	runWithoutPermissions(r);
447	>
448	>	// It seems rather difficult to test that the
449	>	// AccessControlContext of the privilegedCallable is used
450	>	// instead of its caller.  Below is a failed attempt to do
451	>	// that, which does not work because the AccessController
452	>	// cannot capture the internal state of the current Policy.
453	>	// It would be much more work to differentiate based on,
454	>	// e.g. CodeSource.
455	>
456	>	//         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
457	>	//         final Callable[] task = new Callable[1];
458	>
459	>	//         runWithPermissions
460	>	//             (new CheckedRunnable() {
461	>	//                 public void realRun() {
462	>	//                     if (System.getSecurityManager() == null)
463	>	//                         return;
464	>	//                     noprivAcc[0] = AccessController.getContext();
465	>	//                     task[0] = Executors.privilegedCallable(new CheckCCL());
466	>	//                     try {
467	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
468	>	//                                                           public Void run() {
469	>	//                                                               checkCCL();
470	>	//                                                               return null;
471	>	//                                                           }}, noprivAcc[0]);
472	>	//                         shouldThrow();
473	>	//                     } catch (AccessControlException success) {}
474	>	//                 }});
475	>
476	>	//         runWithPermissions
477	>	//             (new CheckedRunnable() {
478	>	//                 public void realRun() throws Exception {
479	>	//                     if (System.getSecurityManager() == null)
480	>	//                         return;
481	>	//                     // Verify that we have an underprivileged ACC
482	>	//                     try {
483	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
484	>	//                                                           public Void run() {
485	>	//                                                               checkCCL();
486	>	//                                                               return null;
487	>	//                                                           }}, noprivAcc[0]);
488	>	//                         shouldThrow();
489	>	//                     } catch (AccessControlException success) {}
490	>
491	>	//                     try {
492	>	//                         task[0].call();
493	>	//                         shouldThrow();
494	>	//                     } catch (AccessControlException success) {}
495	>	//                 }},
496	>	//              new RuntimePermission("getClassLoader"),
497	>	//              new RuntimePermission("setContextClassLoader"));
498		}
499
500		/**
501		* With permissions, calling privilegedCallable succeeds
502		*/
503	<	public void testprivilegedCallableWithPrivs() throws Exception {
504	<	Policy savedPolicy = null;
505	<	try {
506	<	savedPolicy = Policy.getPolicy();
507	<	AdjustablePolicy policy = new AdjustablePolicy();
508	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
509	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
510	<	Policy.setPolicy(policy);
511	<	} 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	<	}
503	>	public void testPrivilegedCallableWithPrivs() throws Exception {
504	>	Runnable r = new CheckedRunnable() {
505	>	public void realRun() throws Exception {
506	>	Executors.privilegedCallable(new CheckCCL()).call();
507	>	}};
508	>
509	>	runWithPermissions(r,
510	>	new RuntimePermission("getClassLoader"),
511	>	new RuntimePermission("setContextClassLoader"));
512		}
513
514		/**
#	Line 538 | Line 524 | public class ExecutorsTest extends JSR16
524		*/
525		public void testCallable2() throws Exception {
526		Callable c = Executors.callable(new NoOpRunnable(), one);
527	<	assertEquals(one, c.call());
527	>	assertSame(one, c.call());
528		}
529
530		/**
#	Line 547 | Line 533 | public class ExecutorsTest extends JSR16
533		public void testCallable3() throws Exception {
534		Callable c = Executors.callable(new PrivilegedAction() {
535		public Object run() { return one; }});
536	<	assertEquals(one, c.call());
536	>	assertSame(one, c.call());
537		}
538
539		/**
#	Line 556 | Line 542 | public class ExecutorsTest extends JSR16
542		public void testCallable4() throws Exception {
543		Callable c = Executors.callable(new PrivilegedExceptionAction() {
544		public Object run() { return one; }});
545	<	assertEquals(one, c.call());
545	>	assertSame(one, c.call());
546		}
547
562	–
548		/**
549		* callable(null Runnable) throws NPE
550		*/
#	Line 600 | Line 585 | public class ExecutorsTest extends JSR16
585		} catch (NullPointerException success) {}
586		}
587
603	–
588		}

Diff Legend

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