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.18 by dl, Tue Aug 4 13:58:09 2009 UTC vs.
Revision 1.28 by jsr166, Wed Dec 2 19:17:01 2009 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.*;
15	–	import sun.security.util.SecurityConstants;
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
25	–	static class TimedCallable<T> implements Callable<T> {
26	–	private final ExecutorService exec;
27	–	private final Callable<T> func;
28	–	private final long msecs;
29	–
30	–	TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
31	–	this.exec = exec;
32	–	this.func = func;
33	–	this.msecs = msecs;
34	–	}
35	–
36	–	public T call() throws Exception {
37	–	Future<T> ftask = exec.submit(func);
38	–	try {
39	–	return ftask.get(msecs, TimeUnit.MILLISECONDS);
40	–	} finally {
41	–	ftask.cancel(true);
42	–	}
43	–	}
44	–	}
45	–
46	–
47	–	private static class Fib implements Callable<BigInteger> {
48	–	private final BigInteger n;
49	–	Fib(long n) {
50	–	if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
51	–	this.n = BigInteger.valueOf(n);
52	–	}
53	–	public BigInteger call() {
54	–	BigInteger f1 = BigInteger.ONE;
55	–	BigInteger f2 = f1;
56	–	for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
57	–	BigInteger t = f1.add(f2);
58	–	f1 = f2;
59	–	f2 = t;
60	–	}
61	–	return f1;
62	–	}
63	–	};
64	–
25		/**
26		* A newCachedThreadPool can execute runnables
27		*/
#	Line 91 | Line 51 | public class ExecutorsTest extends JSR16
51		try {
52		ExecutorService e = Executors.newCachedThreadPool(null);
53		shouldThrow();
54	<	}
95	<	catch(NullPointerException success) {
96	<	}
54	>	} catch (NullPointerException success) {}
55		}
56
57
#	Line 126 | Line 84 | public class ExecutorsTest extends JSR16
84		try {
85		ExecutorService e = Executors.newSingleThreadExecutor(null);
86		shouldThrow();
87	<	}
130	<	catch(NullPointerException success) {
131	<	}
87	>	} catch (NullPointerException success) {}
88		}
89
90		/**
#	Line 138 | 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 174 | Line 131 | public class ExecutorsTest extends JSR16
131		try {
132		ExecutorService e = Executors.newFixedThreadPool(2, null);
133		shouldThrow();
134	<	}
178	<	catch(NullPointerException success) {
179	<	}
134	>	} catch (NullPointerException success) {}
135		}
136
137		/**
#	Line 186 | Line 141 | public class ExecutorsTest extends JSR16
141		try {
142		ExecutorService e = Executors.newFixedThreadPool(0);
143		shouldThrow();
144	<	}
190	<	catch(IllegalArgumentException success) {
191	<	}
144	>	} catch (IllegalArgumentException success) {}
145		}
146
147
#	Line 209 | Line 162 | public class ExecutorsTest extends JSR16
162		public void testunconfigurableExecutorServiceNPE() {
163		try {
164		ExecutorService e = Executors.unconfigurableExecutorService(null);
165	<	}
166	<	catch (NullPointerException success) {
214	<	}
165	>	shouldThrow();
166	>	} catch (NullPointerException success) {}
167		}
168
169		/**
#	Line 220 | Line 172 | public class ExecutorsTest extends JSR16
172		public void testunconfigurableScheduledExecutorServiceNPE() {
173		try {
174		ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
175	<	}
176	<	catch (NullPointerException success) {
225	<	}
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());
241	<	joinPool(p1);
242	<	} catch(RejectedExecutionException e){}
243	<	catch(Exception e){
244	<	e.printStackTrace();
245	<	unexpectedException();
246	<	}
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());
261	<	joinPool(p1);
262	<	} catch(RejectedExecutionException e){}
263	<	catch(Exception e){
264	<	e.printStackTrace();
265	<	unexpectedException();
266	<	}
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());
281	<	joinPool(p1);
282	<	} catch(RejectedExecutionException e){}
283	<	catch(Exception e){
284	<	e.printStackTrace();
285	<	unexpectedException();
286	<	}
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;
307	<	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);
314	<	return;
315	<	}
316	<	catch (Exception e) {
317	<	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);
323	<	}
324	<	finally {
325	<	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	<	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	<	}
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		try {
284		e.shutdown();
285	<	} catch(SecurityException ok) {
285	>	} catch (SecurityException ok) {
286		}
287	<
287	>
288		try {
289		Thread.sleep(SHORT_DELAY_MS);
365	–	} catch (Exception eX) {
366	–	unexpectedException();
290		} finally {
291		joinPool(e);
292		}
#	Line 374 | 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() {
300	>	public void testPrivilegedThreadFactory() throws Exception {
301		Policy savedPolicy = null;
302		try {
303		savedPolicy = Policy.getPolicy();
#	Line 390 | Line 313 | public class ExecutorsTest extends JSR16
313		final AccessControlContext thisacc = AccessController.getContext();
314		Runnable r = new Runnable() {
315		public void run() {
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	<	}
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		try {
340		e.shutdown();
341	<	} catch(SecurityException ok) {
341	>	} catch (SecurityException ok) {
342		}
343		try {
344		Thread.sleep(SHORT_DELAY_MS);
422	–	} catch (Exception ex) {
423	–	unexpectedException();
345		} finally {
346		joinPool(e);
347		}
427	–
348		}
349
350		void checkCCL() {
351		SecurityManager sm = System.getSecurityManager();
352		if (sm != null) {
353		sm.checkPermission(new RuntimePermission("setContextClassLoader"));
354	<	sm.checkPermission(SecurityConstants.GET_CLASSLOADER_PERMISSION);
354	>	sm.checkPermission(new RuntimePermission("getClassLoader"));
355		}
356		}
357
#	Line 448 | Line 368 | public class ExecutorsTest extends JSR16
368		* privilegedCallableUsingCurrentClassLoader throws ACE
369		*/
370		public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
371	<	Policy savedPolicy = null;
371	>	Policy savedPolicy = null;
372		try {
373		savedPolicy = Policy.getPolicy();
374		AdjustablePolicy policy = new AdjustablePolicy();
#	Line 463 | Line 383 | public class ExecutorsTest extends JSR16
383		// too many privileges to test; so return
384		Policy.setPolicy(savedPolicy);
385		return;
386	<	} catch(AccessControlException ok) {
387	<	}
386	>	} catch (AccessControlException ok) {
387	>	}
388
389		try {
390		Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
391		shouldThrow();
392	<	} catch(AccessControlException success) {
393	<	} catch(Exception ex) {
474	<	unexpectedException();
475	<	}
476	<	finally {
392	>	} catch (AccessControlException success) {
393	>	} finally {
394		Policy.setPolicy(savedPolicy);
395		}
396		}
#	Line 482 | Line 399 | public class ExecutorsTest extends JSR16
399		* With class loader permissions, calling
400		* privilegedCallableUsingCurrentClassLoader does not throw ACE
401		*/
402	<	public void testprivilegedCallableUsingCCLWithPrivs() {
403	<	Policy savedPolicy = null;
402	>	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
403	>	Policy savedPolicy = null;
404		try {
405		savedPolicy = Policy.getPolicy();
406		AdjustablePolicy policy = new AdjustablePolicy();
#	Line 493 | Line 410 | public class ExecutorsTest extends JSR16
410		} catch (AccessControlException ok) {
411		return;
412		}
413	<
413	>
414		try {
415		Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
416		task.call();
417	<	} catch(Exception ex) {
501	<	unexpectedException();
502	<	}
417	>	}
418		finally {
419		Policy.setPolicy(savedPolicy);
420		}
#	Line 508 | Line 423 | public class ExecutorsTest extends JSR16
423		/**
424		* Without permissions, calling privilegedCallable throws ACE
425		*/
426	<	public void testprivilegedCallableWithNoPrivs() {
426	>	public void testprivilegedCallableWithNoPrivs() throws Exception {
427		Callable task;
428		Policy savedPolicy = null;
429		AdjustablePolicy policy = null;
#	Line 524 | Line 439 | public class ExecutorsTest extends JSR16
439		return; // program has too few permissions to set up test
440		}
441
442	<	// Make sure that program doesn't have too many permissions
442	>	// Make sure that program doesn't have too many permissions
443		try {
444		AccessController.doPrivileged(new PrivilegedAction() {
445		public Object run() {
#	Line 533 | Line 448 | public class ExecutorsTest extends JSR16
448		}}, noprivAcc);
449		// too many permssions; skip test
450		return;
451	<	} catch(AccessControlException ok) {
451	>	} catch (AccessControlException ok) {
452		}
453
454		try {
455		task.call();
456		shouldThrow();
457	<	} catch(AccessControlException success) {
543	<	} catch(Exception ex) {
544	<	unexpectedException();
545	<	}
457	>	} catch (AccessControlException success) {}
458		}
459
460		/**
461		* With permissions, calling privilegedCallable succeeds
462		*/
463	<	public void testprivilegedCallableWithPrivs() {
464	<	Policy savedPolicy = null;
463	>	public void testprivilegedCallableWithPrivs() throws Exception {
464	>	Policy savedPolicy = null;
465		try {
466		savedPolicy = Policy.getPolicy();
467		AdjustablePolicy policy = new AdjustablePolicy();
#	Line 559 | Line 471 | public class ExecutorsTest extends JSR16
471		} catch (AccessControlException ok) {
472		return;
473		}
474	<
474	>
475		Callable task = Executors.privilegedCallable(new CheckCCL());
476		try {
477		task.call();
566	–	} catch(Exception ex) {
567	–	unexpectedException();
478		} finally {
479		Policy.setPolicy(savedPolicy);
480		}
#	Line 572 | Line 482 | public class ExecutorsTest extends JSR16
482
483		/**
484		* callable(Runnable) returns null when called
485	<	*/
486	<	public void testCallable1() {
487	<	try {
488	<	Callable c = Executors.callable(new NoOpRunnable());
579	<	assertNull(c.call());
580	<	} catch(Exception ex) {
581	<	unexpectedException();
582	<	}
583	<
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() {
495	<	try {
496	<	Callable c = Executors.callable(new NoOpRunnable(), one);
592	<	assertEquals(one, c.call());
593	<	} catch(Exception ex) {
594	<	unexpectedException();
595	<	}
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() {
503	<	try {
504	<	Callable c = Executors.callable(new PrivilegedAction() {
505	<	public Object run() { return one; }});
605	<	assertEquals(one, c.call());
606	<	} catch(Exception ex) {
607	<	unexpectedException();
608	<	}
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() {
512	<	try {
513	<	Callable c = Executors.callable(new PrivilegedExceptionAction() {
514	<	public Object run() { return one; }});
618	<	assertEquals(one, c.call());
619	<	} catch(Exception ex) {
620	<	unexpectedException();
621	<	}
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	<	*/
520	>	*/
521		public void testCallableNPE1() {
522		try {
523	<	Runnable r = null;
524	<	Callable c = Executors.callable(r);
525	<	} catch (NullPointerException success) {
633	<	}
523	>	Callable c = Executors.callable((Runnable) null);
524	>	shouldThrow();
525	>	} catch (NullPointerException success) {}
526		}
527
528		/**
529		* callable(null, result) throws NPE
530	<	*/
530	>	*/
531		public void testCallableNPE2() {
532		try {
533	<	Runnable r = null;
534	<	Callable c = Executors.callable(r, one);
535	<	} catch (NullPointerException success) {
644	<	}
533	>	Callable c = Executors.callable((Runnable) null, one);
534	>	shouldThrow();
535	>	} catch (NullPointerException success) {}
536		}
537
538		/**
539		* callable(null PrivilegedAction) throws NPE
540	<	*/
540	>	*/
541		public void testCallableNPE3() {
542		try {
543	<	PrivilegedAction r = null;
544	<	Callable c = Executors.callable(r);
545	<	} catch (NullPointerException success) {
655	<	}
543	>	Callable c = Executors.callable((PrivilegedAction) null);
544	>	shouldThrow();
545	>	} catch (NullPointerException success) {}
546		}
547
548		/**
549		* callable(null PrivilegedExceptionAction) throws NPE
550	<	*/
550	>	*/
551		public void testCallableNPE4() {
552		try {
553	<	PrivilegedExceptionAction r = null;
554	<	Callable c = Executors.callable(r);
555	<	} catch (NullPointerException success) {
666	<	}
553	>	Callable c = Executors.callable((PrivilegedExceptionAction) null);
554	>	shouldThrow();
555	>	} catch (NullPointerException success) {}
556		}
557
558

Diff Legend

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