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.15 by dl, Thu Jan 22 14:07:50 2004 UTC vs.
Revision 1.35 by jsr166, Mon Oct 11 08:47:04 2010 UTC

#	Line 2 | Line 2
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
5	<	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	<	* Pat Fisher, Mike Judd.
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.*;
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(SMALL_DELAY_MS, MILLISECONDS));
195	>	assertTrue(f.isDone());
196	>	assertEquals(Boolean.TRUE, f.get());
197	>	} finally {
198	>	joinPool(p);
199		}
200		}
201
202		/**
203		* a newScheduledThreadPool successfully runs delayed task
204		*/
205	<	public void testnewScheduledThreadPool() {
206	<	try {
207	<	TrackedCallable callable = new TrackedCallable();
208	<	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
209	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
210	<	assertFalse(callable.done);
211	<	Thread.sleep(MEDIUM_DELAY_MS);
212	<	assertTrue(callable.done);
213	<	assertEquals(Boolean.TRUE, f.get());
214	<	joinPool(p1);
215	<	} catch(RejectedExecutionException e){}
216	<	catch(Exception e){
217	<	e.printStackTrace();
218	<	unexpectedException();
205	>	public void testnewScheduledThreadPool() throws Exception {
206	>	ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
207	>	try {
208	>	final CountDownLatch done = new CountDownLatch(1);
209	>	final Runnable task = new CheckedRunnable() {
210	>	public void realRun() {
211	>	done.countDown();
212	>	}};
213	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
214	>	SHORT_DELAY_MS, MILLISECONDS);
215	>	assertFalse(f.isDone());
216	>	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
217	>	assertTrue(f.isDone());
218	>	assertEquals(Boolean.TRUE, f.get());
219	>	} finally {
220	>	joinPool(p);
221		}
222		}
223
224		/**
225	<	* an unconfigurable  newScheduledThreadPool successfully runs delayed task
225	>	* an unconfigurable newScheduledThreadPool successfully runs delayed task
226		*/
227	<	public void testunconfigurableScheduledExecutorService() {
228	<	try {
229	<	TrackedCallable callable = new TrackedCallable();
230	<	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
231	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
232	<	assertFalse(callable.done);
233	<	Thread.sleep(MEDIUM_DELAY_MS);
234	<	assertTrue(callable.done);
235	<	assertEquals(Boolean.TRUE, f.get());
236	<	joinPool(p1);
237	<	} catch(RejectedExecutionException e){}
238	<	catch(Exception e){
239	<	e.printStackTrace();
240	<	unexpectedException();
227	>	public void testunconfigurableScheduledExecutorService() throws Exception {
228	>	ScheduledExecutorService p =
229	>	Executors.unconfigurableScheduledExecutorService
230	>	(Executors.newScheduledThreadPool(2));
231	>	try {
232	>	final CountDownLatch done = new CountDownLatch(1);
233	>	final Runnable task = new CheckedRunnable() {
234	>	public void realRun() {
235	>	done.countDown();
236	>	}};
237	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
238	>	SHORT_DELAY_MS, MILLISECONDS);
239	>	assertFalse(f.isDone());
240	>	assertTrue(done.await(SMALL_DELAY_MS, MILLISECONDS));
241	>	assertTrue(f.isDone());
242	>	assertEquals(Boolean.TRUE, f.get());
243	>	} finally {
244	>	joinPool(p);
245		}
246		}
247
248		/**
249	<	*  timeouts from execute will time out if they compute too long.
249	>	* Future.get on submitted tasks will time out if they compute too long.
250		*/
251	<	public void testTimedCallable() {
252	<	int N = 10000;
253	<	ExecutorService executor = Executors.newSingleThreadExecutor();
254	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
255	<	try {
256	<	long startTime = System.currentTimeMillis();
257	<
258	<	long i = 0;
259	<	while (tasks.size() < N) {
260	<	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
261	<	i += 10;
262	<	}
263	<
264	<	int iters = 0;
305	<	BigInteger sum = BigInteger.ZERO;
306	<	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
251	>	public void testTimedCallable() throws Exception {
252	>	final Runnable sleeper = new CheckedInterruptedRunnable() {
253	>	public void realRun() throws InterruptedException {
254	>	Thread.sleep(LONG_DELAY_MS);
255	>	}};
256	>	for (ExecutorService executor :
257	>	new ExecutorService[] {
258	>	Executors.newSingleThreadExecutor(),
259	>	Executors.newCachedThreadPool(),
260	>	Executors.newFixedThreadPool(2),
261	>	Executors.newScheduledThreadPool(2),
262	>	}) {
263	>	try {
264	>	Future future = executor.submit(sleeper);
265		try {
266	<	++iters;
267	<	sum = sum.add(it.next().call());
268	<	}
269	<	catch (TimeoutException success) {
270	<	assertTrue(iters > 0);
313	<	return;
314	<	}
315	<	catch (Exception e) {
316	<	unexpectedException();
266	>	future.get(SHORT_DELAY_MS, MILLISECONDS);
267	>	shouldThrow();
268	>	} catch (TimeoutException success) {
269	>	} finally {
270	>	future.cancel(true);
271		}
272		}
273	<	// if by chance we didn't ever time out, total time must be small
274	<	long elapsed = System.currentTimeMillis() - startTime;
275	<	assertTrue(elapsed < N);
322	<	}
323	<	finally {
324	<	joinPool(executor);
273	>	finally {
274	>	joinPool(executor);
275	>	}
276		}
277		}
278
279	<
279	>
280		/**
281		* ThreadPoolExecutor using defaultThreadFactory has
282		* specified group, priority, daemon status, and name
283		*/
284	<	public void testDefaultThreadFactory() {
284	>	public void testDefaultThreadFactory() throws Exception {
285		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
286	<	Runnable r = new Runnable() {
287	<	public void run() {
288	<	try {
289	<	Thread current = Thread.currentThread();
290	<	threadAssertTrue(!current.isDaemon());
291	<	threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
292	<	ThreadGroup g = current.getThreadGroup();
293	<	SecurityManager s = System.getSecurityManager();
294	<	if (s != null)
295	<	threadAssertTrue(g == s.getThreadGroup());
296	<	else
297	<	threadAssertTrue(g == egroup);
298	<	String name = current.getName();
299	<	threadAssertTrue(name.endsWith("thread-1"));
300	<	} catch (SecurityException ok) {
301	<	// Also pass if not allowed to change setting
351	<	}
286	>	Runnable r = new CheckedRunnable() {
287	>	public void realRun() {
288	>	try {
289	>	Thread current = Thread.currentThread();
290	>	assertTrue(!current.isDaemon());
291	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
292	>	ThreadGroup g = current.getThreadGroup();
293	>	SecurityManager s = System.getSecurityManager();
294	>	if (s != null)
295	>	assertTrue(g == s.getThreadGroup());
296	>	else
297	>	assertTrue(g == egroup);
298	>	String name = current.getName();
299	>	assertTrue(name.endsWith("thread-1"));
300	>	} catch (SecurityException ok) {
301	>	// Also pass if not allowed to change setting
302		}
303	<	};
303	>	}};
304		ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
305	<
305	>
306		e.execute(r);
307		try {
308		e.shutdown();
309	<	} catch(SecurityException ok) {
309	>	} catch (SecurityException ok) {
310		}
311	<
311	>
312		try {
313		Thread.sleep(SHORT_DELAY_MS);
364	–	} catch (Exception eX) {
365	–	unexpectedException();
314		} finally {
315		joinPool(e);
316		}
#	Line 373 | Line 321 | public class ExecutorsTest extends JSR16
321		* specified group, priority, daemon status, name,
322		* access control context and context class loader
323		*/
324	<	public void testPrivilegedThreadFactory() {
325	<	Policy savedPolicy = null;
326	<	try {
327	<	savedPolicy = Policy.getPolicy();
328	<	AdjustablePolicy policy = new AdjustablePolicy();
329	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
330	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
331	<	Policy.setPolicy(policy);
332	<	} catch (AccessControlException ok) {
333	<	return;
334	<	}
335	<	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
336	<	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
337	<	final AccessControlContext thisacc = AccessController.getContext();
338	<	Runnable r = new Runnable() {
339	<	public void run() {
340	<	try {
341	<	Thread current = Thread.currentThread();
342	<	threadAssertTrue(!current.isDaemon());
343	<	threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
344	<	ThreadGroup g = current.getThreadGroup();
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	<	}
357	<	}
358	<	};
359	<	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
360	<
361	<	Policy.setPolicy(savedPolicy);
362	<	e.execute(r);
363	<	try {
364	<	e.shutdown();
365	<	} catch(SecurityException ok) {
366	<	}
367	<	try {
420	<	Thread.sleep(SHORT_DELAY_MS);
421	<	} catch (Exception ex) {
422	<	unexpectedException();
423	<	} finally {
424	<	joinPool(e);
324	>	public void testPrivilegedThreadFactory() throws Exception {
325	>	Runnable r = new CheckedRunnable() {
326	>	public void realRun() throws Exception {
327	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
328	>	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
329	>	final AccessControlContext thisacc = AccessController.getContext();
330	>	Runnable r = new CheckedRunnable() {
331	>	public void realRun() {
332	>	Thread current = Thread.currentThread();
333	>	assertTrue(!current.isDaemon());
334	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
335	>	ThreadGroup g = current.getThreadGroup();
336	>	SecurityManager s = System.getSecurityManager();
337	>	if (s != null)
338	>	assertTrue(g == s.getThreadGroup());
339	>	else
340	>	assertTrue(g == egroup);
341	>	String name = current.getName();
342	>	assertTrue(name.endsWith("thread-1"));
343	>	assertSame(thisccl, current.getContextClassLoader());
344	>	assertEquals(thisacc, AccessController.getContext());
345	>	}};
346	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
347	>	e.execute(r);
348	>	e.shutdown();
349	>	Thread.sleep(SHORT_DELAY_MS);
350	>	joinPool(e);
351	>	}};
352	>
353	>	runWithPermissions(r,
354	>	new RuntimePermission("getClassLoader"),
355	>	new RuntimePermission("setContextClassLoader"),
356	>	new RuntimePermission("modifyThread"));
357	>	}
358	>
359	>	boolean haveCCLPermissions() {
360	>	SecurityManager sm = System.getSecurityManager();
361	>	if (sm != null) {
362	>	try {
363	>	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
364	>	sm.checkPermission(new RuntimePermission("getClassLoader"));
365	>	} catch (AccessControlException e) {
366	>	return false;
367	>	}
368		}
369	+	return true;
370	+	}
371
372	+	void checkCCL() {
373	+	SecurityManager sm = System.getSecurityManager();
374	+	if (sm != null) {
375	+	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
376	+	sm.checkPermission(new RuntimePermission("getClassLoader"));
377	+	}
378		}
379
380	<	static class CheckCCL implements Callable<Object> {
380	>	class CheckCCL implements Callable<Object> {
381		public Object call() {
382	<	AccessControlContext acc = AccessController.getContext();
432	<	acc.checkPermission(new RuntimePermission("getContextClassLoader"));
382	>	checkCCL();
383		return null;
384		}
385		}
#	Line 440 | Line 390 | public class ExecutorsTest extends JSR16
390		* privilegedCallableUsingCurrentClassLoader throws ACE
391		*/
392		public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
393	<	Policy savedPolicy = null;
394	<	try {
395	<	savedPolicy = Policy.getPolicy();
396	<	AdjustablePolicy policy = new AdjustablePolicy();
397	<	Policy.setPolicy(policy);
398	<	} catch (AccessControlException ok) {
399	<	return;
400	<	}
393	>	Runnable r = new CheckedRunnable() {
394	>	public void realRun() throws Exception {
395	>	if (System.getSecurityManager() == null)
396	>	return;
397	>	try {
398	>	Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
399	>	shouldThrow();
400	>	} catch (AccessControlException success) {}
401	>	}};
402
403	<	try {
453	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
454	<	shouldThrow();
455	<	} catch(AccessControlException success) {
456	<	} catch(Exception ex) {
457	<	unexpectedException();
458	<	}
459	<	finally {
460	<	Policy.setPolicy(savedPolicy);
461	<	}
403	>	runWithoutPermissions(r);
404		}
405
406		/**
407	<	* Without class loader permissions, calling
408	<	* privilegedCallableUsingCurrentClassLoader throws ACE
407	>	* With class loader permissions, calling
408	>	* privilegedCallableUsingCurrentClassLoader does not throw ACE
409		*/
410	<	public void testprivilegedCallableUsingCCLWithPrivs() {
411	<	Policy savedPolicy = null;
412	<	try {
413	<	savedPolicy = Policy.getPolicy();
414	<	AdjustablePolicy policy = new AdjustablePolicy();
415	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
416	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
475	<	Policy.setPolicy(policy);
476	<	} catch (AccessControlException ok) {
477	<	return;
478	<	}
479	<
480	<	try {
481	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
482	<	task.call();
483	<	} catch(Exception ex) {
484	<	unexpectedException();
485	<	}
486	<	finally {
487	<	Policy.setPolicy(savedPolicy);
488	<	}
489	<	}
410	>	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
411	>	Runnable r = new CheckedRunnable() {
412	>	public void realRun() throws Exception {
413	>	Executors.privilegedCallableUsingCurrentClassLoader
414	>	(new NoOpCallable())
415	>	.call();
416	>	}};
417
418	<	class CallCCL implements Runnable {
419	<	final Callable task;
420	<	CallCCL(Callable t) { task = t; }
494	<	public void run() {
495	<	try {
496	<	task.call();
497	<	threadShouldThrow();
498	<	} catch(AccessControlException success) {
499	<	} catch(Exception ex) {
500	<	threadUnexpectedException();
501	<	}
502	<	}
418	>	runWithPermissions(r,
419	>	new RuntimePermission("getClassLoader"),
420	>	new RuntimePermission("setContextClassLoader"));
421		}
422
423		/**
424		* Without permissions, calling privilegedCallable throws ACE
425		*/
426	<	public void testprivilegedCallableWithNoPrivs() {
427	<	Thread t1;
428	<	try {
429	<	Policy savedPolicy = Policy.getPolicy();
430	<	AdjustablePolicy policy = new AdjustablePolicy();
431	<	Policy.setPolicy(policy);
432	<	Callable task = Executors.privilegedCallable(new CheckCCL());
433	<	t1 = new Thread(new CallCCL(task));
434	<	Policy.setPolicy(savedPolicy);
435	<	} catch (AccessControlException ok) {
436	<	return;
437	<	}
438	<
439	<	try {
440	<	t1.start();
441	<	t1.join();
442	<	} catch(Exception ex) {
443	<	unexpectedException();
444	<	}
426	>	public void testprivilegedCallableWithNoPrivs() throws Exception {
427	>	// Avoid classloader-related SecurityExceptions in swingui.TestRunner
428	>	Executors.privilegedCallable(new CheckCCL());
429	>
430	>	Runnable r = new CheckedRunnable() {
431	>	public void realRun() throws Exception {
432	>	if (System.getSecurityManager() == null)
433	>	return;
434	>	Callable task = Executors.privilegedCallable(new CheckCCL());
435	>	try {
436	>	task.call();
437	>	shouldThrow();
438	>	} catch (AccessControlException success) {}
439	>	}};
440	>
441	>	runWithoutPermissions(r);
442	>
443	>	// It seems rather difficult to test that the
444	>	// AccessControlContext of the privilegedCallable is used
445	>	// instead of its caller.  Below is a failed attempt to do
446	>	// that, which does not work because the AccessController
447	>	// cannot capture the internal state of the current Policy.
448	>	// It would be much more work to differentiate based on,
449	>	// e.g. CodeSource.
450	>
451	>	//         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
452	>	//         final Callable[] task = new Callable[1];
453	>
454	>	//         runWithPermissions
455	>	//             (new CheckedRunnable() {
456	>	//                 public void realRun() {
457	>	//                     if (System.getSecurityManager() == null)
458	>	//                         return;
459	>	//                     noprivAcc[0] = AccessController.getContext();
460	>	//                     task[0] = Executors.privilegedCallable(new CheckCCL());
461	>	//                     try {
462	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
463	>	//                                                           public Void run() {
464	>	//                                                               checkCCL();
465	>	//                                                               return null;
466	>	//                                                           }}, noprivAcc[0]);
467	>	//                         shouldThrow();
468	>	//                     } catch (AccessControlException success) {}
469	>	//                 }});
470	>
471	>	//         runWithPermissions
472	>	//             (new CheckedRunnable() {
473	>	//                 public void realRun() throws Exception {
474	>	//                     if (System.getSecurityManager() == null)
475	>	//                         return;
476	>	//                     // Verify that we have an underprivileged ACC
477	>	//                     try {
478	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
479	>	//                                                           public Void run() {
480	>	//                                                               checkCCL();
481	>	//                                                               return null;
482	>	//                                                           }}, noprivAcc[0]);
483	>	//                         shouldThrow();
484	>	//                     } catch (AccessControlException success) {}
485	>
486	>	//                     try {
487	>	//                         task[0].call();
488	>	//                         shouldThrow();
489	>	//                     } catch (AccessControlException success) {}
490	>	//                 }},
491	>	//              new RuntimePermission("getClassLoader"),
492	>	//              new RuntimePermission("setContextClassLoader"));
493		}
494
495		/**
496		* With permissions, calling privilegedCallable succeeds
497		*/
498	<	public void testprivilegedCallableWithPrivs() {
499	<	Policy savedPolicy = null;
500	<	try {
501	<	savedPolicy = Policy.getPolicy();
502	<	AdjustablePolicy policy = new AdjustablePolicy();
503	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
504	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
505	<	Policy.setPolicy(policy);
506	<	} catch (AccessControlException ok) {
541	<	return;
542	<	}
543	<
544	<	Callable task = Executors.privilegedCallable(new CheckCCL());
545	<	try {
546	<	task.call();
547	<	} catch(Exception ex) {
548	<	unexpectedException();
549	<	} finally {
550	<	Policy.setPolicy(savedPolicy);
551	<	}
498	>	public void testprivilegedCallableWithPrivs() throws Exception {
499	>	Runnable r = new CheckedRunnable() {
500	>	public void realRun() throws Exception {
501	>	Executors.privilegedCallable(new CheckCCL()).call();
502	>	}};
503	>
504	>	runWithPermissions(r,
505	>	new RuntimePermission("getClassLoader"),
506	>	new RuntimePermission("setContextClassLoader"));
507		}
508
509		/**
510		* callable(Runnable) returns null when called
511	<	*/
512	<	public void testCallable1() {
513	<	try {
514	<	Callable c = Executors.callable(new NoOpRunnable());
560	<	assertNull(c.call());
561	<	} catch(Exception ex) {
562	<	unexpectedException();
563	<	}
564	<
511	>	*/
512	>	public void testCallable1() throws Exception {
513	>	Callable c = Executors.callable(new NoOpRunnable());
514	>	assertNull(c.call());
515		}
516
517		/**
518		* callable(Runnable, result) returns result when called
519	<	*/
520	<	public void testCallable2() {
521	<	try {
522	<	Callable c = Executors.callable(new NoOpRunnable(), one);
573	<	assertEquals(one, c.call());
574	<	} catch(Exception ex) {
575	<	unexpectedException();
576	<	}
519	>	*/
520	>	public void testCallable2() throws Exception {
521	>	Callable c = Executors.callable(new NoOpRunnable(), one);
522	>	assertSame(one, c.call());
523		}
524
525		/**
526		* callable(PrivilegedAction) returns its result when called
527	<	*/
528	<	public void testCallable3() {
529	<	try {
530	<	Callable c = Executors.callable(new PrivilegedAction() {
531	<	public Object run() { return one; }});
586	<	assertEquals(one, c.call());
587	<	} catch(Exception ex) {
588	<	unexpectedException();
589	<	}
527	>	*/
528	>	public void testCallable3() throws Exception {
529	>	Callable c = Executors.callable(new PrivilegedAction() {
530	>	public Object run() { return one; }});
531	>	assertSame(one, c.call());
532		}
533
534		/**
535		* callable(PrivilegedExceptionAction) returns its result when called
536	<	*/
537	<	public void testCallable4() {
538	<	try {
539	<	Callable c = Executors.callable(new PrivilegedExceptionAction() {
540	<	public Object run() { return one; }});
599	<	assertEquals(one, c.call());
600	<	} catch(Exception ex) {
601	<	unexpectedException();
602	<	}
536	>	*/
537	>	public void testCallable4() throws Exception {
538	>	Callable c = Executors.callable(new PrivilegedExceptionAction() {
539	>	public Object run() { return one; }});
540	>	assertSame(one, c.call());
541		}
542
543
544		/**
545		* callable(null Runnable) throws NPE
546	<	*/
546	>	*/
547		public void testCallableNPE1() {
548		try {
549	<	Runnable r = null;
550	<	Callable c = Executors.callable(r);
551	<	} catch (NullPointerException success) {
614	<	}
549	>	Callable c = Executors.callable((Runnable) null);
550	>	shouldThrow();
551	>	} catch (NullPointerException success) {}
552		}
553
554		/**
555		* callable(null, result) throws NPE
556	<	*/
556	>	*/
557		public void testCallableNPE2() {
558		try {
559	<	Runnable r = null;
560	<	Callable c = Executors.callable(r, one);
561	<	} catch (NullPointerException success) {
625	<	}
559	>	Callable c = Executors.callable((Runnable) null, one);
560	>	shouldThrow();
561	>	} catch (NullPointerException success) {}
562		}
563
564		/**
565		* callable(null PrivilegedAction) throws NPE
566	<	*/
566	>	*/
567		public void testCallableNPE3() {
568		try {
569	<	PrivilegedAction r = null;
570	<	Callable c = Executors.callable(r);
571	<	} catch (NullPointerException success) {
636	<	}
569	>	Callable c = Executors.callable((PrivilegedAction) null);
570	>	shouldThrow();
571	>	} catch (NullPointerException success) {}
572		}
573
574		/**
575		* callable(null PrivilegedExceptionAction) throws NPE
576	<	*/
576	>	*/
577		public void testCallableNPE4() {
578		try {
579	<	PrivilegedExceptionAction r = null;
580	<	Callable c = Executors.callable(r);
581	<	} catch (NullPointerException success) {
647	<	}
579	>	Callable c = Executors.callable((PrivilegedExceptionAction) null);
580	>	shouldThrow();
581	>	} catch (NullPointerException success) {}
582		}
583
584

Diff Legend

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