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.40 by jsr166, Fri May 27 19:28:38 2011 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/publicdomain/zero/1.0/
5	>	* Other contributors include Andrew Wright, Jeffrey Hayes,
6	>	* Pat Fisher, Mike Judd.
7		*/
8
8	–
9		import junit.framework.*;
10		import java.util.*;
11		import java.util.concurrent.*;
12	+	import static java.util.concurrent.TimeUnit.MILLISECONDS;
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
34	–	static class TimedCallable<T> implements Callable<T> {
35	–	private final Executor exec;
36	–	private final Callable<T> func;
37	–	private final long msecs;
38	–
39	–	TimedCallable(Executor exec, Callable<T> func, long msecs) {
40	–	this.exec = exec;
41	–	this.func = func;
42	–	this.msecs = msecs;
43	–	}
44	–
45	–	public T call() throws Exception {
46	–	Future<T> ftask = Executors.execute(exec, func);
47	–	try {
48	–	return ftask.get(msecs, TimeUnit.MILLISECONDS);
49	–	} finally {
50	–	ftask.cancel(true);
51	–	}
52	–	}
53	–	}
54	–
55	–
56	–	private static class Fib implements Callable<BigInteger> {
57	–	private final BigInteger n;
58	–	Fib(long n) {
59	–	if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
60	–	this.n = BigInteger.valueOf(n);
61	–	}
62	–	public BigInteger call() {
63	–	BigInteger f1 = BigInteger.ONE;
64	–	BigInteger f2 = f1;
65	–	for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
66	–	BigInteger t = f1.add(f2);
67	–	f1 = f2;
68	–	f2 = t;
69	–	}
70	–	return f1;
71	–	}
72	–	};
73	–
24		/**
25		* A newCachedThreadPool can execute runnables
26		*/
#	Line 79 | Line 29 | public class ExecutorsTest extends JSR16
29		e.execute(new NoOpRunnable());
30		e.execute(new NoOpRunnable());
31		e.execute(new NoOpRunnable());
32	<	e.shutdown();
32	>	joinPool(e);
33		}
34
35		/**
#	Line 90 | Line 40 | public class ExecutorsTest extends JSR16
40		e.execute(new NoOpRunnable());
41		e.execute(new NoOpRunnable());
42		e.execute(new NoOpRunnable());
43	<	e.shutdown();
43	>	joinPool(e);
44		}
45
46		/**
#	Line 100 | Line 50 | public class ExecutorsTest extends JSR16
50		try {
51		ExecutorService e = Executors.newCachedThreadPool(null);
52		shouldThrow();
53	<	}
104	<	catch(NullPointerException success) {
105	<	}
53	>	} catch (NullPointerException success) {}
54		}
55
108	–
56		/**
57		* A new SingleThreadExecutor can execute runnables
58		*/
#	Line 114 | Line 61 | public class ExecutorsTest extends JSR16
61		e.execute(new NoOpRunnable());
62		e.execute(new NoOpRunnable());
63		e.execute(new NoOpRunnable());
64	<	e.shutdown();
64	>	joinPool(e);
65		}
66
67		/**
#	Line 125 | Line 72 | public class ExecutorsTest extends JSR16
72		e.execute(new NoOpRunnable());
73		e.execute(new NoOpRunnable());
74		e.execute(new NoOpRunnable());
75	<	e.shutdown();
75	>	joinPool(e);
76		}
77
78		/**
#	Line 135 | Line 82 | public class ExecutorsTest extends JSR16
82		try {
83		ExecutorService e = Executors.newSingleThreadExecutor(null);
84		shouldThrow();
85	<	}
86	<	catch(NullPointerException success) {
85	>	} catch (NullPointerException success) {}
86	>	}
87	>
88	>	/**
89	>	* A new SingleThreadExecutor cannot be casted to concrete implementation
90	>	*/
91	>	public void testCastNewSingleThreadExecutor() {
92	>	ExecutorService e = Executors.newSingleThreadExecutor();
93	>	try {
94	>	ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
95	>	shouldThrow();
96	>	} catch (ClassCastException success) {
97	>	} finally {
98	>	joinPool(e);
99		}
100		}
101
#	Line 148 | Line 107 | public class ExecutorsTest extends JSR16
107		e.execute(new NoOpRunnable());
108		e.execute(new NoOpRunnable());
109		e.execute(new NoOpRunnable());
110	<	e.shutdown();
110	>	joinPool(e);
111		}
112
113		/**
#	Line 159 | Line 118 | public class ExecutorsTest extends JSR16
118		e.execute(new NoOpRunnable());
119		e.execute(new NoOpRunnable());
120		e.execute(new NoOpRunnable());
121	<	e.shutdown();
121	>	joinPool(e);
122		}
123
124		/**
#	Line 169 | Line 128 | public class ExecutorsTest extends JSR16
128		try {
129		ExecutorService e = Executors.newFixedThreadPool(2, null);
130		shouldThrow();
131	<	}
173	<	catch(NullPointerException success) {
174	<	}
131	>	} catch (NullPointerException success) {}
132		}
133
134		/**
#	Line 181 | Line 138 | public class ExecutorsTest extends JSR16
138		try {
139		ExecutorService e = Executors.newFixedThreadPool(0);
140		shouldThrow();
141	<	}
185	<	catch(IllegalArgumentException success) {
186	<	}
141	>	} catch (IllegalArgumentException success) {}
142		}
143
144		/**
145	<	* execute of runnable runs it to completion
145	>	* An unconfigurable newFixedThreadPool can execute runnables
146		*/
147	<	public void testExecuteRunnable () {
148	<	try {
149	<	Executor e = new DirectExecutor();
150	<	TrackedRunnable task = new TrackedRunnable();
151	<	assertFalse(task.done);
152	<	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	<	}
147	>	public void testunconfigurableExecutorService() {
148	>	ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
149	>	e.execute(new NoOpRunnable());
150	>	e.execute(new NoOpRunnable());
151	>	e.execute(new NoOpRunnable());
152	>	joinPool(e);
153		}
154
155		/**
156	<	* invoke of a runnable runs it to completion
156	>	* unconfigurableExecutorService(null) throws NPE
157		*/
158	<	public void testInvokeRunnable () {
158	>	public void testunconfigurableExecutorServiceNPE() {
159		try {
160	<	Executor e = new DirectExecutor();
161	<	TrackedRunnable task = new TrackedRunnable();
162	<	assertFalse(task.done);
218	<	Executors.invoke(e, task);
219	<	assertTrue(task.done);
220	<	}
221	<	catch (ExecutionException ex) {
222	<	unexpectedException();
223	<	}
224	<	catch (InterruptedException ex) {
225	<	unexpectedException();
226	<	}
160	>	ExecutorService e = Executors.unconfigurableExecutorService(null);
161	>	shouldThrow();
162	>	} catch (NullPointerException success) {}
163		}
164
165		/**
166	<	* execute of a callable runs it to completion
166	>	* unconfigurableScheduledExecutorService(null) throws NPE
167		*/
168	<	public void testExecuteCallable () {
168	>	public void testunconfigurableScheduledExecutorServiceNPE() {
169		try {
170	<	Executor e = new DirectExecutor();
171	<	Future<String> future = Executors.execute(e, new StringTask());
172	<	String result = future.get();
237	<	assertSame(TEST_STRING, result);
238	<	}
239	<	catch (ExecutionException ex) {
240	<	unexpectedException();
241	<	}
242	<	catch (InterruptedException ex) {
243	<	unexpectedException();
244	<	}
170	>	ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
171	>	shouldThrow();
172	>	} catch (NullPointerException success) {}
173		}
174
175		/**
176	<	* invoke of a collable runs it to completion
176	>	* a newSingleThreadScheduledExecutor successfully runs delayed task
177		*/
178	<	public void testInvokeCallable () {
178	>	public void testNewSingleThreadScheduledExecutor() throws Exception {
179	>	ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
180		try {
181	<	Executor e = new DirectExecutor();
182	<	String result = Executors.invoke(e, new StringTask());
183	<
184	<	assertSame(TEST_STRING, result);
185	<	}
186	<	catch (ExecutionException ex) {
187	<	unexpectedException();
188	<	}
189	<	catch (InterruptedException ex) {
190	<	unexpectedException();
181	>	final CountDownLatch done = new CountDownLatch(1);
182	>	final Runnable task = new CheckedRunnable() {
183	>	public void realRun() {
184	>	done.countDown();
185	>	}};
186	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
187	>	SHORT_DELAY_MS, MILLISECONDS);
188	>	assertFalse(f.isDone());
189	>	assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
190	>	assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
191	>	assertSame(Boolean.TRUE, f.get());
192	>	assertTrue(f.isDone());
193	>	} finally {
194	>	joinPool(p);
195		}
196		}
197
198		/**
199	<	* execute with null executor throws NPE
199	>	* a newScheduledThreadPool successfully runs delayed task
200		*/
201	<	public void testNullExecuteRunnable () {
201	>	public void testnewScheduledThreadPool() throws Exception {
202	>	ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
203		try {
204	<	TrackedRunnable task = new TrackedRunnable();
205	<	assertFalse(task.done);
206	<	Future<String> future = Executors.execute(null, task, TEST_STRING);
207	<	shouldThrow();
208	<	}
209	<	catch (NullPointerException success) {
210	<	}
211	<	catch (Exception ex) {
212	<	unexpectedException();
204	>	final CountDownLatch done = new CountDownLatch(1);
205	>	final Runnable task = new CheckedRunnable() {
206	>	public void realRun() {
207	>	done.countDown();
208	>	}};
209	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
210	>	SHORT_DELAY_MS, MILLISECONDS);
211	>	assertFalse(f.isDone());
212	>	assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
213	>	assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
214	>	assertSame(Boolean.TRUE, f.get());
215	>	assertTrue(f.isDone());
216	>	} finally {
217	>	joinPool(p);
218		}
219		}
220
221		/**
222	<	* execute with a null runnable throws NPE
222	>	* an unconfigurable newScheduledThreadPool successfully runs delayed task
223		*/
224	<	public void testExecuteNullRunnable() {
224	>	public void testunconfigurableScheduledExecutorService() throws Exception {
225	>	ScheduledExecutorService p =
226	>	Executors.unconfigurableScheduledExecutorService
227	>	(Executors.newScheduledThreadPool(2));
228		try {
229	<	Executor e = new DirectExecutor();
230	<	TrackedRunnable task = null;
231	<	Future<String> future = Executors.execute(e, task, TEST_STRING);
232	<	shouldThrow();
233	<	}
234	<	catch (NullPointerException success) {
235	<	}
236	<	catch (Exception ex) {
237	<	unexpectedException();
229	>	final CountDownLatch done = new CountDownLatch(1);
230	>	final Runnable task = new CheckedRunnable() {
231	>	public void realRun() {
232	>	done.countDown();
233	>	}};
234	>	Future f = p.schedule(Executors.callable(task, Boolean.TRUE),
235	>	SHORT_DELAY_MS, MILLISECONDS);
236	>	assertFalse(f.isDone());
237	>	assertTrue(done.await(MEDIUM_DELAY_MS, MILLISECONDS));
238	>	assertSame(Boolean.TRUE, f.get(SMALL_DELAY_MS, MILLISECONDS));
239	>	assertSame(Boolean.TRUE, f.get());
240	>	assertTrue(f.isDone());
241	>	} finally {
242	>	joinPool(p);
243		}
244		}
245
246		/**
247	<	* invoke of a null runnable throws NPE
247	>	* Future.get on submitted tasks will time out if they compute too long.
248		*/
249	<	public void testInvokeNullRunnable () {
250	<	try {
251	<	Executor e = new DirectExecutor();
252	<	TrackedRunnable task = null;
253	<	Executors.invoke(e, task);
254	<	shouldThrow();
255	<	}
256	<	catch (NullPointerException success) {
257	<	}
258	<	catch (Exception ex) {
259	<	unexpectedException();
249	>	public void testTimedCallable() throws Exception {
250	>	final ExecutorService[] executors = {
251	>	Executors.newSingleThreadExecutor(),
252	>	Executors.newCachedThreadPool(),
253	>	Executors.newFixedThreadPool(2),
254	>	Executors.newScheduledThreadPool(2),
255	>	};
256	>
257	>	final Runnable sleeper = new CheckedInterruptedRunnable() {
258	>	public void realRun() throws InterruptedException {
259	>	delay(LONG_DELAY_MS);
260	>	}};
261	>
262	>	List<Thread> threads = new ArrayList<Thread>();
263	>	for (final ExecutorService executor : executors) {
264	>	threads.add(newStartedThread(new CheckedRunnable() {
265	>	public void realRun() {
266	>	long startTime = System.nanoTime();
267	>	Future future = executor.submit(sleeper);
268	>	assertFutureTimesOut(future);
269	>	}}));
270		}
271	+	for (Thread thread : threads)
272	+	awaitTermination(thread);
273	+	for (ExecutorService executor : executors)
274	+	joinPool(executor);
275		}
276
277		/**
278	<	* execute of a null callable throws NPE
278	>	* ThreadPoolExecutor using defaultThreadFactory has
279	>	* specified group, priority, daemon status, and name
280		*/
281	<	public void testExecuteNullCallable () {
281	>	public void testDefaultThreadFactory() throws Exception {
282	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
283	>	Runnable r = new CheckedRunnable() {
284	>	public void realRun() {
285	>	try {
286	>	Thread current = Thread.currentThread();
287	>	assertTrue(!current.isDaemon());
288	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
289	>	ThreadGroup g = current.getThreadGroup();
290	>	SecurityManager s = System.getSecurityManager();
291	>	if (s != null)
292	>	assertTrue(g == s.getThreadGroup());
293	>	else
294	>	assertTrue(g == egroup);
295	>	String name = current.getName();
296	>	assertTrue(name.endsWith("thread-1"));
297	>	} catch (SecurityException ok) {
298	>	// Also pass if not allowed to change setting
299	>	}
300	>	}};
301	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
302	>
303	>	e.execute(r);
304		try {
305	<	Executor e = new DirectExecutor();
306	<	StringTask t = null;
323	<	Future<String> future = Executors.execute(e, t);
324	<	shouldThrow();
325	<	}
326	<	catch (NullPointerException success) {
305	>	e.shutdown();
306	>	} catch (SecurityException ok) {
307		}
308	<	catch (Exception ex) {
309	<	unexpectedException();
308	>
309	>	try {
310	>	delay(SHORT_DELAY_MS);
311	>	} finally {
312	>	joinPool(e);
313		}
314		}
315
316		/**
317	<	* invoke of a null callable throws NPE
318	<	*/
319	<	public void testInvokeNullCallable () {
320	<	try {
321	<	Executor e = new DirectExecutor();
322	<	StringTask t = null;
323	<	String result = Executors.invoke(e, t);
324	<	shouldThrow();
317	>	* ThreadPoolExecutor using privilegedThreadFactory has
318	>	* specified group, priority, daemon status, name,
319	>	* access control context and context class loader
320	>	*/
321	>	public void testPrivilegedThreadFactory() throws Exception {
322	>	Runnable r = new CheckedRunnable() {
323	>	public void realRun() throws Exception {
324	>	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
325	>	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
326	>	final AccessControlContext thisacc = AccessController.getContext();
327	>	Runnable r = new CheckedRunnable() {
328	>	public void realRun() {
329	>	Thread current = Thread.currentThread();
330	>	assertTrue(!current.isDaemon());
331	>	assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
332	>	ThreadGroup g = current.getThreadGroup();
333	>	SecurityManager s = System.getSecurityManager();
334	>	if (s != null)
335	>	assertTrue(g == s.getThreadGroup());
336	>	else
337	>	assertTrue(g == egroup);
338	>	String name = current.getName();
339	>	assertTrue(name.endsWith("thread-1"));
340	>	assertSame(thisccl, current.getContextClassLoader());
341	>	assertEquals(thisacc, AccessController.getContext());
342	>	}};
343	>	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
344	>	e.execute(r);
345	>	e.shutdown();
346	>	delay(SHORT_DELAY_MS);
347	>	joinPool(e);
348	>	}};
349	>
350	>	runWithPermissions(r,
351	>	new RuntimePermission("getClassLoader"),
352	>	new RuntimePermission("setContextClassLoader"),
353	>	new RuntimePermission("modifyThread"));
354	>	}
355	>
356	>	boolean haveCCLPermissions() {
357	>	SecurityManager sm = System.getSecurityManager();
358	>	if (sm != null) {
359	>	try {
360	>	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
361	>	sm.checkPermission(new RuntimePermission("getClassLoader"));
362	>	} catch (AccessControlException e) {
363	>	return false;
364	>	}
365		}
366	<	catch (NullPointerException success) {
366	>	return true;
367	>	}
368	>
369	>	void checkCCL() {
370	>	SecurityManager sm = System.getSecurityManager();
371	>	if (sm != null) {
372	>	sm.checkPermission(new RuntimePermission("setContextClassLoader"));
373	>	sm.checkPermission(new RuntimePermission("getClassLoader"));
374		}
375	<	catch (Exception ex) {
376	<	unexpectedException();
375	>	}
376	>
377	>	class CheckCCL implements Callable<Object> {
378	>	public Object call() {
379	>	checkCCL();
380	>	return null;
381		}
382		}
383
384		/**
385	<	*  execute(Executor, Runnable) throws RejectedExecutionException
386	<	*  if saturated.
385	>	* Without class loader permissions, creating
386	>	* privilegedCallableUsingCurrentClassLoader throws ACE
387		*/
388	<	public void testExecute1() {
389	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
390	<	try {
391	<
392	<	for(int i = 0; i < 5; ++i){
393	<	Executors.execute(p, new MediumRunnable(), Boolean.TRUE);
394	<	}
395	<	shouldThrow();
396	<	} catch(RejectedExecutionException success){}
397	<	joinPool(p);
388	>	public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
389	>	Runnable r = new CheckedRunnable() {
390	>	public void realRun() throws Exception {
391	>	if (System.getSecurityManager() == null)
392	>	return;
393	>	try {
394	>	Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
395	>	shouldThrow();
396	>	} catch (AccessControlException success) {}
397	>	}};
398	>
399	>	runWithoutPermissions(r);
400		}
401
402		/**
403	<	*  execute(Executor, Callable)throws RejectedExecutionException
404	<	*  if saturated.
403	>	* With class loader permissions, calling
404	>	* privilegedCallableUsingCurrentClassLoader does not throw ACE
405		*/
406	<	public void testExecute2() {
407	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1));
408	<	try {
409	<	for(int i = 0; i < 5; ++i) {
410	<	Executors.execute(p, new SmallCallable());
411	<	}
412	<	shouldThrow();
377	<	} catch(RejectedExecutionException e){}
378	<	joinPool(p);
379	<	}
406	>	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
407	>	Runnable r = new CheckedRunnable() {
408	>	public void realRun() throws Exception {
409	>	Executors.privilegedCallableUsingCurrentClassLoader
410	>	(new NoOpCallable())
411	>	.call();
412	>	}};
413
414	+	runWithPermissions(r,
415	+	new RuntimePermission("getClassLoader"),
416	+	new RuntimePermission("setContextClassLoader"));
417	+	}
418
419		/**
420	<	*  invoke(Executor, Runnable) throws InterruptedException if
384	<	*  caller interrupted.
420	>	* Without permissions, calling privilegedCallable throws ACE
421		*/
422	<	public void testInterruptedInvoke() {
423	<	final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
424	<	Thread t = new Thread(new Runnable() {
425	<	public void run() {
426	<	try {
427	<	Executors.invoke(p,new Runnable() {
428	<	public void run() {
429	<	try {
430	<	Thread.sleep(MEDIUM_DELAY_MS);
431	<	shouldThrow();
432	<	} catch(InterruptedException e){
433	<	}
434	<	}
435	<	});
436	<	} catch(InterruptedException success){
437	<	} catch(Exception e) {
438	<	unexpectedException();
439	<	}
440	<
441	<	}
442	<	});
443	<	try {
444	<	t.start();
445	<	Thread.sleep(SHORT_DELAY_MS);
446	<	t.interrupt();
447	<	} catch(Exception e){
448	<	unexpectedException();
449	<	}
450	<	joinPool(p);
422	>	public void testprivilegedCallableWithNoPrivs() throws Exception {
423	>	// Avoid classloader-related SecurityExceptions in swingui.TestRunner
424	>	Executors.privilegedCallable(new CheckCCL());
425	>
426	>	Runnable r = new CheckedRunnable() {
427	>	public void realRun() throws Exception {
428	>	if (System.getSecurityManager() == null)
429	>	return;
430	>	Callable task = Executors.privilegedCallable(new CheckCCL());
431	>	try {
432	>	task.call();
433	>	shouldThrow();
434	>	} catch (AccessControlException success) {}
435	>	}};
436	>
437	>	runWithoutPermissions(r);
438	>
439	>	// It seems rather difficult to test that the
440	>	// AccessControlContext of the privilegedCallable is used
441	>	// instead of its caller.  Below is a failed attempt to do
442	>	// that, which does not work because the AccessController
443	>	// cannot capture the internal state of the current Policy.
444	>	// It would be much more work to differentiate based on,
445	>	// e.g. CodeSource.
446	>
447	>	//         final AccessControlContext[] noprivAcc = new AccessControlContext[1];
448	>	//         final Callable[] task = new Callable[1];
449	>
450	>	//         runWithPermissions
451	>	//             (new CheckedRunnable() {
452	>	//                 public void realRun() {
453	>	//                     if (System.getSecurityManager() == null)
454	>	//                         return;
455	>	//                     noprivAcc[0] = AccessController.getContext();
456	>	//                     task[0] = Executors.privilegedCallable(new CheckCCL());
457	>	//                     try {
458	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
459	>	//                                                           public Void run() {
460	>	//                                                               checkCCL();
461	>	//                                                               return null;
462	>	//                                                           }}, noprivAcc[0]);
463	>	//                         shouldThrow();
464	>	//                     } catch (AccessControlException success) {}
465	>	//                 }});
466	>
467	>	//         runWithPermissions
468	>	//             (new CheckedRunnable() {
469	>	//                 public void realRun() throws Exception {
470	>	//                     if (System.getSecurityManager() == null)
471	>	//                         return;
472	>	//                     // Verify that we have an underprivileged ACC
473	>	//                     try {
474	>	//                         AccessController.doPrivileged(new PrivilegedAction<Void>() {
475	>	//                                                           public Void run() {
476	>	//                                                               checkCCL();
477	>	//                                                               return null;
478	>	//                                                           }}, noprivAcc[0]);
479	>	//                         shouldThrow();
480	>	//                     } catch (AccessControlException success) {}
481	>
482	>	//                     try {
483	>	//                         task[0].call();
484	>	//                         shouldThrow();
485	>	//                     } catch (AccessControlException success) {}
486	>	//                 }},
487	>	//              new RuntimePermission("getClassLoader"),
488	>	//              new RuntimePermission("setContextClassLoader"));
489		}
490
491		/**
492	<	*  invoke(Executor, Runnable) throws ExecutionException if
419	<	*  runnable throws exception.
492	>	* With permissions, calling privilegedCallable succeeds
493		*/
494	<	public void testInvoke3() {
495	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
496	<	try {
497	<	Runnable r = new Runnable() {
498	<	public void run() {
499	<	int i = 5/0;
500	<	}
501	<	};
502	<
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){
437	<	unexpectedException();
438	<	}
439	<	joinPool(p);
494	>	public void testprivilegedCallableWithPrivs() throws Exception {
495	>	Runnable r = new CheckedRunnable() {
496	>	public void realRun() throws Exception {
497	>	Executors.privilegedCallable(new CheckCCL()).call();
498	>	}};
499	>
500	>	runWithPermissions(r,
501	>	new RuntimePermission("getClassLoader"),
502	>	new RuntimePermission("setContextClassLoader"));
503		}
504
505	+	/**
506	+	* callable(Runnable) returns null when called
507	+	*/
508	+	public void testCallable1() throws Exception {
509	+	Callable c = Executors.callable(new NoOpRunnable());
510	+	assertNull(c.call());
511	+	}
512
513	+	/**
514	+	* callable(Runnable, result) returns result when called
515	+	*/
516	+	public void testCallable2() throws Exception {
517	+	Callable c = Executors.callable(new NoOpRunnable(), one);
518	+	assertSame(one, c.call());
519	+	}
520
521		/**
522	<	*  invoke(Executor, Callable) throws InterruptedException if
446	<	*  callable throws exception
522	>	* callable(PrivilegedAction) returns its result when called
523		*/
524	<	public void testInvoke5() {
525	<	final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
526	<
527	<	final Callable c = new Callable() {
528	<	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	<	};
524	>	public void testCallable3() throws Exception {
525	>	Callable c = Executors.callable(new PrivilegedAction() {
526	>	public Object run() { return one; }});
527	>	assertSame(one, c.call());
528	>	}
529
530	+	/**
531	+	* callable(PrivilegedExceptionAction) returns its result when called
532	+	*/
533	+	public void testCallable4() throws Exception {
534	+	Callable c = Executors.callable(new PrivilegedExceptionAction() {
535	+	public Object run() { return one; }});
536	+	assertSame(one, c.call());
537	+	}
538
539	<
540	<	Thread t = new Thread(new Runnable() {
541	<	public void run() {
542	<	try {
468	<	c.call();
469	<	} catch(Exception e){}
470	<	}
471	<	});
539	>	/**
540	>	* callable(null Runnable) throws NPE
541	>	*/
542	>	public void testCallableNPE1() {
543		try {
544	<	t.start();
545	<	Thread.sleep(SHORT_DELAY_MS);
546	<	t.interrupt();
476	<	t.join();
477	<	} catch(InterruptedException e){
478	<	unexpectedException();
479	<	}
480	<
481	<	joinPool(p);
544	>	Callable c = Executors.callable((Runnable) null);
545	>	shouldThrow();
546	>	} catch (NullPointerException success) {}
547		}
548
549		/**
550	<	*  invoke(Executor, Callable) will throw ExecutionException
486	<	*  if callable throws exception
550	>	* callable(null, result) throws NPE
551		*/
552	<	public void testInvoke6() {
489	<	ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10));
490	<
552	>	public void testCallableNPE2() {
553		try {
554	<	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	<
554	>	Callable c = Executors.callable((Runnable) null, one);
555		shouldThrow();
556	<	}
505	<	catch(ExecutionException success){
506	<	} catch(Exception e) {
507	<	unexpectedException();
508	<	}
509	<	joinPool(p);
556	>	} catch (NullPointerException success) {}
557		}
558
512	–
513	–
559		/**
560	<	*  timeouts from execute will time out if they compute too long.
560	>	* callable(null PrivilegedAction) throws NPE
561		*/
562	<	public void testTimedCallable() {
518	<	int N = 10000;
519	<	ExecutorService executor = Executors.newSingleThreadExecutor();
520	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
562	>	public void testCallableNPE3() {
563		try {
564	<	long startTime = System.currentTimeMillis();
565	<
566	<	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	<	}
564	>	Callable c = Executors.callable((PrivilegedAction) null);
565	>	shouldThrow();
566	>	} catch (NullPointerException success) {}
567		}
568
569	<
570	<
569	>	/**
570	>	* callable(null PrivilegedExceptionAction) throws NPE
571	>	*/
572	>	public void testCallableNPE4() {
573	>	try {
574	>	Callable c = Executors.callable((PrivilegedExceptionAction) null);
575	>	shouldThrow();
576	>	} catch (NullPointerException success) {}
577	>	}
578
579		}

Diff Legend

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