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

Diff Legend

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