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.12 by dl, Sat Dec 27 19:26:43 2003 UTC vs.
Revision 1.24 by jsr166, Fri Nov 20 22:58:48 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
#	Line 13 | Line 13 | import java.util.concurrent.*;
13		import java.math.BigInteger;
14		import java.security.*;
15
16	<	public class ExecutorsTest extends JSR166TestCase{
16	>	public class ExecutorsTest extends JSR166TestCase {
17		public static void main(String[] args) {
18	<	junit.textui.TestRunner.run (suite());
18	>	junit.textui.TestRunner.run (suite());
19		}
20		public static Test suite() {
21		return new TestSuite(ExecutorsTest.class);
#	Line 25 | Line 25 | public class ExecutorsTest extends JSR16
25		private final ExecutorService exec;
26		private final Callable<T> func;
27		private final long msecs;
28	<
28	>
29		TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
30		this.exec = exec;
31		this.func = func;
32		this.msecs = msecs;
33		}
34	<
34	>
35		public T call() throws Exception {
36		Future<T> ftask = exec.submit(func);
37		try {
#	Line 69 | Line 69 | public class ExecutorsTest extends JSR16
69		e.execute(new NoOpRunnable());
70		e.execute(new NoOpRunnable());
71		e.execute(new NoOpRunnable());
72	<	e.shutdown();
72	>	joinPool(e);
73		}
74
75		/**
#	Line 80 | Line 80 | public class ExecutorsTest extends JSR16
80		e.execute(new NoOpRunnable());
81		e.execute(new NoOpRunnable());
82		e.execute(new NoOpRunnable());
83	<	e.shutdown();
83	>	joinPool(e);
84		}
85
86		/**
#	Line 90 | Line 90 | public class ExecutorsTest extends JSR16
90		try {
91		ExecutorService e = Executors.newCachedThreadPool(null);
92		shouldThrow();
93	<	}
94	<	catch(NullPointerException success) {
95	<	}
93	>	} catch (NullPointerException success) {}
94		}
95
96
#	Line 104 | Line 102 | public class ExecutorsTest extends JSR16
102		e.execute(new NoOpRunnable());
103		e.execute(new NoOpRunnable());
104		e.execute(new NoOpRunnable());
105	<	e.shutdown();
105	>	joinPool(e);
106		}
107
108		/**
#	Line 115 | Line 113 | public class ExecutorsTest extends JSR16
113		e.execute(new NoOpRunnable());
114		e.execute(new NoOpRunnable());
115		e.execute(new NoOpRunnable());
116	<	e.shutdown();
116	>	joinPool(e);
117		}
118
119		/**
#	Line 125 | Line 123 | public class ExecutorsTest extends JSR16
123		try {
124		ExecutorService e = Executors.newSingleThreadExecutor(null);
125		shouldThrow();
126	<	}
129	<	catch(NullPointerException success) {
130	<	}
126	>	} catch (NullPointerException success) {}
127		}
128
129		/**
#	Line 137 | Line 133 | public class ExecutorsTest extends JSR16
133		ExecutorService e = Executors.newSingleThreadExecutor();
134		try {
135		ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
136	+	shouldThrow();
137		} catch (ClassCastException success) {
138		} finally {
139		joinPool(e);
#	Line 152 | Line 149 | public class ExecutorsTest extends JSR16
149		e.execute(new NoOpRunnable());
150		e.execute(new NoOpRunnable());
151		e.execute(new NoOpRunnable());
152	<	e.shutdown();
152	>	joinPool(e);
153		}
154
155		/**
#	Line 163 | Line 160 | public class ExecutorsTest extends JSR16
160		e.execute(new NoOpRunnable());
161		e.execute(new NoOpRunnable());
162		e.execute(new NoOpRunnable());
163	<	e.shutdown();
163	>	joinPool(e);
164		}
165
166		/**
#	Line 173 | Line 170 | public class ExecutorsTest extends JSR16
170		try {
171		ExecutorService e = Executors.newFixedThreadPool(2, null);
172		shouldThrow();
173	<	}
177	<	catch(NullPointerException success) {
178	<	}
173	>	} catch (NullPointerException success) {}
174		}
175
176		/**
#	Line 185 | Line 180 | public class ExecutorsTest extends JSR16
180		try {
181		ExecutorService e = Executors.newFixedThreadPool(0);
182		shouldThrow();
183	<	}
189	<	catch(IllegalArgumentException success) {
190	<	}
183	>	} catch (IllegalArgumentException success) {}
184		}
185
186
#	Line 199 | Line 192 | public class ExecutorsTest extends JSR16
192		e.execute(new NoOpRunnable());
193		e.execute(new NoOpRunnable());
194		e.execute(new NoOpRunnable());
195	<	e.shutdown();
195	>	joinPool(e);
196		}
197
198		/**
#	Line 208 | Line 201 | public class ExecutorsTest extends JSR16
201		public void testunconfigurableExecutorServiceNPE() {
202		try {
203		ExecutorService e = Executors.unconfigurableExecutorService(null);
204	<	}
205	<	catch (NullPointerException success) {
213	<	}
204	>	shouldThrow();
205	>	} catch (NullPointerException success) {}
206		}
207
208		/**
#	Line 219 | Line 211 | public class ExecutorsTest extends JSR16
211		public void testunconfigurableScheduledExecutorServiceNPE() {
212		try {
213		ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
214	<	}
215	<	catch (NullPointerException success) {
224	<	}
214	>	shouldThrow();
215	>	} catch (NullPointerException success) {}
216		}
217
218
219		/**
220		* a newSingleThreadScheduledExecutor successfully runs delayed task
221		*/
222	<	public void testNewSingleThreadScheduledExecutor() {
223	<	try {
224	<	TrackedCallable callable = new TrackedCallable();
225	<	ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
226	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
227	<	assertFalse(callable.done);
228	<	Thread.sleep(MEDIUM_DELAY_MS);
229	<	assertTrue(callable.done);
230	<	assertEquals(Boolean.TRUE, f.get());
240	<	p1.shutdown();
241	<	joinPool(p1);
242	<	} catch(RejectedExecutionException e){}
243	<	catch(Exception e){
244	<	e.printStackTrace();
245	<	unexpectedException();
246	<	}
222	>	public void testNewSingleThreadScheduledExecutor() throws Exception {
223	>	TrackedCallable callable = new TrackedCallable();
224	>	ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
225	>	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
226	>	assertFalse(callable.done);
227	>	Thread.sleep(MEDIUM_DELAY_MS);
228	>	assertTrue(callable.done);
229	>	assertEquals(Boolean.TRUE, f.get());
230	>	joinPool(p1);
231		}
232
233		/**
234		* a newScheduledThreadPool successfully runs delayed task
235		*/
236	<	public void testnewScheduledThreadPool() {
237	<	try {
238	<	TrackedCallable callable = new TrackedCallable();
239	<	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
240	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
241	<	assertFalse(callable.done);
242	<	Thread.sleep(MEDIUM_DELAY_MS);
243	<	assertTrue(callable.done);
244	<	assertEquals(Boolean.TRUE, f.get());
261	<	p1.shutdown();
262	<	joinPool(p1);
263	<	} catch(RejectedExecutionException e){}
264	<	catch(Exception e){
265	<	e.printStackTrace();
266	<	unexpectedException();
267	<	}
236	>	public void testnewScheduledThreadPool() throws Exception {
237	>	TrackedCallable callable = new TrackedCallable();
238	>	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
239	>	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
240	>	assertFalse(callable.done);
241	>	Thread.sleep(MEDIUM_DELAY_MS);
242	>	assertTrue(callable.done);
243	>	assertEquals(Boolean.TRUE, f.get());
244	>	joinPool(p1);
245		}
246
247		/**
248	<	* an unconfigurable  newScheduledThreadPool successfully runs delayed task
249	<	*/
250	<	public void testunconfigurableScheduledExecutorService() {
251	<	try {
252	<	TrackedCallable callable = new TrackedCallable();
253	<	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
254	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
255	<	assertFalse(callable.done);
256	<	Thread.sleep(MEDIUM_DELAY_MS);
257	<	assertTrue(callable.done);
258	<	assertEquals(Boolean.TRUE, f.get());
282	<	p1.shutdown();
283	<	joinPool(p1);
284	<	} catch(RejectedExecutionException e){}
285	<	catch(Exception e){
286	<	e.printStackTrace();
287	<	unexpectedException();
288	<	}
248	>	* an unconfigurable newScheduledThreadPool successfully runs delayed task
249	>	*/
250	>	public void testunconfigurableScheduledExecutorService() throws Exception {
251	>	TrackedCallable callable = new TrackedCallable();
252	>	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
253	>	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
254	>	assertFalse(callable.done);
255	>	Thread.sleep(MEDIUM_DELAY_MS);
256	>	assertTrue(callable.done);
257	>	assertEquals(Boolean.TRUE, f.get());
258	>	joinPool(p1);
259		}
260
261		/**
262		*  timeouts from execute will time out if they compute too long.
263		*/
264	<	public void testTimedCallable() {
264	>	public void testTimedCallable() throws Exception {
265		int N = 10000;
266		ExecutorService executor = Executors.newSingleThreadExecutor();
267		List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
268		try {
269		long startTime = System.currentTimeMillis();
270	<
270	>
271		long i = 0;
272		while (tasks.size() < N) {
273		tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
274		i += 10;
275		}
276	<
276	>
277		int iters = 0;
278		BigInteger sum = BigInteger.ZERO;
279		for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
#	Line 315 | Line 285 | public class ExecutorsTest extends JSR16
285		assertTrue(iters > 0);
286		return;
287		}
318	–	catch (Exception e) {
319	–	unexpectedException();
320	–	}
288		}
289		// if by chance we didn't ever time out, total time must be small
290		long elapsed = System.currentTimeMillis() - startTime;
#	Line 328 | Line 295 | public class ExecutorsTest extends JSR16
295		}
296		}
297
298	<
298	>
299		/**
300		* ThreadPoolExecutor using defaultThreadFactory has
301		* specified group, priority, daemon status, and name
302		*/
303	<	public void testDefaultThreadFactory() {
303	>	public void testDefaultThreadFactory() throws Exception {
304		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
305		Runnable r = new Runnable() {
306		public void run() {
307	<	Thread current = Thread.currentThread();
308	<	threadAssertTrue(!current.isDaemon());
309	<	threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
310	<	ThreadGroup g = current.getThreadGroup();
311	<	SecurityManager s = System.getSecurityManager();
312	<	if (s != null)
313	<	threadAssertTrue(g == s.getThreadGroup());
314	<	else
315	<	threadAssertTrue(g == egroup);
316	<	String name = current.getName();
317	<	threadAssertTrue(name.endsWith("thread-1"));
307	>	try {
308	>	Thread current = Thread.currentThread();
309	>	threadAssertTrue(!current.isDaemon());
310	>	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
311	>	ThreadGroup g = current.getThreadGroup();
312	>	SecurityManager s = System.getSecurityManager();
313	>	if (s != null)
314	>	threadAssertTrue(g == s.getThreadGroup());
315	>	else
316	>	threadAssertTrue(g == egroup);
317	>	String name = current.getName();
318	>	threadAssertTrue(name.endsWith("thread-1"));
319	>	} catch (SecurityException ok) {
320	>	// Also pass if not allowed to change setting
321	>	}
322		}
323		};
324		ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
325	<
325	>
326		e.execute(r);
327	<	e.shutdown();
327	>	try {
328	>	e.shutdown();
329	>	} catch (SecurityException ok) {
330	>	}
331	>
332		try {
333		Thread.sleep(SHORT_DELAY_MS);
359	–	} catch (Exception eX) {
360	–	unexpectedException();
334		} finally {
335		joinPool(e);
336		}
#	Line 368 | Line 341 | public class ExecutorsTest extends JSR16
341		* specified group, priority, daemon status, name,
342		* access control context and context class loader
343		*/
344	<	public void testPrivilegedThreadFactory() {
345	<	Policy savedPolicy = Policy.getPolicy();
346	<	AdjustablePolicy policy = new AdjustablePolicy();
347	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
348	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
349	<	Policy.setPolicy(policy);
344	>	public void testPrivilegedThreadFactory() throws Exception {
345	>	Policy savedPolicy = null;
346	>	try {
347	>	savedPolicy = Policy.getPolicy();
348	>	AdjustablePolicy policy = new AdjustablePolicy();
349	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
350	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
351	>	Policy.setPolicy(policy);
352	>	} catch (AccessControlException ok) {
353	>	return;
354	>	}
355		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
356		final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
357		final AccessControlContext thisacc = AccessController.getContext();
358		Runnable r = new Runnable() {
359		public void run() {
360	<	Thread current = Thread.currentThread();
361	<	threadAssertTrue(!current.isDaemon());
362	<	threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
363	<	ThreadGroup g = current.getThreadGroup();
364	<	SecurityManager s = System.getSecurityManager();
365	<	if (s != null)
366	<	threadAssertTrue(g == s.getThreadGroup());
367	<	else
368	<	threadAssertTrue(g == egroup);
369	<	String name = current.getName();
370	<	threadAssertTrue(name.endsWith("thread-1"));
371	<	threadAssertTrue(thisccl == current.getContextClassLoader());
372	<	threadAssertTrue(thisacc.equals(AccessController.getContext()));
360	>	try {
361	>	Thread current = Thread.currentThread();
362	>	threadAssertTrue(!current.isDaemon());
363	>	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
364	>	ThreadGroup g = current.getThreadGroup();
365	>	SecurityManager s = System.getSecurityManager();
366	>	if (s != null)
367	>	threadAssertTrue(g == s.getThreadGroup());
368	>	else
369	>	threadAssertTrue(g == egroup);
370	>	String name = current.getName();
371	>	threadAssertTrue(name.endsWith("thread-1"));
372	>	threadAssertTrue(thisccl == current.getContextClassLoader());
373	>	threadAssertTrue(thisacc.equals(AccessController.getContext()));
374	>	} catch (SecurityException ok) {
375	>	// Also pass if not allowed to change settings
376	>	}
377		}
378		};
379		ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
380	<
380	>
381		Policy.setPolicy(savedPolicy);
382		e.execute(r);
383	<	e.shutdown();
383	>	try {
384	>	e.shutdown();
385	>	} catch (SecurityException ok) {
386	>	}
387		try {
388		Thread.sleep(SHORT_DELAY_MS);
404	–	} catch (Exception ex) {
405	–	unexpectedException();
389		} finally {
390		joinPool(e);
391		}
392
393		}
394
395	<	static class CheckCCL implements Callable<Object> {
395	>	void checkCCL() {
396	>	SecurityManager sm = System.getSecurityManager();
397	>	if (sm != null) {
398	>	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
399	>	sm.checkPermission(new RuntimePermission("getClassLoader"));
400	>	}
401	>	}
402	>
403	>	class CheckCCL implements Callable<Object> {
404		public Object call() {
405	<	AccessControlContext acc = AccessController.getContext();
415	<	acc.checkPermission(new RuntimePermission("getContextClassLoader"));
405	>	checkCCL();
406		return null;
407		}
408		}
#	Line 423 | Line 413 | public class ExecutorsTest extends JSR16
413		* privilegedCallableUsingCurrentClassLoader throws ACE
414		*/
415		public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
416	<	Policy savedPolicy = Policy.getPolicy();
417	<	AdjustablePolicy policy = new AdjustablePolicy();
418	<	Policy.setPolicy(policy);
416	>	Policy savedPolicy = null;
417	>	try {
418	>	savedPolicy = Policy.getPolicy();
419	>	AdjustablePolicy policy = new AdjustablePolicy();
420	>	Policy.setPolicy(policy);
421	>	} catch (AccessControlException ok) {
422	>	return;
423	>	}
424	>
425	>	// Check if program still has too many permissions to run test
426	>	try {
427	>	checkCCL();
428	>	// too many privileges to test; so return
429	>	Policy.setPolicy(savedPolicy);
430	>	return;
431	>	} catch (AccessControlException ok) {
432	>	}
433	>
434		try {
435		Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
436		shouldThrow();
437	<	} catch(AccessControlException success) {
438	<	} catch(Exception ex) {
434	<	unexpectedException();
435	<	}
436	<	finally {
437	>	} catch (AccessControlException success) {
438	>	} finally {
439		Policy.setPolicy(savedPolicy);
440		}
441		}
442
443		/**
444	<	* Without class loader permissions, calling
445	<	* privilegedCallableUsingCurrentClassLoader throws ACE
444	>	* With class loader permissions, calling
445	>	* privilegedCallableUsingCurrentClassLoader does not throw ACE
446		*/
447	<	public void testprivilegedCallableUsingCCLWithPrivs() {
448	<	Policy savedPolicy = Policy.getPolicy();
449	<	AdjustablePolicy policy = new AdjustablePolicy();
450	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
451	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
452	<	Policy.setPolicy(policy);
447	>	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
448	>	Policy savedPolicy = null;
449	>	try {
450	>	savedPolicy = Policy.getPolicy();
451	>	AdjustablePolicy policy = new AdjustablePolicy();
452	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
453	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
454	>	Policy.setPolicy(policy);
455	>	} catch (AccessControlException ok) {
456	>	return;
457	>	}
458	>
459		try {
460		Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
461		task.call();
462	<	} catch(Exception ex) {
455	<	unexpectedException();
456	<	}
462	>	}
463		finally {
464		Policy.setPolicy(savedPolicy);
465		}
#	Line 462 | Line 468 | public class ExecutorsTest extends JSR16
468		/**
469		* Without permissions, calling privilegedCallable throws ACE
470		*/
471	<	public void testprivilegedCallableWithNoPrivs() {
472	<	Policy savedPolicy = Policy.getPolicy();
473	<	AdjustablePolicy policy = new AdjustablePolicy();
474	<	Policy.setPolicy(policy);
475	<	Callable task = Executors.privilegedCallable(new CheckCCL());
476	<	Policy.setPolicy(savedPolicy);
471	>	public void testprivilegedCallableWithNoPrivs() throws Exception {
472	>	Callable task;
473	>	Policy savedPolicy = null;
474	>	AdjustablePolicy policy = null;
475	>	AccessControlContext noprivAcc = null;
476	>	try {
477	>	savedPolicy = Policy.getPolicy();
478	>	policy = new AdjustablePolicy();
479	>	Policy.setPolicy(policy);
480	>	noprivAcc = AccessController.getContext();
481	>	task = Executors.privilegedCallable(new CheckCCL());
482	>	Policy.setPolicy(savedPolicy);
483	>	} catch (AccessControlException ok) {
484	>	return; // program has too few permissions to set up test
485	>	}
486	>
487	>	// Make sure that program doesn't have too many permissions
488	>	try {
489	>	AccessController.doPrivileged(new PrivilegedAction() {
490	>	public Object run() {
491	>	checkCCL();
492	>	return null;
493	>	}}, noprivAcc);
494	>	// too many permssions; skip test
495	>	return;
496	>	} catch (AccessControlException ok) {
497	>	}
498	>
499		try {
500		task.call();
501		shouldThrow();
502	<	} catch(AccessControlException success) {
475	<	} catch(Exception ex) {
476	<	unexpectedException();
477	<	} finally {
478	<	}
502	>	} catch (AccessControlException success) {}
503		}
504
505		/**
506		* With permissions, calling privilegedCallable succeeds
507		*/
508	<	public void testprivilegedCallableWithPrivs() {
509	<	Policy savedPolicy = Policy.getPolicy();
510	<	AdjustablePolicy policy = new AdjustablePolicy();
511	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
512	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
513	<	Policy.setPolicy(policy);
508	>	public void testprivilegedCallableWithPrivs() throws Exception {
509	>	Policy savedPolicy = null;
510	>	try {
511	>	savedPolicy = Policy.getPolicy();
512	>	AdjustablePolicy policy = new AdjustablePolicy();
513	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
514	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
515	>	Policy.setPolicy(policy);
516	>	} catch (AccessControlException ok) {
517	>	return;
518	>	}
519	>
520		Callable task = Executors.privilegedCallable(new CheckCCL());
521		try {
522		task.call();
493	–	} catch(Exception ex) {
494	–	unexpectedException();
523		} finally {
524		Policy.setPolicy(savedPolicy);
525		}
#	Line 499 | Line 527 | public class ExecutorsTest extends JSR16
527
528		/**
529		* callable(Runnable) returns null when called
530	<	*/
531	<	public void testCallable1() {
532	<	try {
533	<	Callable c = Executors.callable(new NoOpRunnable());
506	<	assertNull(c.call());
507	<	} catch(Exception ex) {
508	<	unexpectedException();
509	<	}
510	<
530	>	*/
531	>	public void testCallable1() throws Exception {
532	>	Callable c = Executors.callable(new NoOpRunnable());
533	>	assertNull(c.call());
534		}
535
536		/**
537		* callable(Runnable, result) returns result when called
538	<	*/
539	<	public void testCallable2() {
540	<	try {
541	<	Callable c = Executors.callable(new NoOpRunnable(), one);
519	<	assertEquals(one, c.call());
520	<	} catch(Exception ex) {
521	<	unexpectedException();
522	<	}
538	>	*/
539	>	public void testCallable2() throws Exception {
540	>	Callable c = Executors.callable(new NoOpRunnable(), one);
541	>	assertEquals(one, c.call());
542		}
543
544		/**
545		* callable(PrivilegedAction) returns its result when called
546	<	*/
547	<	public void testCallable3() {
548	<	try {
549	<	Callable c = Executors.callable(new PrivilegedAction() {
531	<	public Object run() { return one; }});
546	>	*/
547	>	public void testCallable3() throws Exception {
548	>	Callable c = Executors.callable(new PrivilegedAction() {
549	>	public Object run() { return one; }});
550		assertEquals(one, c.call());
533	–	} catch(Exception ex) {
534	–	unexpectedException();
535	–	}
551		}
552
553		/**
554		* callable(PrivilegedExceptionAction) returns its result when called
555	<	*/
556	<	public void testCallable4() {
557	<	try {
558	<	Callable c = Executors.callable(new PrivilegedExceptionAction() {
559	<	public Object run() { return one; }});
545	<	assertEquals(one, c.call());
546	<	} catch(Exception ex) {
547	<	unexpectedException();
548	<	}
555	>	*/
556	>	public void testCallable4() throws Exception {
557	>	Callable c = Executors.callable(new PrivilegedExceptionAction() {
558	>	public Object run() { return one; }});
559	>	assertEquals(one, c.call());
560		}
561
562
563		/**
564		* callable(null Runnable) throws NPE
565	<	*/
565	>	*/
566		public void testCallableNPE1() {
567		try {
568	<	Runnable r = null;
569	<	Callable c = Executors.callable(r);
570	<	} catch (NullPointerException success) {
560	<	}
568	>	Callable c = Executors.callable((Runnable) null);
569	>	shouldThrow();
570	>	} catch (NullPointerException success) {}
571		}
572
573		/**
574		* callable(null, result) throws NPE
575	<	*/
575	>	*/
576		public void testCallableNPE2() {
577		try {
578	<	Runnable r = null;
579	<	Callable c = Executors.callable(r, one);
580	<	} catch (NullPointerException success) {
571	<	}
578	>	Callable c = Executors.callable((Runnable) null, one);
579	>	shouldThrow();
580	>	} catch (NullPointerException success) {}
581		}
582
583		/**
584		* callable(null PrivilegedAction) throws NPE
585	<	*/
585	>	*/
586		public void testCallableNPE3() {
587		try {
588	<	PrivilegedAction r = null;
589	<	Callable c = Executors.callable(r);
590	<	} catch (NullPointerException success) {
582	<	}
588	>	Callable c = Executors.callable((PrivilegedAction) null);
589	>	shouldThrow();
590	>	} catch (NullPointerException success) {}
591		}
592
593		/**
594		* callable(null PrivilegedExceptionAction) throws NPE
595	<	*/
595	>	*/
596		public void testCallableNPE4() {
597		try {
598	<	PrivilegedExceptionAction r = null;
599	<	Callable c = Executors.callable(r);
600	<	} catch (NullPointerException success) {
593	<	}
598	>	Callable c = Executors.callable((PrivilegedExceptionAction) null);
599	>	shouldThrow();
600	>	} catch (NullPointerException success) {}
601		}
602
603

Diff Legend

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