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); |
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 |
|
/** |
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 |
|
/** |
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 |
|
/** |
159 |
|
} catch (IllegalArgumentException success) {} |
160 |
|
} |
161 |
|
|
147 |
– |
|
162 |
|
/** |
163 |
|
* An unconfigurable newFixedThreadPool can execute runnables |
164 |
|
*/ |
165 |
< |
public void testunconfigurableExecutorService() { |
166 |
< |
ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2)); |
167 |
< |
e.execute(new NoOpRunnable()); |
168 |
< |
e.execute(new NoOpRunnable()); |
169 |
< |
e.execute(new NoOpRunnable()); |
170 |
< |
joinPool(e); |
165 |
> |
public void testUnconfigurableExecutorService() { |
166 |
> |
final ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2)); |
167 |
> |
try (PoolCleaner cleaner = cleaner(e)) { |
168 |
> |
e.execute(new NoOpRunnable()); |
169 |
> |
e.execute(new NoOpRunnable()); |
170 |
> |
e.execute(new NoOpRunnable()); |
171 |
> |
} |
172 |
|
} |
173 |
|
|
174 |
|
/** |
175 |
|
* unconfigurableExecutorService(null) throws NPE |
176 |
|
*/ |
177 |
< |
public void testunconfigurableExecutorServiceNPE() { |
177 |
> |
public void testUnconfigurableExecutorServiceNPE() { |
178 |
|
try { |
179 |
|
ExecutorService e = Executors.unconfigurableExecutorService(null); |
180 |
|
shouldThrow(); |
184 |
|
/** |
185 |
|
* unconfigurableScheduledExecutorService(null) throws NPE |
186 |
|
*/ |
187 |
< |
public void testunconfigurableScheduledExecutorServiceNPE() { |
187 |
> |
public void testUnconfigurableScheduledExecutorServiceNPE() { |
188 |
|
try { |
189 |
|
ExecutorService e = Executors.unconfigurableScheduledExecutorService(null); |
190 |
|
shouldThrow(); |
191 |
|
} catch (NullPointerException success) {} |
192 |
|
} |
193 |
|
|
179 |
– |
|
194 |
|
/** |
195 |
|
* a newSingleThreadScheduledExecutor successfully runs delayed task |
196 |
|
*/ |
197 |
|
public void testNewSingleThreadScheduledExecutor() throws Exception { |
198 |
< |
TrackedCallable callable = new TrackedCallable(); |
199 |
< |
ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor(); |
200 |
< |
Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS); |
201 |
< |
assertFalse(callable.done); |
202 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
203 |
< |
assertTrue(callable.done); |
204 |
< |
assertEquals(Boolean.TRUE, f.get()); |
205 |
< |
joinPool(p1); |
198 |
> |
final ScheduledExecutorService p = Executors.newSingleThreadScheduledExecutor(); |
199 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
200 |
> |
final CountDownLatch proceed = new CountDownLatch(1); |
201 |
> |
final Runnable task = new CheckedRunnable() { |
202 |
> |
public void realRun() { |
203 |
> |
await(proceed); |
204 |
> |
}}; |
205 |
> |
long startTime = System.nanoTime(); |
206 |
> |
Future f = p.schedule(Executors.callable(task, Boolean.TRUE), |
207 |
> |
timeoutMillis(), MILLISECONDS); |
208 |
> |
assertFalse(f.isDone()); |
209 |
> |
proceed.countDown(); |
210 |
> |
assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS)); |
211 |
> |
assertSame(Boolean.TRUE, f.get()); |
212 |
> |
assertTrue(f.isDone()); |
213 |
> |
assertFalse(f.isCancelled()); |
214 |
> |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
215 |
> |
} |
216 |
|
} |
217 |
|
|
218 |
|
/** |
219 |
|
* a newScheduledThreadPool successfully runs delayed task |
220 |
|
*/ |
221 |
< |
public void testnewScheduledThreadPool() throws Exception { |
222 |
< |
TrackedCallable callable = new TrackedCallable(); |
223 |
< |
ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2); |
224 |
< |
Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS); |
225 |
< |
assertFalse(callable.done); |
226 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
227 |
< |
assertTrue(callable.done); |
228 |
< |
assertEquals(Boolean.TRUE, f.get()); |
229 |
< |
joinPool(p1); |
221 |
> |
public void testNewScheduledThreadPool() throws Exception { |
222 |
> |
final ScheduledExecutorService p = Executors.newScheduledThreadPool(2); |
223 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
224 |
> |
final CountDownLatch proceed = new CountDownLatch(1); |
225 |
> |
final Runnable task = new CheckedRunnable() { |
226 |
> |
public void realRun() { |
227 |
> |
await(proceed); |
228 |
> |
}}; |
229 |
> |
long startTime = System.nanoTime(); |
230 |
> |
Future f = p.schedule(Executors.callable(task, Boolean.TRUE), |
231 |
> |
timeoutMillis(), MILLISECONDS); |
232 |
> |
assertFalse(f.isDone()); |
233 |
> |
proceed.countDown(); |
234 |
> |
assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS)); |
235 |
> |
assertSame(Boolean.TRUE, f.get()); |
236 |
> |
assertTrue(f.isDone()); |
237 |
> |
assertFalse(f.isCancelled()); |
238 |
> |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
239 |
> |
} |
240 |
|
} |
241 |
|
|
242 |
|
/** |
243 |
|
* an unconfigurable newScheduledThreadPool successfully runs delayed task |
244 |
|
*/ |
245 |
< |
public void testunconfigurableScheduledExecutorService() throws Exception { |
246 |
< |
TrackedCallable callable = new TrackedCallable(); |
247 |
< |
ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2)); |
248 |
< |
Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS); |
249 |
< |
assertFalse(callable.done); |
250 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
251 |
< |
assertTrue(callable.done); |
252 |
< |
assertEquals(Boolean.TRUE, f.get()); |
253 |
< |
joinPool(p1); |
245 |
> |
public void testUnconfigurableScheduledExecutorService() throws Exception { |
246 |
> |
final ScheduledExecutorService p = |
247 |
> |
Executors.unconfigurableScheduledExecutorService |
248 |
> |
(Executors.newScheduledThreadPool(2)); |
249 |
> |
try (PoolCleaner cleaner = cleaner(p)) { |
250 |
> |
final CountDownLatch proceed = new CountDownLatch(1); |
251 |
> |
final Runnable task = new CheckedRunnable() { |
252 |
> |
public void realRun() { |
253 |
> |
await(proceed); |
254 |
> |
}}; |
255 |
> |
long startTime = System.nanoTime(); |
256 |
> |
Future f = p.schedule(Executors.callable(task, Boolean.TRUE), |
257 |
> |
timeoutMillis(), MILLISECONDS); |
258 |
> |
assertFalse(f.isDone()); |
259 |
> |
proceed.countDown(); |
260 |
> |
assertSame(Boolean.TRUE, f.get(LONG_DELAY_MS, MILLISECONDS)); |
261 |
> |
assertSame(Boolean.TRUE, f.get()); |
262 |
> |
assertTrue(f.isDone()); |
263 |
> |
assertFalse(f.isCancelled()); |
264 |
> |
assertTrue(millisElapsedSince(startTime) >= timeoutMillis()); |
265 |
> |
} |
266 |
|
} |
267 |
|
|
268 |
|
/** |
269 |
< |
* Future.get on submitted tasks will time out if they compute too long. |
269 |
> |
* Future.get on submitted tasks will time out if they compute too long. |
270 |
|
*/ |
271 |
|
public void testTimedCallable() throws Exception { |
272 |
< |
final Runnable sleeper = |
273 |
< |
new RunnableShouldThrow(InterruptedException.class) { |
274 |
< |
public void realRun() throws InterruptedException { |
275 |
< |
Thread.sleep(LONG_DELAY_MS); |
276 |
< |
}}; |
277 |
< |
for (ExecutorService executor : |
278 |
< |
new ExecutorService[] { |
279 |
< |
Executors.newSingleThreadExecutor(), |
280 |
< |
Executors.newCachedThreadPool(), |
281 |
< |
Executors.newFixedThreadPool(2), |
282 |
< |
Executors.newScheduledThreadPool(2), |
283 |
< |
}) { |
284 |
< |
try { |
285 |
< |
Future future = executor.submit(sleeper); |
286 |
< |
try { |
287 |
< |
future.get(SHORT_DELAY_MS, MILLISECONDS); |
288 |
< |
shouldThrow(); |
289 |
< |
} catch (TimeoutException success) { |
290 |
< |
} finally { |
245 |
< |
future.cancel(true); |
246 |
< |
} |
247 |
< |
} |
248 |
< |
finally { |
249 |
< |
joinPool(executor); |
250 |
< |
} |
272 |
> |
final ExecutorService[] executors = { |
273 |
> |
Executors.newSingleThreadExecutor(), |
274 |
> |
Executors.newCachedThreadPool(), |
275 |
> |
Executors.newFixedThreadPool(2), |
276 |
> |
Executors.newScheduledThreadPool(2), |
277 |
> |
}; |
278 |
> |
|
279 |
> |
final Runnable sleeper = new CheckedInterruptedRunnable() { |
280 |
> |
public void realRun() throws InterruptedException { |
281 |
> |
delay(LONG_DELAY_MS); |
282 |
> |
}}; |
283 |
> |
|
284 |
> |
List<Thread> threads = new ArrayList<>(); |
285 |
> |
for (final ExecutorService executor : executors) { |
286 |
> |
threads.add(newStartedThread(new CheckedRunnable() { |
287 |
> |
public void realRun() { |
288 |
> |
Future future = executor.submit(sleeper); |
289 |
> |
assertFutureTimesOut(future); |
290 |
> |
}})); |
291 |
|
} |
292 |
+ |
for (Thread thread : threads) |
293 |
+ |
awaitTermination(thread); |
294 |
+ |
for (ExecutorService executor : executors) |
295 |
+ |
joinPool(executor); |
296 |
|
} |
297 |
|
|
254 |
– |
|
298 |
|
/** |
299 |
|
* ThreadPoolExecutor using defaultThreadFactory has |
300 |
|
* specified group, priority, daemon status, and name |
301 |
|
*/ |
302 |
|
public void testDefaultThreadFactory() throws Exception { |
303 |
|
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
304 |
< |
Runnable r = new Runnable() { |
305 |
< |
public void run() { |
306 |
< |
try { |
307 |
< |
Thread current = Thread.currentThread(); |
308 |
< |
threadAssertTrue(!current.isDaemon()); |
309 |
< |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
310 |
< |
ThreadGroup g = current.getThreadGroup(); |
311 |
< |
SecurityManager s = System.getSecurityManager(); |
312 |
< |
if (s != null) |
313 |
< |
threadAssertTrue(g == s.getThreadGroup()); |
314 |
< |
else |
315 |
< |
threadAssertTrue(g == egroup); |
316 |
< |
String name = current.getName(); |
274 |
< |
threadAssertTrue(name.endsWith("thread-1")); |
275 |
< |
} catch (SecurityException ok) { |
276 |
< |
// Also pass if not allowed to change setting |
277 |
< |
} |
304 |
> |
final CountDownLatch done = new CountDownLatch(1); |
305 |
> |
Runnable r = new CheckedRunnable() { |
306 |
> |
public void realRun() { |
307 |
> |
try { |
308 |
> |
Thread current = Thread.currentThread(); |
309 |
> |
assertFalse(current.isDaemon()); |
310 |
> |
assertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
311 |
> |
SecurityManager s = System.getSecurityManager(); |
312 |
> |
assertSame(current.getThreadGroup(), |
313 |
> |
(s == null) ? egroup : s.getThreadGroup()); |
314 |
> |
assertTrue(current.getName().endsWith("thread-1")); |
315 |
> |
} catch (SecurityException ok) { |
316 |
> |
// Also pass if not allowed to change setting |
317 |
|
} |
318 |
< |
}; |
318 |
> |
done.countDown(); |
319 |
> |
}}; |
320 |
|
ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory()); |
321 |
< |
|
322 |
< |
e.execute(r); |
323 |
< |
try { |
284 |
< |
e.shutdown(); |
285 |
< |
} catch (SecurityException ok) { |
286 |
< |
} |
287 |
< |
|
288 |
< |
try { |
289 |
< |
Thread.sleep(SHORT_DELAY_MS); |
290 |
< |
} finally { |
291 |
< |
joinPool(e); |
321 |
> |
try (PoolCleaner cleaner = cleaner(e)) { |
322 |
> |
e.execute(r); |
323 |
> |
await(done); |
324 |
|
} |
325 |
|
} |
326 |
|
|
330 |
|
* access control context and context class loader |
331 |
|
*/ |
332 |
|
public void testPrivilegedThreadFactory() throws Exception { |
333 |
+ |
final CountDownLatch done = new CountDownLatch(1); |
334 |
|
Runnable r = new CheckedRunnable() { |
335 |
|
public void realRun() throws Exception { |
336 |
|
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
339 |
|
Runnable r = new CheckedRunnable() { |
340 |
|
public void realRun() { |
341 |
|
Thread current = Thread.currentThread(); |
342 |
< |
assertTrue(!current.isDaemon()); |
342 |
> |
assertFalse(current.isDaemon()); |
343 |
|
assertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
311 |
– |
ThreadGroup g = current.getThreadGroup(); |
344 |
|
SecurityManager s = System.getSecurityManager(); |
345 |
< |
if (s != null) |
346 |
< |
assertTrue(g == s.getThreadGroup()); |
347 |
< |
else |
348 |
< |
assertTrue(g == egroup); |
349 |
< |
String name = current.getName(); |
350 |
< |
assertTrue(name.endsWith("thread-1")); |
319 |
< |
assertTrue(thisccl == current.getContextClassLoader()); |
320 |
< |
assertTrue(thisacc.equals(AccessController.getContext())); |
345 |
> |
assertSame(current.getThreadGroup(), |
346 |
> |
(s == null) ? egroup : s.getThreadGroup()); |
347 |
> |
assertTrue(current.getName().endsWith("thread-1")); |
348 |
> |
assertSame(thisccl, current.getContextClassLoader()); |
349 |
> |
assertEquals(thisacc, AccessController.getContext()); |
350 |
> |
done.countDown(); |
351 |
|
}}; |
352 |
|
ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); |
353 |
< |
e.execute(r); |
354 |
< |
e.shutdown(); |
355 |
< |
Thread.sleep(SHORT_DELAY_MS); |
356 |
< |
joinPool(e); |
353 |
> |
try (PoolCleaner cleaner = cleaner(e)) { |
354 |
> |
e.execute(r); |
355 |
> |
await(done); |
356 |
> |
} |
357 |
|
}}; |
358 |
|
|
359 |
|
runWithPermissions(r, |
390 |
|
} |
391 |
|
} |
392 |
|
|
363 |
– |
|
393 |
|
/** |
394 |
|
* Without class loader permissions, creating |
395 |
|
* privilegedCallableUsingCurrentClassLoader throws ACE |
412 |
|
* With class loader permissions, calling |
413 |
|
* privilegedCallableUsingCurrentClassLoader does not throw ACE |
414 |
|
*/ |
415 |
< |
public void testprivilegedCallableUsingCCLWithPrivs() throws Exception { |
415 |
> |
public void testPrivilegedCallableUsingCCLWithPrivs() throws Exception { |
416 |
|
Runnable r = new CheckedRunnable() { |
417 |
|
public void realRun() throws Exception { |
418 |
|
Executors.privilegedCallableUsingCurrentClassLoader |
428 |
|
/** |
429 |
|
* Without permissions, calling privilegedCallable throws ACE |
430 |
|
*/ |
431 |
< |
public void testprivilegedCallableWithNoPrivs() throws Exception { |
431 |
> |
public void testPrivilegedCallableWithNoPrivs() throws Exception { |
432 |
> |
// Avoid classloader-related SecurityExceptions in swingui.TestRunner |
433 |
> |
Executors.privilegedCallable(new CheckCCL()); |
434 |
> |
|
435 |
|
Runnable r = new CheckedRunnable() { |
436 |
|
public void realRun() throws Exception { |
437 |
|
if (System.getSecurityManager() == null) |
500 |
|
/** |
501 |
|
* With permissions, calling privilegedCallable succeeds |
502 |
|
*/ |
503 |
< |
public void testprivilegedCallableWithPrivs() throws Exception { |
503 |
> |
public void testPrivilegedCallableWithPrivs() throws Exception { |
504 |
|
Runnable r = new CheckedRunnable() { |
505 |
|
public void realRun() throws Exception { |
506 |
|
Executors.privilegedCallable(new CheckCCL()).call(); |
507 |
|
}}; |
508 |
|
|
509 |
< |
runWithPermissions(r, |
509 |
> |
runWithPermissions(r, |
510 |
|
new RuntimePermission("getClassLoader"), |
511 |
|
new RuntimePermission("setContextClassLoader")); |
512 |
|
} |
545 |
|
assertSame(one, c.call()); |
546 |
|
} |
547 |
|
|
516 |
– |
|
548 |
|
/** |
549 |
|
* callable(null Runnable) throws NPE |
550 |
|
*/ |
585 |
|
} catch (NullPointerException success) {} |
586 |
|
} |
587 |
|
|
557 |
– |
|
588 |
|
} |