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.23 by jsr166, Thu Nov 19 03:55:29 2009 UTC vs.
Revision 1.41 by jsr166, Sun May 29 06:54:23 2011 UTC

#	Line 1 | Line 1
1		/*
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
4	>	* http://creativecommons.org/publicdomain/zero/1.0/
5		* Other contributors include Andrew Wright, Jeffrey Hayes,
6		* Pat Fisher, Mike Judd.
7		*/
8
9	–
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 {
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);
21		}
22
24	–	static class TimedCallable<T> implements Callable<T> {
25	–	private final ExecutorService exec;
26	–	private final Callable<T> func;
27	–	private final long msecs;
28	–
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 = exec.submit(func);
37	–	try {
38	–	return ftask.get(msecs, TimeUnit.MILLISECONDS);
39	–	} finally {
40	–	ftask.cancel(true);
41	–	}
42	–	}
43	–	}
44	–
45	–
46	–	private static class Fib implements Callable<BigInteger> {
47	–	private final BigInteger n;
48	–	Fib(long n) {
49	–	if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n);
50	–	this.n = BigInteger.valueOf(n);
51	–	}
52	–	public BigInteger call() {
53	–	BigInteger f1 = BigInteger.ONE;
54	–	BigInteger f2 = f1;
55	–	for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) {
56	–	BigInteger t = f1.add(f2);
57	–	f1 = f2;
58	–	f2 = t;
59	–	}
60	–	return f1;
61	–	}
62	–	};
63	–
23		/**
24		* A newCachedThreadPool can execute runnables
25		*/
#	Line 93 | Line 52 | public class ExecutorsTest extends JSR16
52		} catch (NullPointerException success) {}
53		}
54
96	–
55		/**
56		* A new SingleThreadExecutor can execute runnables
57		*/
#	Line 140 | Line 98 | public class ExecutorsTest extends JSR16
98		}
99		}
100
143	–
101		/**
102		* A new newFixedThreadPool can execute runnables
103		*/
#	Line 183 | Line 140 | public class ExecutorsTest extends JSR16
140		} catch (IllegalArgumentException success) {}
141		}
142
186	–
143		/**
144		* An unconfigurable newFixedThreadPool can execute runnables
145		*/
#	Line 215 | Line 171 | public class ExecutorsTest extends JSR16
171		} catch (NullPointerException success) {}
172		}
173
218	–
174		/**
175		* a newSingleThreadScheduledExecutor successfully runs delayed task
176		*/
177		public void testNewSingleThreadScheduledExecutor() throws Exception {
178	<	try {
179	<	TrackedCallable callable = new TrackedCallable();
180	<	ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
181	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
182	<	assertFalse(callable.done);
183	<	Thread.sleep(MEDIUM_DELAY_MS);
184	<	assertTrue(callable.done);
185	<	assertEquals(Boolean.TRUE, f.get());
186	<	joinPool(p1);
187	<	} catch (RejectedExecutionException e) {}
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	<	try {
202	<	TrackedCallable callable = new TrackedCallable();
203	<	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
204	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
205	<	assertFalse(callable.done);
206	<	Thread.sleep(MEDIUM_DELAY_MS);
207	<	assertTrue(callable.done);
208	<	assertEquals(Boolean.TRUE, f.get());
209	<	joinPool(p1);
210	<	} catch (RejectedExecutionException e) {}
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
221	>	* an unconfigurable newScheduledThreadPool successfully runs delayed task
222		*/
223		public void testunconfigurableScheduledExecutorService() throws Exception {
224	<	try {
225	<	TrackedCallable callable = new TrackedCallable();
226	<	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
227	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
228	<	assertFalse(callable.done);
229	<	Thread.sleep(MEDIUM_DELAY_MS);
230	<	assertTrue(callable.done);
231	<	assertEquals(Boolean.TRUE, f.get());
232	<	joinPool(p1);
233	<	} catch (RejectedExecutionException e) {}
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	<	*  timeouts from execute will time out if they compute too long.
246	>	* Future.get on submitted tasks will time out if they compute too long.
247		*/
248		public void testTimedCallable() throws Exception {
249	<	int N = 10000;
250	<	ExecutorService executor = Executors.newSingleThreadExecutor();
251	<	List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N);
252	<	try {
253	<	long startTime = System.currentTimeMillis();
254	<
255	<	long i = 0;
256	<	while (tasks.size() < N) {
257	<	tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1));
258	<	i += 10;
259	<	}
260	<
261	<	int iters = 0;
262	<	BigInteger sum = BigInteger.ZERO;
263	<	for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) {
264	<	try {
265	<	++iters;
266	<	sum = sum.add(it.next().call());
267	<	}
268	<	catch (TimeoutException success) {
269	<	assertTrue(iters > 0);
270	<	return;
271	<	}
272	<	}
295	<	// if by chance we didn't ever time out, total time must be small
296	<	long elapsed = System.currentTimeMillis() - startTime;
297	<	assertTrue(elapsed < N);
298	<	}
299	<	finally {
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);
301	–	}
274		}
275
304	–
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 Runnable() {
283	<	public void run() {
284	<	try {
285	<	Thread current = Thread.currentThread();
286	<	threadAssertTrue(!current.isDaemon());
287	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
288	<	ThreadGroup g = current.getThreadGroup();
289	<	SecurityManager s = System.getSecurityManager();
290	<	if (s != null)
291	<	threadAssertTrue(g == s.getThreadGroup());
292	<	else
293	<	threadAssertTrue(g == egroup);
294	<	String name = current.getName();
295	<	threadAssertTrue(name.endsWith("thread-1"));
296	<	} catch (SecurityException ok) {
297	<	// Also pass if not allowed to change setting
327	<	}
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);
#	Line 336 | Line 306 | public class ExecutorsTest extends JSR16
306		}
307
308		try {
309	<	Thread.sleep(SHORT_DELAY_MS);
309	>	delay(SHORT_DELAY_MS);
310		} finally {
311		joinPool(e);
312		}
#	Line 348 | Line 318 | public class ExecutorsTest extends JSR16
318		* access control context and context class loader
319		*/
320		public void testPrivilegedThreadFactory() throws Exception {
321	<	Policy savedPolicy = null;
322	<	try {
323	<	savedPolicy = Policy.getPolicy();
324	<	AdjustablePolicy policy = new AdjustablePolicy();
325	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
326	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
327	<	Policy.setPolicy(policy);
328	<	} catch (AccessControlException ok) {
329	<	return;
330	<	}
331	<	final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
332	<	final ClassLoader thisccl = Thread.currentThread().getContextClassLoader();
333	<	final AccessControlContext thisacc = AccessController.getContext();
334	<	Runnable r = new Runnable() {
335	<	public void run() {
336	<	try {
337	<	Thread current = Thread.currentThread();
338	<	threadAssertTrue(!current.isDaemon());
339	<	threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
340	<	ThreadGroup g = current.getThreadGroup();
341	<	SecurityManager s = System.getSecurityManager();
342	<	if (s != null)
343	<	threadAssertTrue(g == s.getThreadGroup());
344	<	else
345	<	threadAssertTrue(g == egroup);
346	<	String name = current.getName();
347	<	threadAssertTrue(name.endsWith("thread-1"));
348	<	threadAssertTrue(thisccl == current.getContextClassLoader());
349	<	threadAssertTrue(thisacc.equals(AccessController.getContext()));
350	<	} catch (SecurityException ok) {
351	<	// Also pass if not allowed to change settings
352	<	}
353	<	}
384	<	};
385	<	ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
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	<	Policy.setPolicy(savedPolicy);
356	<	e.execute(r);
357	<	try {
358	<	e.shutdown();
359	<	} catch (SecurityException ok) {
360	<	}
361	<	try {
362	<	Thread.sleep(SHORT_DELAY_MS);
363	<	} finally {
396	<	joinPool(e);
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	>	}
364		}
365	<
365	>	return true;
366		}
367
368		void checkCCL() {
#	Line 413 | Line 380 | public class ExecutorsTest extends JSR16
380		}
381		}
382
416	–
383		/**
384		* Without class loader permissions, creating
385		* privilegedCallableUsingCurrentClassLoader throws ACE
386		*/
387		public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
388	<	Policy savedPolicy = null;
389	<	try {
390	<	savedPolicy = Policy.getPolicy();
391	<	AdjustablePolicy policy = new AdjustablePolicy();
392	<	Policy.setPolicy(policy);
393	<	} catch (AccessControlException ok) {
394	<	return;
395	<	}
396	<
431	<	// Check if program still has too many permissions to run test
432	<	try {
433	<	checkCCL();
434	<	// too many privileges to test; so return
435	<	Policy.setPolicy(savedPolicy);
436	<	return;
437	<	} catch (AccessControlException ok) {
438	<	}
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	<	try {
441	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
442	<	shouldThrow();
443	<	} catch (AccessControlException success) {
444	<	} finally {
445	<	Policy.setPolicy(savedPolicy);
446	<	}
398	>	runWithoutPermissions(r);
399		}
400
401		/**
#	Line 451 | Line 403 | public class ExecutorsTest extends JSR16
403		* privilegedCallableUsingCurrentClassLoader does not throw ACE
404		*/
405		public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
406	<	Policy savedPolicy = null;
407	<	try {
408	<	savedPolicy = Policy.getPolicy();
409	<	AdjustablePolicy policy = new AdjustablePolicy();
410	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
411	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
412	<	Policy.setPolicy(policy);
413	<	} catch (AccessControlException ok) {
414	<	return;
415	<	}
464	<
465	<	try {
466	<	Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
467	<	task.call();
468	<	}
469	<	finally {
470	<	Policy.setPolicy(savedPolicy);
471	<	}
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		* Without permissions, calling privilegedCallable throws ACE
420		*/
421		public void testprivilegedCallableWithNoPrivs() throws Exception {
422	<	Callable task;
423	<	Policy savedPolicy = null;
480	<	AdjustablePolicy policy = null;
481	<	AccessControlContext noprivAcc = null;
482	<	try {
483	<	savedPolicy = Policy.getPolicy();
484	<	policy = new AdjustablePolicy();
485	<	Policy.setPolicy(policy);
486	<	noprivAcc = AccessController.getContext();
487	<	task = Executors.privilegedCallable(new CheckCCL());
488	<	Policy.setPolicy(savedPolicy);
489	<	} catch (AccessControlException ok) {
490	<	return; // program has too few permissions to set up test
491	<	}
422	>	// Avoid classloader-related SecurityExceptions in swingui.TestRunner
423	>	Executors.privilegedCallable(new CheckCCL());
424
425	<	// Make sure that program doesn't have too many permissions
426	<	try {
427	<	AccessController.doPrivileged(new PrivilegedAction() {
428	<	public Object run() {
429	<	checkCCL();
430	<	return null;
431	<	}}, noprivAcc);
432	<	// too many permssions; skip test
433	<	return;
434	<	} catch (AccessControlException ok) {
435	<	}
436	<
437	<	try {
438	<	task.call();
439	<	shouldThrow();
440	<	} catch (AccessControlException success) {}
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		* With permissions, calling privilegedCallable succeeds
492		*/
493		public void testprivilegedCallableWithPrivs() throws Exception {
494	<	Policy savedPolicy = null;
495	<	try {
496	<	savedPolicy = Policy.getPolicy();
497	<	AdjustablePolicy policy = new AdjustablePolicy();
498	<	policy.addPermission(new RuntimePermission("getContextClassLoader"));
499	<	policy.addPermission(new RuntimePermission("setContextClassLoader"));
500	<	Policy.setPolicy(policy);
501	<	} catch (AccessControlException ok) {
523	<	return;
524	<	}
525	<
526	<	Callable task = Executors.privilegedCallable(new CheckCCL());
527	<	try {
528	<	task.call();
529	<	} finally {
530	<	Policy.setPolicy(savedPolicy);
531	<	}
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		/**
#	Line 544 | Line 514 | public class ExecutorsTest extends JSR16
514		*/
515		public void testCallable2() throws Exception {
516		Callable c = Executors.callable(new NoOpRunnable(), one);
517	<	assertEquals(one, c.call());
517	>	assertSame(one, c.call());
518		}
519
520		/**
#	Line 553 | Line 523 | public class ExecutorsTest extends JSR16
523		public void testCallable3() throws Exception {
524		Callable c = Executors.callable(new PrivilegedAction() {
525		public Object run() { return one; }});
526	<	assertEquals(one, c.call());
526	>	assertSame(one, c.call());
527		}
528
529		/**
#	Line 562 | Line 532 | public class ExecutorsTest extends JSR16
532		public void testCallable4() throws Exception {
533		Callable c = Executors.callable(new PrivilegedExceptionAction() {
534		public Object run() { return one; }});
535	<	assertEquals(one, c.call());
535	>	assertSame(one, c.call());
536		}
537
568	–
538		/**
539		* callable(null Runnable) throws NPE
540		*/
#	Line 606 | Line 575 | public class ExecutorsTest extends JSR16
575		} catch (NullPointerException success) {}
576		}
577
609	–
578		}

Diff Legend

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