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.5 by dl, Thu Sep 25 11:02:41 2003 UTC vs.
Revision 1.14 by dl, Tue Jan 20 20:20:56 2004 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{
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 MyTask implements Runnable {
25	<	public void run() { completed = true; }
26	<	public boolean isCompleted() { return completed; }
27	<	public void reset() { completed = false; }
28	<	private boolean completed = false;
29	<	}
30	<
31	<	private static class StringTask implements Callable<String> {
32	<	public String call() { return TEST_STRING; }
33	<	}
34	<
35	<	static class DirectExecutor implements Executor {
36	<	public void execute(Runnable r) {
37	<	r.run();
38	<	}
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) {
29	>	TimedCallable(ExecutorService exec, Callable<T> func, long msecs) {
30		this.exec = exec;
31		this.func = func;
32		this.msecs = msecs;
33		}
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 62 | public class ExecutorsTest extends JSR16
62		};
63
64		/**
82	–	* For use as ThreadFactory in constructors
83	–	*/
84	–	static class MyThreadFactory implements ThreadFactory{
85	–	public Thread newThread(Runnable r){
86	–	return new Thread(r);
87	–	}
88	–	}
89	–
90	–	/**
65		* A newCachedThreadPool can execute runnables
66		*/
67		public void testNewCachedThreadPool1() {
#	Line 95 | 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		/**
76		* A newCachedThreadPool with given ThreadFactory can execute runnables
77		*/
78		public void testNewCachedThreadPool2() {
79	<	ExecutorService e = Executors.newCachedThreadPool(new MyThreadFactory());
79	>	ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
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 130 | Line 104 | public class ExecutorsTest extends JSR16
104		e.execute(new NoOpRunnable());
105		e.execute(new NoOpRunnable());
106		e.execute(new NoOpRunnable());
107	<	e.shutdown();
107	>	joinPool(e);
108		}
109
110		/**
111		* A new SingleThreadExecutor with given ThreadFactory can execute runnables
112		*/
113		public void testNewSingleThreadExecutor2() {
114	<	ExecutorService e = Executors.newSingleThreadExecutor(new MyThreadFactory());
114	>	ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
115		e.execute(new NoOpRunnable());
116		e.execute(new NoOpRunnable());
117		e.execute(new NoOpRunnable());
118	<	e.shutdown();
118	>	joinPool(e);
119		}
120
121		/**
#	Line 157 | Line 131 | public class ExecutorsTest extends JSR16
131		}
132
133		/**
134	+	* A new SingleThreadExecutor cannot be casted to concrete implementation
135	+	*/
136	+	public void testCastNewSingleThreadExecutor() {
137	+	ExecutorService e = Executors.newSingleThreadExecutor();
138	+	try {
139	+	ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
140	+	} catch (ClassCastException success) {
141	+	} finally {
142	+	joinPool(e);
143	+	}
144	+	}
145	+
146	+
147	+	/**
148		* A new newFixedThreadPool can execute runnables
149		*/
150		public void testNewFixedThreadPool1() {
#	Line 164 | Line 152 | public class ExecutorsTest extends JSR16
152		e.execute(new NoOpRunnable());
153		e.execute(new NoOpRunnable());
154		e.execute(new NoOpRunnable());
155	<	e.shutdown();
155	>	joinPool(e);
156		}
157
158		/**
159		* A new newFixedThreadPool with given ThreadFactory can execute runnables
160		*/
161		public void testNewFixedThreadPool2() {
162	<	ExecutorService e = Executors.newFixedThreadPool(2, new MyThreadFactory());
162	>	ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
163		e.execute(new NoOpRunnable());
164		e.execute(new NoOpRunnable());
165		e.execute(new NoOpRunnable());
166	<	e.shutdown();
166	>	joinPool(e);
167		}
168
169		/**
#	Line 202 | Line 190 | public class ExecutorsTest extends JSR16
190		}
191		}
192
193	+
194		/**
195	<	* execute of runnable runs it to completion
195	>	* An unconfigurable newFixedThreadPool can execute runnables
196		*/
197	<	public void testExecuteRunnable () {
198	<	try {
199	<	Executor e = new DirectExecutor();
200	<	MyTask task = new MyTask();
201	<	assertFalse(task.isCompleted());
202	<	Future<String> future = Executors.execute(e, task, TEST_STRING);
214	<	String result = future.get();
215	<	assertTrue(task.isCompleted());
216	<	assertSame(TEST_STRING, result);
217	<	}
218	<	catch (ExecutionException ex) {
219	<	unexpectedException();
220	<	}
221	<	catch (InterruptedException ex) {
222	<	unexpectedException();
223	<	}
197	>	public void testunconfigurableExecutorService() {
198	>	ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
199	>	e.execute(new NoOpRunnable());
200	>	e.execute(new NoOpRunnable());
201	>	e.execute(new NoOpRunnable());
202	>	joinPool(e);
203		}
204
205		/**
206	<	* invoke of a runnable runs it to completion
206	>	* unconfigurableExecutorService(null) throws NPE
207		*/
208	<	public void testInvokeRunnable () {
208	>	public void testunconfigurableExecutorServiceNPE() {
209		try {
210	<	Executor e = new DirectExecutor();
232	<	MyTask task = new MyTask();
233	<	assertFalse(task.isCompleted());
234	<	Executors.invoke(e, task);
235	<	assertTrue(task.isCompleted());
236	<	}
237	<	catch (ExecutionException ex) {
238	<	unexpectedException();
210	>	ExecutorService e = Executors.unconfigurableExecutorService(null);
211		}
212	<	catch (InterruptedException ex) {
241	<	unexpectedException();
212	>	catch (NullPointerException success) {
213		}
214		}
215
216		/**
217	<	* execute of a callable runs it to completion
217	>	* unconfigurableScheduledExecutorService(null) throws NPE
218		*/
219	<	public void testExecuteCallable () {
219	>	public void testunconfigurableScheduledExecutorServiceNPE() {
220		try {
221	<	Executor e = new DirectExecutor();
251	<	Future<String> future = Executors.execute(e, new StringTask());
252	<	String result = future.get();
253	<	assertSame(TEST_STRING, result);
254	<	}
255	<	catch (ExecutionException ex) {
256	<	unexpectedException();
221	>	ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
222		}
223	<	catch (InterruptedException ex) {
259	<	unexpectedException();
223	>	catch (NullPointerException success) {
224		}
225		}
226
227	+
228		/**
229	<	* invoke of a collable runs it to completion
229	>	* a newSingleThreadScheduledExecutor successfully runs delayed task
230		*/
231	<	public void testInvokeCallable () {
232	<	try {
233	<	Executor e = new DirectExecutor();
234	<	String result = Executors.invoke(e, new StringTask());
235	<
236	<	assertSame(TEST_STRING, result);
231	>	public void testNewSingleThreadScheduledExecutor() {
232	>	try {
233	>	TrackedCallable callable = new TrackedCallable();
234	>	ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
235	>	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
236	>	assertFalse(callable.done);
237	>	Thread.sleep(MEDIUM_DELAY_MS);
238	>	assertTrue(callable.done);
239	>	assertEquals(Boolean.TRUE, f.get());
240	>	joinPool(p1);
241	>	} catch(RejectedExecutionException e){}
242	>	catch(Exception e){
243	>	e.printStackTrace();
244	>	unexpectedException();
245		}
246	<	catch (ExecutionException ex) {
246	>	}
247	>
248	>	/**
249	>	* a newScheduledThreadPool successfully runs delayed task
250	>	*/
251	>	public void testnewScheduledThreadPool() {
252	>	try {
253	>	TrackedCallable callable = new TrackedCallable();
254	>	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
255	>	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
256	>	assertFalse(callable.done);
257	>	Thread.sleep(MEDIUM_DELAY_MS);
258	>	assertTrue(callable.done);
259	>	assertEquals(Boolean.TRUE, f.get());
260	>	joinPool(p1);
261	>	} catch(RejectedExecutionException e){}
262	>	catch(Exception e){
263	>	e.printStackTrace();
264		unexpectedException();
265		}
266	<	catch (InterruptedException ex) {
266	>	}
267	>
268	>	/**
269	>	* an unconfigurable  newScheduledThreadPool successfully runs delayed task
270	>	*/
271	>	public void testunconfigurableScheduledExecutorService() {
272	>	try {
273	>	TrackedCallable callable = new TrackedCallable();
274	>	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
275	>	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
276	>	assertFalse(callable.done);
277	>	Thread.sleep(MEDIUM_DELAY_MS);
278	>	assertTrue(callable.done);
279	>	assertEquals(Boolean.TRUE, f.get());
280	>	joinPool(p1);
281	>	} catch(RejectedExecutionException e){}
282	>	catch(Exception e){
283	>	e.printStackTrace();
284		unexpectedException();
285		}
286		}
287
288		/**
289	<	* execute with null executor throws NPE
289	>	*  timeouts from execute will time out if they compute too long.
290		*/
291	<	public void testNullExecuteRunnable () {
291	>	public void testTimedCallable() {
292	>	int N = 10000;
293	>	ExecutorService executor = Executors.newSingleThreadExecutor();
294	>	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
295		try {
296	<	MyTask task = new MyTask();
297	<	assertFalse(task.isCompleted());
298	<	Future<String> future = Executors.execute(null, task, TEST_STRING);
299	<	shouldThrow();
300	<	}
301	<	catch (NullPointerException success) {
296	>	long startTime = System.currentTimeMillis();
297	>
298	>	long i = 0;
299	>	while (tasks.size() < N) {
300	>	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
301	>	i += 10;
302	>	}
303	>
304	>	int iters = 0;
305	>	BigInteger sum = BigInteger.ZERO;
306	>	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
307	>	try {
308	>	++iters;
309	>	sum = sum.add(it.next().call());
310	>	}
311	>	catch (TimeoutException success) {
312	>	assertTrue(iters > 0);
313	>	return;
314	>	}
315	>	catch (Exception e) {
316	>	unexpectedException();
317	>	}
318	>	}
319	>	// if by chance we didn't ever time out, total time must be small
320	>	long elapsed = System.currentTimeMillis() - startTime;
321	>	assertTrue(elapsed < N);
322		}
323	<	catch (Exception ex) {
324	<	unexpectedException();
323	>	finally {
324	>	joinPool(executor);
325		}
326		}
327
328	+
329		/**
330	<	* execute with a null runnable throws NPE
330	>	* ThreadPoolExecutor using defaultThreadFactory has
331	>	* specified group, priority, daemon status, and name
332		*/
333	<	public void testExecuteNullRunnable() {
333	>	public void testDefaultThreadFactory() {
334	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
335	>	Runnable r = new Runnable() {
336	>	public void run() {
337	>	try {
338	>	Thread current = Thread.currentThread();
339	>	threadAssertTrue(!current.isDaemon());
340	>	threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
341	>	ThreadGroup g = current.getThreadGroup();
342	>	SecurityManager s = System.getSecurityManager();
343	>	if (s != null)
344	>	threadAssertTrue(g == s.getThreadGroup());
345	>	else
346	>	threadAssertTrue(g == egroup);
347	>	String name = current.getName();
348	>	threadAssertTrue(name.endsWith("thread-1"));
349	>	} catch (SecurityException ok) {
350	>	// Also pass if not allowed to change setting
351	>	}
352	>	}
353	>	};
354	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
355	>
356	>	e.execute(r);
357		try {
358	<	Executor e = new DirectExecutor();
359	<	MyTask task = null;
305	<	Future<String> future = Executors.execute(e, task, TEST_STRING);
306	<	shouldThrow();
307	<	}
308	<	catch (NullPointerException success) {
358	>	e.shutdown();
359	>	} catch(SecurityException ok) {
360		}
361	<	catch (Exception ex) {
361	>
362	>	try {
363	>	Thread.sleep(SHORT_DELAY_MS);
364	>	} catch (Exception eX) {
365		unexpectedException();
366	+	} finally {
367	+	joinPool(e);
368		}
369		}
370
371		/**
372	<	* invoke of a null runnable throws NPE
372	>	* ThreadPoolExecutor using privilegedThreadFactory has
373	>	* specified group, priority, daemon status, name,
374	>	* access control context and context class loader
375		*/
376	<	public void testInvokeNullRunnable () {
376	>	public void testPrivilegedThreadFactory() {
377	>	Policy savedPolicy = null;
378		try {
379	<	Executor e = new DirectExecutor();
380	<	MyTask task = null;
381	<	Executors.invoke(e, task);
382	<	shouldThrow();
379	>	savedPolicy = Policy.getPolicy();
380	>	AdjustablePolicy policy = new AdjustablePolicy();
381	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
382	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
383	>	Policy.setPolicy(policy);
384	>	} catch (AccessControlException ok) {
385	>	return;
386		}
387	<	catch (NullPointerException success) {
387	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
388	>	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
389	>	final AccessControlContext thisacc = AccessController.getContext();
390	>	Runnable r = new Runnable() {
391	>	public void run() {
392	>	try {
393	>	Thread current = Thread.currentThread();
394	>	threadAssertTrue(!current.isDaemon());
395	>	threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
396	>	ThreadGroup g = current.getThreadGroup();
397	>	SecurityManager s = System.getSecurityManager();
398	>	if (s != null)
399	>	threadAssertTrue(g == s.getThreadGroup());
400	>	else
401	>	threadAssertTrue(g == egroup);
402	>	String name = current.getName();
403	>	threadAssertTrue(name.endsWith("thread-1"));
404	>	threadAssertTrue(thisccl == current.getContextClassLoader());
405	>	threadAssertTrue(thisacc.equals(AccessController.getContext()));
406	>	} catch(SecurityException ok) {
407	>	// Also pass if not allowed to change settings
408	>	}
409	>	}
410	>	};
411	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
412	>
413	>	Policy.setPolicy(savedPolicy);
414	>	e.execute(r);
415	>	try {
416	>	e.shutdown();
417	>	} catch(SecurityException ok) {
418		}
419	<	catch (Exception ex) {
419	>	try {
420	>	Thread.sleep(SHORT_DELAY_MS);
421	>	} catch (Exception ex) {
422		unexpectedException();
423	+	} finally {
424	+	joinPool(e);
425	+	}
426	+
427	+	}
428	+
429	+	static class CheckCCL implements Callable<Object> {
430	+	public Object call() {
431	+	AccessControlContext acc = AccessController.getContext();
432	+	acc.checkPermission(new RuntimePermission("getContextClassLoader"));
433	+	return null;
434		}
435		}
436
437	+
438		/**
439	<	* execute of a null callable throws NPE
439	>	* Without class loader permissions, creating
440	>	* privilegedCallableUsingCurrentClassLoader throws ACE
441		*/
442	<	public void testExecuteNullCallable () {
442	>	public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
443	>	Policy savedPolicy = null;
444		try {
445	<	Executor e = new DirectExecutor();
446	<	StringTask t = null;
447	<	Future<String> future = Executors.execute(e, t);
448	<	shouldThrow();
449	<	}
342	<	catch (NullPointerException success) {
445	>	savedPolicy = Policy.getPolicy();
446	>	AdjustablePolicy policy = new AdjustablePolicy();
447	>	Policy.setPolicy(policy);
448	>	} catch (AccessControlException ok) {
449	>	return;
450		}
451	<	catch (Exception ex) {
451	>
452	>	try {
453	>	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
454	>	shouldThrow();
455	>	} catch(AccessControlException success) {
456	>	} catch(Exception ex) {
457		unexpectedException();
458	+	}
459	+	finally {
460	+	Policy.setPolicy(savedPolicy);
461		}
462		}
463
464		/**
465	<	* invoke of a null callable throws NPE
465	>	* Without class loader permissions, calling
466	>	* privilegedCallableUsingCurrentClassLoader throws ACE
467		*/
468	<	public void testInvokeNullCallable () {
468	>	public void testprivilegedCallableUsingCCLWithPrivs() {
469	>	Policy savedPolicy = null;
470		try {
471	<	Executor e = new DirectExecutor();
472	<	StringTask t = null;
473	<	String result = Executors.invoke(e, t);
474	<	shouldThrow();
471	>	savedPolicy = Policy.getPolicy();
472	>	AdjustablePolicy policy = new AdjustablePolicy();
473	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
474	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
475	>	Policy.setPolicy(policy);
476	>	} catch (AccessControlException ok) {
477	>	return;
478		}
479	<	catch (NullPointerException success) {
480	<	}
481	<	catch (Exception ex) {
479	>
480	>	try {
481	>	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
482	>	task.call();
483	>	} catch(Exception ex) {
484		unexpectedException();
485	+	}
486	+	finally {
487	+	Policy.setPolicy(savedPolicy);
488		}
489		}
490
491		/**
492	<	*  execute(Executor, Runnable) throws RejectedExecutionException
368	<	*  if saturated.
492	>	* Without permissions, calling privilegedCallable throws ACE
493		*/
494	<	public void testExecute1() {
495	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
494	>	public void testprivilegedCallableWithNoPrivs() {
495	>	Policy savedPolicy = null;
496		try {
497	<
498	<	for(int i = 0; i < 5; ++i){
499	<	Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
500	<	}
497	>	savedPolicy = Policy.getPolicy();
498	>	AdjustablePolicy policy = new AdjustablePolicy();
499	>	Policy.setPolicy(policy);
500	>	} catch (AccessControlException ok) {
501	>	return;
502	>	}
503	>
504	>	Callable task = Executors.privilegedCallable(new CheckCCL());
505	>	Policy.setPolicy(savedPolicy);
506	>	try {
507	>	task.call();
508		shouldThrow();
509	<	} catch(RejectedExecutionException success){}
510	<	joinPool(p);
509	>	} catch(AccessControlException success) {
510	>	} catch(Exception ex) {
511	>	unexpectedException();
512	>	} finally {
513	>	}
514		}
515
516		/**
517	<	*  execute(Executor, Callable)throws RejectedExecutionException
384	<	*  if saturated.
517	>	* With permissions, calling privilegedCallable succeeds
518		*/
519	<	public void testExecute2() {
520	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
519	>	public void testprivilegedCallableWithPrivs() {
520	>	Policy savedPolicy = null;
521		try {
522	<	for(int i = 0; i < 5; ++i) {
523	<	Executors.execute(p, new SmallCallable());
524	<	}
525	<	shouldThrow();
526	<	} catch(RejectedExecutionException e){}
527	<	joinPool(p);
522	>	savedPolicy = Policy.getPolicy();
523	>	AdjustablePolicy policy = new AdjustablePolicy();
524	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
525	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
526	>	Policy.setPolicy(policy);
527	>	} catch (AccessControlException ok) {
528	>	return;
529	>	}
530	>
531	>	Callable task = Executors.privilegedCallable(new CheckCCL());
532	>	try {
533	>	task.call();
534	>	} catch(Exception ex) {
535	>	unexpectedException();
536	>	} finally {
537	>	Policy.setPolicy(savedPolicy);
538	>	}
539		}
540
397	–
541		/**
542	<	*  invoke(Executor, Runnable) throws InterruptedException if
543	<	*  caller interrupted.
544	<	*/
402	<	public void testInterruptedInvoke() {
403	<	final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
404	<	Thread t = new Thread(new Runnable() {
405	<	public void run() {
406	<	try {
407	<	Executors.invoke(p,new Runnable() {
408	<	public void run() {
409	<	try {
410	<	Thread.sleep(MEDIUM_DELAY_MS);
411	<	shouldThrow();
412	<	} catch(InterruptedException e){
413	<	}
414	<	}
415	<	});
416	<	} catch(InterruptedException success){
417	<	} catch(Exception e) {
418	<	unexpectedException();
419	<	}
420	<
421	<	}
422	<	});
542	>	* callable(Runnable) returns null when called
543	>	*/
544	>	public void testCallable1() {
545		try {
546	<	t.start();
547	<	Thread.sleep(SHORT_DELAY_MS);
548	<	t.interrupt();
427	<	} catch(Exception e){
546	>	Callable c = Executors.callable(new NoOpRunnable());
547	>	assertNull(c.call());
548	>	} catch(Exception ex) {
549		unexpectedException();
550		}
551	<	joinPool(p);
551	>
552		}
553
554		/**
555	<	*  invoke(Executor, Runnable) throws ExecutionException if
556	<	*  runnable throws exception.
557	<	*/
437	<	public void testInvoke3() {
438	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
555	>	* callable(Runnable, result) returns result when called
556	>	*/
557	>	public void testCallable2() {
558		try {
559	<	Runnable r = new Runnable() {
560	<	public void run() {
561	<	int i = 5/0;
443	<	}
444	<	};
445	<
446	<	for(int i =0; i < 5; i++){
447	<	Executors.invoke(p,r);
448	<	}
449	<
450	<	shouldThrow();
451	<	} catch(ExecutionException success){
452	<	} catch(Exception e){
559	>	Callable c = Executors.callable(new NoOpRunnable(), one);
560	>	assertEquals(one, c.call());
561	>	} catch(Exception ex) {
562		unexpectedException();
563		}
455	–	joinPool(p);
564		}
565
458	–
459	–
566		/**
567	<	*  invoke(Executor, Callable) throws InterruptedException if
568	<	*  callable throws exception
569	<	*/
464	<	public void testInvoke5() {
465	<	final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
466	<
467	<	final Callable c = new Callable() {
468	<	public Object call() {
469	<	try {
470	<	Executors.invoke(p, new SmallCallable());
471	<	shouldThrow();
472	<	} catch(InterruptedException e){}
473	<	catch(RejectedExecutionException e2){}
474	<	catch(ExecutionException e3){}
475	<	return Boolean.TRUE;
476	<	}
477	<	};
478	<
479	<
480	<
481	<	Thread t = new Thread(new Runnable() {
482	<	public void run() {
483	<	try {
484	<	c.call();
485	<	} catch(Exception e){}
486	<	}
487	<	});
567	>	* callable(PrivilegedAction) returns its result when called
568	>	*/
569	>	public void testCallable3() {
570		try {
571	<	t.start();
572	<	Thread.sleep(SHORT_DELAY_MS);
573	<	t.interrupt();
574	<	t.join();
493	<	} catch(InterruptedException e){
571	>	Callable c = Executors.callable(new PrivilegedAction() {
572	>	public Object run() { return one; }});
573	>	assertEquals(one, c.call());
574	>	} catch(Exception ex) {
575		unexpectedException();
576		}
496	–
497	–	joinPool(p);
577		}
578
579		/**
580	<	*  invoke(Executor, Callable) will throw ExecutionException
581	<	*  if callable throws exception
582	<	*/
504	<	public void testInvoke6() {
505	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
506	<
580	>	* callable(PrivilegedExceptionAction) returns its result when called
581	>	*/
582	>	public void testCallable4() {
583		try {
584	<	Callable c = new Callable() {
585	<	public Object call() {
586	<	int i = 5/0;
587	<	return Boolean.TRUE;
512	<	}
513	<	};
514	<
515	<	for(int i =0; i < 5; i++){
516	<	Executors.invoke(p,c);
517	<	}
518	<
519	<	shouldThrow();
520	<	}
521	<	catch(ExecutionException success){
522	<	} catch(Exception e) {
584	>	Callable c = Executors.callable(new PrivilegedExceptionAction() {
585	>	public Object run() { return one; }});
586	>	assertEquals(one, c.call());
587	>	} catch(Exception ex) {
588		unexpectedException();
589		}
525	–	joinPool(p);
590		}
591
592
593	+	/**
594	+	* callable(null Runnable) throws NPE
595	+	*/
596	+	public void testCallableNPE1() {
597	+	try {
598	+	Runnable r = null;
599	+	Callable c = Executors.callable(r);
600	+	} catch (NullPointerException success) {
601	+	}
602	+	}
603
604		/**
605	<	*  timeouts from execute will time out if they compute too long.
606	<	*/
607	<	public void testTimedCallable() {
534	<	int N = 10000;
535	<	ExecutorService executor = Executors.newSingleThreadExecutor();
536	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
605	>	* callable(null, result) throws NPE
606	>	*/
607	>	public void testCallableNPE2() {
608		try {
609	<	long startTime = System.currentTimeMillis();
610	<
611	<	long i = 0;
541	<	while (tasks.size() < N) {
542	<	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
543	<	i += 10;
544	<	}
545	<
546	<	int iters = 0;
547	<	BigInteger sum = BigInteger.ZERO;
548	<	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
549	<	try {
550	<	++iters;
551	<	sum = sum.add(it.next().call());
552	<	}
553	<	catch (TimeoutException success) {
554	<	assertTrue(iters > 0);
555	<	return;
556	<	}
557	<	catch (Exception e) {
558	<	unexpectedException();
559	<	}
560	<	}
561	<	// if by chance we didn't ever time out, total time must be small
562	<	long elapsed = System.currentTimeMillis() - startTime;
563	<	assertTrue(elapsed < N);
609	>	Runnable r = null;
610	>	Callable c = Executors.callable(r, one);
611	>	} catch (NullPointerException success) {
612		}
613	<	finally {
614	<	joinPool(executor);
613	>	}
614	>
615	>	/**
616	>	* callable(null PrivilegedAction) throws NPE
617	>	*/
618	>	public void testCallableNPE3() {
619	>	try {
620	>	PrivilegedAction r = null;
621	>	Callable c = Executors.callable(r);
622	>	} catch (NullPointerException success) {
623		}
624		}
625
626	<
626	>	/**
627	>	* callable(null PrivilegedExceptionAction) throws NPE
628	>	*/
629	>	public void testCallableNPE4() {
630	>	try {
631	>	PrivilegedExceptionAction r = null;
632	>	Callable c = Executors.callable(r);
633	>	} catch (NullPointerException success) {
634	>	}
635	>	}
636
637
638		}

Diff Legend

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