ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/src/test/tck/ExecutorsTest.java
(Generate patch)

Comparing jsr166/src/test/tck/ExecutorsTest.java (file contents):
Revision 1.21 by jsr166, Mon Nov 16 04:57:10 2009 UTC vs.
Revision 1.27 by jsr166, Tue Dec 1 09:56:28 2009 UTC

# Line 10 | Line 10
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());
20      }
# Line 35 | Line 36 | public class ExecutorsTest extends JSR16
36          public T call() throws Exception {
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              }
# Line 90 | Line 91 | public class ExecutorsTest extends JSR16
91          try {
92              ExecutorService e = Executors.newCachedThreadPool(null);
93              shouldThrow();
94 <        }
94 <        catch (NullPointerException success) {
95 <        }
94 >        } catch (NullPointerException success) {}
95      }
96  
97  
# Line 125 | Line 124 | public class ExecutorsTest extends JSR16
124          try {
125              ExecutorService e = Executors.newSingleThreadExecutor(null);
126              shouldThrow();
127 <        }
129 <        catch (NullPointerException success) {
130 <        }
127 >        } catch (NullPointerException success) {}
128      }
129  
130      /**
# Line 137 | Line 134 | public class ExecutorsTest extends JSR16
134          ExecutorService e = Executors.newSingleThreadExecutor();
135          try {
136              ThreadPoolExecutor tpe = (ThreadPoolExecutor)e;
137 +            shouldThrow();
138          } catch (ClassCastException success) {
139          } finally {
140              joinPool(e);
# Line 173 | Line 171 | public class ExecutorsTest extends JSR16
171          try {
172              ExecutorService e = Executors.newFixedThreadPool(2, null);
173              shouldThrow();
174 <        }
177 <        catch (NullPointerException success) {
178 <        }
174 >        } catch (NullPointerException success) {}
175      }
176  
177      /**
# Line 185 | Line 181 | public class ExecutorsTest extends JSR16
181          try {
182              ExecutorService e = Executors.newFixedThreadPool(0);
183              shouldThrow();
184 <        }
189 <        catch (IllegalArgumentException success) {
190 <        }
184 >        } catch (IllegalArgumentException success) {}
185      }
186  
187  
# Line 208 | Line 202 | public class ExecutorsTest extends JSR16
202      public void testunconfigurableExecutorServiceNPE() {
203          try {
204              ExecutorService e = Executors.unconfigurableExecutorService(null);
205 <        }
206 <        catch (NullPointerException success) {
213 <        }
205 >            shouldThrow();
206 >        } catch (NullPointerException success) {}
207      }
208  
209      /**
# Line 219 | Line 212 | public class ExecutorsTest extends JSR16
212      public void testunconfigurableScheduledExecutorServiceNPE() {
213          try {
214              ExecutorService e = Executors.unconfigurableScheduledExecutorService(null);
215 <        }
216 <        catch (NullPointerException success) {
224 <        }
215 >            shouldThrow();
216 >        } catch (NullPointerException success) {}
217      }
218  
219  
220      /**
221       * a newSingleThreadScheduledExecutor successfully runs delayed task
222       */
223 <    public void testNewSingleThreadScheduledExecutor() {
224 <        try {
225 <            TrackedCallable callable = new TrackedCallable();
226 <            ScheduledExecutorService p1 = Executors.newSingleThreadScheduledExecutor();
227 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
228 <            assertFalse(callable.done);
229 <            Thread.sleep(MEDIUM_DELAY_MS);
230 <            assertTrue(callable.done);
231 <            assertEquals(Boolean.TRUE, f.get());
240 <            joinPool(p1);
241 <        } catch (RejectedExecutionException e){}
242 <        catch (Exception e){
243 <            e.printStackTrace();
244 <            unexpectedException();
245 <        }
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       * a newScheduledThreadPool successfully runs delayed task
236       */
237 <    public void testnewScheduledThreadPool() {
238 <        try {
239 <            TrackedCallable callable = new TrackedCallable();
240 <            ScheduledExecutorService p1 = Executors.newScheduledThreadPool(2);
241 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
242 <            assertFalse(callable.done);
243 <            Thread.sleep(MEDIUM_DELAY_MS);
244 <            assertTrue(callable.done);
245 <            assertEquals(Boolean.TRUE, f.get());
260 <            joinPool(p1);
261 <        } catch (RejectedExecutionException e){}
262 <        catch (Exception e){
263 <            e.printStackTrace();
264 <            unexpectedException();
265 <        }
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      /**
249 <     * an unconfigurable  newScheduledThreadPool successfully runs delayed task
250 <     */
251 <    public void testunconfigurableScheduledExecutorService() {
252 <        try {
253 <            TrackedCallable callable = new TrackedCallable();
254 <            ScheduledExecutorService p1 = Executors.unconfigurableScheduledExecutorService(Executors.newScheduledThreadPool(2));
255 <            Future f = p1.schedule(callable, SHORT_DELAY_MS, TimeUnit.MILLISECONDS);
256 <            assertFalse(callable.done);
257 <            Thread.sleep(MEDIUM_DELAY_MS);
258 <            assertTrue(callable.done);
259 <            assertEquals(Boolean.TRUE, f.get());
280 <            joinPool(p1);
281 <        } catch (RejectedExecutionException e){}
282 <        catch (Exception e){
283 <            e.printStackTrace();
284 <            unexpectedException();
285 <        }
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       *  timeouts from execute will time out if they compute too long.
264       */
265 <    public void testTimedCallable() {
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);
# Line 312 | Line 286 | public class ExecutorsTest extends JSR16
286                      assertTrue(iters > 0);
287                      return;
288                  }
315                catch (Exception e) {
316                    unexpectedException();
317                }
289              }
290              // if by chance we didn't ever time out, total time must be small
291              long elapsed = System.currentTimeMillis() - startTime;
# Line 330 | Line 301 | public class ExecutorsTest extends JSR16
301       * ThreadPoolExecutor using defaultThreadFactory has
302       * specified group, priority, daemon status, and name
303       */
304 <    public void testDefaultThreadFactory() {
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 <                    }
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());
# Line 361 | Line 332 | public class ExecutorsTest extends JSR16
332  
333          try {
334              Thread.sleep(SHORT_DELAY_MS);
364        } catch (Exception eX) {
365            unexpectedException();
335          } finally {
336              joinPool(e);
337          }
# Line 373 | Line 342 | public class ExecutorsTest extends JSR16
342       * specified group, priority, daemon status, name,
343       * access control context and context class loader
344       */
345 <    public void testPrivilegedThreadFactory() {
345 >    public void testPrivilegedThreadFactory() throws Exception {
346          Policy savedPolicy = null;
347          try {
348              savedPolicy = Policy.getPolicy();
# Line 389 | Line 358 | public class ExecutorsTest extends JSR16
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 <                    }
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());
# Line 418 | Line 387 | public class ExecutorsTest extends JSR16
387          }
388          try {
389              Thread.sleep(SHORT_DELAY_MS);
421        } catch (Exception ex) {
422            unexpectedException();
390          } finally {
391              joinPool(e);
392          }
426
393      }
394  
395      void checkCCL() {
# Line 447 | Line 413 | public class ExecutorsTest extends JSR16
413       * privilegedCallableUsingCurrentClassLoader throws ACE
414       */
415      public void testCreatePrivilegedCallableUsingCCLWithNoPrivs() {
416 <        Policy savedPolicy = null;
416 >        Policy savedPolicy = null;
417          try {
418              savedPolicy = Policy.getPolicy();
419              AdjustablePolicy policy = new AdjustablePolicy();
# Line 469 | Line 435 | public class ExecutorsTest extends JSR16
435              Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
436              shouldThrow();
437          } catch (AccessControlException success) {
438 <        } catch (Exception ex) {
473 <            unexpectedException();
474 <        }
475 <        finally {
438 >        } finally {
439              Policy.setPolicy(savedPolicy);
440          }
441      }
# Line 481 | Line 444 | public class ExecutorsTest extends JSR16
444       * With class loader permissions, calling
445       * privilegedCallableUsingCurrentClassLoader does not throw ACE
446       */
447 <    public void testprivilegedCallableUsingCCLWithPrivs() {
448 <        Policy savedPolicy = null;
447 >    public void testprivilegedCallableUsingCCLWithPrivs() throws Exception {
448 >        Policy savedPolicy = null;
449          try {
450              savedPolicy = Policy.getPolicy();
451              AdjustablePolicy policy = new AdjustablePolicy();
# Line 496 | Line 459 | public class ExecutorsTest extends JSR16
459          try {
460              Callable task = Executors.privilegedCallableUsingCurrentClassLoader(new NoOpCallable());
461              task.call();
499        } catch (Exception ex) {
500            unexpectedException();
462          }
463          finally {
464              Policy.setPolicy(savedPolicy);
# Line 507 | Line 468 | public class ExecutorsTest extends JSR16
468      /**
469       * Without permissions, calling privilegedCallable throws ACE
470       */
471 <    public void testprivilegedCallableWithNoPrivs() {
471 >    public void testprivilegedCallableWithNoPrivs() throws Exception {
472          Callable task;
473          Policy savedPolicy = null;
474          AdjustablePolicy policy = null;
# Line 538 | Line 499 | public class ExecutorsTest extends JSR16
499          try {
500              task.call();
501              shouldThrow();
502 <        } catch (AccessControlException success) {
542 <        } catch (Exception ex) {
543 <            unexpectedException();
544 <        }
502 >        } catch (AccessControlException success) {}
503      }
504  
505      /**
506       * With permissions, calling privilegedCallable succeeds
507       */
508 <    public void testprivilegedCallableWithPrivs() {
509 <        Policy savedPolicy = null;
508 >    public void testprivilegedCallableWithPrivs() throws Exception {
509 >        Policy savedPolicy = null;
510          try {
511              savedPolicy = Policy.getPolicy();
512              AdjustablePolicy policy = new AdjustablePolicy();
# Line 562 | Line 520 | public class ExecutorsTest extends JSR16
520          Callable task = Executors.privilegedCallable(new CheckCCL());
521          try {
522              task.call();
565        } catch (Exception ex) {
566            unexpectedException();
523          } finally {
524              Policy.setPolicy(savedPolicy);
525          }
# Line 572 | Line 528 | public class ExecutorsTest extends JSR16
528      /**
529       * callable(Runnable) returns null when called
530       */
531 <    public void testCallable1() {
532 <        try {
533 <            Callable c = Executors.callable(new NoOpRunnable());
578 <            assertNull(c.call());
579 <        } catch (Exception ex) {
580 <            unexpectedException();
581 <        }
582 <
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);
591 <            assertEquals(one, c.call());
592 <        } catch (Exception ex) {
593 <            unexpectedException();
594 <        }
539 >    public void testCallable2() throws Exception {
540 >        Callable c = Executors.callable(new NoOpRunnable(), one);
541 >        assertSame(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() {
550 <                    public Object run() { return one; }});
604 <        assertEquals(one, c.call());
605 <        } catch (Exception ex) {
606 <            unexpectedException();
607 <        }
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       * 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; }});
617 <            assertEquals(one, c.call());
618 <        } catch (Exception ex) {
619 <            unexpectedException();
620 <        }
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  
# Line 626 | Line 565 | public class ExecutorsTest extends JSR16
565       */
566      public void testCallableNPE1() {
567          try {
568 <            Runnable r = null;
569 <            Callable c = Executors.callable(r);
570 <        } catch (NullPointerException success) {
632 <        }
568 >            Callable c = Executors.callable((Runnable) null);
569 >            shouldThrow();
570 >        } catch (NullPointerException success) {}
571      }
572  
573      /**
# Line 637 | Line 575 | public class ExecutorsTest extends JSR16
575       */
576      public void testCallableNPE2() {
577          try {
578 <            Runnable r = null;
579 <            Callable c = Executors.callable(r, one);
580 <        } catch (NullPointerException success) {
643 <        }
578 >            Callable c = Executors.callable((Runnable) null, one);
579 >            shouldThrow();
580 >        } catch (NullPointerException success) {}
581      }
582  
583      /**
# Line 648 | Line 585 | public class ExecutorsTest extends JSR16
585       */
586      public void testCallableNPE3() {
587          try {
588 <            PrivilegedAction r = null;
589 <            Callable c = Executors.callable(r);
590 <        } catch (NullPointerException success) {
654 <        }
588 >            Callable c = Executors.callable((PrivilegedAction) null);
589 >            shouldThrow();
590 >        } catch (NullPointerException success) {}
591      }
592  
593      /**
# Line 659 | Line 595 | public class ExecutorsTest extends JSR16
595       */
596      public void testCallableNPE4() {
597          try {
598 <            PrivilegedExceptionAction r = null;
599 <            Callable c = Executors.callable(r);
600 <        } catch (NullPointerException success) {
665 <        }
598 >            Callable c = Executors.callable((PrivilegedExceptionAction) null);
599 >            shouldThrow();
600 >        } catch (NullPointerException success) {}
601      }
602  
603  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines