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. |
5 |
> |
* Other contributors include Andrew Wright, Jeffrey Hayes, |
6 |
> |
* Pat Fisher, Mike Judd. |
7 |
|
*/ |
8 |
|
|
9 |
|
|
13 |
|
import java.math.BigInteger; |
14 |
|
import java.security.*; |
15 |
|
|
16 |
< |
public class ExecutorsTest extends JSR166TestCase{ |
16 |
> |
public class ExecutorsTest extends JSR166TestCase { |
17 |
|
public static void main(String[] args) { |
18 |
< |
junit.textui.TestRunner.run (suite()); |
18 |
> |
junit.textui.TestRunner.run (suite()); |
19 |
|
} |
20 |
|
public static Test suite() { |
21 |
|
return new TestSuite(ExecutorsTest.class); |
25 |
|
private final ExecutorService exec; |
26 |
|
private final Callable<T> func; |
27 |
|
private final long msecs; |
28 |
< |
|
28 |
> |
|
29 |
|
TimedCallable(ExecutorService exec, Callable<T> func, long msecs) { |
30 |
|
this.exec = exec; |
31 |
|
this.func = func; |
32 |
|
this.msecs = msecs; |
33 |
|
} |
34 |
< |
|
34 |
> |
|
35 |
|
public T call() throws Exception { |
36 |
|
Future<T> ftask = exec.submit(func); |
37 |
|
try { |
90 |
|
try { |
91 |
|
ExecutorService e = Executors.newCachedThreadPool(null); |
92 |
|
shouldThrow(); |
93 |
< |
} |
94 |
< |
catch(NullPointerException success) { |
95 |
< |
} |
93 |
> |
} catch (NullPointerException success) {} |
94 |
|
} |
95 |
|
|
96 |
|
|
123 |
|
try { |
124 |
|
ExecutorService e = Executors.newSingleThreadExecutor(null); |
125 |
|
shouldThrow(); |
126 |
< |
} |
129 |
< |
catch(NullPointerException success) { |
130 |
< |
} |
126 |
> |
} catch (NullPointerException success) {} |
127 |
|
} |
128 |
|
|
129 |
|
/** |
133 |
|
ExecutorService e = Executors.newSingleThreadExecutor(); |
134 |
|
try { |
135 |
|
ThreadPoolExecutor tpe = (ThreadPoolExecutor)e; |
136 |
+ |
shouldThrow(); |
137 |
|
} catch (ClassCastException success) { |
138 |
|
} finally { |
139 |
|
joinPool(e); |
170 |
|
try { |
171 |
|
ExecutorService e = Executors.newFixedThreadPool(2, null); |
172 |
|
shouldThrow(); |
173 |
< |
} |
177 |
< |
catch(NullPointerException success) { |
178 |
< |
} |
173 |
> |
} catch (NullPointerException success) {} |
174 |
|
} |
175 |
|
|
176 |
|
/** |
180 |
|
try { |
181 |
|
ExecutorService e = Executors.newFixedThreadPool(0); |
182 |
|
shouldThrow(); |
183 |
< |
} |
189 |
< |
catch(IllegalArgumentException success) { |
190 |
< |
} |
183 |
> |
} catch (IllegalArgumentException success) {} |
184 |
|
} |
185 |
|
|
186 |
|
|
201 |
|
public void testunconfigurableExecutorServiceNPE() { |
202 |
|
try { |
203 |
|
ExecutorService e = Executors.unconfigurableExecutorService(null); |
204 |
< |
} |
205 |
< |
catch (NullPointerException success) { |
213 |
< |
} |
204 |
> |
shouldThrow(); |
205 |
> |
} catch (NullPointerException success) {} |
206 |
|
} |
207 |
|
|
208 |
|
/** |
211 |
|
public void testunconfigurableScheduledExecutorServiceNPE() { |
212 |
|
try { |
213 |
|
ExecutorService e = Executors.unconfigurableScheduledExecutorService(null); |
214 |
< |
} |
215 |
< |
catch (NullPointerException success) { |
224 |
< |
} |
214 |
> |
shouldThrow(); |
215 |
> |
} catch (NullPointerException success) {} |
216 |
|
} |
217 |
|
|
218 |
|
|
219 |
|
/** |
220 |
|
* a newSingleThreadScheduledExecutor successfully runs delayed task |
221 |
|
*/ |
222 |
< |
public void testNewSingleThreadScheduledExecutor() { |
223 |
< |
try { |
224 |
< |
TrackedCallable callable = new TrackedCallable(); |
225 |
< |
ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor(); |
226 |
< |
Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); |
227 |
< |
assertFalse(callable.done); |
228 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
229 |
< |
assertTrue(callable.done); |
230 |
< |
assertEquals(Boolean.TRUE, f.get()); |
240 |
< |
joinPool(p1); |
241 |
< |
} catch(RejectedExecutionException e){} |
242 |
< |
catch(Exception e){ |
243 |
< |
e.printStackTrace(); |
244 |
< |
unexpectedException(); |
245 |
< |
} |
222 |
> |
public void testNewSingleThreadScheduledExecutor() throws Exception { |
223 |
> |
TrackedCallable callable = new TrackedCallable(); |
224 |
> |
ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor(); |
225 |
> |
Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); |
226 |
> |
assertFalse(callable.done); |
227 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
228 |
> |
assertTrue(callable.done); |
229 |
> |
assertEquals(Boolean.TRUE, f.get()); |
230 |
> |
joinPool(p1); |
231 |
|
} |
232 |
|
|
233 |
|
/** |
234 |
|
* a newScheduledThreadPool successfully runs delayed task |
235 |
|
*/ |
236 |
< |
public void testnewScheduledThreadPool() { |
237 |
< |
try { |
238 |
< |
TrackedCallable callable = new TrackedCallable(); |
239 |
< |
ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2); |
240 |
< |
Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); |
241 |
< |
assertFalse(callable.done); |
242 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
243 |
< |
assertTrue(callable.done); |
244 |
< |
assertEquals(Boolean.TRUE, f.get()); |
260 |
< |
joinPool(p1); |
261 |
< |
} catch(RejectedExecutionException e){} |
262 |
< |
catch(Exception e){ |
263 |
< |
e.printStackTrace(); |
264 |
< |
unexpectedException(); |
265 |
< |
} |
236 |
> |
public void testnewScheduledThreadPool() throws Exception { |
237 |
> |
TrackedCallable callable = new TrackedCallable(); |
238 |
> |
ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2); |
239 |
> |
Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); |
240 |
> |
assertFalse(callable.done); |
241 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
242 |
> |
assertTrue(callable.done); |
243 |
> |
assertEquals(Boolean.TRUE, f.get()); |
244 |
> |
joinPool(p1); |
245 |
|
} |
246 |
|
|
247 |
|
/** |
248 |
< |
* an unconfigurable newScheduledThreadPool successfully runs delayed task |
249 |
< |
*/ |
250 |
< |
public void testunconfigurableScheduledExecutorService() { |
251 |
< |
try { |
252 |
< |
TrackedCallable callable = new TrackedCallable(); |
253 |
< |
ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2)); |
254 |
< |
Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); |
255 |
< |
assertFalse(callable.done); |
256 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
257 |
< |
assertTrue(callable.done); |
258 |
< |
assertEquals(Boolean.TRUE, f.get()); |
280 |
< |
joinPool(p1); |
281 |
< |
} catch(RejectedExecutionException e){} |
282 |
< |
catch(Exception e){ |
283 |
< |
e.printStackTrace(); |
284 |
< |
unexpectedException(); |
285 |
< |
} |
248 |
> |
* an unconfigurable newScheduledThreadPool successfully runs delayed task |
249 |
> |
*/ |
250 |
> |
public void testunconfigurableScheduledExecutorService() throws Exception { |
251 |
> |
TrackedCallable callable = new TrackedCallable(); |
252 |
> |
ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2)); |
253 |
> |
Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); |
254 |
> |
assertFalse(callable.done); |
255 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
256 |
> |
assertTrue(callable.done); |
257 |
> |
assertEquals(Boolean.TRUE, f.get()); |
258 |
> |
joinPool(p1); |
259 |
|
} |
260 |
|
|
261 |
|
/** |
262 |
|
* timeouts from execute will time out if they compute too long. |
263 |
|
*/ |
264 |
< |
public void testTimedCallable() { |
264 |
> |
public void testTimedCallable() throws Exception { |
265 |
|
int N = 10000; |
266 |
|
ExecutorService executor = Executors.newSingleThreadExecutor(); |
267 |
|
List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N); |
268 |
|
try { |
269 |
|
long startTime = System.currentTimeMillis(); |
270 |
< |
|
270 |
> |
|
271 |
|
long i = 0; |
272 |
|
while (tasks.size() < N) { |
273 |
|
tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1)); |
274 |
|
i += 10; |
275 |
|
} |
276 |
< |
|
276 |
> |
|
277 |
|
int iters = 0; |
278 |
|
BigInteger sum = BigInteger.ZERO; |
279 |
|
for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) { |
285 |
|
assertTrue(iters > 0); |
286 |
|
return; |
287 |
|
} |
315 |
– |
catch (Exception e) { |
316 |
– |
unexpectedException(); |
317 |
– |
} |
288 |
|
} |
289 |
|
// if by chance we didn't ever time out, total time must be small |
290 |
|
long elapsed = System.currentTimeMillis() - startTime; |
295 |
|
} |
296 |
|
} |
297 |
|
|
298 |
< |
|
298 |
> |
|
299 |
|
/** |
300 |
|
* ThreadPoolExecutor using defaultThreadFactory has |
301 |
|
* specified group, priority, daemon status, and name |
302 |
|
*/ |
303 |
< |
public void testDefaultThreadFactory() { |
303 |
> |
public void testDefaultThreadFactory() throws Exception { |
304 |
|
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
305 |
|
Runnable r = new Runnable() { |
306 |
|
public void run() { |
307 |
|
try { |
308 |
|
Thread current = Thread.currentThread(); |
309 |
|
threadAssertTrue(!current.isDaemon()); |
310 |
< |
threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY); |
310 |
> |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
311 |
|
ThreadGroup g = current.getThreadGroup(); |
312 |
|
SecurityManager s = System.getSecurityManager(); |
313 |
|
if (s != null) |
322 |
|
} |
323 |
|
}; |
324 |
|
ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory()); |
325 |
< |
|
325 |
> |
|
326 |
|
e.execute(r); |
327 |
|
try { |
328 |
|
e.shutdown(); |
329 |
< |
} catch(SecurityException ok) { |
329 |
> |
} catch (SecurityException ok) { |
330 |
|
} |
331 |
< |
|
331 |
> |
|
332 |
|
try { |
333 |
|
Thread.sleep(SHORT_DELAY_MS); |
364 |
– |
} catch (Exception eX) { |
365 |
– |
unexpectedException(); |
334 |
|
} finally { |
335 |
|
joinPool(e); |
336 |
|
} |
341 |
|
* specified group, priority, daemon status, name, |
342 |
|
* access control context and context class loader |
343 |
|
*/ |
344 |
< |
public void testPrivilegedThreadFactory() { |
344 |
> |
public void testPrivilegedThreadFactory() throws Exception { |
345 |
|
Policy savedPolicy = null; |
346 |
|
try { |
347 |
|
savedPolicy = Policy.getPolicy(); |
360 |
|
try { |
361 |
|
Thread current = Thread.currentThread(); |
362 |
|
threadAssertTrue(!current.isDaemon()); |
363 |
< |
threadAssertTrue(current.getPriority() == Thread.NORM_PRIORITY); |
363 |
> |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
364 |
|
ThreadGroup g = current.getThreadGroup(); |
365 |
|
SecurityManager s = System.getSecurityManager(); |
366 |
|
if (s != null) |
371 |
|
threadAssertTrue(name.endsWith("thread-1")); |
372 |
|
threadAssertTrue(thisccl == current.getContextClassLoader()); |
373 |
|
threadAssertTrue(thisacc.equals(AccessController.getContext())); |
374 |
< |
} catch(SecurityException ok) { |
374 |
> |
} catch (SecurityException ok) { |
375 |
|
// Also pass if not allowed to change settings |
376 |
|
} |
377 |
|
} |
378 |
|
}; |
379 |
|
ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); |
380 |
< |
|
380 |
> |
|
381 |
|
Policy.setPolicy(savedPolicy); |
382 |
|
e.execute(r); |
383 |
|
try { |
384 |
|
e.shutdown(); |
385 |
< |
} catch(SecurityException ok) { |
385 |
> |
} catch (SecurityException ok) { |
386 |
|
} |
387 |
|
try { |
388 |
|
Thread.sleep(SHORT_DELAY_MS); |
421 |
– |
} catch (Exception ex) { |
422 |
– |
unexpectedException(); |
389 |
|
} finally { |
390 |
|
joinPool(e); |
391 |
|
} |
392 |
|
|
393 |
|
} |
394 |
|
|
395 |
< |
static class CheckCCL implements Callable<Object> { |
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 |
> |
} |
402 |
> |
|
403 |
> |
class CheckCCL implements Callable<Object> { |
404 |
|
public Object call() { |
405 |
< |
AccessControlContext acc = AccessController.getContext(); |
432 |
< |
acc.checkPermission(new RuntimePermission("getContextClassLoader")); |
405 |
> |
checkCCL(); |
406 |
|
return null; |
407 |
|
} |
408 |
|
} |
422 |
|
return; |
423 |
|
} |
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 |
+ |
} |
433 |
+ |
|
434 |
|
try { |
435 |
|
Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); |
436 |
|
shouldThrow(); |
437 |
< |
} catch(AccessControlException success) { |
438 |
< |
} catch(Exception ex) { |
457 |
< |
unexpectedException(); |
458 |
< |
} |
459 |
< |
finally { |
437 |
> |
} catch (AccessControlException success) { |
438 |
> |
} finally { |
439 |
|
Policy.setPolicy(savedPolicy); |
440 |
|
} |
441 |
|
} |
442 |
|
|
443 |
|
/** |
444 |
< |
* Without class loader permissions, calling |
445 |
< |
* privilegedCallableUsingCurrentClassLoader throws ACE |
444 |
> |
* With class loader permissions, calling |
445 |
> |
* privilegedCallableUsingCurrentClassLoader does not throw ACE |
446 |
|
*/ |
447 |
< |
public void testprivilegedCallableUsingCCLWithPrivs() { |
447 |
> |
public void testprivilegedCallableUsingCCLWithPrivs() throws Exception { |
448 |
|
Policy savedPolicy = null; |
449 |
|
try { |
450 |
|
savedPolicy = Policy.getPolicy(); |
455 |
|
} catch (AccessControlException ok) { |
456 |
|
return; |
457 |
|
} |
458 |
< |
|
458 |
> |
|
459 |
|
try { |
460 |
|
Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); |
461 |
|
task.call(); |
462 |
< |
} catch(Exception ex) { |
484 |
< |
unexpectedException(); |
485 |
< |
} |
462 |
> |
} |
463 |
|
finally { |
464 |
|
Policy.setPolicy(savedPolicy); |
465 |
|
} |
466 |
|
} |
467 |
|
|
491 |
– |
class CallCCL implements Runnable { |
492 |
– |
final Callable task; |
493 |
– |
CallCCL(Callable t) { task = t; } |
494 |
– |
public void run() { |
495 |
– |
try { |
496 |
– |
task.call(); |
497 |
– |
threadShouldThrow(); |
498 |
– |
} catch(AccessControlException success) { |
499 |
– |
} catch(Exception ex) { |
500 |
– |
threadUnexpectedException(); |
501 |
– |
} |
502 |
– |
} |
503 |
– |
} |
504 |
– |
|
468 |
|
/** |
469 |
|
* Without permissions, calling privilegedCallable throws ACE |
470 |
|
*/ |
471 |
< |
public void testprivilegedCallableWithNoPrivs() { |
472 |
< |
Thread t1; |
471 |
> |
public void testprivilegedCallableWithNoPrivs() throws Exception { |
472 |
> |
Callable task; |
473 |
> |
Policy savedPolicy = null; |
474 |
> |
AdjustablePolicy policy = null; |
475 |
> |
AccessControlContext noprivAcc = null; |
476 |
|
try { |
477 |
< |
Policy savedPolicy = Policy.getPolicy(); |
478 |
< |
AdjustablePolicy policy = new AdjustablePolicy(); |
477 |
> |
savedPolicy = Policy.getPolicy(); |
478 |
> |
policy = new AdjustablePolicy(); |
479 |
|
Policy.setPolicy(policy); |
480 |
< |
Callable task = Executors.privilegedCallable(new CheckCCL()); |
481 |
< |
t1 = new Thread(new CallCCL(task)); |
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 |
+ |
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 |
|
|
499 |
|
try { |
500 |
< |
t1.start(); |
501 |
< |
t1.join(); |
502 |
< |
} catch(Exception ex) { |
525 |
< |
unexpectedException(); |
526 |
< |
} |
500 |
> |
task.call(); |
501 |
> |
shouldThrow(); |
502 |
> |
} catch (AccessControlException success) {} |
503 |
|
} |
504 |
|
|
505 |
|
/** |
506 |
|
* With permissions, calling privilegedCallable succeeds |
507 |
|
*/ |
508 |
< |
public void testprivilegedCallableWithPrivs() { |
508 |
> |
public void testprivilegedCallableWithPrivs() throws Exception { |
509 |
|
Policy savedPolicy = null; |
510 |
|
try { |
511 |
|
savedPolicy = Policy.getPolicy(); |
516 |
|
} catch (AccessControlException ok) { |
517 |
|
return; |
518 |
|
} |
519 |
< |
|
519 |
> |
|
520 |
|
Callable task = Executors.privilegedCallable(new CheckCCL()); |
521 |
|
try { |
522 |
|
task.call(); |
547 |
– |
} catch(Exception ex) { |
548 |
– |
unexpectedException(); |
523 |
|
} finally { |
524 |
|
Policy.setPolicy(savedPolicy); |
525 |
|
} |
527 |
|
|
528 |
|
/** |
529 |
|
* callable(Runnable) returns null when called |
530 |
< |
*/ |
531 |
< |
public void testCallable1() { |
532 |
< |
try { |
533 |
< |
Callable c = Executors.callable(new NoOpRunnable()); |
560 |
< |
assertNull(c.call()); |
561 |
< |
} catch(Exception ex) { |
562 |
< |
unexpectedException(); |
563 |
< |
} |
564 |
< |
|
530 |
> |
*/ |
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() { |
540 |
< |
try { |
541 |
< |
Callable c = Executors.callable(new NoOpRunnable(), one); |
573 |
< |
assertEquals(one, c.call()); |
574 |
< |
} catch(Exception ex) { |
575 |
< |
unexpectedException(); |
576 |
< |
} |
538 |
> |
*/ |
539 |
> |
public void testCallable2() throws Exception { |
540 |
> |
Callable c = Executors.callable(new NoOpRunnable(), one); |
541 |
> |
assertEquals(one, c.call()); |
542 |
|
} |
543 |
|
|
544 |
|
/** |
545 |
|
* callable(PrivilegedAction) returns its result when called |
546 |
< |
*/ |
547 |
< |
public void testCallable3() { |
548 |
< |
try { |
549 |
< |
Callable c = Executors.callable(new PrivilegedAction() { |
585 |
< |
public Object run() { return one; }}); |
546 |
> |
*/ |
547 |
> |
public void testCallable3() throws Exception { |
548 |
> |
Callable c = Executors.callable(new PrivilegedAction() { |
549 |
> |
public Object run() { return one; }}); |
550 |
|
assertEquals(one, c.call()); |
587 |
– |
} catch(Exception ex) { |
588 |
– |
unexpectedException(); |
589 |
– |
} |
551 |
|
} |
552 |
|
|
553 |
|
/** |
554 |
|
* callable(PrivilegedExceptionAction) returns its result when called |
555 |
< |
*/ |
556 |
< |
public void testCallable4() { |
557 |
< |
try { |
558 |
< |
Callable c = Executors.callable(new PrivilegedExceptionAction() { |
559 |
< |
public Object run() { return one; }}); |
599 |
< |
assertEquals(one, c.call()); |
600 |
< |
} catch(Exception ex) { |
601 |
< |
unexpectedException(); |
602 |
< |
} |
555 |
> |
*/ |
556 |
> |
public void testCallable4() throws Exception { |
557 |
> |
Callable c = Executors.callable(new PrivilegedExceptionAction() { |
558 |
> |
public Object run() { return one; }}); |
559 |
> |
assertEquals(one, c.call()); |
560 |
|
} |
561 |
|
|
562 |
|
|
563 |
|
/** |
564 |
|
* callable(null Runnable) throws NPE |
565 |
< |
*/ |
565 |
> |
*/ |
566 |
|
public void testCallableNPE1() { |
567 |
|
try { |
568 |
< |
Runnable r = null; |
569 |
< |
Callable c = Executors.callable(r); |
570 |
< |
} catch (NullPointerException success) { |
614 |
< |
} |
568 |
> |
Callable c = Executors.callable((Runnable) null); |
569 |
> |
shouldThrow(); |
570 |
> |
} catch (NullPointerException success) {} |
571 |
|
} |
572 |
|
|
573 |
|
/** |
574 |
|
* callable(null, result) throws NPE |
575 |
< |
*/ |
575 |
> |
*/ |
576 |
|
public void testCallableNPE2() { |
577 |
|
try { |
578 |
< |
Runnable r = null; |
579 |
< |
Callable c = Executors.callable(r, one); |
580 |
< |
} catch (NullPointerException success) { |
625 |
< |
} |
578 |
> |
Callable c = Executors.callable((Runnable) null, one); |
579 |
> |
shouldThrow(); |
580 |
> |
} catch (NullPointerException success) {} |
581 |
|
} |
582 |
|
|
583 |
|
/** |
584 |
|
* callable(null PrivilegedAction) throws NPE |
585 |
< |
*/ |
585 |
> |
*/ |
586 |
|
public void testCallableNPE3() { |
587 |
|
try { |
588 |
< |
PrivilegedAction r = null; |
589 |
< |
Callable c = Executors.callable(r); |
590 |
< |
} catch (NullPointerException success) { |
636 |
< |
} |
588 |
> |
Callable c = Executors.callable((PrivilegedAction) null); |
589 |
> |
shouldThrow(); |
590 |
> |
} catch (NullPointerException success) {} |
591 |
|
} |
592 |
|
|
593 |
|
/** |
594 |
|
* callable(null PrivilegedExceptionAction) throws NPE |
595 |
< |
*/ |
595 |
> |
*/ |
596 |
|
public void testCallableNPE4() { |
597 |
|
try { |
598 |
< |
PrivilegedExceptionAction r = null; |
599 |
< |
Callable c = Executors.callable(r); |
600 |
< |
} catch (NullPointerException success) { |
647 |
< |
} |
598 |
> |
Callable c = Executors.callable((PrivilegedExceptionAction) null); |
599 |
> |
shouldThrow(); |
600 |
> |
} catch (NullPointerException success) {} |
601 |
|
} |
602 |
|
|
603 |
|
|