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.36 by jsr166, Tue Nov 9 15:29:11 2010 UTC

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

Diff Legend

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