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

Diff Legend

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