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.12 by dl, Thu Dec 25 19:48:57 2003 UTC vs.
Revision 1.23 by dl, Tue Dec 28 16:15:59 2004 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.*;
# Line 22 | Line 23 | import java.security.*;
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 99 | Line 109 | public class JSR166TestCase extends Test
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 114 | Line 127 | public class JSR166TestCase extends Test
127          suite.addTest(new TestSuite(AtomicStampedReferenceTest.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 123 | Line 140 | public class JSR166TestCase extends Test
140          suite.addTest(new TestSuite(ExecutorsTest.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 137 | Line 155 | public class JSR166TestCase extends Test
155          suite.addTest(new TestSuite(ThreadLocalTest.class));
156          suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
157          suite.addTest(new TestSuite(ThreadTest.class));
158 <        suite.addTest(new TestSuite(TimeUnitTest.class));
158 >        suite.addTest(new TestSuite(TreeMapTest.class));
159 >        suite.addTest(new TestSuite(TreeSetTest.class));
160                  
161          return suite;
162      }
# Line 151 | Line 170 | public class JSR166TestCase extends Test
170  
171      /**
172       * Return the shortest timed delay. This could
173 <     * be reimplmented to use for example a Property.
173 >     * be reimplemented to use for example a Property.
174       */
175      protected long getShortDelay() {
176 <        return 100;
176 >        return 50;
177      }
178  
179  
# Line 275 | Line 294 | public class JSR166TestCase extends Test
294          try {
295              exec.shutdown();
296              assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
297 +        } catch(SecurityException ok) {
298 +            // Allowed in case test doesn't have privs
299          } catch(InterruptedException ie) {
300              fail("Unexpected exception");
301          }
# Line 537 | Line 558 | public class JSR166TestCase extends Test
558          }
559      }
560  
561 +
562      /**
563       * For use as RejectedExecutionHandler in constructors
564       */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines