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); |
23 |
|
} |
24 |
|
|
23 |
– |
private static final String TEST_STRING = "a test string"; |
24 |
– |
|
25 |
– |
private static class StringTask implements Callable<String> { |
26 |
– |
public String call() { return TEST_STRING; } |
27 |
– |
} |
28 |
– |
|
29 |
– |
static class DirectExecutor implements Executor { |
30 |
– |
public void execute(Runnable r) { |
31 |
– |
r.run(); |
32 |
– |
} |
33 |
– |
} |
34 |
– |
|
25 |
|
static class TimedCallable<T> implements Callable<T> { |
26 |
< |
private final Executor exec; |
26 |
> |
private final ExecutorService exec; |
27 |
|
private final Callable<T> func; |
28 |
|
private final long msecs; |
29 |
< |
|
30 |
< |
TimedCallable(Executor exec, Callable<T> func, long msecs) { |
29 |
> |
|
30 |
> |
TimedCallable(ExecutorService exec, Callable<T> func, long msecs) { |
31 |
|
this.exec = exec; |
32 |
|
this.func = func; |
33 |
|
this.msecs = msecs; |
34 |
|
} |
35 |
< |
|
35 |
> |
|
36 |
|
public T call() throws Exception { |
37 |
< |
Future<T> ftask = Executors.execute(exec, func); |
37 |
> |
Future<T> ftask = exec.submit(func); |
38 |
|
try { |
39 |
< |
return ftask.get(msecs, TimeUnit.MILLISECONDS); |
39 |
> |
return ftask.get(msecs, MILLISECONDS); |
40 |
|
} finally { |
41 |
|
ftask.cancel(true); |
42 |
|
} |
70 |
|
e.execute(new NoOpRunnable()); |
71 |
|
e.execute(new NoOpRunnable()); |
72 |
|
e.execute(new NoOpRunnable()); |
73 |
< |
e.shutdown(); |
73 |
> |
joinPool(e); |
74 |
|
} |
75 |
|
|
76 |
|
/** |
81 |
|
e.execute(new NoOpRunnable()); |
82 |
|
e.execute(new NoOpRunnable()); |
83 |
|
e.execute(new NoOpRunnable()); |
84 |
< |
e.shutdown(); |
84 |
> |
joinPool(e); |
85 |
|
} |
86 |
|
|
87 |
|
/** |
91 |
|
try { |
92 |
|
ExecutorService e = Executors.newCachedThreadPool(null); |
93 |
|
shouldThrow(); |
94 |
< |
} |
105 |
< |
catch(NullPointerException success) { |
106 |
< |
} |
94 |
> |
} catch (NullPointerException success) {} |
95 |
|
} |
96 |
|
|
97 |
|
|
103 |
|
e.execute(new NoOpRunnable()); |
104 |
|
e.execute(new NoOpRunnable()); |
105 |
|
e.execute(new NoOpRunnable()); |
106 |
< |
e.shutdown(); |
106 |
> |
joinPool(e); |
107 |
|
} |
108 |
|
|
109 |
|
/** |
114 |
|
e.execute(new NoOpRunnable()); |
115 |
|
e.execute(new NoOpRunnable()); |
116 |
|
e.execute(new NoOpRunnable()); |
117 |
< |
e.shutdown(); |
117 |
> |
joinPool(e); |
118 |
|
} |
119 |
|
|
120 |
|
/** |
124 |
|
try { |
125 |
|
ExecutorService e = Executors.newSingleThreadExecutor(null); |
126 |
|
shouldThrow(); |
127 |
< |
} |
128 |
< |
catch(NullPointerException success) { |
127 |
> |
} catch (NullPointerException success) {} |
128 |
> |
} |
129 |
> |
|
130 |
> |
/** |
131 |
> |
* A new SingleThreadExecutor cannot be casted to concrete implementation |
132 |
> |
*/ |
133 |
> |
public void testCastNewSingleThreadExecutor() { |
134 |
> |
ExecutorService e = Executors.newSingleThreadExecutor(); |
135 |
> |
try { |
136 |
> |
ThreadPoolExecutor tpe = (ThreadPoolExecutor)e; |
137 |
> |
shouldThrow(); |
138 |
> |
} catch (ClassCastException success) { |
139 |
> |
} finally { |
140 |
> |
joinPool(e); |
141 |
|
} |
142 |
|
} |
143 |
|
|
144 |
+ |
|
145 |
|
/** |
146 |
|
* A new newFixedThreadPool can execute runnables |
147 |
|
*/ |
150 |
|
e.execute(new NoOpRunnable()); |
151 |
|
e.execute(new NoOpRunnable()); |
152 |
|
e.execute(new NoOpRunnable()); |
153 |
< |
e.shutdown(); |
153 |
> |
joinPool(e); |
154 |
|
} |
155 |
|
|
156 |
|
/** |
161 |
|
e.execute(new NoOpRunnable()); |
162 |
|
e.execute(new NoOpRunnable()); |
163 |
|
e.execute(new NoOpRunnable()); |
164 |
< |
e.shutdown(); |
164 |
> |
joinPool(e); |
165 |
|
} |
166 |
|
|
167 |
|
/** |
171 |
|
try { |
172 |
|
ExecutorService e = Executors.newFixedThreadPool(2, null); |
173 |
|
shouldThrow(); |
174 |
< |
} |
174 |
< |
catch(NullPointerException success) { |
175 |
< |
} |
174 |
> |
} catch (NullPointerException success) {} |
175 |
|
} |
176 |
|
|
177 |
|
/** |
181 |
|
try { |
182 |
|
ExecutorService e = Executors.newFixedThreadPool(0); |
183 |
|
shouldThrow(); |
184 |
< |
} |
186 |
< |
catch(IllegalArgumentException success) { |
187 |
< |
} |
184 |
> |
} catch (IllegalArgumentException success) {} |
185 |
|
} |
186 |
|
|
187 |
+ |
|
188 |
|
/** |
189 |
< |
* execute of runnable runs it to completion |
189 |
> |
* An unconfigurable newFixedThreadPool can execute runnables |
190 |
|
*/ |
191 |
< |
public void testExecuteRunnable() { |
192 |
< |
try { |
193 |
< |
Executor e = new DirectExecutor(); |
194 |
< |
TrackedShortRunnable task = new TrackedShortRunnable(); |
195 |
< |
assertFalse(task.done); |
196 |
< |
Future<?> future = Executors.execute(e, task); |
199 |
< |
future.get(); |
200 |
< |
assertTrue(task.done); |
201 |
< |
} |
202 |
< |
catch (ExecutionException ex) { |
203 |
< |
unexpectedException(); |
204 |
< |
} |
205 |
< |
catch (InterruptedException ex) { |
206 |
< |
unexpectedException(); |
207 |
< |
} |
191 |
> |
public void testunconfigurableExecutorService() { |
192 |
> |
ExecutorService e = Executors.unconfigurableExecutorService(Executors.newFixedThreadPool(2)); |
193 |
> |
e.execute(new NoOpRunnable()); |
194 |
> |
e.execute(new NoOpRunnable()); |
195 |
> |
e.execute(new NoOpRunnable()); |
196 |
> |
joinPool(e); |
197 |
|
} |
198 |
|
|
199 |
|
/** |
200 |
< |
* invoke of a runnable runs it to completion |
200 |
> |
* unconfigurableExecutorService(null) throws NPE |
201 |
|
*/ |
202 |
< |
public void testInvokeRunnable() { |
202 |
> |
public void testunconfigurableExecutorServiceNPE() { |
203 |
|
try { |
204 |
< |
Executor e = new DirectExecutor(); |
205 |
< |
TrackedShortRunnable task = new TrackedShortRunnable(); |
206 |
< |
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 |
< |
} |
204 |
> |
ExecutorService e = Executors.unconfigurableExecutorService(null); |
205 |
> |
shouldThrow(); |
206 |
> |
} catch (NullPointerException success) {} |
207 |
|
} |
208 |
|
|
209 |
|
/** |
210 |
< |
* execute of a callable runs it to completion |
210 |
> |
* unconfigurableScheduledExecutorService(null) throws NPE |
211 |
|
*/ |
212 |
< |
public void testExecuteCallable() { |
212 |
> |
public void testunconfigurableScheduledExecutorServiceNPE() { |
213 |
|
try { |
214 |
< |
Executor e = new DirectExecutor(); |
215 |
< |
Future<String> future = Executors.execute(e, new StringTask()); |
216 |
< |
String result = future.get(); |
237 |
< |
assertSame(TEST_STRING, result); |
238 |
< |
} |
239 |
< |
catch (ExecutionException ex) { |
240 |
< |
unexpectedException(); |
241 |
< |
} |
242 |
< |
catch (InterruptedException ex) { |
243 |
< |
unexpectedException(); |
244 |
< |
} |
214 |
> |
ExecutorService e = Executors.unconfigurableScheduledExecutorService(null); |
215 |
> |
shouldThrow(); |
216 |
> |
} catch (NullPointerException success) {} |
217 |
|
} |
218 |
|
|
219 |
|
|
220 |
|
/** |
221 |
< |
* execute of a privileged action runs it to completion |
221 |
> |
* a newSingleThreadScheduledExecutor successfully runs delayed task |
222 |
|
*/ |
223 |
< |
public void testExecutePrivilegedAction() { |
224 |
< |
Policy savedPolicy = Policy.getPolicy(); |
225 |
< |
AdjustablePolicy policy = new AdjustablePolicy(); |
226 |
< |
policy.addPermission(new RuntimePermission("getContextClassLoader")); |
227 |
< |
policy.addPermission(new RuntimePermission("setContextClassLoader")); |
228 |
< |
Policy.setPolicy(policy); |
229 |
< |
try { |
230 |
< |
Executor e = new DirectExecutor(); |
231 |
< |
Future future = Executors.execute(e, new PrivilegedAction() { |
260 |
< |
public Object run() { |
261 |
< |
return TEST_STRING; |
262 |
< |
}}); |
263 |
< |
|
264 |
< |
Object result = future.get(); |
265 |
< |
assertSame(TEST_STRING, result); |
266 |
< |
} |
267 |
< |
catch (ExecutionException ex) { |
268 |
< |
unexpectedException(); |
269 |
< |
} |
270 |
< |
catch (InterruptedException ex) { |
271 |
< |
unexpectedException(); |
272 |
< |
} |
273 |
< |
finally { |
274 |
< |
Policy.setPolicy(savedPolicy); |
275 |
< |
} |
223 |
> |
public void testNewSingleThreadScheduledExecutor() throws Exception { |
224 |
> |
TrackedCallable callable = new TrackedCallable(); |
225 |
> |
ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor(); |
226 |
> |
Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS); |
227 |
> |
assertFalse(callable.done); |
228 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
229 |
> |
assertTrue(callable.done); |
230 |
> |
assertEquals(Boolean.TRUE, f.get()); |
231 |
> |
joinPool(p1); |
232 |
|
} |
233 |
|
|
234 |
|
/** |
235 |
< |
* execute of a privileged exception action runs it to completion |
235 |
> |
* a newScheduledThreadPool successfully runs delayed task |
236 |
|
*/ |
237 |
< |
public void testExecutePrivilegedExceptionAction() { |
238 |
< |
Policy savedPolicy = Policy.getPolicy(); |
239 |
< |
AdjustablePolicy policy = new AdjustablePolicy(); |
240 |
< |
policy.addPermission(new RuntimePermission("getContextClassLoader")); |
241 |
< |
policy.addPermission(new RuntimePermission("setContextClassLoader")); |
242 |
< |
Policy.setPolicy(policy); |
243 |
< |
try { |
244 |
< |
Executor e = new DirectExecutor(); |
245 |
< |
Future future = Executors.execute(e, new PrivilegedExceptionAction() { |
246 |
< |
public Object run() { |
291 |
< |
return TEST_STRING; |
292 |
< |
}}); |
237 |
> |
public void testnewScheduledThreadPool() throws Exception { |
238 |
> |
TrackedCallable callable = new TrackedCallable(); |
239 |
> |
ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2); |
240 |
> |
Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS); |
241 |
> |
assertFalse(callable.done); |
242 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
243 |
> |
assertTrue(callable.done); |
244 |
> |
assertEquals(Boolean.TRUE, f.get()); |
245 |
> |
joinPool(p1); |
246 |
> |
} |
247 |
|
|
248 |
< |
Object result = future.get(); |
249 |
< |
assertSame(TEST_STRING, result); |
250 |
< |
} |
251 |
< |
catch (ExecutionException ex) { |
252 |
< |
unexpectedException(); |
253 |
< |
} |
254 |
< |
catch (InterruptedException ex) { |
255 |
< |
unexpectedException(); |
256 |
< |
} |
257 |
< |
finally { |
258 |
< |
Policy.setPolicy(savedPolicy); |
259 |
< |
} |
248 |
> |
/** |
249 |
> |
* an unconfigurable newScheduledThreadPool successfully runs delayed task |
250 |
> |
*/ |
251 |
> |
public void testunconfigurableScheduledExecutorService() throws Exception { |
252 |
> |
TrackedCallable callable = new TrackedCallable(); |
253 |
> |
ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2)); |
254 |
> |
Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS); |
255 |
> |
assertFalse(callable.done); |
256 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
257 |
> |
assertTrue(callable.done); |
258 |
> |
assertEquals(Boolean.TRUE, f.get()); |
259 |
> |
joinPool(p1); |
260 |
|
} |
261 |
|
|
262 |
|
/** |
263 |
< |
* execute of a failed privileged exception action reports exception |
263 |
> |
* timeouts from execute will time out if they compute too long. |
264 |
|
*/ |
265 |
< |
public void testExecuteFailedPrivilegedExceptionAction() { |
266 |
< |
Policy savedPolicy = Policy.getPolicy(); |
267 |
< |
AdjustablePolicy policy = new AdjustablePolicy(); |
268 |
< |
policy.addPermission(new RuntimePermission("getContextClassLoader")); |
315 |
< |
policy.addPermission(new RuntimePermission("setContextClassLoader")); |
316 |
< |
Policy.setPolicy(policy); |
265 |
> |
public void testTimedCallable() throws Exception { |
266 |
> |
int N = 10000; |
267 |
> |
ExecutorService executor = Executors.newSingleThreadExecutor(); |
268 |
> |
List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N); |
269 |
|
try { |
270 |
< |
Executor e = new DirectExecutor(); |
319 |
< |
Future future = Executors.execute(e, new PrivilegedExceptionAction() { |
320 |
< |
public Object run() throws Exception { |
321 |
< |
throw new IndexOutOfBoundsException(); |
322 |
< |
}}); |
270 |
> |
long startTime = System.currentTimeMillis(); |
271 |
|
|
272 |
< |
Object result = future.get(); |
273 |
< |
shouldThrow(); |
274 |
< |
} |
275 |
< |
catch (ExecutionException success) { |
276 |
< |
} |
277 |
< |
catch (InterruptedException ex) { |
278 |
< |
unexpectedException(); |
272 |
> |
long i = 0; |
273 |
> |
while (tasks.size() < N) { |
274 |
> |
tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1)); |
275 |
> |
i += 10; |
276 |
> |
} |
277 |
> |
|
278 |
> |
int iters = 0; |
279 |
> |
BigInteger sum = BigInteger.ZERO; |
280 |
> |
for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) { |
281 |
> |
try { |
282 |
> |
++iters; |
283 |
> |
sum = sum.add(it.next().call()); |
284 |
> |
} |
285 |
> |
catch (TimeoutException success) { |
286 |
> |
assertTrue(iters > 0); |
287 |
> |
return; |
288 |
> |
} |
289 |
> |
} |
290 |
> |
// if by chance we didn't ever time out, total time must be small |
291 |
> |
long elapsed = System.currentTimeMillis() - startTime; |
292 |
> |
assertTrue(elapsed < N); |
293 |
|
} |
294 |
|
finally { |
295 |
< |
Policy.setPolicy(savedPolicy); |
295 |
> |
joinPool(executor); |
296 |
|
} |
297 |
|
} |
298 |
|
|
299 |
+ |
|
300 |
|
/** |
301 |
< |
* invoke of a collable runs it to completion |
301 |
> |
* ThreadPoolExecutor using defaultThreadFactory has |
302 |
> |
* specified group, priority, daemon status, and name |
303 |
|
*/ |
304 |
< |
public void testInvokeCallable() { |
305 |
< |
try { |
306 |
< |
Executor e = new DirectExecutor(); |
307 |
< |
String result = Executors.invoke(e, new StringTask()); |
304 |
> |
public void testDefaultThreadFactory() throws Exception { |
305 |
> |
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
306 |
> |
Runnable r = new Runnable() { |
307 |
> |
public void run() { |
308 |
> |
try { |
309 |
> |
Thread current = Thread.currentThread(); |
310 |
> |
threadAssertTrue(!current.isDaemon()); |
311 |
> |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
312 |
> |
ThreadGroup g = current.getThreadGroup(); |
313 |
> |
SecurityManager s = System.getSecurityManager(); |
314 |
> |
if (s != null) |
315 |
> |
threadAssertTrue(g == s.getThreadGroup()); |
316 |
> |
else |
317 |
> |
threadAssertTrue(g == egroup); |
318 |
> |
String name = current.getName(); |
319 |
> |
threadAssertTrue(name.endsWith("thread-1")); |
320 |
> |
} catch (SecurityException ok) { |
321 |
> |
// Also pass if not allowed to change setting |
322 |
> |
} |
323 |
> |
} |
324 |
> |
}; |
325 |
> |
ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory()); |
326 |
|
|
327 |
< |
assertSame(TEST_STRING, result); |
328 |
< |
} |
329 |
< |
catch (ExecutionException ex) { |
330 |
< |
unexpectedException(); |
327 |
> |
e.execute(r); |
328 |
> |
try { |
329 |
> |
e.shutdown(); |
330 |
> |
} catch (SecurityException ok) { |
331 |
|
} |
332 |
< |
catch (InterruptedException ex) { |
333 |
< |
unexpectedException(); |
332 |
> |
|
333 |
> |
try { |
334 |
> |
Thread.sleep(SHORT_DELAY_MS); |
335 |
> |
} finally { |
336 |
> |
joinPool(e); |
337 |
|
} |
338 |
|
} |
339 |
|
|
340 |
|
/** |
341 |
< |
* execute with null executor throws NPE |
341 |
> |
* ThreadPoolExecutor using privilegedThreadFactory has |
342 |
> |
* specified group, priority, daemon status, name, |
343 |
> |
* access control context and context class loader |
344 |
|
*/ |
345 |
< |
public void testNullExecuteRunnable() { |
345 |
> |
public void testPrivilegedThreadFactory() throws Exception { |
346 |
> |
Policy savedPolicy = null; |
347 |
|
try { |
348 |
< |
TrackedShortRunnable task = new TrackedShortRunnable(); |
349 |
< |
assertFalse(task.done); |
350 |
< |
Future<?> future = Executors.execute(null, task); |
351 |
< |
shouldThrow(); |
348 |
> |
savedPolicy = Policy.getPolicy(); |
349 |
> |
AdjustablePolicy policy = new AdjustablePolicy(); |
350 |
> |
policy.addPermission(new RuntimePermission("getContextClassLoader")); |
351 |
> |
policy.addPermission(new RuntimePermission("setContextClassLoader")); |
352 |
> |
Policy.setPolicy(policy); |
353 |
> |
} catch (AccessControlException ok) { |
354 |
> |
return; |
355 |
|
} |
356 |
< |
catch (NullPointerException success) { |
356 |
> |
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
357 |
> |
final ClassLoader thisccl = Thread.currentThread().getContextClassLoader(); |
358 |
> |
final AccessControlContext thisacc = AccessController.getContext(); |
359 |
> |
Runnable r = new Runnable() { |
360 |
> |
public void run() { |
361 |
> |
try { |
362 |
> |
Thread current = Thread.currentThread(); |
363 |
> |
threadAssertTrue(!current.isDaemon()); |
364 |
> |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
365 |
> |
ThreadGroup g = current.getThreadGroup(); |
366 |
> |
SecurityManager s = System.getSecurityManager(); |
367 |
> |
if (s != null) |
368 |
> |
threadAssertTrue(g == s.getThreadGroup()); |
369 |
> |
else |
370 |
> |
threadAssertTrue(g == egroup); |
371 |
> |
String name = current.getName(); |
372 |
> |
threadAssertTrue(name.endsWith("thread-1")); |
373 |
> |
threadAssertTrue(thisccl == current.getContextClassLoader()); |
374 |
> |
threadAssertTrue(thisacc.equals(AccessController.getContext())); |
375 |
> |
} catch (SecurityException ok) { |
376 |
> |
// Also pass if not allowed to change settings |
377 |
> |
} |
378 |
> |
} |
379 |
> |
}; |
380 |
> |
ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); |
381 |
> |
|
382 |
> |
Policy.setPolicy(savedPolicy); |
383 |
> |
e.execute(r); |
384 |
> |
try { |
385 |
> |
e.shutdown(); |
386 |
> |
} catch (SecurityException ok) { |
387 |
|
} |
388 |
< |
catch (Exception ex) { |
389 |
< |
unexpectedException(); |
388 |
> |
try { |
389 |
> |
Thread.sleep(SHORT_DELAY_MS); |
390 |
> |
} finally { |
391 |
> |
joinPool(e); |
392 |
|
} |
393 |
|
} |
394 |
|
|
395 |
< |
/** |
396 |
< |
* execute with a null runnable throws NPE |
397 |
< |
*/ |
398 |
< |
public void testExecuteNullRunnable() { |
399 |
< |
try { |
377 |
< |
Executor e = new DirectExecutor(); |
378 |
< |
TrackedShortRunnable task = null; |
379 |
< |
Future<?> future = Executors.execute(e, task); |
380 |
< |
shouldThrow(); |
395 |
> |
void checkCCL() { |
396 |
> |
SecurityManager sm = System.getSecurityManager(); |
397 |
> |
if (sm != null) { |
398 |
> |
sm.checkPermission(new RuntimePermission("setContextClassLoader")); |
399 |
> |
sm.checkPermission(new RuntimePermission("getClassLoader")); |
400 |
|
} |
401 |
< |
catch (NullPointerException success) { |
402 |
< |
} |
403 |
< |
catch (Exception ex) { |
404 |
< |
unexpectedException(); |
401 |
> |
} |
402 |
> |
|
403 |
> |
class CheckCCL implements Callable<Object> { |
404 |
> |
public Object call() { |
405 |
> |
checkCCL(); |
406 |
> |
return null; |
407 |
|
} |
408 |
|
} |
409 |
|
|
410 |
+ |
|
411 |
|
/** |
412 |
< |
* invoke of a null runnable throws NPE |
412 |
> |
* Without class loader permissions, creating |
413 |
> |
* privilegedCallableUsingCurrentClassLoader throws ACE |
414 |
|
*/ |
415 |
< |
public void testInvokeNullRunnable() { |
415 |
> |
public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() { |
416 |
> |
Policy savedPolicy = null; |
417 |
|
try { |
418 |
< |
Executor e = new DirectExecutor(); |
419 |
< |
TrackedShortRunnable task = null; |
420 |
< |
Executors.invoke(e, task); |
421 |
< |
shouldThrow(); |
418 |
> |
savedPolicy = Policy.getPolicy(); |
419 |
> |
AdjustablePolicy policy = new AdjustablePolicy(); |
420 |
> |
Policy.setPolicy(policy); |
421 |
> |
} catch (AccessControlException ok) { |
422 |
> |
return; |
423 |
|
} |
424 |
< |
catch (NullPointerException success) { |
425 |
< |
} |
426 |
< |
catch (Exception ex) { |
427 |
< |
unexpectedException(); |
424 |
> |
|
425 |
> |
// Check if program still has too many permissions to run test |
426 |
> |
try { |
427 |
> |
checkCCL(); |
428 |
> |
// too many privileges to test; so return |
429 |
> |
Policy.setPolicy(savedPolicy); |
430 |
> |
return; |
431 |
> |
} catch (AccessControlException ok) { |
432 |
|
} |
404 |
– |
} |
433 |
|
|
406 |
– |
/** |
407 |
– |
* execute of a null callable throws NPE |
408 |
– |
*/ |
409 |
– |
public void testExecuteNullCallable() { |
434 |
|
try { |
435 |
< |
Executor e = new DirectExecutor(); |
412 |
< |
StringTask t = null; |
413 |
< |
Future<String> future = Executors.execute(e, t); |
435 |
> |
Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); |
436 |
|
shouldThrow(); |
437 |
< |
} |
438 |
< |
catch (NullPointerException success) { |
439 |
< |
} |
418 |
< |
catch (Exception ex) { |
419 |
< |
unexpectedException(); |
437 |
> |
} catch (AccessControlException success) { |
438 |
> |
} finally { |
439 |
> |
Policy.setPolicy(savedPolicy); |
440 |
|
} |
441 |
|
} |
442 |
|
|
443 |
|
/** |
444 |
< |
* invoke of a null callable throws NPE |
444 |
> |
* With class loader permissions, calling |
445 |
> |
* privilegedCallableUsingCurrentClassLoader does not throw ACE |
446 |
|
*/ |
447 |
< |
public void testInvokeNullCallable() { |
447 |
> |
public void testprivilegedCallableUsingCCLWithPrivs() throws Exception { |
448 |
> |
Policy savedPolicy = null; |
449 |
|
try { |
450 |
< |
Executor e = new DirectExecutor(); |
451 |
< |
StringTask t = null; |
452 |
< |
String result = Executors.invoke(e, t); |
453 |
< |
shouldThrow(); |
450 |
> |
savedPolicy = Policy.getPolicy(); |
451 |
> |
AdjustablePolicy policy = new AdjustablePolicy(); |
452 |
> |
policy.addPermission(new RuntimePermission("getContextClassLoader")); |
453 |
> |
policy.addPermission(new RuntimePermission("setContextClassLoader")); |
454 |
> |
Policy.setPolicy(policy); |
455 |
> |
} catch (AccessControlException ok) { |
456 |
> |
return; |
457 |
|
} |
458 |
< |
catch (NullPointerException success) { |
458 |
> |
|
459 |
> |
try { |
460 |
> |
Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); |
461 |
> |
task.call(); |
462 |
|
} |
463 |
< |
catch (Exception ex) { |
464 |
< |
unexpectedException(); |
463 |
> |
finally { |
464 |
> |
Policy.setPolicy(savedPolicy); |
465 |
|
} |
466 |
|
} |
467 |
|
|
468 |
|
/** |
469 |
< |
* execute(Executor, Runnable) throws RejectedExecutionException |
442 |
< |
* if saturated. |
469 |
> |
* Without permissions, calling privilegedCallable throws ACE |
470 |
|
*/ |
471 |
< |
public void testExecute1() { |
472 |
< |
ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1)); |
471 |
> |
public void testprivilegedCallableWithNoPrivs() throws Exception { |
472 |
> |
Callable task; |
473 |
> |
Policy savedPolicy = null; |
474 |
> |
AdjustablePolicy policy = null; |
475 |
> |
AccessControlContext noprivAcc = null; |
476 |
> |
try { |
477 |
> |
savedPolicy = Policy.getPolicy(); |
478 |
> |
policy = new AdjustablePolicy(); |
479 |
> |
Policy.setPolicy(policy); |
480 |
> |
noprivAcc = AccessController.getContext(); |
481 |
> |
task = Executors.privilegedCallable(new CheckCCL()); |
482 |
> |
Policy.setPolicy(savedPolicy); |
483 |
> |
} catch (AccessControlException ok) { |
484 |
> |
return; // program has too few permissions to set up test |
485 |
> |
} |
486 |
> |
|
487 |
> |
// Make sure that program doesn't have too many permissions |
488 |
|
try { |
489 |
< |
|
490 |
< |
for(int i = 0; i < 5; ++i){ |
491 |
< |
Executors.execute(p, new MediumRunnable()); |
492 |
< |
} |
493 |
< |
shouldThrow(); |
494 |
< |
} catch(RejectedExecutionException success){} |
495 |
< |
joinPool(p); |
496 |
< |
} |
489 |
> |
AccessController.doPrivileged(new PrivilegedAction() { |
490 |
> |
public Object run() { |
491 |
> |
checkCCL(); |
492 |
> |
return null; |
493 |
> |
}}, noprivAcc); |
494 |
> |
// too many permssions; skip test |
495 |
> |
return; |
496 |
> |
} catch (AccessControlException ok) { |
497 |
> |
} |
498 |
|
|
456 |
– |
/** |
457 |
– |
* execute(Executor, Callable)throws RejectedExecutionException |
458 |
– |
* if saturated. |
459 |
– |
*/ |
460 |
– |
public void testExecute2() { |
461 |
– |
ThreadPoolExecutor p = new ThreadPoolExecutor(1,1, SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(1)); |
499 |
|
try { |
500 |
< |
for(int i = 0; i < 5; ++i) { |
464 |
< |
Executors.execute(p, new SmallCallable()); |
465 |
< |
} |
500 |
> |
task.call(); |
501 |
|
shouldThrow(); |
502 |
< |
} catch(RejectedExecutionException e){} |
468 |
< |
joinPool(p); |
502 |
> |
} catch (AccessControlException success) {} |
503 |
|
} |
504 |
|
|
471 |
– |
|
505 |
|
/** |
506 |
< |
* invoke(Executor, Runnable) throws InterruptedException if |
474 |
< |
* caller interrupted. |
506 |
> |
* With permissions, calling privilegedCallable succeeds |
507 |
|
*/ |
508 |
< |
public void testInterruptedInvoke() { |
509 |
< |
final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
478 |
< |
Thread t = new Thread(new Runnable() { |
479 |
< |
public void run() { |
480 |
< |
try { |
481 |
< |
Executors.invoke(p,new Runnable() { |
482 |
< |
public void run() { |
483 |
< |
try { |
484 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
485 |
< |
shouldThrow(); |
486 |
< |
} catch(InterruptedException e){ |
487 |
< |
} |
488 |
< |
} |
489 |
< |
}); |
490 |
< |
} catch(InterruptedException success){ |
491 |
< |
} catch(Exception e) { |
492 |
< |
unexpectedException(); |
493 |
< |
} |
494 |
< |
|
495 |
< |
} |
496 |
< |
}); |
508 |
> |
public void testprivilegedCallableWithPrivs() throws Exception { |
509 |
> |
Policy savedPolicy = null; |
510 |
|
try { |
511 |
< |
t.start(); |
512 |
< |
Thread.sleep(SHORT_DELAY_MS); |
513 |
< |
t.interrupt(); |
514 |
< |
} catch(Exception e){ |
515 |
< |
unexpectedException(); |
511 |
> |
savedPolicy = Policy.getPolicy(); |
512 |
> |
AdjustablePolicy policy = new AdjustablePolicy(); |
513 |
> |
policy.addPermission(new RuntimePermission("getContextClassLoader")); |
514 |
> |
policy.addPermission(new RuntimePermission("setContextClassLoader")); |
515 |
> |
Policy.setPolicy(policy); |
516 |
> |
} catch (AccessControlException ok) { |
517 |
> |
return; |
518 |
|
} |
504 |
– |
joinPool(p); |
505 |
– |
} |
519 |
|
|
520 |
< |
/** |
508 |
< |
* invoke(Executor, Runnable) throws ExecutionException if |
509 |
< |
* runnable throws exception. |
510 |
< |
*/ |
511 |
< |
public void testInvoke3() { |
512 |
< |
ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
520 |
> |
Callable task = Executors.privilegedCallable(new CheckCCL()); |
521 |
|
try { |
522 |
< |
Runnable r = new Runnable() { |
523 |
< |
public void run() { |
524 |
< |
int i = 5/0; |
517 |
< |
} |
518 |
< |
}; |
519 |
< |
|
520 |
< |
for(int i =0; i < 5; i++){ |
521 |
< |
Executors.invoke(p,r); |
522 |
< |
} |
523 |
< |
|
524 |
< |
shouldThrow(); |
525 |
< |
} catch(ExecutionException success){ |
526 |
< |
} catch(Exception e){ |
527 |
< |
unexpectedException(); |
522 |
> |
task.call(); |
523 |
> |
} finally { |
524 |
> |
Policy.setPolicy(savedPolicy); |
525 |
|
} |
529 |
– |
joinPool(p); |
526 |
|
} |
527 |
|
|
532 |
– |
|
533 |
– |
|
528 |
|
/** |
529 |
< |
* invoke(Executor, Callable) throws InterruptedException if |
536 |
< |
* callable throws exception |
529 |
> |
* callable(Runnable) returns null when called |
530 |
|
*/ |
531 |
< |
public void testInvoke5() { |
532 |
< |
final ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
533 |
< |
|
534 |
< |
final Callable c = new Callable() { |
542 |
< |
public Object call() { |
543 |
< |
try { |
544 |
< |
Executors.invoke(p, new SmallCallable()); |
545 |
< |
shouldThrow(); |
546 |
< |
} catch(InterruptedException e){} |
547 |
< |
catch(RejectedExecutionException e2){} |
548 |
< |
catch(ExecutionException e3){} |
549 |
< |
return Boolean.TRUE; |
550 |
< |
} |
551 |
< |
}; |
531 |
> |
public void testCallable1() throws Exception { |
532 |
> |
Callable c = Executors.callable(new NoOpRunnable()); |
533 |
> |
assertNull(c.call()); |
534 |
> |
} |
535 |
|
|
536 |
+ |
/** |
537 |
+ |
* callable(Runnable, result) returns result when called |
538 |
+ |
*/ |
539 |
+ |
public void testCallable2() throws Exception { |
540 |
+ |
Callable c = Executors.callable(new NoOpRunnable(), one); |
541 |
+ |
assertSame(one, c.call()); |
542 |
+ |
} |
543 |
|
|
544 |
< |
|
545 |
< |
Thread t = new Thread(new Runnable() { |
546 |
< |
public void run() { |
547 |
< |
try { |
548 |
< |
c.call(); |
549 |
< |
} catch(Exception e){} |
550 |
< |
} |
561 |
< |
}); |
562 |
< |
try { |
563 |
< |
t.start(); |
564 |
< |
Thread.sleep(SHORT_DELAY_MS); |
565 |
< |
t.interrupt(); |
566 |
< |
t.join(); |
567 |
< |
} catch(InterruptedException e){ |
568 |
< |
unexpectedException(); |
569 |
< |
} |
570 |
< |
|
571 |
< |
joinPool(p); |
544 |
> |
/** |
545 |
> |
* callable(PrivilegedAction) returns its result when called |
546 |
> |
*/ |
547 |
> |
public void testCallable3() throws Exception { |
548 |
> |
Callable c = Executors.callable(new PrivilegedAction() { |
549 |
> |
public Object run() { return one; }}); |
550 |
> |
assertSame(one, c.call()); |
551 |
|
} |
552 |
|
|
553 |
|
/** |
554 |
< |
* invoke(Executor, Callable) will throw ExecutionException |
576 |
< |
* if callable throws exception |
554 |
> |
* callable(PrivilegedExceptionAction) returns its result when called |
555 |
|
*/ |
556 |
< |
public void testInvoke6() { |
557 |
< |
ThreadPoolExecutor p = new ThreadPoolExecutor(1,1,SHORT_DELAY_MS, TimeUnit.MILLISECONDS, new ArrayBlockingQueue<Runnable>(10)); |
556 |
> |
public void testCallable4() throws Exception { |
557 |
> |
Callable c = Executors.callable(new PrivilegedExceptionAction() { |
558 |
> |
public Object run() { return one; }}); |
559 |
> |
assertSame(one, c.call()); |
560 |
> |
} |
561 |
> |
|
562 |
|
|
563 |
+ |
/** |
564 |
+ |
* callable(null Runnable) throws NPE |
565 |
+ |
*/ |
566 |
+ |
public void testCallableNPE1() { |
567 |
|
try { |
568 |
< |
Callable c = new Callable() { |
583 |
< |
public Object call() { |
584 |
< |
int i = 5/0; |
585 |
< |
return Boolean.TRUE; |
586 |
< |
} |
587 |
< |
}; |
588 |
< |
|
589 |
< |
for(int i =0; i < 5; i++){ |
590 |
< |
Executors.invoke(p,c); |
591 |
< |
} |
592 |
< |
|
568 |
> |
Callable c = Executors.callable((Runnable) null); |
569 |
|
shouldThrow(); |
570 |
< |
} |
595 |
< |
catch(ExecutionException success){ |
596 |
< |
} catch(Exception e) { |
597 |
< |
unexpectedException(); |
598 |
< |
} |
599 |
< |
joinPool(p); |
570 |
> |
} catch (NullPointerException success) {} |
571 |
|
} |
572 |
|
|
602 |
– |
|
603 |
– |
|
573 |
|
/** |
574 |
< |
* timeouts from execute will time out if they compute too long. |
574 |
> |
* callable(null, result) throws NPE |
575 |
|
*/ |
576 |
< |
public void testTimedCallable() { |
608 |
< |
int N = 10000; |
609 |
< |
ExecutorService executor = Executors.newSingleThreadExecutor(); |
610 |
< |
List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N); |
576 |
> |
public void testCallableNPE2() { |
577 |
|
try { |
578 |
< |
long startTime = System.currentTimeMillis(); |
579 |
< |
|
580 |
< |
long i = 0; |
615 |
< |
while (tasks.size() < N) { |
616 |
< |
tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1)); |
617 |
< |
i += 10; |
618 |
< |
} |
619 |
< |
|
620 |
< |
int iters = 0; |
621 |
< |
BigInteger sum = BigInteger.ZERO; |
622 |
< |
for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) { |
623 |
< |
try { |
624 |
< |
++iters; |
625 |
< |
sum = sum.add(it.next().call()); |
626 |
< |
} |
627 |
< |
catch (TimeoutException success) { |
628 |
< |
assertTrue(iters > 0); |
629 |
< |
return; |
630 |
< |
} |
631 |
< |
catch (Exception e) { |
632 |
< |
unexpectedException(); |
633 |
< |
} |
634 |
< |
} |
635 |
< |
// if by chance we didn't ever time out, total time must be small |
636 |
< |
long elapsed = System.currentTimeMillis() - startTime; |
637 |
< |
assertTrue(elapsed < N); |
638 |
< |
} |
639 |
< |
finally { |
640 |
< |
joinPool(executor); |
641 |
< |
} |
578 |
> |
Callable c = Executors.callable((Runnable) null, one); |
579 |
> |
shouldThrow(); |
580 |
> |
} catch (NullPointerException success) {} |
581 |
|
} |
582 |
|
|
644 |
– |
|
583 |
|
/** |
584 |
< |
* ThreadPoolExecutor using defaultThreadFactory has |
647 |
< |
* specified group, priority, daemon status, and name |
584 |
> |
* callable(null PrivilegedAction) throws NPE |
585 |
|
*/ |
586 |
< |
public void testDefaultThreadFactory() { |
650 |
< |
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
651 |
< |
Runnable r = new Runnable() { |
652 |
< |
public void run() { |
653 |
< |
Thread current = Thread.currentThread(); |
654 |
< |
threadAssertTrue(!current.isDaemon()); |
655 |
< |
threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY); |
656 |
< |
ThreadGroup g = current.getThreadGroup(); |
657 |
< |
SecurityManager s = System.getSecurityManager(); |
658 |
< |
if (s != null) |
659 |
< |
threadAssertTrue(g == s.getThreadGroup()); |
660 |
< |
else |
661 |
< |
threadAssertTrue(g == egroup); |
662 |
< |
String name = current.getName(); |
663 |
< |
threadAssertTrue(name.endsWith("thread-1")); |
664 |
< |
} |
665 |
< |
}; |
666 |
< |
ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory()); |
667 |
< |
|
668 |
< |
e.execute(r); |
669 |
< |
e.shutdown(); |
586 |
> |
public void testCallableNPE3() { |
587 |
|
try { |
588 |
< |
Thread.sleep(SHORT_DELAY_MS); |
589 |
< |
} catch (Exception eX) { |
590 |
< |
unexpectedException(); |
674 |
< |
} finally { |
675 |
< |
joinPool(e); |
676 |
< |
} |
588 |
> |
Callable c = Executors.callable((PrivilegedAction) null); |
589 |
> |
shouldThrow(); |
590 |
> |
} catch (NullPointerException success) {} |
591 |
|
} |
592 |
|
|
593 |
|
/** |
594 |
< |
* ThreadPoolExecutor using privilegedThreadFactory has |
681 |
< |
* specified group, priority, daemon status, name, |
682 |
< |
* access control context and context class loader |
594 |
> |
* callable(null PrivilegedExceptionAction) throws NPE |
595 |
|
*/ |
596 |
< |
public void testPrivilegedThreadFactory() { |
685 |
< |
Policy savedPolicy = Policy.getPolicy(); |
686 |
< |
AdjustablePolicy policy = new AdjustablePolicy(); |
687 |
< |
policy.addPermission(new RuntimePermission("getContextClassLoader")); |
688 |
< |
policy.addPermission(new RuntimePermission("setContextClassLoader")); |
689 |
< |
Policy.setPolicy(policy); |
690 |
< |
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
691 |
< |
final ClassLoader thisccl = Thread.currentThread().getContextClassLoader(); |
692 |
< |
final AccessControlContext thisacc = AccessController.getContext(); |
693 |
< |
Runnable r = new Runnable() { |
694 |
< |
public void run() { |
695 |
< |
Thread current = Thread.currentThread(); |
696 |
< |
threadAssertTrue(!current.isDaemon()); |
697 |
< |
threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY); |
698 |
< |
ThreadGroup g = current.getThreadGroup(); |
699 |
< |
SecurityManager s = System.getSecurityManager(); |
700 |
< |
if (s != null) |
701 |
< |
threadAssertTrue(g == s.getThreadGroup()); |
702 |
< |
else |
703 |
< |
threadAssertTrue(g == egroup); |
704 |
< |
String name = current.getName(); |
705 |
< |
threadAssertTrue(name.endsWith("thread-1")); |
706 |
< |
threadAssertTrue(thisccl == current.getContextClassLoader()); |
707 |
< |
threadAssertTrue(thisacc.equals(AccessController.getContext())); |
708 |
< |
} |
709 |
< |
}; |
710 |
< |
ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); |
711 |
< |
|
712 |
< |
Policy.setPolicy(savedPolicy); |
713 |
< |
e.execute(r); |
714 |
< |
e.shutdown(); |
596 |
> |
public void testCallableNPE4() { |
597 |
|
try { |
598 |
< |
Thread.sleep(SHORT_DELAY_MS); |
599 |
< |
} catch (Exception ex) { |
600 |
< |
unexpectedException(); |
719 |
< |
} finally { |
720 |
< |
joinPool(e); |
721 |
< |
} |
722 |
< |
|
598 |
> |
Callable c = Executors.callable((PrivilegedExceptionAction) null); |
599 |
> |
shouldThrow(); |
600 |
> |
} catch (NullPointerException success) {} |
601 |
|
} |
602 |
|
|
603 |
+ |
|
604 |
|
} |