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.12 by dl, Sat Dec 27 19:26:43 2003 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 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) {
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 141 | 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 186 | 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	<	TrackedRunnable task = new TrackedRunnable();
201	<	assertFalse(task.done);
202	<	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	<	}
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	>	e.shutdown();
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();
216	<	TrackedRunnable task = new TrackedRunnable();
217	<	assertFalse(task.done);
218	<	Executors.invoke(e, task);
219	<	assertTrue(task.done);
210	>	ExecutorService e = Executors.unconfigurableExecutorService(null);
211		}
212	<	catch (ExecutionException ex) {
222	<	unexpectedException();
223	<	}
224	<	catch (InterruptedException ex) {
225	<	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();
235	<	Future<String> future = Executors.execute(e, new StringTask());
236	<	String result = future.get();
237	<	assertSame(TEST_STRING, result);
221	>	ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
222		}
223	<	catch (ExecutionException ex) {
240	<	unexpectedException();
241	<	}
242	<	catch (InterruptedException ex) {
243	<	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	>	p1.shutdown();
241	>	joinPool(p1);
242	>	} catch(RejectedExecutionException e){}
243	>	catch(Exception e){
244	>	e.printStackTrace();
245	>	unexpectedException();
246		}
247	<	catch (ExecutionException ex) {
247	>	}
248	>
249	>	/**
250	>	* a newScheduledThreadPool successfully runs delayed task
251	>	*/
252	>	public void testnewScheduledThreadPool() {
253	>	try {
254	>	TrackedCallable callable = new TrackedCallable();
255	>	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
256	>	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
257	>	assertFalse(callable.done);
258	>	Thread.sleep(MEDIUM_DELAY_MS);
259	>	assertTrue(callable.done);
260	>	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		}
268	<	catch (InterruptedException ex) {
268	>	}
269	>
270	>	/**
271	>	* an unconfigurable  newScheduledThreadPool successfully runs delayed task
272	>	*/
273	>	public void testunconfigurableScheduledExecutorService() {
274	>	try {
275	>	TrackedCallable callable = new TrackedCallable();
276	>	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
277	>	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
278	>	assertFalse(callable.done);
279	>	Thread.sleep(MEDIUM_DELAY_MS);
280	>	assertTrue(callable.done);
281	>	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		}
289		}
290
291		/**
292	<	* execute with null executor throws NPE
292	>	*  timeouts from execute will time out if they compute too long.
293		*/
294	<	public void testNullExecuteRunnable () {
294	>	public void testTimedCallable() {
295	>	int N = 10000;
296	>	ExecutorService executor = Executors.newSingleThreadExecutor();
297	>	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
298		try {
299	<	TrackedRunnable task = new TrackedRunnable();
300	<	assertFalse(task.done);
301	<	Future<String> future = Executors.execute(null, task, TEST_STRING);
302	<	shouldThrow();
303	<	}
304	<	catch (NullPointerException success) {
299	>	long startTime = System.currentTimeMillis();
300	>
301	>	long i = 0;
302	>	while (tasks.size() < N) {
303	>	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
304	>	i += 10;
305	>	}
306	>
307	>	int iters = 0;
308	>	BigInteger sum = BigInteger.ZERO;
309	>	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
310	>	try {
311	>	++iters;
312	>	sum = sum.add(it.next().call());
313	>	}
314	>	catch (TimeoutException success) {
315	>	assertTrue(iters > 0);
316	>	return;
317	>	}
318	>	catch (Exception e) {
319	>	unexpectedException();
320	>	}
321	>	}
322	>	// if by chance we didn't ever time out, total time must be small
323	>	long elapsed = System.currentTimeMillis() - startTime;
324	>	assertTrue(elapsed < N);
325		}
326	<	catch (Exception ex) {
327	<	unexpectedException();
326	>	finally {
327	>	joinPool(executor);
328		}
329		}
330
331	+
332		/**
333	<	* execute with a null runnable throws NPE
333	>	* ThreadPoolExecutor using defaultThreadFactory has
334	>	* specified group, priority, daemon status, and name
335		*/
336	<	public void testExecuteNullRunnable() {
336	>	public void testDefaultThreadFactory() {
337	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
338	>	Runnable r = new Runnable() {
339	>	public void run() {
340	>	Thread current = Thread.currentThread();
341	>	threadAssertTrue(!current.isDaemon());
342	>	threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
343	>	ThreadGroup g = current.getThreadGroup();
344	>	SecurityManager s = System.getSecurityManager();
345	>	if (s != null)
346	>	threadAssertTrue(g == s.getThreadGroup());
347	>	else
348	>	threadAssertTrue(g == egroup);
349	>	String name = current.getName();
350	>	threadAssertTrue(name.endsWith("thread-1"));
351	>	}
352	>	};
353	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
354	>
355	>	e.execute(r);
356	>	e.shutdown();
357		try {
358	<	Executor e = new DirectExecutor();
359	<	TrackedRunnable task = null;
289	<	Future<String> future = Executors.execute(e, task, TEST_STRING);
290	<	shouldThrow();
291	<	}
292	<	catch (NullPointerException success) {
293	<	}
294	<	catch (Exception ex) {
358	>	Thread.sleep(SHORT_DELAY_MS);
359	>	} catch (Exception eX) {
360		unexpectedException();
361	+	} finally {
362	+	joinPool(e);
363		}
364		}
365
366		/**
367	<	* invoke of a null runnable throws NPE
367	>	* ThreadPoolExecutor using privilegedThreadFactory has
368	>	* specified group, priority, daemon status, name,
369	>	* access control context and context class loader
370		*/
371	<	public void testInvokeNullRunnable () {
371	>	public void testPrivilegedThreadFactory() {
372	>	Policy savedPolicy = Policy.getPolicy();
373	>	AdjustablePolicy policy = new AdjustablePolicy();
374	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
375	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
376	>	Policy.setPolicy(policy);
377	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
378	>	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
379	>	final AccessControlContext thisacc = AccessController.getContext();
380	>	Runnable r = new Runnable() {
381	>	public void run() {
382	>	Thread current = Thread.currentThread();
383	>	threadAssertTrue(!current.isDaemon());
384	>	threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY);
385	>	ThreadGroup g = current.getThreadGroup();
386	>	SecurityManager s = System.getSecurityManager();
387	>	if (s != null)
388	>	threadAssertTrue(g == s.getThreadGroup());
389	>	else
390	>	threadAssertTrue(g == egroup);
391	>	String name = current.getName();
392	>	threadAssertTrue(name.endsWith("thread-1"));
393	>	threadAssertTrue(thisccl == current.getContextClassLoader());
394	>	threadAssertTrue(thisacc.equals(AccessController.getContext()));
395	>	}
396	>	};
397	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
398	>
399	>	Policy.setPolicy(savedPolicy);
400	>	e.execute(r);
401	>	e.shutdown();
402		try {
403	<	Executor e = new DirectExecutor();
404	<	TrackedRunnable task = null;
306	<	Executors.invoke(e, task);
307	<	shouldThrow();
308	<	}
309	<	catch (NullPointerException success) {
310	<	}
311	<	catch (Exception ex) {
403	>	Thread.sleep(SHORT_DELAY_MS);
404	>	} catch (Exception ex) {
405		unexpectedException();
406	+	} finally {
407	+	joinPool(e);
408		}
409	+
410		}
411
412	+	static class CheckCCL implements Callable<Object> {
413	+	public Object call() {
414	+	AccessControlContext acc = AccessController.getContext();
415	+	acc.checkPermission(new RuntimePermission("getContextClassLoader"));
416	+	return null;
417	+	}
418	+	}
419	+
420	+
421		/**
422	<	* execute of a null callable throws NPE
422	>	* Without class loader permissions, creating
423	>	* privilegedCallableUsingCurrentClassLoader throws ACE
424		*/
425	<	public void testExecuteNullCallable () {
425	>	public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
426	>	Policy savedPolicy = Policy.getPolicy();
427	>	AdjustablePolicy policy = new AdjustablePolicy();
428	>	Policy.setPolicy(policy);
429		try {
430	<	Executor e = new DirectExecutor();
322	<	StringTask t = null;
323	<	Future<String> future = Executors.execute(e, t);
430	>	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
431		shouldThrow();
432	<	}
433	<	catch (NullPointerException success) {
327	<	}
328	<	catch (Exception ex) {
432	>	} catch(AccessControlException success) {
433	>	} catch(Exception ex) {
434		unexpectedException();
435	+	}
436	+	finally {
437	+	Policy.setPolicy(savedPolicy);
438		}
439		}
440
441		/**
442	<	* invoke of a null callable throws NPE
442	>	* Without class loader permissions, calling
443	>	* privilegedCallableUsingCurrentClassLoader throws ACE
444		*/
445	<	public void testInvokeNullCallable () {
445	>	public void testprivilegedCallableUsingCCLWithPrivs() {
446	>	Policy savedPolicy = Policy.getPolicy();
447	>	AdjustablePolicy policy = new AdjustablePolicy();
448	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
449	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
450	>	Policy.setPolicy(policy);
451		try {
452	<	Executor e = new DirectExecutor();
453	<	StringTask t = null;
454	<	String result = Executors.invoke(e, t);
341	<	shouldThrow();
342	<	}
343	<	catch (NullPointerException success) {
344	<	}
345	<	catch (Exception ex) {
452	>	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
453	>	task.call();
454	>	} catch(Exception ex) {
455		unexpectedException();
456	+	}
457	+	finally {
458	+	Policy.setPolicy(savedPolicy);
459		}
460		}
461
462		/**
463	<	*  execute(Executor, Runnable) throws RejectedExecutionException
352	<	*  if saturated.
463	>	* Without permissions, calling privilegedCallable throws ACE
464		*/
465	<	public void testExecute1() {
466	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
465	>	public void testprivilegedCallableWithNoPrivs() {
466	>	Policy savedPolicy = Policy.getPolicy();
467	>	AdjustablePolicy policy = new AdjustablePolicy();
468	>	Policy.setPolicy(policy);
469	>	Callable task = Executors.privilegedCallable(new CheckCCL());
470	>	Policy.setPolicy(savedPolicy);
471		try {
472	<
358	<	for(int i = 0; i < 5; ++i){
359	<	Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
360	<	}
472	>	task.call();
473		shouldThrow();
474	<	} catch(RejectedExecutionException success){}
475	<	joinPool(p);
474	>	} catch(AccessControlException success) {
475	>	} catch(Exception ex) {
476	>	unexpectedException();
477	>	} finally {
478	>	}
479		}
480
481		/**
482	<	*  execute(Executor, Callable)throws RejectedExecutionException
368	<	*  if saturated.
482	>	* With permissions, calling privilegedCallable succeeds
483		*/
484	<	public void testExecute2() {
485	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
484	>	public void testprivilegedCallableWithPrivs() {
485	>	Policy savedPolicy = Policy.getPolicy();
486	>	AdjustablePolicy policy = new AdjustablePolicy();
487	>	policy.addPermission(new RuntimePermission("getContextClassLoader"));
488	>	policy.addPermission(new RuntimePermission("setContextClassLoader"));
489	>	Policy.setPolicy(policy);
490	>	Callable task = Executors.privilegedCallable(new CheckCCL());
491		try {
492	<	for(int i = 0; i < 5; ++i) {
493	<	Executors.execute(p, new SmallCallable());
494	<	}
495	<	shouldThrow();
496	<	} catch(RejectedExecutionException e){}
497	<	joinPool(p);
492	>	task.call();
493	>	} catch(Exception ex) {
494	>	unexpectedException();
495	>	} finally {
496	>	Policy.setPolicy(savedPolicy);
497	>	}
498		}
499
381	–
500		/**
501	<	*  invoke(Executor, Runnable) throws InterruptedException if
502	<	*  caller interrupted.
503	<	*/
386	<	public void testInterruptedInvoke() {
387	<	final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
388	<	Thread t = new Thread(new Runnable() {
389	<	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	<	});
501	>	* callable(Runnable) returns null when called
502	>	*/
503	>	public void testCallable1() {
504		try {
505	<	t.start();
506	<	Thread.sleep(SHORT_DELAY_MS);
507	<	t.interrupt();
411	<	} catch(Exception e){
505	>	Callable c = Executors.callable(new NoOpRunnable());
506	>	assertNull(c.call());
507	>	} catch(Exception ex) {
508		unexpectedException();
509		}
510	<	joinPool(p);
510	>
511		}
512
513		/**
514	<	*  invoke(Executor, Runnable) throws ExecutionException if
515	<	*  runnable throws exception.
516	<	*/
421	<	public void testInvoke3() {
422	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
514	>	* callable(Runnable, result) returns result when called
515	>	*/
516	>	public void testCallable2() {
517		try {
518	<	Runnable r = new Runnable() {
519	<	public void run() {
520	<	int i = 5/0;
427	<	}
428	<	};
429	<
430	<	for(int i =0; i < 5; i++){
431	<	Executors.invoke(p,r);
432	<	}
433	<
434	<	shouldThrow();
435	<	} catch(ExecutionException success){
436	<	} catch(Exception e){
518	>	Callable c = Executors.callable(new NoOpRunnable(), one);
519	>	assertEquals(one, c.call());
520	>	} catch(Exception ex) {
521		unexpectedException();
522		}
439	–	joinPool(p);
523		}
524
442	–
443	–
525		/**
526	<	*  invoke(Executor, Callable) throws InterruptedException if
527	<	*  callable throws exception
528	<	*/
448	<	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	<	});
526	>	* callable(PrivilegedAction) returns its result when called
527	>	*/
528	>	public void testCallable3() {
529		try {
530	<	t.start();
531	<	Thread.sleep(SHORT_DELAY_MS);
532	<	t.interrupt();
533	<	t.join();
477	<	} catch(InterruptedException e){
530	>	Callable c = Executors.callable(new PrivilegedAction() {
531	>	public Object run() { return one; }});
532	>	assertEquals(one, c.call());
533	>	} catch(Exception ex) {
534		unexpectedException();
535		}
480	–
481	–	joinPool(p);
536		}
537
538		/**
539	<	*  invoke(Executor, Callable) will throw ExecutionException
540	<	*  if callable throws exception
541	<	*/
488	<	public void testInvoke6() {
489	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
490	<
539	>	* callable(PrivilegedExceptionAction) returns its result when called
540	>	*/
541	>	public void testCallable4() {
542		try {
543	<	Callable c = new Callable() {
544	<	public Object call() {
545	<	int i = 5/0;
546	<	return Boolean.TRUE;
496	<	}
497	<	};
498	<
499	<	for(int i =0; i < 5; i++){
500	<	Executors.invoke(p,c);
501	<	}
502	<
503	<	shouldThrow();
504	<	}
505	<	catch(ExecutionException success){
506	<	} catch(Exception e) {
543	>	Callable c = Executors.callable(new PrivilegedExceptionAction() {
544	>	public Object run() { return one; }});
545	>	assertEquals(one, c.call());
546	>	} catch(Exception ex) {
547		unexpectedException();
548		}
509	–	joinPool(p);
549		}
550
551
552	+	/**
553	+	* callable(null Runnable) throws NPE
554	+	*/
555	+	public void testCallableNPE1() {
556	+	try {
557	+	Runnable r = null;
558	+	Callable c = Executors.callable(r);
559	+	} catch (NullPointerException success) {
560	+	}
561	+	}
562
563		/**
564	<	*  timeouts from execute will time out if they compute too long.
565	<	*/
566	<	public void testTimedCallable() {
518	<	int N = 10000;
519	<	ExecutorService executor = Executors.newSingleThreadExecutor();
520	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
564	>	* callable(null, result) throws NPE
565	>	*/
566	>	public void testCallableNPE2() {
567		try {
568	<	long startTime = System.currentTimeMillis();
569	<
570	<	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);
568	>	Runnable r = null;
569	>	Callable c = Executors.callable(r, one);
570	>	} catch (NullPointerException success) {
571		}
572	<	finally {
573	<	joinPool(executor);
572	>	}
573	>
574	>	/**
575	>	* callable(null PrivilegedAction) throws NPE
576	>	*/
577	>	public void testCallableNPE3() {
578	>	try {
579	>	PrivilegedAction r = null;
580	>	Callable c = Executors.callable(r);
581	>	} catch (NullPointerException success) {
582		}
583		}
584
585	<
585	>	/**
586	>	* callable(null PrivilegedExceptionAction) throws NPE
587	>	*/
588	>	public void testCallableNPE4() {
589	>	try {
590	>	PrivilegedExceptionAction r = null;
591	>	Callable c = Executors.callable(r);
592	>	} catch (NullPointerException success) {
593	>	}
594	>	}
595
596
597		}

Diff Legend

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