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.34 by jsr166, Sat Oct 9 19:30:35 2010 UTC vs.
Revision 1.56 by dl, Tue Mar 22 21:29:23 2022 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	–
10	–	import junit.framework.*;
11	–	import java.util.*;
12	–	import java.util.concurrent.*;
9		import static java.util.concurrent.TimeUnit.MILLISECONDS;
10	<	import java.math.BigInteger;
11	<	import java.security.*;
10	>
11	>	import java.security.AccessControlContext;
12	>	import java.security.AccessControlException;
13	>	import java.security.AccessController;
14	>	import java.security.PrivilegedAction;
15	>	import java.security.PrivilegedExceptionAction;
16	>	import java.util.ArrayList;
17	>	import java.util.List;
18	>	import java.util.concurrent.Callable;
19	>	import java.util.concurrent.CountDownLatch;
20	>	import java.util.concurrent.Executors;
21	>	import java.util.concurrent.ExecutorService;
22	>	import java.util.concurrent.Future;
23	>	import java.util.concurrent.ScheduledExecutorService;
24	>	import java.util.concurrent.ThreadPoolExecutor;
25	>
26	>	import junit.framework.Test;
27	>	import junit.framework.TestSuite;
28
29		public class ExecutorsTest extends JSR166TestCase {
30		public static void main(String[] args) {
31	<	junit.textui.TestRunner.run(suite());
31	>	main(suite(), args);
32		}
33		public static Test suite() {
34		return new TestSuite(ExecutorsTest.class);
#	Line 26 | Line 38 | public class ExecutorsTest extends JSR16
38		* A newCachedThreadPool can execute runnables
39		*/
40		public void testNewCachedThreadPool1() {
41	<	ExecutorService e = Executors.newCachedThreadPool();
42	<	e.execute(new NoOpRunnable());
43	<	e.execute(new NoOpRunnable());
44	<	e.execute(new NoOpRunnable());
45	<	joinPool(e);
41	>	final ExecutorService e = Executors.newCachedThreadPool();
42	>	try (PoolCleaner cleaner = cleaner(e)) {
43	>	e.execute(new NoOpRunnable());
44	>	e.execute(new NoOpRunnable());
45	>	e.execute(new NoOpRunnable());
46	>	}
47		}
48
49		/**
50		* A newCachedThreadPool with given ThreadFactory can execute runnables
51		*/
52		public void testNewCachedThreadPool2() {
53	<	ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
54	<	e.execute(new NoOpRunnable());
55	<	e.execute(new NoOpRunnable());
56	<	e.execute(new NoOpRunnable());
57	<	joinPool(e);
53	>	final ExecutorService e = Executors.newCachedThreadPool(new SimpleThreadFactory());
54	>	try (PoolCleaner cleaner = cleaner(e)) {
55	>	e.execute(new NoOpRunnable());
56	>	e.execute(new NoOpRunnable());
57	>	e.execute(new NoOpRunnable());
58	>	}
59		}
60
61		/**
#	Line 49 | Line 63 | public class ExecutorsTest extends JSR16
63		*/
64		public void testNewCachedThreadPool3() {
65		try {
66	<	ExecutorService e = Executors.newCachedThreadPool(null);
66	>	ExecutorService unused = Executors.newCachedThreadPool(null);
67		shouldThrow();
68		} catch (NullPointerException success) {}
69		}
70
57	–
71		/**
72		* A new SingleThreadExecutor can execute runnables
73		*/
74		public void testNewSingleThreadExecutor1() {
75	<	ExecutorService e = Executors.newSingleThreadExecutor();
76	<	e.execute(new NoOpRunnable());
77	<	e.execute(new NoOpRunnable());
78	<	e.execute(new NoOpRunnable());
79	<	joinPool(e);
75	>	final ExecutorService e = Executors.newSingleThreadExecutor();
76	>	try (PoolCleaner cleaner = cleaner(e)) {
77	>	e.execute(new NoOpRunnable());
78	>	e.execute(new NoOpRunnable());
79	>	e.execute(new NoOpRunnable());
80	>	}
81		}
82
83		/**
84		* A new SingleThreadExecutor with given ThreadFactory can execute runnables
85		*/
86		public void testNewSingleThreadExecutor2() {
87	<	ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
88	<	e.execute(new NoOpRunnable());
89	<	e.execute(new NoOpRunnable());
90	<	e.execute(new NoOpRunnable());
91	<	joinPool(e);
87	>	final ExecutorService e = Executors.newSingleThreadExecutor(new SimpleThreadFactory());
88	>	try (PoolCleaner cleaner = cleaner(e)) {
89	>	e.execute(new NoOpRunnable());
90	>	e.execute(new NoOpRunnable());
91	>	e.execute(new NoOpRunnable());
92	>	}
93		}
94
95		/**
#	Line 82 | Line 97 | public class ExecutorsTest extends JSR16
97		*/
98		public void testNewSingleThreadExecutor3() {
99		try {
100	<	ExecutorService e = Executors.newSingleThreadExecutor(null);
100	>	ExecutorService unused = Executors.newSingleThreadExecutor(null);
101		shouldThrow();
102		} catch (NullPointerException success) {}
103		}
#	Line 91 | Line 106 | public class ExecutorsTest extends JSR16
106		* A new SingleThreadExecutor cannot be casted to concrete implementation
107		*/
108		public void testCastNewSingleThreadExecutor() {
109	<	ExecutorService e = Executors.newSingleThreadExecutor();
110	<	try {
111	<	ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
112	<	shouldThrow();
113	<	} catch (ClassCastException success) {
114	<	} finally {
100	<	joinPool(e);
109	>	final ExecutorService e = Executors.newSingleThreadExecutor();
110	>	try (PoolCleaner cleaner = cleaner(e)) {
111	>	try {
112	>	ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
113	>	shouldThrow();
114	>	} catch (ClassCastException success) {}
115		}
116		}
117
104	–
118		/**
119		* A new newFixedThreadPool can execute runnables
120		*/
121		public void testNewFixedThreadPool1() {
122	<	ExecutorService e = Executors.newFixedThreadPool(2);
123	<	e.execute(new NoOpRunnable());
124	<	e.execute(new NoOpRunnable());
125	<	e.execute(new NoOpRunnable());
126	<	joinPool(e);
122	>	final ExecutorService e = Executors.newFixedThreadPool(2);
123	>	try (PoolCleaner cleaner = cleaner(e)) {
124	>	e.execute(new NoOpRunnable());
125	>	e.execute(new NoOpRunnable());
126	>	e.execute(new NoOpRunnable());
127	>	}
128		}
129
130		/**
131		* A new newFixedThreadPool with given ThreadFactory can execute runnables
132		*/
133		public void testNewFixedThreadPool2() {
134	<	ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
135	<	e.execute(new NoOpRunnable());
136	<	e.execute(new NoOpRunnable());
137	<	e.execute(new NoOpRunnable());
138	<	joinPool(e);
134	>	final ExecutorService e = Executors.newFixedThreadPool(2, new SimpleThreadFactory());
135	>	try (PoolCleaner cleaner = cleaner(e)) {
136	>	e.execute(new NoOpRunnable());
137	>	e.execute(new NoOpRunnable());
138	>	e.execute(new NoOpRunnable());
139	>	}
140		}
141
142		/**
143	<	* A new newFixedThreadPool with null ThreadFactory throws NPE
143	>	* A new newFixedThreadPool with null ThreadFactory throws
144	>	* NullPointerException
145		*/
146		public void testNewFixedThreadPool3() {
147		try {
148	<	ExecutorService e = Executors.newFixedThreadPool(2, null);
148	>	ExecutorService unused = Executors.newFixedThreadPool(2, null);
149		shouldThrow();
150		} catch (NullPointerException success) {}
151		}
152
153		/**
154	<	* A new newFixedThreadPool with 0 threads throws IAE
154	>	* A new newFixedThreadPool with 0 threads throws IllegalArgumentException
155		*/
156		public void testNewFixedThreadPool4() {
157		try {
158	<	ExecutorService e = Executors.newFixedThreadPool(0);
158	>	ExecutorService unused = Executors.newFixedThreadPool(0);
159		shouldThrow();
160		} catch (IllegalArgumentException success) {}
161		}
162
147	–
163		/**
164		* An unconfigurable newFixedThreadPool can execute runnables
165		*/
166	<	public void testunconfigurableExecutorService() {
167	<	ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
168	<	e.execute(new NoOpRunnable());
169	<	e.execute(new NoOpRunnable());
170	<	e.execute(new NoOpRunnable());
171	<	joinPool(e);
166	>	public void testUnconfigurableExecutorService() {
167	>	final ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2));
168	>	try (PoolCleaner cleaner = cleaner(e)) {
169	>	e.execute(new NoOpRunnable());
170	>	e.execute(new NoOpRunnable());
171	>	e.execute(new NoOpRunnable());
172	>	}
173		}
174
175		/**
176		* unconfigurableExecutorService(null) throws NPE
177		*/
178	<	public void testunconfigurableExecutorServiceNPE() {
178	>	public void testUnconfigurableExecutorServiceNPE() {
179		try {
180	<	ExecutorService e = Executors.unconfigurableExecutorService(null);
180	>	ExecutorService unused =
181	>	Executors.unconfigurableExecutorService(null);
182		shouldThrow();
183		} catch (NullPointerException success) {}
184		}
#	Line 169 | Line 186 | public class ExecutorsTest extends JSR16
186		/**
187		* unconfigurableScheduledExecutorService(null) throws NPE
188		*/
189	<	public void testunconfigurableScheduledExecutorServiceNPE() {
189	>	public void testUnconfigurableScheduledExecutorServiceNPE() {
190		try {
191	<	ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
191	>	ExecutorService unused =
192	>	Executors.unconfigurableScheduledExecutorService(null);
193		shouldThrow();
194		} catch (NullPointerException success) {}
195		}
196
179	–
197		/**
198		* a newSingleThreadScheduledExecutor successfully runs delayed task
199		*/
200		public void testNewSingleThreadScheduledExecutor() throws Exception {
201	<	TrackedCallable callable = new TrackedCallable();
202	<	ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
203	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
204	<	assertFalse(callable.done);
205	<	Thread.sleep(MEDIUM_DELAY_MS);
206	<	assertTrue(callable.done);
207	<	assertEquals(Boolean.TRUE, f.get());
208	<	joinPool(p1);
201	>	final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor();
202	>	try (PoolCleaner cleaner = cleaner(p)) {
203	>	final CountDownLatch proceed = new CountDownLatch(1);
204	>	final Runnable task = new CheckedRunnable() {
205	>	public void realRun() {
206	>	await(proceed);
207	>	}};
208	>	long startTime = System.nanoTime();
209	>	Future<?> f = p.schedule(Executors.callable(task, Boolean.TRUE),
210	>	timeoutMillis(), MILLISECONDS);
211	>	assertFalse(f.isDone());
212	>	proceed.countDown();
213	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
214	>	assertSame(Boolean.TRUE, f.get());
215	>	assertTrue(f.isDone());
216	>	assertFalse(f.isCancelled());
217	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
218	>	}
219		}
220
221		/**
222		* a newScheduledThreadPool successfully runs delayed task
223		*/
224	<	public void testnewScheduledThreadPool() throws Exception {
225	<	TrackedCallable callable = new TrackedCallable();
226	<	ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
227	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
228	<	assertFalse(callable.done);
229	<	Thread.sleep(MEDIUM_DELAY_MS);
230	<	assertTrue(callable.done);
231	<	assertEquals(Boolean.TRUE, f.get());
232	<	joinPool(p1);
224	>	public void testNewScheduledThreadPool() throws Exception {
225	>	final ScheduledExecutorService p = Executors.newScheduledThreadPool(2);
226	>	try (PoolCleaner cleaner = cleaner(p)) {
227	>	final CountDownLatch proceed = new CountDownLatch(1);
228	>	final Runnable task = new CheckedRunnable() {
229	>	public void realRun() {
230	>	await(proceed);
231	>	}};
232	>	long startTime = System.nanoTime();
233	>	Future<?> f = p.schedule(Executors.callable(task, Boolean.TRUE),
234	>	timeoutMillis(), MILLISECONDS);
235	>	assertFalse(f.isDone());
236	>	proceed.countDown();
237	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
238	>	assertSame(Boolean.TRUE, f.get());
239	>	assertTrue(f.isDone());
240	>	assertFalse(f.isCancelled());
241	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
242	>	}
243		}
244
245		/**
246		* an unconfigurable newScheduledThreadPool successfully runs delayed task
247		*/
248	<	public void testunconfigurableScheduledExecutorService() throws Exception {
249	<	TrackedCallable callable = new TrackedCallable();
250	<	ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
251	<	Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS);
252	<	assertFalse(callable.done);
253	<	Thread.sleep(MEDIUM_DELAY_MS);
254	<	assertTrue(callable.done);
255	<	assertEquals(Boolean.TRUE, f.get());
256	<	joinPool(p1);
248	>	public void testUnconfigurableScheduledExecutorService() throws Exception {
249	>	final ScheduledExecutorService p =
250	>	Executors.unconfigurableScheduledExecutorService
251	>	(Executors.newScheduledThreadPool(2));
252	>	try (PoolCleaner cleaner = cleaner(p)) {
253	>	final CountDownLatch proceed = new CountDownLatch(1);
254	>	final Runnable task = new CheckedRunnable() {
255	>	public void realRun() {
256	>	await(proceed);
257	>	}};
258	>	long startTime = System.nanoTime();
259	>	Future<?> f = p.schedule(Executors.callable(task, Boolean.TRUE),
260	>	timeoutMillis(), MILLISECONDS);
261	>	assertFalse(f.isDone());
262	>	proceed.countDown();
263	>	assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS));
264	>	assertSame(Boolean.TRUE, f.get());
265	>	assertTrue(f.isDone());
266	>	assertFalse(f.isCancelled());
267	>	assertTrue(millisElapsedSince(startTime) >= timeoutMillis());
268	>	}
269		}
270
271		/**
272		* Future.get on submitted tasks will time out if they compute too long.
273		*/
274		public void testTimedCallable() throws Exception {
275	<	final Runnable sleeper = new CheckedInterruptedRunnable() {
275	>	final ExecutorService[] executors = {
276	>	Executors.newSingleThreadExecutor(),
277	>	Executors.newCachedThreadPool(),
278	>	Executors.newFixedThreadPool(2),
279	>	Executors.newScheduledThreadPool(2),
280	>	};
281	>
282	>	final CountDownLatch done = new CountDownLatch(1);
283	>
284	>	final Runnable sleeper = new CheckedRunnable() {
285		public void realRun() throws InterruptedException {
286	<	Thread.sleep(LONG_DELAY_MS);
286	>	done.await(LONG_DELAY_MS, MILLISECONDS);
287		}};
288	<	for (ExecutorService executor :
289	<	new ExecutorService[] {
290	<	Executors.newSingleThreadExecutor(),
291	<	Executors.newCachedThreadPool(),
292	<	Executors.newFixedThreadPool(2),
293	<	Executors.newScheduledThreadPool(2),
294	<	}) {
295	<	try {
238	<	Future future = executor.submit(sleeper);
239	<	try {
240	<	future.get(SHORT_DELAY_MS, MILLISECONDS);
241	<	shouldThrow();
242	<	} catch (TimeoutException success) {
243	<	} finally {
244	<	future.cancel(true);
245	<	}
246	<	}
247	<	finally {
248	<	joinPool(executor);
249	<	}
288	>
289	>	List<Thread> threads = new ArrayList<>();
290	>	for (final ExecutorService executor : executors) {
291	>	threads.add(newStartedThread(new CheckedRunnable() {
292	>	public void realRun() {
293	>	Future<?> future = executor.submit(sleeper);
294	>	assertFutureTimesOut(future);
295	>	}}));
296		}
297	+	for (Thread thread : threads)
298	+	awaitTermination(thread);
299	+	done.countDown();
300	+	for (ExecutorService executor : executors)
301	+	joinPool(executor);
302		}
303
253	–
304		/**
305		* ThreadPoolExecutor using defaultThreadFactory has
306		* specified group, priority, daemon status, and name
307		*/
308	+	@SuppressWarnings("removal")
309		public void testDefaultThreadFactory() throws Exception {
310		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
311	+	final CountDownLatch done = new CountDownLatch(1);
312		Runnable r = new CheckedRunnable() {
313		public void realRun() {
314		try {
315		Thread current = Thread.currentThread();
316	<	assertTrue(!current.isDaemon());
316	>	assertFalse(current.isDaemon());
317		assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
266	–	ThreadGroup g = current.getThreadGroup();
318		SecurityManager s = System.getSecurityManager();
319	<	if (s != null)
320	<	assertTrue(g == s.getThreadGroup());
321	<	else
271	<	assertTrue(g == egroup);
272	<	String name = current.getName();
273	<	assertTrue(name.endsWith("thread-1"));
319	>	assertSame(current.getThreadGroup(),
320	>	(s == null) ? egroup : s.getThreadGroup());
321	>	assertTrue(current.getName().endsWith("thread-1"));
322		} catch (SecurityException ok) {
323		// Also pass if not allowed to change setting
324		}
325	+	done.countDown();
326		}};
327		ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory());
328	<
329	<	e.execute(r);
330	<	try {
282	<	e.shutdown();
283	<	} catch (SecurityException ok) {
284	<	}
285	<
286	<	try {
287	<	Thread.sleep(SHORT_DELAY_MS);
288	<	} finally {
289	<	joinPool(e);
328	>	try (PoolCleaner cleaner = cleaner(e)) {
329	>	e.execute(r);
330	>	await(done);
331		}
332		}
333
#	Line 295 | Line 336 | public class ExecutorsTest extends JSR16
336		* specified group, priority, daemon status, name,
337		* access control context and context class loader
338		*/
339	+	@SuppressWarnings("removal")
340		public void testPrivilegedThreadFactory() throws Exception {
341	+	final CountDownLatch done = new CountDownLatch(1);
342		Runnable r = new CheckedRunnable() {
343		public void realRun() throws Exception {
344		final ThreadGroup egroup = Thread.currentThread().getThreadGroup();
#	Line 304 | Line 347 | public class ExecutorsTest extends JSR16
347		Runnable r = new CheckedRunnable() {
348		public void realRun() {
349		Thread current = Thread.currentThread();
350	<	assertTrue(!current.isDaemon());
350	>	assertFalse(current.isDaemon());
351		assertTrue(current.getPriority() <= Thread.NORM_PRIORITY);
309	–	ThreadGroup g = current.getThreadGroup();
352		SecurityManager s = System.getSecurityManager();
353	<	if (s != null)
354	<	assertTrue(g == s.getThreadGroup());
355	<	else
314	<	assertTrue(g == egroup);
315	<	String name = current.getName();
316	<	assertTrue(name.endsWith("thread-1"));
353	>	assertSame(current.getThreadGroup(),
354	>	(s == null) ? egroup : s.getThreadGroup());
355	>	assertTrue(current.getName().endsWith("thread-1"));
356		assertSame(thisccl, current.getContextClassLoader());
357		assertEquals(thisacc, AccessController.getContext());
358	+	done.countDown();
359		}};
360		ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory());
361	<	e.execute(r);
362	<	e.shutdown();
363	<	Thread.sleep(SHORT_DELAY_MS);
364	<	joinPool(e);
361	>	try (PoolCleaner cleaner = cleaner(e)) {
362	>	e.execute(r);
363	>	await(done);
364	>	}
365		}};
366
367		runWithPermissions(r,
#	Line 330 | Line 370 | public class ExecutorsTest extends JSR16
370		new RuntimePermission("modifyThread"));
371		}
372
373	+	@SuppressWarnings("removal")
374		boolean haveCCLPermissions() {
375		SecurityManager sm = System.getSecurityManager();
376		if (sm != null) {
#	Line 343 | Line 384 | public class ExecutorsTest extends JSR16
384		return true;
385		}
386
387	+	@SuppressWarnings("removal")
388		void checkCCL() {
389		SecurityManager sm = System.getSecurityManager();
390		if (sm != null) {
#	Line 358 | Line 400 | public class ExecutorsTest extends JSR16
400		}
401		}
402
361	–
403		/**
404		* Without class loader permissions, creating
405		* privilegedCallableUsingCurrentClassLoader throws ACE
406		*/
407	+	@SuppressWarnings("removal")
408		public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
409		Runnable r = new CheckedRunnable() {
410		public void realRun() throws Exception {
#	Line 381 | Line 423 | public class ExecutorsTest extends JSR16
423		* With class loader permissions, calling
424		* privilegedCallableUsingCurrentClassLoader does not throw ACE
425		*/
426	<	public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
426	>	@SuppressWarnings("removal")
427	>	public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception {
428		Runnable r = new CheckedRunnable() {
429		public void realRun() throws Exception {
430		Executors.privilegedCallableUsingCurrentClassLoader
#	Line 397 | Line 440 | public class ExecutorsTest extends JSR16
440		/**
441		* Without permissions, calling privilegedCallable throws ACE
442		*/
443	<	public void testprivilegedCallableWithNoPrivs() throws Exception {
443	>	@SuppressWarnings("removal")
444	>	public void testPrivilegedCallableWithNoPrivs() throws Exception {
445		// Avoid classloader-related SecurityExceptions in swingui.TestRunner
446		Executors.privilegedCallable(new CheckCCL());
447
#	Line 405 | Line 449 | public class ExecutorsTest extends JSR16
449		public void realRun() throws Exception {
450		if (System.getSecurityManager() == null)
451		return;
452	<	Callable task = Executors.privilegedCallable(new CheckCCL());
452	>	Callable<?> task = Executors.privilegedCallable(new CheckCCL());
453		try {
454		task.call();
455		shouldThrow();
#	Line 469 | Line 513 | public class ExecutorsTest extends JSR16
513		/**
514		* With permissions, calling privilegedCallable succeeds
515		*/
516	<	public void testprivilegedCallableWithPrivs() throws Exception {
516	>	@SuppressWarnings("removal")
517	>	public void testPrivilegedCallableWithPrivs() throws Exception {
518		Runnable r = new CheckedRunnable() {
519		public void realRun() throws Exception {
520		Executors.privilegedCallable(new CheckCCL()).call();
521		}};
522
523	<	runWithPermissions(r,
523	>	runWithPermissions(r,
524		new RuntimePermission("getClassLoader"),
525		new RuntimePermission("setContextClassLoader"));
526		}
#	Line 484 | Line 529 | public class ExecutorsTest extends JSR16
529		* callable(Runnable) returns null when called
530		*/
531		public void testCallable1() throws Exception {
532	<	Callable c = Executors.callable(new NoOpRunnable());
532	>	Callable<?> c = Executors.callable(new NoOpRunnable());
533		assertNull(c.call());
534		}
535
#	Line 492 | Line 537 | public class ExecutorsTest extends JSR16
537		* callable(Runnable, result) returns result when called
538		*/
539		public void testCallable2() throws Exception {
540	<	Callable c = Executors.callable(new NoOpRunnable(), one);
540	>	Callable<?> c = Executors.callable(new NoOpRunnable(), one);
541		assertSame(one, c.call());
542		}
543
#	Line 500 | Line 545 | public class ExecutorsTest extends JSR16
545		* callable(PrivilegedAction) returns its result when called
546		*/
547		public void testCallable3() throws Exception {
548	<	Callable c = Executors.callable(new PrivilegedAction() {
548	>	Callable<?> c = Executors.callable(new PrivilegedAction() {
549		public Object run() { return one; }});
550		assertSame(one, c.call());
551		}
#	Line 509 | Line 554 | public class ExecutorsTest extends JSR16
554		* callable(PrivilegedExceptionAction) returns its result when called
555		*/
556		public void testCallable4() throws Exception {
557	<	Callable c = Executors.callable(new PrivilegedExceptionAction() {
557	>	Callable<?> c = Executors.callable(new PrivilegedExceptionAction() {
558		public Object run() { return one; }});
559		assertSame(one, c.call());
560		}
561
517	–
562		/**
563		* callable(null Runnable) throws NPE
564		*/
565		public void testCallableNPE1() {
566		try {
567	<	Callable c = Executors.callable((Runnable) null);
567	>	Callable<?> unused = Executors.callable((Runnable) null);
568		shouldThrow();
569		} catch (NullPointerException success) {}
570		}
#	Line 530 | Line 574 | public class ExecutorsTest extends JSR16
574		*/
575		public void testCallableNPE2() {
576		try {
577	<	Callable c = Executors.callable((Runnable) null, one);
577	>	Callable<?> unused = Executors.callable((Runnable) null, one);
578		shouldThrow();
579		} catch (NullPointerException success) {}
580		}
#	Line 540 | Line 584 | public class ExecutorsTest extends JSR16
584		*/
585		public void testCallableNPE3() {
586		try {
587	<	Callable c = Executors.callable((PrivilegedAction) null);
587	>	Callable<?> unused = Executors.callable((PrivilegedAction) null);
588		shouldThrow();
589		} catch (NullPointerException success) {}
590		}
#	Line 550 | Line 594 | public class ExecutorsTest extends JSR16
594		*/
595		public void testCallableNPE4() {
596		try {
597	<	Callable c = Executors.callable((PrivilegedExceptionAction) null);
597	>	Callable<?> unused = Executors.callable((PrivilegedExceptionAction) null);
598		shouldThrow();
599		} catch (NullPointerException success) {}
600		}
601
602	+	/**
603	+	* callable(runnable, x).toString() contains toString of wrapped task
604	+	*/
605	+	public void testCallable_withResult_toString() {
606	+	if (testImplementationDetails) {
607	+	Runnable r = () -> {};
608	+	Callable<String> c = Executors.callable(r, "");
609	+	assertEquals(
610	+	identityString(c) + "[Wrapped task = " + r.toString() + "]",
611	+	c.toString());
612	+	}
613	+	}
614	+
615	+	/**
616	+	* callable(runnable).toString() contains toString of wrapped task
617	+	*/
618	+	public void testCallable_toString() {
619	+	if (testImplementationDetails) {
620	+	Runnable r = () -> {};
621	+	Callable<Object> c = Executors.callable(r);
622	+	assertEquals(
623	+	identityString(c) + "[Wrapped task = " + r.toString() + "]",
624	+	c.toString());
625	+	}
626	+	}
627	+
628	+	/**
629	+	* privilegedCallable(callable).toString() contains toString of wrapped task
630	+	*/
631	+	@SuppressWarnings("removal")
632	+	public void testPrivilegedCallable_toString() {
633	+	if (testImplementationDetails) {
634	+	Callable<String> c = () -> "";
635	+	Callable<String> priv = Executors.privilegedCallable(c);
636	+	assertEquals(
637	+	identityString(priv) + "[Wrapped task = " + c.toString() + "]",
638	+	priv.toString());
639	+	}
640	+	}
641
642	+	/**
643	+	* privilegedCallableUsingCurrentClassLoader(callable).toString()
644	+	* contains toString of wrapped task
645	+	*/
646	+	@SuppressWarnings("removal")
647	+	public void testPrivilegedCallableUsingCurrentClassLoader_toString() {
648	+	if (testImplementationDetails) {
649	+	Callable<String> c = () -> "";
650	+	Callable<String> priv = Executors.privilegedCallableUsingCurrentClassLoader(c);
651	+	assertEquals(
652	+	identityString(priv) + "[Wrapped task = " + c.toString() + "]",
653	+	priv.toString());
654	+	}
655	+	}
656		}

Diff Legend

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