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 |
|
|
22 |
|
return new TestSuite(ExecutorsTest.class); |
23 |
|
} |
24 |
|
|
24 |
– |
static class TimedCallable<T> implements Callable<T> { |
25 |
– |
private final ExecutorService exec; |
26 |
– |
private final Callable<T> func; |
27 |
– |
private final long msecs; |
28 |
– |
|
29 |
– |
TimedCallable(ExecutorService exec, Callable<T> func, long msecs) { |
30 |
– |
this.exec = exec; |
31 |
– |
this.func = func; |
32 |
– |
this.msecs = msecs; |
33 |
– |
} |
34 |
– |
|
35 |
– |
public T call() throws Exception { |
36 |
– |
Future<T> ftask = exec.submit(func); |
37 |
– |
try { |
38 |
– |
return ftask.get(msecs, TimeUnit.MILLISECONDS); |
39 |
– |
} finally { |
40 |
– |
ftask.cancel(true); |
41 |
– |
} |
42 |
– |
} |
43 |
– |
} |
44 |
– |
|
45 |
– |
|
46 |
– |
private static class Fib implements Callable<BigInteger> { |
47 |
– |
private final BigInteger n; |
48 |
– |
Fib(long n) { |
49 |
– |
if (n < 0) throw new IllegalArgumentException("need non-negative arg, but got " + n); |
50 |
– |
this.n = BigInteger.valueOf(n); |
51 |
– |
} |
52 |
– |
public BigInteger call() { |
53 |
– |
BigInteger f1 = BigInteger.ONE; |
54 |
– |
BigInteger f2 = f1; |
55 |
– |
for (BigInteger i = BigInteger.ZERO; i.compareTo(n) < 0; i = i.add(BigInteger.ONE)) { |
56 |
– |
BigInteger t = f1.add(f2); |
57 |
– |
f1 = f2; |
58 |
– |
f2 = t; |
59 |
– |
} |
60 |
– |
return f1; |
61 |
– |
} |
62 |
– |
}; |
63 |
– |
|
25 |
|
/** |
26 |
|
* A newCachedThreadPool can execute runnables |
27 |
|
*/ |
51 |
|
try { |
52 |
|
ExecutorService e = Executors.newCachedThreadPool(null); |
53 |
|
shouldThrow(); |
54 |
< |
} |
94 |
< |
catch (NullPointerException success) { |
95 |
< |
} |
54 |
> |
} catch (NullPointerException success) {} |
55 |
|
} |
56 |
|
|
57 |
|
|
84 |
|
try { |
85 |
|
ExecutorService e = Executors.newSingleThreadExecutor(null); |
86 |
|
shouldThrow(); |
87 |
< |
} |
129 |
< |
catch (NullPointerException success) { |
130 |
< |
} |
87 |
> |
} catch (NullPointerException success) {} |
88 |
|
} |
89 |
|
|
90 |
|
/** |
94 |
|
ExecutorService e = Executors.newSingleThreadExecutor(); |
95 |
|
try { |
96 |
|
ThreadPoolExecutor tpe = (ThreadPoolExecutor)e; |
97 |
+ |
shouldThrow(); |
98 |
|
} catch (ClassCastException success) { |
99 |
|
} finally { |
100 |
|
joinPool(e); |
131 |
|
try { |
132 |
|
ExecutorService e = Executors.newFixedThreadPool(2, null); |
133 |
|
shouldThrow(); |
134 |
< |
} |
177 |
< |
catch (NullPointerException success) { |
178 |
< |
} |
134 |
> |
} catch (NullPointerException success) {} |
135 |
|
} |
136 |
|
|
137 |
|
/** |
141 |
|
try { |
142 |
|
ExecutorService e = Executors.newFixedThreadPool(0); |
143 |
|
shouldThrow(); |
144 |
< |
} |
189 |
< |
catch (IllegalArgumentException success) { |
190 |
< |
} |
144 |
> |
} catch (IllegalArgumentException success) {} |
145 |
|
} |
146 |
|
|
147 |
|
|
162 |
|
public void testunconfigurableExecutorServiceNPE() { |
163 |
|
try { |
164 |
|
ExecutorService e = Executors.unconfigurableExecutorService(null); |
165 |
< |
} |
166 |
< |
catch (NullPointerException success) { |
213 |
< |
} |
165 |
> |
shouldThrow(); |
166 |
> |
} catch (NullPointerException success) {} |
167 |
|
} |
168 |
|
|
169 |
|
/** |
172 |
|
public void testunconfigurableScheduledExecutorServiceNPE() { |
173 |
|
try { |
174 |
|
ExecutorService e = Executors.unconfigurableScheduledExecutorService(null); |
175 |
< |
} |
176 |
< |
catch (NullPointerException success) { |
224 |
< |
} |
175 |
> |
shouldThrow(); |
176 |
> |
} catch (NullPointerException success) {} |
177 |
|
} |
178 |
|
|
179 |
|
|
180 |
|
/** |
181 |
|
* a newSingleThreadScheduledExecutor successfully runs delayed task |
182 |
|
*/ |
183 |
< |
public void testNewSingleThreadScheduledExecutor() { |
184 |
< |
try { |
185 |
< |
TrackedCallable callable = new TrackedCallable(); |
186 |
< |
ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor(); |
187 |
< |
Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); |
188 |
< |
assertFalse(callable.done); |
189 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
190 |
< |
assertTrue(callable.done); |
191 |
< |
assertEquals(Boolean.TRUE, f.get()); |
240 |
< |
joinPool(p1); |
241 |
< |
} catch (RejectedExecutionException e) {} |
242 |
< |
catch (Exception e) { |
243 |
< |
e.printStackTrace(); |
244 |
< |
unexpectedException(); |
245 |
< |
} |
183 |
> |
public void testNewSingleThreadScheduledExecutor() throws Exception { |
184 |
> |
TrackedCallable callable = new TrackedCallable(); |
185 |
> |
ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor(); |
186 |
> |
Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS); |
187 |
> |
assertFalse(callable.done); |
188 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
189 |
> |
assertTrue(callable.done); |
190 |
> |
assertEquals(Boolean.TRUE, f.get()); |
191 |
> |
joinPool(p1); |
192 |
|
} |
193 |
|
|
194 |
|
/** |
195 |
|
* a newScheduledThreadPool successfully runs delayed task |
196 |
|
*/ |
197 |
< |
public void testnewScheduledThreadPool() { |
198 |
< |
try { |
199 |
< |
TrackedCallable callable = new TrackedCallable(); |
200 |
< |
ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2); |
201 |
< |
Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); |
202 |
< |
assertFalse(callable.done); |
203 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
204 |
< |
assertTrue(callable.done); |
205 |
< |
assertEquals(Boolean.TRUE, f.get()); |
260 |
< |
joinPool(p1); |
261 |
< |
} catch (RejectedExecutionException e) {} |
262 |
< |
catch (Exception e) { |
263 |
< |
e.printStackTrace(); |
264 |
< |
unexpectedException(); |
265 |
< |
} |
197 |
> |
public void testnewScheduledThreadPool() throws Exception { |
198 |
> |
TrackedCallable callable = new TrackedCallable(); |
199 |
> |
ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2); |
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); |
206 |
|
} |
207 |
|
|
208 |
|
/** |
209 |
< |
* an unconfigurable newScheduledThreadPool successfully runs delayed task |
210 |
< |
*/ |
211 |
< |
public void testunconfigurableScheduledExecutorService() { |
212 |
< |
try { |
213 |
< |
TrackedCallable callable = new TrackedCallable(); |
214 |
< |
ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2)); |
215 |
< |
Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS); |
216 |
< |
assertFalse(callable.done); |
217 |
< |
Thread.sleep(MEDIUM_DELAY_MS); |
218 |
< |
assertTrue(callable.done); |
219 |
< |
assertEquals(Boolean.TRUE, f.get()); |
280 |
< |
joinPool(p1); |
281 |
< |
} catch (RejectedExecutionException e) {} |
282 |
< |
catch (Exception e) { |
283 |
< |
e.printStackTrace(); |
284 |
< |
unexpectedException(); |
285 |
< |
} |
209 |
> |
* an unconfigurable newScheduledThreadPool successfully runs delayed task |
210 |
> |
*/ |
211 |
> |
public void testunconfigurableScheduledExecutorService() throws Exception { |
212 |
> |
TrackedCallable callable = new TrackedCallable(); |
213 |
> |
ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2)); |
214 |
> |
Future f = p1.schedule(callable, SHORT_DELAY_MS, MILLISECONDS); |
215 |
> |
assertFalse(callable.done); |
216 |
> |
Thread.sleep(MEDIUM_DELAY_MS); |
217 |
> |
assertTrue(callable.done); |
218 |
> |
assertEquals(Boolean.TRUE, f.get()); |
219 |
> |
joinPool(p1); |
220 |
|
} |
221 |
|
|
222 |
|
/** |
223 |
< |
* timeouts from execute will time out if they compute too long. |
224 |
< |
*/ |
225 |
< |
public void testTimedCallable() { |
226 |
< |
int N = 10000; |
227 |
< |
ExecutorService executor = Executors.newSingleThreadExecutor(); |
228 |
< |
List<Callable<BigInteger>> tasks = new ArrayList<Callable<BigInteger>>(N); |
229 |
< |
try { |
230 |
< |
long startTime = System.currentTimeMillis(); |
231 |
< |
|
232 |
< |
long i = 0; |
233 |
< |
while (tasks.size() < N) { |
234 |
< |
tasks.add(new TimedCallable<BigInteger>(executor, new Fib(i), 1)); |
235 |
< |
i += 10; |
236 |
< |
} |
237 |
< |
|
238 |
< |
int iters = 0; |
239 |
< |
BigInteger sum = BigInteger.ZERO; |
306 |
< |
for (Iterator<Callable<BigInteger>> it = tasks.iterator(); it.hasNext();) { |
223 |
> |
* Future.get on submitted tasks will time out if they compute too long. |
224 |
> |
*/ |
225 |
> |
public void testTimedCallable() throws Exception { |
226 |
> |
final Runnable sleeper = |
227 |
> |
new RunnableShouldThrow(InterruptedException.class) { |
228 |
> |
public void realRun() throws InterruptedException { |
229 |
> |
Thread.sleep(LONG_DELAY_MS); |
230 |
> |
}}; |
231 |
> |
for (ExecutorService executor : |
232 |
> |
new ExecutorService[] { |
233 |
> |
Executors.newSingleThreadExecutor(), |
234 |
> |
Executors.newCachedThreadPool(), |
235 |
> |
Executors.newFixedThreadPool(2), |
236 |
> |
Executors.newScheduledThreadPool(2), |
237 |
> |
}) { |
238 |
> |
try { |
239 |
> |
Future future = executor.submit(sleeper); |
240 |
|
try { |
241 |
< |
++iters; |
242 |
< |
sum = sum.add(it.next().call()); |
243 |
< |
} |
244 |
< |
catch (TimeoutException success) { |
245 |
< |
assertTrue(iters > 0); |
313 |
< |
return; |
314 |
< |
} |
315 |
< |
catch (Exception e) { |
316 |
< |
unexpectedException(); |
241 |
> |
future.get(SHORT_DELAY_MS, MILLISECONDS); |
242 |
> |
shouldThrow(); |
243 |
> |
} catch (TimeoutException success) { |
244 |
> |
} finally { |
245 |
> |
future.cancel(true); |
246 |
|
} |
247 |
|
} |
248 |
< |
// if by chance we didn't ever time out, total time must be small |
249 |
< |
long elapsed = System.currentTimeMillis() - startTime; |
250 |
< |
assertTrue(elapsed < N); |
322 |
< |
} |
323 |
< |
finally { |
324 |
< |
joinPool(executor); |
248 |
> |
finally { |
249 |
> |
joinPool(executor); |
250 |
> |
} |
251 |
|
} |
252 |
|
} |
253 |
|
|
256 |
|
* ThreadPoolExecutor using defaultThreadFactory has |
257 |
|
* specified group, priority, daemon status, and name |
258 |
|
*/ |
259 |
< |
public void testDefaultThreadFactory() { |
259 |
> |
public void testDefaultThreadFactory() throws Exception { |
260 |
|
final ThreadGroup egroup = Thread.currentThread().getThreadGroup(); |
261 |
|
Runnable r = new Runnable() { |
262 |
|
public void run() { |
263 |
< |
try { |
264 |
< |
Thread current = Thread.currentThread(); |
265 |
< |
threadAssertTrue(!current.isDaemon()); |
266 |
< |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
267 |
< |
ThreadGroup g = current.getThreadGroup(); |
268 |
< |
SecurityManager s = System.getSecurityManager(); |
269 |
< |
if (s != null) |
270 |
< |
threadAssertTrue(g == s.getThreadGroup()); |
271 |
< |
else |
272 |
< |
threadAssertTrue(g == egroup); |
273 |
< |
String name = current.getName(); |
274 |
< |
threadAssertTrue(name.endsWith("thread-1")); |
275 |
< |
} catch (SecurityException ok) { |
276 |
< |
// Also pass if not allowed to change setting |
277 |
< |
} |
263 |
> |
try { |
264 |
> |
Thread current = Thread.currentThread(); |
265 |
> |
threadAssertTrue(!current.isDaemon()); |
266 |
> |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
267 |
> |
ThreadGroup g = current.getThreadGroup(); |
268 |
> |
SecurityManager s = System.getSecurityManager(); |
269 |
> |
if (s != null) |
270 |
> |
threadAssertTrue(g == s.getThreadGroup()); |
271 |
> |
else |
272 |
> |
threadAssertTrue(g == egroup); |
273 |
> |
String name = current.getName(); |
274 |
> |
threadAssertTrue(name.endsWith("thread-1")); |
275 |
> |
} catch (SecurityException ok) { |
276 |
> |
// Also pass if not allowed to change setting |
277 |
> |
} |
278 |
|
} |
279 |
|
}; |
280 |
|
ExecutorService e = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory()); |
287 |
|
|
288 |
|
try { |
289 |
|
Thread.sleep(SHORT_DELAY_MS); |
364 |
– |
} catch (Exception eX) { |
365 |
– |
unexpectedException(); |
290 |
|
} finally { |
291 |
|
joinPool(e); |
292 |
|
} |
297 |
|
* specified group, priority, daemon status, name, |
298 |
|
* access control context and context class loader |
299 |
|
*/ |
300 |
< |
public void testPrivilegedThreadFactory() { |
300 |
> |
public void testPrivilegedThreadFactory() throws Exception { |
301 |
|
Policy savedPolicy = null; |
302 |
|
try { |
303 |
|
savedPolicy = Policy.getPolicy(); |
313 |
|
final AccessControlContext thisacc = AccessController.getContext(); |
314 |
|
Runnable r = new Runnable() { |
315 |
|
public void run() { |
316 |
< |
try { |
317 |
< |
Thread current = Thread.currentThread(); |
318 |
< |
threadAssertTrue(!current.isDaemon()); |
319 |
< |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
320 |
< |
ThreadGroup g = current.getThreadGroup(); |
321 |
< |
SecurityManager s = System.getSecurityManager(); |
322 |
< |
if (s != null) |
323 |
< |
threadAssertTrue(g == s.getThreadGroup()); |
324 |
< |
else |
325 |
< |
threadAssertTrue(g == egroup); |
326 |
< |
String name = current.getName(); |
327 |
< |
threadAssertTrue(name.endsWith("thread-1")); |
328 |
< |
threadAssertTrue(thisccl == current.getContextClassLoader()); |
329 |
< |
threadAssertTrue(thisacc.equals(AccessController.getContext())); |
330 |
< |
} catch (SecurityException ok) { |
331 |
< |
// Also pass if not allowed to change settings |
332 |
< |
} |
316 |
> |
try { |
317 |
> |
Thread current = Thread.currentThread(); |
318 |
> |
threadAssertTrue(!current.isDaemon()); |
319 |
> |
threadAssertTrue(current.getPriority() <= Thread.NORM_PRIORITY); |
320 |
> |
ThreadGroup g = current.getThreadGroup(); |
321 |
> |
SecurityManager s = System.getSecurityManager(); |
322 |
> |
if (s != null) |
323 |
> |
threadAssertTrue(g == s.getThreadGroup()); |
324 |
> |
else |
325 |
> |
threadAssertTrue(g == egroup); |
326 |
> |
String name = current.getName(); |
327 |
> |
threadAssertTrue(name.endsWith("thread-1")); |
328 |
> |
threadAssertTrue(thisccl == current.getContextClassLoader()); |
329 |
> |
threadAssertTrue(thisacc.equals(AccessController.getContext())); |
330 |
> |
} catch (SecurityException ok) { |
331 |
> |
// Also pass if not allowed to change settings |
332 |
> |
} |
333 |
|
} |
334 |
|
}; |
335 |
|
ExecutorService e = Executors.newSingleThreadExecutor(Executors.privilegedThreadFactory()); |
342 |
|
} |
343 |
|
try { |
344 |
|
Thread.sleep(SHORT_DELAY_MS); |
421 |
– |
} catch (Exception ex) { |
422 |
– |
unexpectedException(); |
345 |
|
} finally { |
346 |
|
joinPool(e); |
347 |
|
} |
426 |
– |
|
348 |
|
} |
349 |
|
|
350 |
|
void checkCCL() { |
368 |
|
* privilegedCallableUsingCurrentClassLoader throws ACE |
369 |
|
*/ |
370 |
|
public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() { |
371 |
< |
Policy savedPolicy = null; |
371 |
> |
Policy savedPolicy = null; |
372 |
|
try { |
373 |
|
savedPolicy = Policy.getPolicy(); |
374 |
|
AdjustablePolicy policy = new AdjustablePolicy(); |
390 |
|
Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); |
391 |
|
shouldThrow(); |
392 |
|
} catch (AccessControlException success) { |
393 |
< |
} catch (Exception ex) { |
473 |
< |
unexpectedException(); |
474 |
< |
} |
475 |
< |
finally { |
393 |
> |
} finally { |
394 |
|
Policy.setPolicy(savedPolicy); |
395 |
|
} |
396 |
|
} |
399 |
|
* With class loader permissions, calling |
400 |
|
* privilegedCallableUsingCurrentClassLoader does not throw ACE |
401 |
|
*/ |
402 |
< |
public void testprivilegedCallableUsingCCLWithPrivs() { |
403 |
< |
Policy savedPolicy = null; |
402 |
> |
public void testprivilegedCallableUsingCCLWithPrivs() throws Exception { |
403 |
> |
Policy savedPolicy = null; |
404 |
|
try { |
405 |
|
savedPolicy = Policy.getPolicy(); |
406 |
|
AdjustablePolicy policy = new AdjustablePolicy(); |
414 |
|
try { |
415 |
|
Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable()); |
416 |
|
task.call(); |
499 |
– |
} catch (Exception ex) { |
500 |
– |
unexpectedException(); |
417 |
|
} |
418 |
|
finally { |
419 |
|
Policy.setPolicy(savedPolicy); |
423 |
|
/** |
424 |
|
* Without permissions, calling privilegedCallable throws ACE |
425 |
|
*/ |
426 |
< |
public void testprivilegedCallableWithNoPrivs() { |
426 |
> |
public void testprivilegedCallableWithNoPrivs() throws Exception { |
427 |
|
Callable task; |
428 |
|
Policy savedPolicy = null; |
429 |
|
AdjustablePolicy policy = null; |
454 |
|
try { |
455 |
|
task.call(); |
456 |
|
shouldThrow(); |
457 |
< |
} catch (AccessControlException success) { |
542 |
< |
} catch (Exception ex) { |
543 |
< |
unexpectedException(); |
544 |
< |
} |
457 |
> |
} catch (AccessControlException success) {} |
458 |
|
} |
459 |
|
|
460 |
|
/** |
461 |
|
* With permissions, calling privilegedCallable succeeds |
462 |
|
*/ |
463 |
< |
public void testprivilegedCallableWithPrivs() { |
464 |
< |
Policy savedPolicy = null; |
463 |
> |
public void testprivilegedCallableWithPrivs() throws Exception { |
464 |
> |
Policy savedPolicy = null; |
465 |
|
try { |
466 |
|
savedPolicy = Policy.getPolicy(); |
467 |
|
AdjustablePolicy policy = new AdjustablePolicy(); |
475 |
|
Callable task = Executors.privilegedCallable(new CheckCCL()); |
476 |
|
try { |
477 |
|
task.call(); |
565 |
– |
} catch (Exception ex) { |
566 |
– |
unexpectedException(); |
478 |
|
} finally { |
479 |
|
Policy.setPolicy(savedPolicy); |
480 |
|
} |
483 |
|
/** |
484 |
|
* callable(Runnable) returns null when called |
485 |
|
*/ |
486 |
< |
public void testCallable1() { |
487 |
< |
try { |
488 |
< |
Callable c = Executors.callable(new NoOpRunnable()); |
578 |
< |
assertNull(c.call()); |
579 |
< |
} catch (Exception ex) { |
580 |
< |
unexpectedException(); |
581 |
< |
} |
582 |
< |
|
486 |
> |
public void testCallable1() throws Exception { |
487 |
> |
Callable c = Executors.callable(new NoOpRunnable()); |
488 |
> |
assertNull(c.call()); |
489 |
|
} |
490 |
|
|
491 |
|
/** |
492 |
|
* callable(Runnable, result) returns result when called |
493 |
|
*/ |
494 |
< |
public void testCallable2() { |
495 |
< |
try { |
496 |
< |
Callable c = Executors.callable(new NoOpRunnable(), one); |
591 |
< |
assertEquals(one, c.call()); |
592 |
< |
} catch (Exception ex) { |
593 |
< |
unexpectedException(); |
594 |
< |
} |
494 |
> |
public void testCallable2() throws Exception { |
495 |
> |
Callable c = Executors.callable(new NoOpRunnable(), one); |
496 |
> |
assertSame(one, c.call()); |
497 |
|
} |
498 |
|
|
499 |
|
/** |
500 |
|
* callable(PrivilegedAction) returns its result when called |
501 |
|
*/ |
502 |
< |
public void testCallable3() { |
503 |
< |
try { |
504 |
< |
Callable c = Executors.callable(new PrivilegedAction() { |
505 |
< |
public Object run() { return one; }}); |
604 |
< |
assertEquals(one, c.call()); |
605 |
< |
} catch (Exception ex) { |
606 |
< |
unexpectedException(); |
607 |
< |
} |
502 |
> |
public void testCallable3() throws Exception { |
503 |
> |
Callable c = Executors.callable(new PrivilegedAction() { |
504 |
> |
public Object run() { return one; }}); |
505 |
> |
assertSame(one, c.call()); |
506 |
|
} |
507 |
|
|
508 |
|
/** |
509 |
|
* callable(PrivilegedExceptionAction) returns its result when called |
510 |
|
*/ |
511 |
< |
public void testCallable4() { |
512 |
< |
try { |
513 |
< |
Callable c = Executors.callable(new PrivilegedExceptionAction() { |
514 |
< |
public Object run() { return one; }}); |
617 |
< |
assertEquals(one, c.call()); |
618 |
< |
} catch (Exception ex) { |
619 |
< |
unexpectedException(); |
620 |
< |
} |
511 |
> |
public void testCallable4() throws Exception { |
512 |
> |
Callable c = Executors.callable(new PrivilegedExceptionAction() { |
513 |
> |
public Object run() { return one; }}); |
514 |
> |
assertSame(one, c.call()); |
515 |
|
} |
516 |
|
|
517 |
|
|
520 |
|
*/ |
521 |
|
public void testCallableNPE1() { |
522 |
|
try { |
523 |
< |
Runnable r = null; |
524 |
< |
Callable c = Executors.callable(r); |
525 |
< |
} catch (NullPointerException success) { |
632 |
< |
} |
523 |
> |
Callable c = Executors.callable((Runnable) null); |
524 |
> |
shouldThrow(); |
525 |
> |
} catch (NullPointerException success) {} |
526 |
|
} |
527 |
|
|
528 |
|
/** |
530 |
|
*/ |
531 |
|
public void testCallableNPE2() { |
532 |
|
try { |
533 |
< |
Runnable r = null; |
534 |
< |
Callable c = Executors.callable(r, one); |
535 |
< |
} catch (NullPointerException success) { |
643 |
< |
} |
533 |
> |
Callable c = Executors.callable((Runnable) null, one); |
534 |
> |
shouldThrow(); |
535 |
> |
} catch (NullPointerException success) {} |
536 |
|
} |
537 |
|
|
538 |
|
/** |
540 |
|
*/ |
541 |
|
public void testCallableNPE3() { |
542 |
|
try { |
543 |
< |
PrivilegedAction r = null; |
544 |
< |
Callable c = Executors.callable(r); |
545 |
< |
} catch (NullPointerException success) { |
654 |
< |
} |
543 |
> |
Callable c = Executors.callable((PrivilegedAction) null); |
544 |
> |
shouldThrow(); |
545 |
> |
} catch (NullPointerException success) {} |
546 |
|
} |
547 |
|
|
548 |
|
/** |
550 |
|
*/ |
551 |
|
public void testCallableNPE4() { |
552 |
|
try { |
553 |
< |
PrivilegedExceptionAction r = null; |
554 |
< |
Callable c = Executors.callable(r); |
555 |
< |
} catch (NullPointerException success) { |
665 |
< |
} |
553 |
> |
Callable c = Executors.callable((PrivilegedExceptionAction) null); |
554 |
> |
shouldThrow(); |
555 |
> |
} catch (NullPointerException success) {} |
556 |
|
} |
557 |
|
|
558 |
|
|