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

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.21 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.31 by jsr166, Thu Sep 16 00:52:49 2010 UTC

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

Diff Legend

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

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents): Revision 1.21 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs. Revision 1.31 by jsr166, Thu Sep 16 00:52:49 2010 UTC

Diff Legend

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.21 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.31 by jsr166, Thu Sep 16 00:52:49 2010 UTC