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.6 by dl, Sun Oct 5 23:00:40 2003 UTC vs.
Revision 1.24 by dl, Thu Jan 20 00:39:13 2005 UTC

# Line 1 | Line 1
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   import junit.framework.*;
10   import java.util.*;
11   import java.util.concurrent.*;
12   import java.io.*;
13 <
13 > import java.security.*;
14  
15   /**
16   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 22 | Line 23 | import java.io.*;
23   * <ol>
24   *
25   * <li> All assertions in code running in generated threads must use
26 < * the forms {@link threadFail} , {@link threadAssertTrue} {@link
27 < * threadAssertEquals}, or {@link threadAssertNull}, (not
26 > * the forms {@link #threadFail} , {@link #threadAssertTrue} {@link
27 > * #threadAssertEquals}, or {@link #threadAssertNull}, (not
28   * <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
29   * particularly recommended) for other code to use these forms too.
30   * Only the most typically used JUnit assertion methods are defined
31   * this way, but enough to live with.</li>
32   *
33 < * <li> If you override {@link setUp} or {@link tearDown}, make sure
33 > * <li> If you override {@link #setUp} or {@link #tearDown}, make sure
34   * to invoke <tt>super.setUp</tt> and <tt>super.tearDown</tt> within
35   * them. These methods are used to clear and check for thread
36   * assertion failures.</li>
# Line 89 | Line 90 | public class JSR166TestCase extends Test
90       * Runs all JSR166 unit tests using junit.textui.TestRunner
91       */
92      public static void main (String[] args) {
93 <        junit.textui.TestRunner.run (suite());
93 >        int iters = 1;
94 >        if (args.length > 0)
95 >            iters = Integer.parseInt(args[0]);
96 >        Test s = suite();
97 >        for (int i = 0; i < iters; ++i) {
98 >            junit.textui.TestRunner.run (s);
99 >            System.gc();
100 >            System.runFinalization();
101 >        }
102 >        System.exit(0);
103      }
104  
105      /**
# Line 98 | Line 108 | public class JSR166TestCase extends Test
108      public static Test suite ( ) {
109          TestSuite suite = new TestSuite("JSR166 Unit Tests");
110          
111 +        suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
112 +        suite.addTest(new TestSuite(AbstractQueueTest.class));
113 +        suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
114          suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
115 +        suite.addTest(new TestSuite(ArrayDequeTest.class));
116          suite.addTest(new TestSuite(AtomicBooleanTest.class));
117          suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
118          suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
# Line 111 | Line 125 | public class JSR166TestCase extends Test
125          suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
126          suite.addTest(new TestSuite(AtomicReferenceTest.class));
127          suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
114        suite.addTest(new TestSuite(CancellableTaskTest.class));
128          suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
129          suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
130 +        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
131 +        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
132 +        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
133 +        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
134          suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
135          suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
136          suite.addTest(new TestSuite(CountDownLatchTest.class));
# Line 121 | Line 138 | public class JSR166TestCase extends Test
138          suite.addTest(new TestSuite(DelayQueueTest.class));
139          suite.addTest(new TestSuite(ExchangerTest.class));
140          suite.addTest(new TestSuite(ExecutorsTest.class));
141 <        suite.addTest(new TestSuite(FairSemaphoreTest.class));
141 >        suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
142          suite.addTest(new TestSuite(FutureTaskTest.class));
143 +        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
144          suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
145          suite.addTest(new TestSuite(LinkedListTest.class));
146          suite.addTest(new TestSuite(LockSupportTest.class));
# Line 138 | Line 156 | public class JSR166TestCase extends Test
156          suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
157          suite.addTest(new TestSuite(ThreadTest.class));
158          suite.addTest(new TestSuite(TimeUnitTest.class));
159 +        suite.addTest(new TestSuite(TreeMapTest.class));
160 +        suite.addTest(new TestSuite(TreeSetTest.class));
161                  
162          return suite;
163      }
# Line 151 | Line 171 | public class JSR166TestCase extends Test
171  
172      /**
173       * Return the shortest timed delay. This could
174 <     * be reimplmented to use for example a Property.
174 >     * be reimplemented to use for example a Property.
175       */
176      protected long getShortDelay() {
177 <        return 100;
177 >        return 50;
178      }
179  
180  
# Line 275 | Line 295 | public class JSR166TestCase extends Test
295          try {
296              exec.shutdown();
297              assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
298 +        } catch(SecurityException ok) {
299 +            // Allowed in case test doesn't have privs
300          } catch(InterruptedException ie) {
301              fail("Unexpected exception");
302          }
# Line 321 | Line 343 | public class JSR166TestCase extends Test
343      static final Integer m10 = new Integer(-10);
344  
345  
346 +    /**
347 +     * A security policy where new permissions can be dynamically added
348 +     * or all cleared.
349 +     */
350 +    static class AdjustablePolicy extends java.security.Policy {
351 +        Permissions perms = new Permissions();
352 +        AdjustablePolicy() { }
353 +        void addPermission(Permission perm) { perms.add(perm); }
354 +        void clearPermissions() { perms = new Permissions(); }
355 +        public PermissionCollection getPermissions(CodeSource cs) {
356 +            return perms;
357 +        }
358 +        public PermissionCollection getPermissions(ProtectionDomain pd) {
359 +            return perms;
360 +        }
361 +        public boolean implies(ProtectionDomain pd, Permission p) {
362 +            return perms.implies(p);
363 +        }
364 +        public void refresh() {}
365 +    }
366 +
367 +
368      // Some convenient Runnable classes
369  
370      static class NoOpRunnable implements Runnable {
# Line 331 | Line 375 | public class JSR166TestCase extends Test
375          public Object call() { return Boolean.TRUE; }
376      }
377  
378 +    static final String TEST_STRING = "a test string";
379 +
380 +    static class StringTask implements Callable<String> {
381 +        public String call() { return TEST_STRING; }
382 +    }
383 +
384 +    static class NPETask implements Callable<String> {
385 +        public String call() { throw new NullPointerException(); }
386 +    }
387 +
388 +    static class CallableOne implements Callable<Integer> {
389 +        public Integer call() { return one; }
390 +    }
391 +
392      class ShortRunnable implements Runnable {
393          public void run() {
394              try {
# Line 430 | Line 488 | public class JSR166TestCase extends Test
488          }
489      }
490  
491 +    class LongPossiblyInterruptedRunnable implements Runnable {
492 +        public void run() {
493 +            try {
494 +                Thread.sleep(LONG_DELAY_MS);
495 +            }
496 +            catch(InterruptedException success) {
497 +            }
498 +        }
499 +    }
500 +
501      /**
502       * For use as ThreadFactory in constructors
503       */
# Line 491 | Line 559 | public class JSR166TestCase extends Test
559          }
560      }
561  
562 +
563      /**
564       * For use as RejectedExecutionHandler in constructors
565       */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines