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

Comparing jsr166/src/test/tck/JSR166TestCase.java (file contents):
Revision 1.40 by jsr166, Fri Nov 20 00:58:01 2009 UTC vs.
Revision 1.52 by jsr166, Mon Sep 13 23:19:31 2010 UTC

# Line 26 | Line 26 | import java.security.*;
26   * <li> All assertions in code running in generated threads must use
27   * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
28   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
29 < * <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
29 > * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
30   * particularly recommended) for other code to use these forms too.
31   * Only the most typically used JUnit assertion methods are defined
32   * this way, but enough to live with.</li>
33   *
34   * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
35 < * to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within
35 > * to invoke {@code super.setUp} and {@code super.tearDown} within
36   * them. These methods are used to clear and check for thread
37   * assertion failures.</li>
38   *
39 < * <li>All delays and timeouts must use one of the constants <tt>
40 < * SHORT_DELAY_MS</tt>, <tt> SMALL_DELAY_MS</tt>, <tt> MEDIUM_DELAY_MS</tt>,
41 < * <tt> LONG_DELAY_MS</tt>. The idea here is that a SHORT is always
39 > * <li>All delays and timeouts must use one of the constants {@code
40 > * SHORT_DELAY_MS}, {@code SMALL_DELAY_MS}, {@code MEDIUM_DELAY_MS},
41 > * {@code LONG_DELAY_MS}. The idea here is that a SHORT is always
42   * discriminable from zero time, and always allows enough time for the
43   * small amounts of computation (creating a thread, calling a few
44   * methods, etc) needed to reach a timeout point. Similarly, a SMALL
# Line 48 | Line 48 | import java.security.*;
48   * in one spot to rerun tests on slower platforms.</li>
49   *
50   * <li> All threads generated must be joined inside each test case
51 < * method (or <tt>fail</tt> to do so) before returning from the
52 < * method. The <tt> joinPool</tt> method can be used to do this when
51 > * method (or {@code fail} to do so) before returning from the
52 > * method. The {@code joinPool} method can be used to do this when
53   * using Executors.</li>
54   *
55   * </ol>
# Line 81 | Line 81 | import java.security.*;
81   * any particular package to simplify things for people integrating
82   * them in TCK test suites.</li>
83   *
84 < * <li> As a convenience, the <tt>main</tt> of this class (JSR166TestCase)
84 > * <li> As a convenience, the {@code main} of this class (JSR166TestCase)
85   * runs all JSR166 unit tests.</li>
86   *
87   * </ul>
88   */
89   public class JSR166TestCase extends TestCase {
90 +    private static final boolean useSecurityManager =
91 +        Boolean.getBoolean("jsr166.useSecurityManager");
92 +
93      /**
94       * Runs all JSR166 unit tests using junit.textui.TestRunner
95       */
96 <    public static void main (String[] args) {
96 >    public static void main(String[] args) {
97 >        if (useSecurityManager) {
98 >            System.err.println("Setting a permissive security manager");
99 >            Policy.setPolicy(permissivePolicy());
100 >            System.setSecurityManager(new SecurityManager());
101 >        }
102          int iters = 1;
103          if (args.length > 0)
104              iters = Integer.parseInt(args[0]);
105          Test s = suite();
106          for (int i = 0; i < iters; ++i) {
107 <            junit.textui.TestRunner.run (s);
107 >            junit.textui.TestRunner.run(s);
108              System.gc();
109              System.runFinalization();
110          }
# Line 106 | Line 114 | public class JSR166TestCase extends Test
114      /**
115       * Collects all JSR166 unit tests as one suite
116       */
117 <    public static Test suite ( ) {
117 >    public static Test suite() {
118          TestSuite suite = new TestSuite("JSR166 Unit Tests");
119  
120          suite.addTest(new TestSuite(ForkJoinPoolTest.class));
# Line 135 | Line 143 | public class JSR166TestCase extends Test
143          suite.addTest(new TestSuite(AtomicReferenceTest.class));
144          suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
145          suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
146 +        suite.addTest(new TestSuite(ConcurrentLinkedDequeTest.class));
147          suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
148          suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
149          suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
# Line 195 | Line 204 | public class JSR166TestCase extends Test
204      /**
205       * Sets delays as multiples of SHORT_DELAY.
206       */
207 <    protected  void setDelays() {
207 >    protected void setDelays() {
208          SHORT_DELAY_MS = getShortDelay();
209          SMALL_DELAY_MS = SHORT_DELAY_MS * 5;
210          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
# Line 286 | Line 295 | public class JSR166TestCase extends Test
295      }
296  
297      /**
298 +     * If arguments not identical, set status to indicate current testcase
299 +     * should fail
300 +     */
301 +    public void threadAssertSame(Object x, Object y) {
302 +        if (x != y) {
303 +            threadFailed = true;
304 +            assertSame(x, y);
305 +        }
306 +    }
307 +
308 +    /**
309       * threadFail with message "should throw exception"
310       */
311      public void threadShouldThrow() {
# Line 328 | Line 348 | public class JSR166TestCase extends Test
348          } catch (SecurityException ok) {
349              // Allowed in case test doesn't have privs
350          } catch (InterruptedException ie) {
351 <            fail("Unexpected exception");
351 >            fail("Unexpected InterruptedException");
352          }
353      }
354  
# Line 366 | Line 386 | public class JSR166TestCase extends Test
386      /**
387       * The number of elements to place in collections, arrays, etc.
388       */
389 <    static final int SIZE = 20;
389 >    public static final int SIZE = 20;
390  
391      // Some convenient Integer constants
392  
393 <    static final Integer zero = new Integer(0);
394 <    static final Integer one = new Integer(1);
395 <    static final Integer two = new Integer(2);
396 <    static final Integer three  = new Integer(3);
397 <    static final Integer four  = new Integer(4);
398 <    static final Integer five  = new Integer(5);
399 <    static final Integer six = new Integer(6);
400 <    static final Integer seven = new Integer(7);
401 <    static final Integer eight = new Integer(8);
402 <    static final Integer nine = new Integer(9);
403 <    static final Integer m1  = new Integer(-1);
404 <    static final Integer m2  = new Integer(-2);
405 <    static final Integer m3  = new Integer(-3);
406 <    static final Integer m4 = new Integer(-4);
407 <    static final Integer m5 = new Integer(-5);
408 <    static final Integer m6 = new Integer(-6);
409 <    static final Integer m10 = new Integer(-10);
393 >    public static final Integer zero  = new Integer(0);
394 >    public static final Integer one   = new Integer(1);
395 >    public static final Integer two   = new Integer(2);
396 >    public static final Integer three = new Integer(3);
397 >    public static final Integer four  = new Integer(4);
398 >    public static final Integer five  = new Integer(5);
399 >    public static final Integer six   = new Integer(6);
400 >    public static final Integer seven = new Integer(7);
401 >    public static final Integer eight = new Integer(8);
402 >    public static final Integer nine  = new Integer(9);
403 >    public static final Integer m1  = new Integer(-1);
404 >    public static final Integer m2  = new Integer(-2);
405 >    public static final Integer m3  = new Integer(-3);
406 >    public static final Integer m4  = new Integer(-4);
407 >    public static final Integer m5  = new Integer(-5);
408 >    public static final Integer m6  = new Integer(-6);
409 >    public static final Integer m10 = new Integer(-10);
410  
411  
412      /**
413 +     * Runs Runnable r with a security policy that permits precisely
414 +     * the specified permissions.  If there is no current security
415 +     * manager, the runnable is run twice, both with and without a
416 +     * security manager.  We require that any security manager permit
417 +     * getPolicy/setPolicy.
418 +     */
419 +    public void runWithPermissions(Runnable r, Permission... permissions) {
420 +        SecurityManager sm = System.getSecurityManager();
421 +        if (sm == null) {
422 +            r.run();
423 +            Policy savedPolicy = Policy.getPolicy();
424 +            try {
425 +                Policy.setPolicy(permissivePolicy());
426 +                System.setSecurityManager(new SecurityManager());
427 +                runWithPermissions(r, permissions);
428 +            } finally {
429 +                System.setSecurityManager(null);
430 +                Policy.setPolicy(savedPolicy);
431 +            }
432 +        } else {
433 +            Policy savedPolicy = Policy.getPolicy();
434 +            AdjustablePolicy policy = new AdjustablePolicy(permissions);
435 +            Policy.setPolicy(policy);
436 +
437 +            try {
438 +                r.run();
439 +            } finally {
440 +                policy.addPermission(new SecurityPermission("setPolicy"));
441 +                Policy.setPolicy(savedPolicy);
442 +            }
443 +        }
444 +    }
445 +
446 +    /**
447 +     * Runs a runnable without any permissions.
448 +     */
449 +    public void runWithoutPermissions(Runnable r) {
450 +        runWithPermissions(r);
451 +    }
452 +
453 +    /**
454       * A security policy where new permissions can be dynamically added
455       * or all cleared.
456       */
457 <    static class AdjustablePolicy extends java.security.Policy {
457 >    public static class AdjustablePolicy extends java.security.Policy {
458          Permissions perms = new Permissions();
459 <        AdjustablePolicy() { }
459 >        AdjustablePolicy(Permission... permissions) {
460 >            for (Permission permission : permissions)
461 >                perms.add(permission);
462 >        }
463          void addPermission(Permission perm) { perms.add(perm); }
464          void clearPermissions() { perms = new Permissions(); }
465 <        public PermissionCollection getPermissions(CodeSource cs) {
466 <            return perms;
467 <        }
468 <        public PermissionCollection getPermissions(ProtectionDomain pd) {
469 <            return perms;
470 <        }
471 <        public boolean implies(ProtectionDomain pd, Permission p) {
472 <            return perms.implies(p);
473 <        }
474 <        public void refresh() {}
465 >        public PermissionCollection getPermissions(CodeSource cs) {
466 >            return perms;
467 >        }
468 >        public PermissionCollection getPermissions(ProtectionDomain pd) {
469 >            return perms;
470 >        }
471 >        public boolean implies(ProtectionDomain pd, Permission p) {
472 >            return perms.implies(p);
473 >        }
474 >        public void refresh() {}
475 >    }
476 >
477 >    /**
478 >     * Returns a policy containing all the permissions we ever need.
479 >     */
480 >    public static Policy permissivePolicy() {
481 >        return new AdjustablePolicy
482 >            // Permissions j.u.c. needs directly
483 >            (new RuntimePermission("modifyThread"),
484 >             new RuntimePermission("getClassLoader"),
485 >             new RuntimePermission("setContextClassLoader"),
486 >             // Permissions needed to change permissions!
487 >             new SecurityPermission("getPolicy"),
488 >             new SecurityPermission("setPolicy"),
489 >             new RuntimePermission("setSecurityManager"),
490 >             // Permissions needed by the junit test harness
491 >             new RuntimePermission("accessDeclaredMembers"),
492 >             new PropertyPermission("*", "read"),
493 >             new java.io.FilePermission("<<ALL FILES>>", "read"));
494      }
495  
496      /**
# Line 417 | Line 500 | public class JSR166TestCase extends Test
500      void sleepTillInterrupted(long timeoutMillis) {
501          try {
502              Thread.sleep(timeoutMillis);
503 <        } catch (InterruptedException wakeup) {
421 <        }
503 >        } catch (InterruptedException wakeup) {}
504      }
505  
506      /**
# Line 432 | Line 514 | public class JSR166TestCase extends Test
514  
515      // Some convenient Runnable classes
516  
517 <    abstract class CheckedRunnable implements Runnable {
518 <        abstract void realRun() throws Throwable;
517 >    public abstract class CheckedRunnable implements Runnable {
518 >        protected abstract void realRun() throws Throwable;
519  
520          public final void run() {
521              try {
# Line 444 | Line 526 | public class JSR166TestCase extends Test
526          }
527      }
528  
529 <    abstract class RunnableShouldThrow implements Runnable {
530 <        abstract void realRun() throws Throwable;
529 >    public abstract class RunnableShouldThrow implements Runnable {
530 >        protected abstract void realRun() throws Throwable;
531  
532          final Class<?> exceptionClass;
533  
# Line 457 | Line 539 | public class JSR166TestCase extends Test
539              try {
540                  realRun();
541                  threadShouldThrow(exceptionClass.getSimpleName());
460            } catch (InterruptedException success) {
542              } catch (Throwable t) {
543                  if (! exceptionClass.isInstance(t))
544                      threadUnexpectedException(t);
# Line 465 | Line 546 | public class JSR166TestCase extends Test
546          }
547      }
548  
549 <    abstract class ThreadShouldThrow extends Thread {
550 <        abstract void realRun() throws Throwable;
549 >    public abstract class ThreadShouldThrow extends Thread {
550 >        protected abstract void realRun() throws Throwable;
551  
552          final Class<?> exceptionClass;
553  
# Line 478 | Line 559 | public class JSR166TestCase extends Test
559              try {
560                  realRun();
561                  threadShouldThrow(exceptionClass.getSimpleName());
481            } catch (InterruptedException success) {
562              } catch (Throwable t) {
563                  if (! exceptionClass.isInstance(t))
564                      threadUnexpectedException(t);
# Line 486 | Line 566 | public class JSR166TestCase extends Test
566          }
567      }
568  
569 <    abstract class CheckedInterruptedRunnable implements Runnable {
570 <        abstract void realRun() throws Throwable;
569 >    public abstract class CheckedInterruptedRunnable implements Runnable {
570 >        protected abstract void realRun() throws Throwable;
571  
572          public final void run() {
573              try {
# Line 500 | Line 580 | public class JSR166TestCase extends Test
580          }
581      }
582  
583 <    abstract class CheckedCallable<T> implements Callable<T> {
584 <        abstract T realCall() throws Throwable;
583 >    public abstract class CheckedCallable<T> implements Callable<T> {
584 >        protected abstract T realCall() throws Throwable;
585  
586          public final T call() {
587              try {
# Line 513 | Line 593 | public class JSR166TestCase extends Test
593          }
594      }
595  
596 <    abstract class CheckedInterruptedCallable<T> implements Callable<T> {
597 <        abstract T realCall() throws Throwable;
596 >    public abstract class CheckedInterruptedCallable<T> implements Callable<T> {
597 >        protected abstract T realCall() throws Throwable;
598  
599          public final T call() {
600              try {
# Line 529 | Line 609 | public class JSR166TestCase extends Test
609          }
610      }
611  
612 <    static class NoOpRunnable implements Runnable {
612 >    public static class NoOpRunnable implements Runnable {
613          public void run() {}
614      }
615  
616 <    static class NoOpCallable implements Callable {
616 >    public static class NoOpCallable implements Callable {
617          public Object call() { return Boolean.TRUE; }
618      }
619  
620 <    static final String TEST_STRING = "a test string";
620 >    public static final String TEST_STRING = "a test string";
621  
622 <    static class StringTask implements Callable<String> {
622 >    public static class StringTask implements Callable<String> {
623          public String call() { return TEST_STRING; }
624      }
625  
626 <    static class NPETask implements Callable<String> {
626 >    public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
627 >        return new CheckedCallable<String>() {
628 >            public String realCall() {
629 >                try {
630 >                    latch.await();
631 >                } catch (InterruptedException quittingTime) {}
632 >                return TEST_STRING;
633 >            }};
634 >    }
635 >
636 >    public static class NPETask implements Callable<String> {
637          public String call() { throw new NullPointerException(); }
638      }
639  
640 <    static class CallableOne implements Callable<Integer> {
640 >    public static class CallableOne implements Callable<Integer> {
641          public Integer call() { return one; }
642      }
643  
644 <    class ShortRunnable extends CheckedRunnable {
645 <        void realRun() throws Throwable {
644 >    public class ShortRunnable extends CheckedRunnable {
645 >        protected void realRun() throws Throwable {
646              Thread.sleep(SHORT_DELAY_MS);
647          }
648      }
649  
650 <    class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
651 <        void realRun() throws InterruptedException {
650 >    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
651 >        protected void realRun() throws InterruptedException {
652              Thread.sleep(SHORT_DELAY_MS);
653          }
654      }
655  
656 <    class SmallRunnable extends CheckedRunnable {
657 <        void realRun() throws Throwable {
656 >    public class SmallRunnable extends CheckedRunnable {
657 >        protected void realRun() throws Throwable {
658              Thread.sleep(SMALL_DELAY_MS);
659          }
660      }
661  
662 <    class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
663 <        void realRun() {
662 >    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
663 >        protected void realRun() {
664              try {
665                  Thread.sleep(SMALL_DELAY_MS);
666 <            }
577 <            catch (InterruptedException ok) {
578 <            }
666 >            } catch (InterruptedException ok) {}
667          }
668      }
669  
670 <    class SmallCallable extends CheckedCallable {
671 <        Object realCall() throws Throwable {
670 >    public class SmallCallable extends CheckedCallable {
671 >        protected Object realCall() throws InterruptedException {
672              Thread.sleep(SMALL_DELAY_MS);
673              return Boolean.TRUE;
674          }
675      }
676  
677 <    class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
678 <        void realRun() throws InterruptedException {
677 >    public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
678 >        protected void realRun() throws InterruptedException {
679              Thread.sleep(SMALL_DELAY_MS);
680          }
681      }
682  
683 <    class MediumRunnable extends CheckedRunnable {
684 <        void realRun() throws Throwable {
683 >    public class MediumRunnable extends CheckedRunnable {
684 >        protected void realRun() throws Throwable {
685              Thread.sleep(MEDIUM_DELAY_MS);
686          }
687      }
688  
689 <    class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
690 <        void realRun() throws InterruptedException {
689 >    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
690 >        protected void realRun() throws InterruptedException {
691              Thread.sleep(MEDIUM_DELAY_MS);
692          }
693      }
694  
695 <    class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
696 <        void realRun() {
695 >    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
696 >        protected void realRun() {
697              try {
698                  Thread.sleep(MEDIUM_DELAY_MS);
699 <            }
612 <            catch (InterruptedException ok) {
613 <            }
699 >            } catch (InterruptedException ok) {}
700          }
701      }
702  
703 <    class LongPossiblyInterruptedRunnable extends CheckedRunnable {
704 <        void realRun() {
703 >    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
704 >        protected void realRun() {
705              try {
706                  Thread.sleep(LONG_DELAY_MS);
707 <            }
622 <            catch (InterruptedException ok) {
623 <            }
707 >            } catch (InterruptedException ok) {}
708          }
709      }
710  
711      /**
712       * For use as ThreadFactory in constructors
713       */
714 <    static class SimpleThreadFactory implements ThreadFactory {
714 >    public static class SimpleThreadFactory implements ThreadFactory {
715          public Thread newThread(Runnable r) {
716              return new Thread(r);
717          }
718      }
719  
720 <    static class TrackedShortRunnable implements Runnable {
721 <        volatile boolean done = false;
720 >    public static class TrackedShortRunnable implements Runnable {
721 >        public volatile boolean done = false;
722          public void run() {
723              try {
724                  Thread.sleep(SMALL_DELAY_MS);
725                  done = true;
726 <            } catch (InterruptedException ok) {
643 <            }
726 >            } catch (InterruptedException ok) {}
727          }
728      }
729  
730 <    static class TrackedMediumRunnable implements Runnable {
731 <        volatile boolean done = false;
730 >    public static class TrackedMediumRunnable implements Runnable {
731 >        public volatile boolean done = false;
732          public void run() {
733              try {
734                  Thread.sleep(MEDIUM_DELAY_MS);
735                  done = true;
736 <            } catch (InterruptedException ok) {
654 <            }
736 >            } catch (InterruptedException ok) {}
737          }
738      }
739  
740 <    static class TrackedLongRunnable implements Runnable {
741 <        volatile boolean done = false;
740 >    public static class TrackedLongRunnable implements Runnable {
741 >        public volatile boolean done = false;
742          public void run() {
743              try {
744                  Thread.sleep(LONG_DELAY_MS);
745                  done = true;
746 <            } catch (InterruptedException ok) {
665 <            }
746 >            } catch (InterruptedException ok) {}
747          }
748      }
749  
750 <    static class TrackedNoOpRunnable implements Runnable {
751 <        volatile boolean done = false;
750 >    public static class TrackedNoOpRunnable implements Runnable {
751 >        public volatile boolean done = false;
752          public void run() {
753              done = true;
754          }
755      }
756  
757 <    static class TrackedCallable implements Callable {
758 <        volatile boolean done = false;
757 >    public static class TrackedCallable implements Callable {
758 >        public volatile boolean done = false;
759          public Object call() {
760              try {
761                  Thread.sleep(SMALL_DELAY_MS);
762                  done = true;
763 <            } catch (InterruptedException ok) {
683 <            }
763 >            } catch (InterruptedException ok) {}
764              return Boolean.TRUE;
765          }
766      }
# Line 689 | Line 769 | public class JSR166TestCase extends Test
769      /**
770       * For use as RejectedExecutionHandler in constructors
771       */
772 <    static class NoOpREHandler implements RejectedExecutionHandler {
772 >    public static class NoOpREHandler implements RejectedExecutionHandler {
773          public void rejectedExecution(Runnable r,
774                                        ThreadPoolExecutor executor) {}
775      }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines