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.10 by tim, Wed Dec 10 01:51:12 2003 UTC vs.
Revision 1.28 by jsr166, Wed Dec 2 19:17:01 2009 UTC

#	Line 1 | Line 1
1		/*
2	<	* Written by members of JCP JSR-166 Expert Group and released to the
3	<	* public domain. Use, modify, and redistribute this code in any way
4	<	* without acknowledgement. Other contributors include Andrew Wright,
5	<	* Jeffrey Hayes, Pat Fischer, Mike Judd.
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.
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
23	–	static class TimedCallable<T> implements Callable<T> {
24	–	private final ExecutorService exec;
25	–	private final Callable<T> func;
26	–	private final long msecs;
27	–
28	–	TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
29	–	this.exec = exec;
30	–	this.func = func;
31	–	this.msecs = msecs;
32	–	}
33	–
34	–	public T call() throws Exception {
35	–	Future<T> ftask = exec.submit(func);
36	–	try {
37	–	return ftask.get(msecs, TimeUnit.MILLISECONDS);
38	–	} finally {
39	–	ftask.cancel(true);
40	–	}
41	–	}
42	–	}
43	–
44	–
45	–	private static class Fib implements Callable<BigInteger> {
46	–	private final BigInteger n;
47	–	Fib(long n) {
48	–	if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
49	–	this.n = BigInteger.valueOf(n);
50	–	}
51	–	public BigInteger call() {
52	–	BigInteger f1 = BigInteger.ONE;
53	–	BigInteger f2 = f1;
54	–	for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
55	–	BigInteger t = f1.add(f2);
56	–	f1 = f2;
57	–	f2 = t;
58	–	}
59	–	return f1;
60	–	}
61	–	};
62	–
25		/**
26		* A newCachedThreadPool can execute runnables
27		*/
#	Line 68 | Line 30 | public class ExecutorsTest extends JSR16
30		e.execute(new NoOpRunnable());
31		e.execute(new NoOpRunnable());
32		e.execute(new NoOpRunnable());
33	<	e.shutdown();
33	>	joinPool(e);
34		}
35
36		/**
#	Line 79 | Line 41 | public class ExecutorsTest extends JSR16
41		e.execute(new NoOpRunnable());
42		e.execute(new NoOpRunnable());
43		e.execute(new NoOpRunnable());
44	<	e.shutdown();
44	>	joinPool(e);
45		}
46
47		/**
#	Line 89 | Line 51 | public class ExecutorsTest extends JSR16
51		try {
52		ExecutorService e = Executors.newCachedThreadPool(null);
53		shouldThrow();
54	<	}
93	<	catch(NullPointerException success) {
94	<	}
54	>	} catch (NullPointerException success) {}
55		}
56
57
#	Line 103 | Line 63 | public class ExecutorsTest extends JSR16
63		e.execute(new NoOpRunnable());
64		e.execute(new NoOpRunnable());
65		e.execute(new NoOpRunnable());
66	<	e.shutdown();
66	>	joinPool(e);
67		}
68
69		/**
#	Line 114 | Line 74 | public class ExecutorsTest extends JSR16
74		e.execute(new NoOpRunnable());
75		e.execute(new NoOpRunnable());
76		e.execute(new NoOpRunnable());
77	<	e.shutdown();
77	>	joinPool(e);
78		}
79
80		/**
#	Line 124 | Line 84 | public class ExecutorsTest extends JSR16
84		try {
85		ExecutorService e = Executors.newSingleThreadExecutor(null);
86		shouldThrow();
87	<	}
88	<	catch(NullPointerException success) {
87	>	} catch (NullPointerException success) {}
88	>	}
89	>
90	>	/**
91	>	* A new SingleThreadExecutor cannot be casted to concrete implementation
92	>	*/
93	>	public void testCastNewSingleThreadExecutor() {
94	>	ExecutorService e = Executors.newSingleThreadExecutor();
95	>	try {
96	>	ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
97	>	shouldThrow();
98	>	} catch (ClassCastException success) {
99	>	} finally {
100	>	joinPool(e);
101		}
102		}
103
104	+
105		/**
106		* A new newFixedThreadPool can execute runnables
107		*/
#	Line 137 | Line 110 | public class ExecutorsTest extends JSR16
110		e.execute(new NoOpRunnable());
111		e.execute(new NoOpRunnable());
112		e.execute(new NoOpRunnable());
113	<	e.shutdown();
113	>	joinPool(e);
114		}
115
116		/**
#	Line 148 | Line 121 | public class ExecutorsTest extends JSR16
121		e.execute(new NoOpRunnable());
122		e.execute(new NoOpRunnable());
123		e.execute(new NoOpRunnable());
124	<	e.shutdown();
124	>	joinPool(e);
125		}
126
127		/**
#	Line 158 | Line 131 | public class ExecutorsTest extends JSR16
131		try {
132		ExecutorService e = Executors.newFixedThreadPool(2, null);
133		shouldThrow();
134	<	}
162	<	catch(NullPointerException success) {
163	<	}
134	>	} catch (NullPointerException success) {}
135		}
136
137		/**
#	Line 170 | Line 141 | public class ExecutorsTest extends JSR16
141		try {
142		ExecutorService e = Executors.newFixedThreadPool(0);
143		shouldThrow();
144	<	}
174	<	catch(IllegalArgumentException success) {
175	<	}
144	>	} catch (IllegalArgumentException success) {}
145		}
146
147
148		/**
149	<	*  timeouts from execute will time out if they compute too long.
149	>	* An unconfigurable newFixedThreadPool can execute runnables
150	>	*/
151	>	public void testunconfigurableExecutorService() {
152	>	ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
153	>	e.execute(new NoOpRunnable());
154	>	e.execute(new NoOpRunnable());
155	>	e.execute(new NoOpRunnable());
156	>	joinPool(e);
157	>	}
158	>
159	>	/**
160	>	* unconfigurableExecutorService(null) throws NPE
161		*/
162	<	public void testTimedCallable() {
183	<	int N = 10000;
184	<	ExecutorService executor = Executors.newSingleThreadExecutor();
185	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
162	>	public void testunconfigurableExecutorServiceNPE() {
163		try {
164	<	long startTime = System.currentTimeMillis();
165	<
166	<	long i = 0;
167	<	while (tasks.size() < N) {
168	<	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
169	<	i += 10;
170	<	}
171	<
172	<	int iters = 0;
173	<	BigInteger sum = BigInteger.ZERO;
174	<	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
164	>	ExecutorService e = Executors.unconfigurableExecutorService(null);
165	>	shouldThrow();
166	>	} catch (NullPointerException success) {}
167	>	}
168	>
169	>	/**
170	>	* unconfigurableScheduledExecutorService(null) throws NPE
171	>	*/
172	>	public void testunconfigurableScheduledExecutorServiceNPE() {
173	>	try {
174	>	ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
175	>	shouldThrow();
176	>	} catch (NullPointerException success) {}
177	>	}
178	>
179	>
180	>	/**
181	>	* a newSingleThreadScheduledExecutor successfully runs delayed task
182	>	*/
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() 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() 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	>	*  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);
204	<	return;
205	<	}
206	<	catch (Exception e) {
207	<	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);
213	<	}
214	<	finally {
215	<	joinPool(executor);
248	>	finally {
249	>	joinPool(executor);
250	>	}
251		}
252		}
253
254	<
254	>
255		/**
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	<	Thread current = Thread.currentThread();
264	<	threadAssertTrue(!current.isDaemon());
265	<	threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
266	<	ThreadGroup g = current.getThreadGroup();
267	<	SecurityManager s = System.getSecurityManager();
268	<	if (s != null)
269	<	threadAssertTrue(g == s.getThreadGroup());
270	<	else
271	<	threadAssertTrue(g == egroup);
272	<	String name = current.getName();
273	<	threadAssertTrue(name.endsWith("thread-1"));
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
277	>	}
278		}
279		};
280		ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
281	<
281	>
282		e.execute(r);
283	<	e.shutdown();
283	>	try {
284	>	e.shutdown();
285	>	} catch (SecurityException ok) {
286	>	}
287	>
288		try {
289		Thread.sleep(SHORT_DELAY_MS);
247	–	} catch (Exception eX) {
248	–	unexpectedException();
290		} finally {
291		joinPool(e);
292		}
#	Line 256 | Line 297 | public class ExecutorsTest extends JSR16
297		* specified group, priority, daemon status, name,
298		* access control context and context class loader
299		*/
300	<	public void testPrivilegedThreadFactory() {
301	<	Policy savedPolicy = Policy.getPolicy();
302	<	AdjustablePolicy policy = new AdjustablePolicy();
303	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
304	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
305	<	Policy.setPolicy(policy);
300	>	public void testPrivilegedThreadFactory() throws Exception {
301	>	Policy savedPolicy = null;
302	>	try {
303	>	savedPolicy = Policy.getPolicy();
304	>	AdjustablePolicy policy = new AdjustablePolicy();
305	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
306	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
307	>	Policy.setPolicy(policy);
308	>	} catch (AccessControlException ok) {
309	>	return;
310	>	}
311		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
312		final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
313		final AccessControlContext thisacc = AccessController.getContext();
314		Runnable r = new Runnable() {
315		public void run() {
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()));
316	>	try {
317	>	Thread current = Thread.currentThread();
318	>	threadAssertTrue(!current.isDaemon());
319	>	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
320	>	ThreadGroup g = current.getThreadGroup();
321	>	SecurityManager s = System.getSecurityManager();
322	>	if (s != null)
323	>	threadAssertTrue(g == s.getThreadGroup());
324	>	else
325	>	threadAssertTrue(g == egroup);
326	>	String name = current.getName();
327	>	threadAssertTrue(name.endsWith("thread-1"));
328	>	threadAssertTrue(thisccl == current.getContextClassLoader());
329	>	threadAssertTrue(thisacc.equals(AccessController.getContext()));
330	>	} catch (SecurityException ok) {
331	>	// Also pass if not allowed to change settings
332	>	}
333		}
334		};
335		ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
336	<
336	>
337		Policy.setPolicy(savedPolicy);
338		e.execute(r);
339	<	e.shutdown();
339	>	try {
340	>	e.shutdown();
341	>	} catch (SecurityException ok) {
342	>	}
343		try {
344		Thread.sleep(SHORT_DELAY_MS);
292	–	} catch (Exception ex) {
293	–	unexpectedException();
345		} finally {
346		joinPool(e);
347		}
348	+	}
349
350	+	void checkCCL() {
351	+	SecurityManager sm = System.getSecurityManager();
352	+	if (sm != null) {
353	+	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
354	+	sm.checkPermission(new RuntimePermission("getClassLoader"));
355	+	}
356		}
357
358	+	class CheckCCL implements Callable<Object> {
359	+	public Object call() {
360	+	checkCCL();
361	+	return null;
362	+	}
363	+	}
364	+
365	+
366	+	/**
367	+	* Without class loader permissions, creating
368	+	* privilegedCallableUsingCurrentClassLoader throws ACE
369	+	*/
370	+	public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
371	+	Policy savedPolicy = null;
372	+	try {
373	+	savedPolicy = Policy.getPolicy();
374	+	AdjustablePolicy policy = new AdjustablePolicy();
375	+	Policy.setPolicy(policy);
376	+	} catch (AccessControlException ok) {
377	+	return;
378	+	}
379	+
380	+	// Check if program still has too many permissions to run test
381	+	try {
382	+	checkCCL();
383	+	// too many privileges to test; so return
384	+	Policy.setPolicy(savedPolicy);
385	+	return;
386	+	} catch (AccessControlException ok) {
387	+	}
388	+
389	+	try {
390	+	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
391	+	shouldThrow();
392	+	} catch (AccessControlException success) {
393	+	} finally {
394	+	Policy.setPolicy(savedPolicy);
395	+	}
396	+	}
397	+
398	+	/**
399	+	* With class loader permissions, calling
400	+	* privilegedCallableUsingCurrentClassLoader does not throw ACE
401	+	*/
402	+	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
403	+	Policy savedPolicy = null;
404	+	try {
405	+	savedPolicy = Policy.getPolicy();
406	+	AdjustablePolicy policy = new AdjustablePolicy();
407	+	policy.addPermission(new RuntimePermission("getContextClassLoader"));
408	+	policy.addPermission(new RuntimePermission("setContextClassLoader"));
409	+	Policy.setPolicy(policy);
410	+	} catch (AccessControlException ok) {
411	+	return;
412	+	}
413	+
414	+	try {
415	+	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
416	+	task.call();
417	+	}
418	+	finally {
419	+	Policy.setPolicy(savedPolicy);
420	+	}
421	+	}
422	+
423	+	/**
424	+	* Without permissions, calling privilegedCallable throws ACE
425	+	*/
426	+	public void testprivilegedCallableWithNoPrivs() throws Exception {
427	+	Callable task;
428	+	Policy savedPolicy = null;
429	+	AdjustablePolicy policy = null;
430	+	AccessControlContext noprivAcc = null;
431	+	try {
432	+	savedPolicy = Policy.getPolicy();
433	+	policy = new AdjustablePolicy();
434	+	Policy.setPolicy(policy);
435	+	noprivAcc = AccessController.getContext();
436	+	task = Executors.privilegedCallable(new CheckCCL());
437	+	Policy.setPolicy(savedPolicy);
438	+	} catch (AccessControlException ok) {
439	+	return; // program has too few permissions to set up test
440	+	}
441	+
442	+	// Make sure that program doesn't have too many permissions
443	+	try {
444	+	AccessController.doPrivileged(new PrivilegedAction() {
445	+	public Object run() {
446	+	checkCCL();
447	+	return null;
448	+	}}, noprivAcc);
449	+	// too many permssions; skip test
450	+	return;
451	+	} catch (AccessControlException ok) {
452	+	}
453	+
454	+	try {
455	+	task.call();
456	+	shouldThrow();
457	+	} catch (AccessControlException success) {}
458	+	}
459	+
460	+	/**
461	+	* With permissions, calling privilegedCallable succeeds
462	+	*/
463	+	public void testprivilegedCallableWithPrivs() throws Exception {
464	+	Policy savedPolicy = null;
465	+	try {
466	+	savedPolicy = Policy.getPolicy();
467	+	AdjustablePolicy policy = new AdjustablePolicy();
468	+	policy.addPermission(new RuntimePermission("getContextClassLoader"));
469	+	policy.addPermission(new RuntimePermission("setContextClassLoader"));
470	+	Policy.setPolicy(policy);
471	+	} catch (AccessControlException ok) {
472	+	return;
473	+	}
474	+
475	+	Callable task = Executors.privilegedCallable(new CheckCCL());
476	+	try {
477	+	task.call();
478	+	} finally {
479	+	Policy.setPolicy(savedPolicy);
480	+	}
481	+	}
482	+
483	+	/**
484	+	* callable(Runnable) returns null when called
485	+	*/
486	+	public void testCallable1() throws Exception {
487	+	Callable c = Executors.callable(new NoOpRunnable());
488	+	assertNull(c.call());
489	+	}
490	+
491	+	/**
492	+	* callable(Runnable, result) returns result when called
493	+	*/
494	+	public void testCallable2() throws Exception {
495	+	Callable c = Executors.callable(new NoOpRunnable(), one);
496	+	assertSame(one, c.call());
497	+	}
498	+
499	+	/**
500	+	* callable(PrivilegedAction) returns its result when called
501	+	*/
502	+	public void testCallable3() throws Exception {
503	+	Callable c = Executors.callable(new PrivilegedAction() {
504	+	public Object run() { return one; }});
505	+	assertSame(one, c.call());
506	+	}
507	+
508	+	/**
509	+	* callable(PrivilegedExceptionAction) returns its result when called
510	+	*/
511	+	public void testCallable4() throws Exception {
512	+	Callable c = Executors.callable(new PrivilegedExceptionAction() {
513	+	public Object run() { return one; }});
514	+	assertSame(one, c.call());
515	+	}
516	+
517	+
518	+	/**
519	+	* callable(null Runnable) throws NPE
520	+	*/
521	+	public void testCallableNPE1() {
522	+	try {
523	+	Callable c = Executors.callable((Runnable) null);
524	+	shouldThrow();
525	+	} catch (NullPointerException success) {}
526	+	}
527	+
528	+	/**
529	+	* callable(null, result) throws NPE
530	+	*/
531	+	public void testCallableNPE2() {
532	+	try {
533	+	Callable c = Executors.callable((Runnable) null, one);
534	+	shouldThrow();
535	+	} catch (NullPointerException success) {}
536	+	}
537	+
538	+	/**
539	+	* callable(null PrivilegedAction) throws NPE
540	+	*/
541	+	public void testCallableNPE3() {
542	+	try {
543	+	Callable c = Executors.callable((PrivilegedAction) null);
544	+	shouldThrow();
545	+	} catch (NullPointerException success) {}
546	+	}
547	+
548	+	/**
549	+	* callable(null PrivilegedExceptionAction) throws NPE
550	+	*/
551	+	public void testCallableNPE4() {
552	+	try {
553	+	Callable c = Executors.callable((PrivilegedExceptionAction) null);
554	+	shouldThrow();
555	+	} catch (NullPointerException success) {}
556	+	}
557	+
558	+
559		}

Diff Legend

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