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.6 by dl, Fri Sep 26 15:33:13 2003 UTC vs.
Revision 1.23 by jsr166, Thu Nov 19 03:55:29 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
#	Line 10 | Line 11 | import junit.framework.*;
11		import java.util.*;
12		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);
20	<	}
21	<
22	<	private static final String TEST_STRING = "a test string";
23	<
24	<	private static class StringTask implements Callable<String> {
25	<	public String call() { return TEST_STRING; }
26	<	}
27	<
28	<	static class DirectExecutor implements Executor {
29	<	public void execute(Runnable r) {
30	<	r.run();
31	<	}
21	>	return new TestSuite(ExecutorsTest.class);
22		}
23
24		static class TimedCallable<T> implements Callable<T> {
25	<	private final Executor exec;
25	>	private final ExecutorService exec;
26		private final Callable<T> func;
27		private final long msecs;
28	<
29	<	TimedCallable(Executor exec, Callable<T> func, 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	<
34	>
35		public T call() throws Exception {
36	<	Future<T> ftask = Executors.execute(exec, func);
36	>	Future<T> ftask = exec.submit(func);
37		try {
38		return ftask.get(msecs, TimeUnit.MILLISECONDS);
39		} finally {
#	Line 79 | 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 90 | 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 100 | Line 90 | public class ExecutorsTest extends JSR16
90		try {
91		ExecutorService e = Executors.newCachedThreadPool(null);
92		shouldThrow();
93	<	}
104	<	catch(NullPointerException success) {
105	<	}
93	>	} catch (NullPointerException success) {}
94		}
95
96
#	Line 114 | 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 125 | 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 135 | Line 123 | public class ExecutorsTest extends JSR16
123		try {
124		ExecutorService e = Executors.newSingleThreadExecutor(null);
125		shouldThrow();
126	<	}
127	<	catch(NullPointerException success) {
126	>	} catch (NullPointerException success) {}
127	>	}
128	>
129	>	/**
130	>	* A new SingleThreadExecutor cannot be casted to concrete implementation
131	>	*/
132	>	public void testCastNewSingleThreadExecutor() {
133	>	ExecutorService e = Executors.newSingleThreadExecutor();
134	>	try {
135	>	ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
136	>	shouldThrow();
137	>	} catch (ClassCastException success) {
138	>	} finally {
139	>	joinPool(e);
140		}
141		}
142
143	+
144		/**
145		* A new newFixedThreadPool can execute runnables
146		*/
#	Line 148 | 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 159 | 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 169 | Line 170 | public class ExecutorsTest extends JSR16
170		try {
171		ExecutorService e = Executors.newFixedThreadPool(2, null);
172		shouldThrow();
173	<	}
173	<	catch(NullPointerException success) {
174	<	}
173	>	} catch (NullPointerException success) {}
174		}
175
176		/**
#	Line 181 | Line 180 | public class ExecutorsTest extends JSR16
180		try {
181		ExecutorService e = Executors.newFixedThreadPool(0);
182		shouldThrow();
183	<	}
185	<	catch(IllegalArgumentException success) {
186	<	}
183	>	} catch (IllegalArgumentException success) {}
184		}
185
186	+
187		/**
188	<	* execute of runnable runs it to completion
188	>	* An unconfigurable newFixedThreadPool can execute runnables
189		*/
190	<	public void testExecuteRunnable () {
190	>	public void testunconfigurableExecutorService() {
191	>	ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
192	>	e.execute(new NoOpRunnable());
193	>	e.execute(new NoOpRunnable());
194	>	e.execute(new NoOpRunnable());
195	>	joinPool(e);
196	>	}
197	>
198	>	/**
199	>	* unconfigurableExecutorService(null) throws NPE
200	>	*/
201	>	public void testunconfigurableExecutorServiceNPE() {
202		try {
203	<	Executor e = new DirectExecutor();
204	<	TrackedRunnable task = new TrackedRunnable();
205	<	assertFalse(task.done);
197	<	Future<String> future = Executors.execute(e, task, TEST_STRING);
198	<	String result = future.get();
199	<	assertTrue(task.done);
200	<	assertSame(TEST_STRING, result);
201	<	}
202	<	catch (ExecutionException ex) {
203	<	unexpectedException();
204	<	}
205	<	catch (InterruptedException ex) {
206	<	unexpectedException();
207	<	}
203	>	ExecutorService e = Executors.unconfigurableExecutorService(null);
204	>	shouldThrow();
205	>	} catch (NullPointerException success) {}
206		}
207
208		/**
209	<	* invoke of a runnable runs it to completion
209	>	* unconfigurableScheduledExecutorService(null) throws NPE
210		*/
211	<	public void testInvokeRunnable () {
211	>	public void testunconfigurableScheduledExecutorServiceNPE() {
212		try {
213	<	Executor e = new DirectExecutor();
214	<	TrackedRunnable task = new TrackedRunnable();
215	<	assertFalse(task.done);
216	<	Executors.invoke(e, task);
217	<	assertTrue(task.done);
218	<	}
219	<	catch (ExecutionException ex) {
220	<	unexpectedException();
221	<	}
222	<	catch (InterruptedException ex) {
223	<	unexpectedException();
224	<	}
213	>	ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
214	>	shouldThrow();
215	>	} catch (NullPointerException success) {}
216	>	}
217	>
218	>
219	>	/**
220	>	* a newSingleThreadScheduledExecutor successfully runs delayed task
221	>	*/
222	>	public void testNewSingleThreadScheduledExecutor() throws Exception {
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());
231	>	joinPool(p1);
232	>	} catch (RejectedExecutionException e) {}
233	>	}
234	>
235	>	/**
236	>	* a newScheduledThreadPool successfully runs delayed task
237	>	*/
238	>	public void testnewScheduledThreadPool() throws Exception {
239	>	try {
240	>	TrackedCallable callable = new TrackedCallable();
241	>	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
242	>	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
243	>	assertFalse(callable.done);
244	>	Thread.sleep(MEDIUM_DELAY_MS);
245	>	assertTrue(callable.done);
246	>	assertEquals(Boolean.TRUE, f.get());
247	>	joinPool(p1);
248	>	} catch (RejectedExecutionException e) {}
249		}
250
251		/**
252	<	* execute of a callable runs it to completion
252	>	* an unconfigurable  newScheduledThreadPool successfully runs delayed task
253		*/
254	<	public void testExecuteCallable () {
254	>	public void testunconfigurableScheduledExecutorService() throws Exception {
255	>	try {
256	>	TrackedCallable callable = new TrackedCallable();
257	>	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
258	>	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
259	>	assertFalse(callable.done);
260	>	Thread.sleep(MEDIUM_DELAY_MS);
261	>	assertTrue(callable.done);
262	>	assertEquals(Boolean.TRUE, f.get());
263	>	joinPool(p1);
264	>	} catch (RejectedExecutionException e) {}
265	>	}
266	>
267	>	/**
268	>	*  timeouts from execute will time out if they compute too long.
269	>	*/
270	>	public void testTimedCallable() throws Exception {
271	>	int N = 10000;
272	>	ExecutorService executor = Executors.newSingleThreadExecutor();
273	>	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
274		try {
275	<	Executor e = new DirectExecutor();
276	<	Future<String> future = Executors.execute(e, new StringTask());
277	<	String result = future.get();
278	<	assertSame(TEST_STRING, result);
279	<	}
280	<	catch (ExecutionException ex) {
281	<	unexpectedException();
275	>	long startTime = System.currentTimeMillis();
276	>
277	>	long i = 0;
278	>	while (tasks.size() < N) {
279	>	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
280	>	i += 10;
281	>	}
282	>
283	>	int iters = 0;
284	>	BigInteger sum = BigInteger.ZERO;
285	>	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
286	>	try {
287	>	++iters;
288	>	sum = sum.add(it.next().call());
289	>	}
290	>	catch (TimeoutException success) {
291	>	assertTrue(iters > 0);
292	>	return;
293	>	}
294	>	}
295	>	// if by chance we didn't ever time out, total time must be small
296	>	long elapsed = System.currentTimeMillis() - startTime;
297	>	assertTrue(elapsed < N);
298		}
299	<	catch (InterruptedException ex) {
300	<	unexpectedException();
299	>	finally {
300	>	joinPool(executor);
301		}
302		}
303
304	+
305		/**
306	<	* invoke of a collable runs it to completion
306	>	* ThreadPoolExecutor using defaultThreadFactory has
307	>	* specified group, priority, daemon status, and name
308		*/
309	<	public void testInvokeCallable () {
310	<	try {
311	<	Executor e = new DirectExecutor();
312	<	String result = Executors.invoke(e, new StringTask());
309	>	public void testDefaultThreadFactory() throws Exception {
310	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
311	>	Runnable r = new Runnable() {
312	>	public void run() {
313	>	try {
314	>	Thread current = Thread.currentThread();
315	>	threadAssertTrue(!current.isDaemon());
316	>	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
317	>	ThreadGroup g = current.getThreadGroup();
318	>	SecurityManager s = System.getSecurityManager();
319	>	if (s != null)
320	>	threadAssertTrue(g == s.getThreadGroup());
321	>	else
322	>	threadAssertTrue(g == egroup);
323	>	String name = current.getName();
324	>	threadAssertTrue(name.endsWith("thread-1"));
325	>	} catch (SecurityException ok) {
326	>	// Also pass if not allowed to change setting
327	>	}
328	>	}
329	>	};
330	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
331
332	<	assertSame(TEST_STRING, result);
333	<	}
334	<	catch (ExecutionException ex) {
335	<	unexpectedException();
332	>	e.execute(r);
333	>	try {
334	>	e.shutdown();
335	>	} catch (SecurityException ok) {
336		}
337	<	catch (InterruptedException ex) {
338	<	unexpectedException();
337	>
338	>	try {
339	>	Thread.sleep(SHORT_DELAY_MS);
340	>	} finally {
341	>	joinPool(e);
342		}
343		}
344
345		/**
346	<	* execute with null executor throws NPE
346	>	* ThreadPoolExecutor using privilegedThreadFactory has
347	>	* specified group, priority, daemon status, name,
348	>	* access control context and context class loader
349		*/
350	<	public void testNullExecuteRunnable () {
350	>	public void testPrivilegedThreadFactory() throws Exception {
351	>	Policy savedPolicy = null;
352		try {
353	<	TrackedRunnable task = new TrackedRunnable();
354	<	assertFalse(task.done);
355	<	Future<String> future = Executors.execute(null, task, TEST_STRING);
356	<	shouldThrow();
353	>	savedPolicy = Policy.getPolicy();
354	>	AdjustablePolicy policy = new AdjustablePolicy();
355	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
356	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
357	>	Policy.setPolicy(policy);
358	>	} catch (AccessControlException ok) {
359	>	return;
360	>	}
361	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
362	>	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
363	>	final AccessControlContext thisacc = AccessController.getContext();
364	>	Runnable r = new Runnable() {
365	>	public void run() {
366	>	try {
367	>	Thread current = Thread.currentThread();
368	>	threadAssertTrue(!current.isDaemon());
369	>	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
370	>	ThreadGroup g = current.getThreadGroup();
371	>	SecurityManager s = System.getSecurityManager();
372	>	if (s != null)
373	>	threadAssertTrue(g == s.getThreadGroup());
374	>	else
375	>	threadAssertTrue(g == egroup);
376	>	String name = current.getName();
377	>	threadAssertTrue(name.endsWith("thread-1"));
378	>	threadAssertTrue(thisccl == current.getContextClassLoader());
379	>	threadAssertTrue(thisacc.equals(AccessController.getContext()));
380	>	} catch (SecurityException ok) {
381	>	// Also pass if not allowed to change settings
382	>	}
383	>	}
384	>	};
385	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
386	>
387	>	Policy.setPolicy(savedPolicy);
388	>	e.execute(r);
389	>	try {
390	>	e.shutdown();
391	>	} catch (SecurityException ok) {
392		}
393	<	catch (NullPointerException success) {
393	>	try {
394	>	Thread.sleep(SHORT_DELAY_MS);
395	>	} finally {
396	>	joinPool(e);
397		}
398	<	catch (Exception ex) {
399	<	unexpectedException();
398	>
399	>	}
400	>
401	>	void checkCCL() {
402	>	SecurityManager sm = System.getSecurityManager();
403	>	if (sm != null) {
404	>	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
405	>	sm.checkPermission(new RuntimePermission("getClassLoader"));
406		}
407		}
408
409	+	class CheckCCL implements Callable<Object> {
410	+	public Object call() {
411	+	checkCCL();
412	+	return null;
413	+	}
414	+	}
415	+
416	+
417		/**
418	<	* execute with a null runnable throws NPE
418	>	* Without class loader permissions, creating
419	>	* privilegedCallableUsingCurrentClassLoader throws ACE
420		*/
421	<	public void testExecuteNullRunnable() {
421	>	public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
422	>	Policy savedPolicy = null;
423		try {
424	<	Executor e = new DirectExecutor();
425	<	TrackedRunnable task = null;
426	<	Future<String> future = Executors.execute(e, task, TEST_STRING);
427	<	shouldThrow();
424	>	savedPolicy = Policy.getPolicy();
425	>	AdjustablePolicy policy = new AdjustablePolicy();
426	>	Policy.setPolicy(policy);
427	>	} catch (AccessControlException ok) {
428	>	return;
429		}
430	<	catch (NullPointerException success) {
430	>
431	>	// Check if program still has too many permissions to run test
432	>	try {
433	>	checkCCL();
434	>	// too many privileges to test; so return
435	>	Policy.setPolicy(savedPolicy);
436	>	return;
437	>	} catch (AccessControlException ok) {
438		}
439	<	catch (Exception ex) {
440	<	unexpectedException();
439	>
440	>	try {
441	>	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
442	>	shouldThrow();
443	>	} catch (AccessControlException success) {
444	>	} finally {
445	>	Policy.setPolicy(savedPolicy);
446		}
447		}
448
449		/**
450	<	* invoke of a null runnable throws NPE
450	>	* With class loader permissions, calling
451	>	* privilegedCallableUsingCurrentClassLoader does not throw ACE
452		*/
453	<	public void testInvokeNullRunnable () {
453	>	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
454	>	Policy savedPolicy = null;
455		try {
456	<	Executor e = new DirectExecutor();
457	<	TrackedRunnable task = null;
458	<	Executors.invoke(e, task);
459	<	shouldThrow();
456	>	savedPolicy = Policy.getPolicy();
457	>	AdjustablePolicy policy = new AdjustablePolicy();
458	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
459	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
460	>	Policy.setPolicy(policy);
461	>	} catch (AccessControlException ok) {
462	>	return;
463		}
464	<	catch (NullPointerException success) {
464	>
465	>	try {
466	>	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
467	>	task.call();
468		}
469	<	catch (Exception ex) {
470	<	unexpectedException();
469	>	finally {
470	>	Policy.setPolicy(savedPolicy);
471		}
472		}
473
474		/**
475	<	* execute of a null callable throws NPE
475	>	* Without permissions, calling privilegedCallable throws ACE
476		*/
477	<	public void testExecuteNullCallable () {
477	>	public void testprivilegedCallableWithNoPrivs() throws Exception {
478	>	Callable task;
479	>	Policy savedPolicy = null;
480	>	AdjustablePolicy policy = null;
481	>	AccessControlContext noprivAcc = null;
482		try {
483	<	Executor e = new DirectExecutor();
484	<	StringTask t = null;
485	<	Future<String> future = Executors.execute(e, t);
486	<	shouldThrow();
483	>	savedPolicy = Policy.getPolicy();
484	>	policy = new AdjustablePolicy();
485	>	Policy.setPolicy(policy);
486	>	noprivAcc = AccessController.getContext();
487	>	task = Executors.privilegedCallable(new CheckCCL());
488	>	Policy.setPolicy(savedPolicy);
489	>	} catch (AccessControlException ok) {
490	>	return; // program has too few permissions to set up test
491		}
492	<	catch (NullPointerException success) {
493	<	}
494	<	catch (Exception ex) {
495	<	unexpectedException();
492	>
493	>	// Make sure that program doesn't have too many permissions
494	>	try {
495	>	AccessController.doPrivileged(new PrivilegedAction() {
496	>	public Object run() {
497	>	checkCCL();
498	>	return null;
499	>	}}, noprivAcc);
500	>	// too many permssions; skip test
501	>	return;
502	>	} catch (AccessControlException ok) {
503		}
504	+
505	+	try {
506	+	task.call();
507	+	shouldThrow();
508	+	} catch (AccessControlException success) {}
509		}
510
511		/**
512	<	* invoke of a null callable throws NPE
512	>	* With permissions, calling privilegedCallable succeeds
513		*/
514	<	public void testInvokeNullCallable () {
514	>	public void testprivilegedCallableWithPrivs() throws Exception {
515	>	Policy savedPolicy = null;
516		try {
517	<	Executor e = new DirectExecutor();
518	<	StringTask t = null;
519	<	String result = Executors.invoke(e, t);
520	<	shouldThrow();
521	<	}
522	<	catch (NullPointerException success) {
517	>	savedPolicy = Policy.getPolicy();
518	>	AdjustablePolicy policy = new AdjustablePolicy();
519	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
520	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
521	>	Policy.setPolicy(policy);
522	>	} catch (AccessControlException ok) {
523	>	return;
524		}
525	<	catch (Exception ex) {
526	<	unexpectedException();
525	>
526	>	Callable task = Executors.privilegedCallable(new CheckCCL());
527	>	try {
528	>	task.call();
529	>	} finally {
530	>	Policy.setPolicy(savedPolicy);
531		}
532		}
533
534		/**
535	<	*  execute(Executor, Runnable) throws RejectedExecutionException
352	<	*  if saturated.
535	>	* callable(Runnable) returns null when called
536		*/
537	<	public void testExecute1() {
538	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
539	<	try {
357	<
358	<	for(int i = 0; i < 5; ++i){
359	<	Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
360	<	}
361	<	shouldThrow();
362	<	} catch(RejectedExecutionException success){}
363	<	joinPool(p);
537	>	public void testCallable1() throws Exception {
538	>	Callable c = Executors.callable(new NoOpRunnable());
539	>	assertNull(c.call());
540		}
541
542		/**
543	<	*  execute(Executor, Callable)throws RejectedExecutionException
368	<	*  if saturated.
543	>	* callable(Runnable, result) returns result when called
544		*/
545	<	public void testExecute2() {
546	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
547	<	try {
373	<	for(int i = 0; i < 5; ++i) {
374	<	Executors.execute(p, new SmallCallable());
375	<	}
376	<	shouldThrow();
377	<	} catch(RejectedExecutionException e){}
378	<	joinPool(p);
545	>	public void testCallable2() throws Exception {
546	>	Callable c = Executors.callable(new NoOpRunnable(), one);
547	>	assertEquals(one, c.call());
548		}
549
550	+	/**
551	+	* callable(PrivilegedAction) returns its result when called
552	+	*/
553	+	public void testCallable3() throws Exception {
554	+	Callable c = Executors.callable(new PrivilegedAction() {
555	+	public Object run() { return one; }});
556	+	assertEquals(one, c.call());
557	+	}
558
559		/**
560	<	*  invoke(Executor, Runnable) throws InterruptedException if
384	<	*  caller interrupted.
560	>	* callable(PrivilegedExceptionAction) returns its result when called
561		*/
562	<	public void testInterruptedInvoke() {
563	<	final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
564	<	Thread t = new Thread(new Runnable() {
565	<	public void run() {
390	<	try {
391	<	Executors.invoke(p,new Runnable() {
392	<	public void run() {
393	<	try {
394	<	Thread.sleep(MEDIUM_DELAY_MS);
395	<	shouldThrow();
396	<	} catch(InterruptedException e){
397	<	}
398	<	}
399	<	});
400	<	} catch(InterruptedException success){
401	<	} catch(Exception e) {
402	<	unexpectedException();
403	<	}
404	<
405	<	}
406	<	});
407	<	try {
408	<	t.start();
409	<	Thread.sleep(SHORT_DELAY_MS);
410	<	t.interrupt();
411	<	} catch(Exception e){
412	<	unexpectedException();
413	<	}
414	<	joinPool(p);
562	>	public void testCallable4() throws Exception {
563	>	Callable c = Executors.callable(new PrivilegedExceptionAction() {
564	>	public Object run() { return one; }});
565	>	assertEquals(one, c.call());
566		}
567
568	+
569		/**
570	<	*  invoke(Executor, Runnable) throws ExecutionException if
419	<	*  runnable throws exception.
570	>	* callable(null Runnable) throws NPE
571		*/
572	<	public void testInvoke3() {
422	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
572	>	public void testCallableNPE1() {
573		try {
574	<	Runnable r = new Runnable() {
425	<	public void run() {
426	<	int i = 5/0;
427	<	}
428	<	};
429	<
430	<	for(int i =0; i < 5; i++){
431	<	Executors.invoke(p,r);
432	<	}
433	<
574	>	Callable c = Executors.callable((Runnable) null);
575		shouldThrow();
576	<	} catch(ExecutionException success){
436	<	} catch(Exception e){
437	<	unexpectedException();
438	<	}
439	<	joinPool(p);
576	>	} catch (NullPointerException success) {}
577		}
578
442	–
443	–
579		/**
580	<	*  invoke(Executor, Callable) throws InterruptedException if
446	<	*  callable throws exception
580	>	* callable(null, result) throws NPE
581		*/
582	<	public void testInvoke5() {
449	<	final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
450	<
451	<	final Callable c = new Callable() {
452	<	public Object call() {
453	<	try {
454	<	Executors.invoke(p, new SmallCallable());
455	<	shouldThrow();
456	<	} catch(InterruptedException e){}
457	<	catch(RejectedExecutionException e2){}
458	<	catch(ExecutionException e3){}
459	<	return Boolean.TRUE;
460	<	}
461	<	};
462	<
463	<
464	<
465	<	Thread t = new Thread(new Runnable() {
466	<	public void run() {
467	<	try {
468	<	c.call();
469	<	} catch(Exception e){}
470	<	}
471	<	});
582	>	public void testCallableNPE2() {
583		try {
584	<	t.start();
585	<	Thread.sleep(SHORT_DELAY_MS);
586	<	t.interrupt();
476	<	t.join();
477	<	} catch(InterruptedException e){
478	<	unexpectedException();
479	<	}
480	<
481	<	joinPool(p);
584	>	Callable c = Executors.callable((Runnable) null, one);
585	>	shouldThrow();
586	>	} catch (NullPointerException success) {}
587		}
588
589		/**
590	<	*  invoke(Executor, Callable) will throw ExecutionException
486	<	*  if callable throws exception
590	>	* callable(null PrivilegedAction) throws NPE
591		*/
592	<	public void testInvoke6() {
489	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
490	<
592	>	public void testCallableNPE3() {
593		try {
594	<	Callable c = new Callable() {
493	<	public Object call() {
494	<	int i = 5/0;
495	<	return Boolean.TRUE;
496	<	}
497	<	};
498	<
499	<	for(int i =0; i < 5; i++){
500	<	Executors.invoke(p,c);
501	<	}
502	<
594	>	Callable c = Executors.callable((PrivilegedAction) null);
595		shouldThrow();
596	<	}
505	<	catch(ExecutionException success){
506	<	} catch(Exception e) {
507	<	unexpectedException();
508	<	}
509	<	joinPool(p);
596	>	} catch (NullPointerException success) {}
597		}
598
512	–
513	–
599		/**
600	<	*  timeouts from execute will time out if they compute too long.
600	>	* callable(null PrivilegedExceptionAction) throws NPE
601		*/
602	<	public void testTimedCallable() {
518	<	int N = 10000;
519	<	ExecutorService executor = Executors.newSingleThreadExecutor();
520	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
602	>	public void testCallableNPE4() {
603		try {
604	<	long startTime = System.currentTimeMillis();
605	<
606	<	long i = 0;
525	<	while (tasks.size() < N) {
526	<	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
527	<	i += 10;
528	<	}
529	<
530	<	int iters = 0;
531	<	BigInteger sum = BigInteger.ZERO;
532	<	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
533	<	try {
534	<	++iters;
535	<	sum = sum.add(it.next().call());
536	<	}
537	<	catch (TimeoutException success) {
538	<	assertTrue(iters > 0);
539	<	return;
540	<	}
541	<	catch (Exception e) {
542	<	unexpectedException();
543	<	}
544	<	}
545	<	// if by chance we didn't ever time out, total time must be small
546	<	long elapsed = System.currentTimeMillis() - startTime;
547	<	assertTrue(elapsed < N);
548	<	}
549	<	finally {
550	<	joinPool(executor);
551	<	}
604	>	Callable c = Executors.callable((PrivilegedExceptionAction) null);
605	>	shouldThrow();
606	>	} catch (NullPointerException success) {}
607		}
608
554	–
555	–
609
610		}

Diff Legend

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