[ViewVC] Diff of: jsr166/jsr166/src/test/tck/ExecutorsTest.java

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.20 by jsr166, Wed Aug 5 00:40:11 2009 UTC vs.
Revision 1.37 by jsr166, Tue Mar 15 19:47:06 2011 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		*/
#	Line 10 \| Line 10
10		import junit.framework.*;
11		import java.util.*;
12		import java.util.concurrent.*;
13	+	import static java.util.concurrent.TimeUnit.MILLISECONDS;
14		import java.math.BigInteger;
15		import java.security.*;
16
17	<	public class ExecutorsTest extends JSR166TestCase{
17	>	public class ExecutorsTest extends JSR166TestCase {
18		public static void main(String[] args) {
19	<	junit.textui.TestRunner.run (suite());
19	>	junit.textui.TestRunner.run(suite());
20		}
21		public static Test suite() {
22		return new TestSuite(ExecutorsTest.class);
23		}
24
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	–
25		/**
26		* A newCachedThreadPool can execute runnables
27		*/
#	Line 90 \| Line 51 \| public class ExecutorsTest extends JSR16
51		try {
52		ExecutorService e = Executors.newCachedThreadPool(null);
53		shouldThrow();
54	<	}
94	<	catch(NullPointerException success) {
95	<	}
54	>	} catch (NullPointerException success) {}
55		}
56
57
#	Line 125 \| Line 84 \| public class ExecutorsTest extends JSR16
84		try {
85		ExecutorService e = Executors.newSingleThreadExecutor(null);
86		shouldThrow();
87	<	}
129	<	catch(NullPointerException success) {
130	<	}
87	>	} catch (NullPointerException success) {}
88		}
89
90		/**
#	Line 137 \| Line 94 \| public class ExecutorsTest extends JSR16
94		ExecutorService e = Executors.newSingleThreadExecutor();
95		try {
96		ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
97	+	shouldThrow();
98		} catch (ClassCastException success) {
99		} finally {
100		joinPool(e);
#	Line 173 \| Line 131 \| public class ExecutorsTest extends JSR16
131		try {
132		ExecutorService e = Executors.newFixedThreadPool(2, null);
133		shouldThrow();
134	<	}
177	<	catch(NullPointerException success) {
178	<	}
134	>	} catch (NullPointerException success) {}
135		}
136
137		/**
#	Line 185 \| Line 141 \| public class ExecutorsTest extends JSR16
141		try {
142		ExecutorService e = Executors.newFixedThreadPool(0);
143		shouldThrow();
144	<	}
189	<	catch(IllegalArgumentException success) {
190	<	}
144	>	} catch (IllegalArgumentException success) {}
145		}
146
147
#	Line 208 \| Line 162 \| public class ExecutorsTest extends JSR16
162		public void testunconfigurableExecutorServiceNPE() {
163		try {
164		ExecutorService e = Executors.unconfigurableExecutorService(null);
165	<	}
166	<	catch (NullPointerException success) {
213	<	}
165	>	shouldThrow();
166	>	} catch (NullPointerException success) {}
167		}
168
169		/**
#	Line 219 \| Line 172 \| public class ExecutorsTest extends JSR16
172		public void testunconfigurableScheduledExecutorServiceNPE() {
173		try {
174		ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
175	<	}
176	<	catch (NullPointerException success) {
224	<	}
175	>	shouldThrow();
176	>	} catch (NullPointerException success) {}
177		}
178
179
180		/**
181		* a newSingleThreadScheduledExecutor successfully runs delayed task
182		*/
183	<	public void testNewSingleThreadScheduledExecutor() {
184	<	try {
185	<	TrackedCallable callable = new TrackedCallable();
186	<	ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
187	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
188	<	assertFalse(callable.done);
189	<	Thread.sleep(MEDIUM_DELAY_MS);
190	<	assertTrue(callable.done);
191	<	assertEquals(Boolean.TRUE, f.get());
192	<	joinPool(p1);
193	<	} catch(RejectedExecutionException e){}
194	<	catch(Exception e){
195	<	e.printStackTrace();
196	<	unexpectedException();
183	>	public void testNewSingleThreadScheduledExecutor() throws Exception {
184	>	ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
185	>	try {
186	>	final CountDownLatch done = new CountDownLatch(1);
187	>	final Runnable task = new CheckedRunnable() {
188	>	public void realRun() {
189	>	done.countDown();
190	>	}};
191	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
192	>	SHORT_DELAY_MS, MILLISECONDS);
193	>	assertFalse(f.isDone());
194	>	assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
195	>	assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
196	>	assertSame(Boolean.TRUE, f.get());
197	>	assertTrue(f.isDone());
198	>	} finally {
199	>	joinPool(p);
200		}
201		}
202
203		/**
204		* a newScheduledThreadPool successfully runs delayed task
205		*/
206	<	public void testnewScheduledThreadPool() {
207	<	try {
208	<	TrackedCallable callable = new TrackedCallable();
209	<	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
210	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
211	<	assertFalse(callable.done);
212	<	Thread.sleep(MEDIUM_DELAY_MS);
213	<	assertTrue(callable.done);
214	<	assertEquals(Boolean.TRUE, f.get());
215	<	joinPool(p1);
216	<	} catch(RejectedExecutionException e){}
217	<	catch(Exception e){
218	<	e.printStackTrace();
219	<	unexpectedException();
206	>	public void testnewScheduledThreadPool() throws Exception {
207	>	ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
208	>	try {
209	>	final CountDownLatch done = new CountDownLatch(1);
210	>	final Runnable task = new CheckedRunnable() {
211	>	public void realRun() {
212	>	done.countDown();
213	>	}};
214	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
215	>	SHORT_DELAY_MS, MILLISECONDS);
216	>	assertFalse(f.isDone());
217	>	assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
218	>	assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
219	>	assertSame(Boolean.TRUE, f.get());
220	>	assertTrue(f.isDone());
221	>	} finally {
222	>	joinPool(p);
223		}
224		}
225
226		/**
227	<	* an unconfigurable newScheduledThreadPool successfully runs delayed task
227	>	* an unconfigurable newScheduledThreadPool successfully runs delayed task
228		*/
229	<	public void testunconfigurableScheduledExecutorService() {
230	<	try {
231	<	TrackedCallable callable = new TrackedCallable();
232	<	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
233	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
234	<	assertFalse(callable.done);
235	<	Thread.sleep(MEDIUM_DELAY_MS);
236	<	assertTrue(callable.done);
237	<	assertEquals(Boolean.TRUE, f.get());
238	<	joinPool(p1);
239	<	} catch(RejectedExecutionException e){}
240	<	catch(Exception e){
241	<	e.printStackTrace();
242	<	unexpectedException();
229	>	public void testunconfigurableScheduledExecutorService() throws Exception {
230	>	ScheduledExecutorService p =
231	>	Executors.unconfigurableScheduledExecutorService
232	>	(Executors.newScheduledThreadPool(2));
233	>	try {
234	>	final CountDownLatch done = new CountDownLatch(1);
235	>	final Runnable task = new CheckedRunnable() {
236	>	public void realRun() {
237	>	done.countDown();
238	>	}};
239	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
240	>	SHORT_DELAY_MS, MILLISECONDS);
241	>	assertFalse(f.isDone());
242	>	assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
243	>	assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
244	>	assertSame(Boolean.TRUE, f.get());
245	>	assertTrue(f.isDone());
246	>	} finally {
247	>	joinPool(p);
248		}
249		}
250
251		/**
252	<	* timeouts from execute will time out if they compute too long.
252	>	* Future.get on submitted tasks will time out if they compute too long.
253		*/
254	<	public void testTimedCallable() {
255	<	int N = 10000;
256	<	ExecutorService executor = Executors.newSingleThreadExecutor();
257	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
258	<	try {
259	<	long startTime = System.currentTimeMillis();
260	<
261	<	long i = 0;
262	<	while (tasks.size() < N) {
263	<	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
264	<	i += 10;
265	<	}
266	<
267	<	int iters = 0;
305	<	BigInteger sum = BigInteger.ZERO;
306	<	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
254	>	public void testTimedCallable() throws Exception {
255	>	final Runnable sleeper = new CheckedInterruptedRunnable() {
256	>	public void realRun() throws InterruptedException {
257	>	Thread.sleep(LONG_DELAY_MS);
258	>	}};
259	>	for (ExecutorService executor :
260	>	new ExecutorService[] {
261	>	Executors.newSingleThreadExecutor(),
262	>	Executors.newCachedThreadPool(),
263	>	Executors.newFixedThreadPool(2),
264	>	Executors.newScheduledThreadPool(2),
265	>	}) {
266	>	try {
267	>	Future future = executor.submit(sleeper);
268		try {
269	<	++iters;
270	<	sum = sum.add(it.next().call());
271	<	}
272	<	catch (TimeoutException success) {
273	<	assertTrue(iters > 0);
313	<	return;
314	<	}
315	<	catch (Exception e) {
316	<	unexpectedException();
269	>	future.get(SHORT_DELAY_MS, MILLISECONDS);
270	>	shouldThrow();
271	>	} catch (TimeoutException success) {
272	>	} finally {
273	>	future.cancel(true);
274		}
275		}
276	<	// if by chance we didn't ever time out, total time must be small
277	<	long elapsed = System.currentTimeMillis() - startTime;
278	<	assertTrue(elapsed < N);
322	<	}
323	<	finally {
324	<	joinPool(executor);
276	>	finally {
277	>	joinPool(executor);
278	>	}
279		}
280		}
281
#	Line 330 \| Line 284 \| public class ExecutorsTest extends JSR16
284		* ThreadPoolExecutor using defaultThreadFactory has
285		* specified group, priority, daemon status, and name
286		*/
287	<	public void testDefaultThreadFactory() {
287	>	public void testDefaultThreadFactory() throws Exception {
288		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
289	<	Runnable r = new Runnable() {
290	<	public void run() {
291	<	try {
292	<	Thread current = Thread.currentThread();
293	<	threadAssertTrue(!current.isDaemon());
294	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
295	<	ThreadGroup g = current.getThreadGroup();
296	<	SecurityManager s = System.getSecurityManager();
297	<	if (s != null)
298	<	threadAssertTrue(g == s.getThreadGroup());
299	<	else
300	<	threadAssertTrue(g == egroup);
301	<	String name = current.getName();
302	<	threadAssertTrue(name.endsWith("thread-1"));
303	<	} catch (SecurityException ok) {
304	<	// Also pass if not allowed to change setting
351	<	}
289	>	Runnable r = new CheckedRunnable() {
290	>	public void realRun() {
291	>	try {
292	>	Thread current = Thread.currentThread();
293	>	assertTrue(!current.isDaemon());
294	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
295	>	ThreadGroup g = current.getThreadGroup();
296	>	SecurityManager s = System.getSecurityManager();
297	>	if (s != null)
298	>	assertTrue(g == s.getThreadGroup());
299	>	else
300	>	assertTrue(g == egroup);
301	>	String name = current.getName();
302	>	assertTrue(name.endsWith("thread-1"));
303	>	} catch (SecurityException ok) {
304	>	// Also pass if not allowed to change setting
305		}
306	<	};
306	>	}};
307		ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
308
309		e.execute(r);
310		try {
311		e.shutdown();
312	<	} catch(SecurityException ok) {
312	>	} catch (SecurityException ok) {
313		}
314
315		try {
316		Thread.sleep(SHORT_DELAY_MS);
364	–	} catch (Exception eX) {
365	–	unexpectedException();
317		} finally {
318		joinPool(e);
319		}
#	Line 373 \| Line 324 \| public class ExecutorsTest extends JSR16
324		* specified group, priority, daemon status, name,
325		* access control context and context class loader
326		*/
327	<	public void testPrivilegedThreadFactory() {
328	<	Policy savedPolicy = null;
329	<	try {
330	<	savedPolicy = Policy.getPolicy();
331	<	AdjustablePolicy policy = new AdjustablePolicy();
332	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
333	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
334	<	Policy.setPolicy(policy);
335	<	} catch (AccessControlException ok) {
336	<	return;
337	<	}
338	<	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
339	<	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
340	<	final AccessControlContext thisacc = AccessController.getContext();
341	<	Runnable r = new Runnable() {
342	<	public void run() {
343	<	try {
344	<	Thread current = Thread.currentThread();
345	<	threadAssertTrue(!current.isDaemon());
346	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
347	<	ThreadGroup g = current.getThreadGroup();
348	<	SecurityManager s = System.getSecurityManager();
349	<	if (s != null)
350	<	threadAssertTrue(g == s.getThreadGroup());
351	<	else
352	<	threadAssertTrue(g == egroup);
353	<	String name = current.getName();
354	<	threadAssertTrue(name.endsWith("thread-1"));
355	<	threadAssertTrue(thisccl == current.getContextClassLoader());
356	<	threadAssertTrue(thisacc.equals(AccessController.getContext()));
357	<	} catch(SecurityException ok) {
358	<	// Also pass if not allowed to change settings
359	<	}
360	<	}
410	<	};
411	<	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
327	>	public void testPrivilegedThreadFactory() throws Exception {
328	>	Runnable r = new CheckedRunnable() {
329	>	public void realRun() throws Exception {
330	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
331	>	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
332	>	final AccessControlContext thisacc = AccessController.getContext();
333	>	Runnable r = new CheckedRunnable() {
334	>	public void realRun() {
335	>	Thread current = Thread.currentThread();
336	>	assertTrue(!current.isDaemon());
337	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
338	>	ThreadGroup g = current.getThreadGroup();
339	>	SecurityManager s = System.getSecurityManager();
340	>	if (s != null)
341	>	assertTrue(g == s.getThreadGroup());
342	>	else
343	>	assertTrue(g == egroup);
344	>	String name = current.getName();
345	>	assertTrue(name.endsWith("thread-1"));
346	>	assertSame(thisccl, current.getContextClassLoader());
347	>	assertEquals(thisacc, AccessController.getContext());
348	>	}};
349	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
350	>	e.execute(r);
351	>	e.shutdown();
352	>	Thread.sleep(SHORT_DELAY_MS);
353	>	joinPool(e);
354	>	}};
355	>
356	>	runWithPermissions(r,
357	>	new RuntimePermission("getClassLoader"),
358	>	new RuntimePermission("setContextClassLoader"),
359	>	new RuntimePermission("modifyThread"));
360	>	}
361
362	<	Policy.setPolicy(savedPolicy);
363	<	e.execute(r);
364	<	try {
365	<	e.shutdown();
366	<	} catch(SecurityException ok) {
367	<	}
368	<	try {
369	<	Thread.sleep(SHORT_DELAY_MS);
370	<	} catch (Exception ex) {
422	<	unexpectedException();
423	<	} finally {
424	<	joinPool(e);
362	>	boolean haveCCLPermissions() {
363	>	SecurityManager sm = System.getSecurityManager();
364	>	if (sm != null) {
365	>	try {
366	>	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
367	>	sm.checkPermission(new RuntimePermission("getClassLoader"));
368	>	} catch (AccessControlException e) {
369	>	return false;
370	>	}
371		}
372	<
372	>	return true;
373		}
374
375		void checkCCL() {
#	Line 447 \| Line 393 \| public class ExecutorsTest extends JSR16
393		* privilegedCallableUsingCurrentClassLoader throws ACE
394		*/
395		public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
396	<	Policy savedPolicy = null;
397	<	try {
398	<	savedPolicy = Policy.getPolicy();
399	<	AdjustablePolicy policy = new AdjustablePolicy();
400	<	Policy.setPolicy(policy);
401	<	} catch (AccessControlException ok) {
402	<	return;
403	<	}
404	<
459	<	// Check if program still has too many permissions to run test
460	<	try {
461	<	checkCCL();
462	<	// too many privileges to test; so return
463	<	Policy.setPolicy(savedPolicy);
464	<	return;
465	<	} catch(AccessControlException ok) {
466	<	}
396	>	Runnable r = new CheckedRunnable() {
397	>	public void realRun() throws Exception {
398	>	if (System.getSecurityManager() == null)
399	>	return;
400	>	try {
401	>	Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
402	>	shouldThrow();
403	>	} catch (AccessControlException success) {}
404	>	}};
405
406	<	try {
469	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
470	<	shouldThrow();
471	<	} catch(AccessControlException success) {
472	<	} catch(Exception ex) {
473	<	unexpectedException();
474	<	}
475	<	finally {
476	<	Policy.setPolicy(savedPolicy);
477	<	}
406	>	runWithoutPermissions(r);
407		}
408
409		/**
410		* With class loader permissions, calling
411		* privilegedCallableUsingCurrentClassLoader does not throw ACE
412		*/
413	<	public void testprivilegedCallableUsingCCLWithPrivs() {
414	<	Policy savedPolicy = null;
415	<	try {
416	<	savedPolicy = Policy.getPolicy();
417	<	AdjustablePolicy policy = new AdjustablePolicy();
418	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
419	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
420	<	Policy.setPolicy(policy);
421	<	} catch (AccessControlException ok) {
422	<	return;
423	<	}
495	<
496	<	try {
497	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
498	<	task.call();
499	<	} catch(Exception ex) {
500	<	unexpectedException();
501	<	}
502	<	finally {
503	<	Policy.setPolicy(savedPolicy);
504	<	}
413	>	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
414	>	Runnable r = new CheckedRunnable() {
415	>	public void realRun() throws Exception {
416	>	Executors.privilegedCallableUsingCurrentClassLoader
417	>	(new NoOpCallable())
418	>	.call();
419	>	}};
420	>
421	>	runWithPermissions(r,
422	>	new RuntimePermission("getClassLoader"),
423	>	new RuntimePermission("setContextClassLoader"));
424		}
425
426		/**
427		* Without permissions, calling privilegedCallable throws ACE
428		*/
429	<	public void testprivilegedCallableWithNoPrivs() {
430	<	Callable task;
431	<	Policy savedPolicy = null;
432	<	AdjustablePolicy policy = null;
433	<	AccessControlContext noprivAcc = null;
434	<	try {
435	<	savedPolicy = Policy.getPolicy();
436	<	policy = new AdjustablePolicy();
437	<	Policy.setPolicy(policy);
438	<	noprivAcc = AccessController.getContext();
439	<	task = Executors.privilegedCallable(new CheckCCL());
440	<	Policy.setPolicy(savedPolicy);
441	<	} catch (AccessControlException ok) {
442	<	return; // program has too few permissions to set up test
443	<	}
444	<
445	<	// Make sure that program doesn't have too many permissions
446	<	try {
447	<	AccessController.doPrivileged(new PrivilegedAction() {
448	<	public Object run() {
449	<	checkCCL();
450	<	return null;
451	<	}}, noprivAcc);
452	<	// too many permssions; skip test
453	<	return;
454	<	} catch(AccessControlException ok) {
455	<	}
456	<
457	<	try {
458	<	task.call();
459	<	shouldThrow();
460	<	} catch(AccessControlException success) {
461	<	} catch(Exception ex) {
462	<	unexpectedException();
463	<	}
429	>	public void testprivilegedCallableWithNoPrivs() throws Exception {
430	>	// Avoid classloader-related SecurityExceptions in swingui.TestRunner
431	>	Executors.privilegedCallable(new CheckCCL());
432	>
433	>	Runnable r = new CheckedRunnable() {
434	>	public void realRun() throws Exception {
435	>	if (System.getSecurityManager() == null)
436	>	return;
437	>	Callable task = Executors.privilegedCallable(new CheckCCL());
438	>	try {
439	>	task.call();
440	>	shouldThrow();
441	>	} catch (AccessControlException success) {}
442	>	}};
443	>
444	>	runWithoutPermissions(r);
445	>
446	>	// It seems rather difficult to test that the
447	>	// AccessControlContext of the privilegedCallable is used
448	>	// instead of its caller. Below is a failed attempt to do
449	>	// that, which does not work because the AccessController
450	>	// cannot capture the internal state of the current Policy.
451	>	// It would be much more work to differentiate based on,
452	>	// e.g. CodeSource.
453	>
454	>	// final AccessControlContext[] noprivAcc = new AccessControlContext[1];
455	>	// final Callable[] task = new Callable[1];
456	>
457	>	// runWithPermissions
458	>	// (new CheckedRunnable() {
459	>	// public void realRun() {
460	>	// if (System.getSecurityManager() == null)
461	>	// return;
462	>	// noprivAcc[0] = AccessController.getContext();
463	>	// task[0] = Executors.privilegedCallable(new CheckCCL());
464	>	// try {
465	>	// AccessController.doPrivileged(new PrivilegedAction<Void>() {
466	>	// public Void run() {
467	>	// checkCCL();
468	>	// return null;
469	>	// }}, noprivAcc[0]);
470	>	// shouldThrow();
471	>	// } catch (AccessControlException success) {}
472	>	// }});
473	>
474	>	// runWithPermissions
475	>	// (new CheckedRunnable() {
476	>	// public void realRun() throws Exception {
477	>	// if (System.getSecurityManager() == null)
478	>	// return;
479	>	// // Verify that we have an underprivileged ACC
480	>	// try {
481	>	// AccessController.doPrivileged(new PrivilegedAction<Void>() {
482	>	// public Void run() {
483	>	// checkCCL();
484	>	// return null;
485	>	// }}, noprivAcc[0]);
486	>	// shouldThrow();
487	>	// } catch (AccessControlException success) {}
488	>
489	>	// try {
490	>	// task[0].call();
491	>	// shouldThrow();
492	>	// } catch (AccessControlException success) {}
493	>	// }},
494	>	// new RuntimePermission("getClassLoader"),
495	>	// new RuntimePermission("setContextClassLoader"));
496		}
497
498		/**
499		* With permissions, calling privilegedCallable succeeds
500		*/
501	<	public void testprivilegedCallableWithPrivs() {
502	<	Policy savedPolicy = null;
503	<	try {
504	<	savedPolicy = Policy.getPolicy();
505	<	AdjustablePolicy policy = new AdjustablePolicy();
506	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
507	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
508	<	Policy.setPolicy(policy);
509	<	} catch (AccessControlException ok) {
559	<	return;
560	<	}
561	<
562	<	Callable task = Executors.privilegedCallable(new CheckCCL());
563	<	try {
564	<	task.call();
565	<	} catch(Exception ex) {
566	<	unexpectedException();
567	<	} finally {
568	<	Policy.setPolicy(savedPolicy);
569	<	}
501	>	public void testprivilegedCallableWithPrivs() throws Exception {
502	>	Runnable r = new CheckedRunnable() {
503	>	public void realRun() throws Exception {
504	>	Executors.privilegedCallable(new CheckCCL()).call();
505	>	}};
506	>
507	>	runWithPermissions(r,
508	>	new RuntimePermission("getClassLoader"),
509	>	new RuntimePermission("setContextClassLoader"));
510		}
511
512		/**
513		* callable(Runnable) returns null when called
514		*/
515	<	public void testCallable1() {
516	<	try {
517	<	Callable c = Executors.callable(new NoOpRunnable());
578	<	assertNull(c.call());
579	<	} catch(Exception ex) {
580	<	unexpectedException();
581	<	}
582	<
515	>	public void testCallable1() throws Exception {
516	>	Callable c = Executors.callable(new NoOpRunnable());
517	>	assertNull(c.call());
518		}
519
520		/**
521		* callable(Runnable, result) returns result when called
522		*/
523	<	public void testCallable2() {
524	<	try {
525	<	Callable c = Executors.callable(new NoOpRunnable(), one);
591	<	assertEquals(one, c.call());
592	<	} catch(Exception ex) {
593	<	unexpectedException();
594	<	}
523	>	public void testCallable2() throws Exception {
524	>	Callable c = Executors.callable(new NoOpRunnable(), one);
525	>	assertSame(one, c.call());
526		}
527
528		/**
529		* callable(PrivilegedAction) returns its result when called
530		*/
531	<	public void testCallable3() {
532	<	try {
533	<	Callable c = Executors.callable(new PrivilegedAction() {
534	<	public Object run() { return one; }});
604	<	assertEquals(one, c.call());
605	<	} catch(Exception ex) {
606	<	unexpectedException();
607	<	}
531	>	public void testCallable3() throws Exception {
532	>	Callable c = Executors.callable(new PrivilegedAction() {
533	>	public Object run() { return one; }});
534	>	assertSame(one, c.call());
535		}
536
537		/**
538		* callable(PrivilegedExceptionAction) returns its result when called
539		*/
540	<	public void testCallable4() {
541	<	try {
542	<	Callable c = Executors.callable(new PrivilegedExceptionAction() {
543	<	public Object run() { return one; }});
617	<	assertEquals(one, c.call());
618	<	} catch(Exception ex) {
619	<	unexpectedException();
620	<	}
540	>	public void testCallable4() throws Exception {
541	>	Callable c = Executors.callable(new PrivilegedExceptionAction() {
542	>	public Object run() { return one; }});
543	>	assertSame(one, c.call());
544		}
545
546
#	Line 626 \| Line 549 \| public class ExecutorsTest extends JSR16
549		*/
550		public void testCallableNPE1() {
551		try {
552	<	Runnable r = null;
553	<	Callable c = Executors.callable(r);
554	<	} catch (NullPointerException success) {
632	<	}
552	>	Callable c = Executors.callable((Runnable) null);
553	>	shouldThrow();
554	>	} catch (NullPointerException success) {}
555		}
556
557		/**
#	Line 637 \| Line 559 \| public class ExecutorsTest extends JSR16
559		*/
560		public void testCallableNPE2() {
561		try {
562	<	Runnable r = null;
563	<	Callable c = Executors.callable(r, one);
564	<	} catch (NullPointerException success) {
643	<	}
562	>	Callable c = Executors.callable((Runnable) null, one);
563	>	shouldThrow();
564	>	} catch (NullPointerException success) {}
565		}
566
567		/**
#	Line 648 \| Line 569 \| public class ExecutorsTest extends JSR16
569		*/
570		public void testCallableNPE3() {
571		try {
572	<	PrivilegedAction r = null;
573	<	Callable c = Executors.callable(r);
574	<	} catch (NullPointerException success) {
654	<	}
572	>	Callable c = Executors.callable((PrivilegedAction) null);
573	>	shouldThrow();
574	>	} catch (NullPointerException success) {}
575		}
576
577		/**
#	Line 659 \| Line 579 \| public class ExecutorsTest extends JSR16
579		*/
580		public void testCallableNPE4() {
581		try {
582	<	PrivilegedExceptionAction r = null;
583	<	Callable c = Executors.callable(r);
584	<	} catch (NullPointerException success) {
665	<	}
582	>	Callable c = Executors.callable((PrivilegedExceptionAction) null);
583	>	shouldThrow();
584	>	} catch (NullPointerException success) {}
585		}
586
587

Diff Legend

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

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents): Revision 1.20 by jsr166, Wed Aug 5 00:40:11 2009 UTC vs. Revision 1.37 by jsr166, Tue Mar 15 19:47:06 2011 UTC

Diff Legend

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.20 by jsr166, Wed Aug 5 00:40:11 2009 UTC vs.
Revision 1.37 by jsr166, Tue Mar 15 19:47:06 2011 UTC