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.14 by dl, Sun Dec 28 21:56:18 2003 UTC vs.
Revision 1.25 by dl, Tue Mar 1 01:32:00 2005 UTC

# Line 23 | 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 90 | 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 100 | 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(AbstractQueuedLongSynchronizerTest.class));
115          suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
116 +        suite.addTest(new TestSuite(ArrayDequeTest.class));
117          suite.addTest(new TestSuite(AtomicBooleanTest.class));
118          suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
119          suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
# Line 116 | Line 128 | public class JSR166TestCase extends Test
128          suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
129          suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
130          suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
131 +        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
132 +        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
133 +        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
134 +        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
135          suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
136          suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
137          suite.addTest(new TestSuite(CountDownLatchTest.class));
# Line 125 | Line 141 | public class JSR166TestCase extends Test
141          suite.addTest(new TestSuite(ExecutorsTest.class));
142          suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
143          suite.addTest(new TestSuite(FutureTaskTest.class));
144 +        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
145          suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
146          suite.addTest(new TestSuite(LinkedListTest.class));
147          suite.addTest(new TestSuite(LockSupportTest.class));
# Line 140 | Line 157 | public class JSR166TestCase extends Test
157          suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
158          suite.addTest(new TestSuite(ThreadTest.class));
159          suite.addTest(new TestSuite(TimeUnitTest.class));
160 +        suite.addTest(new TestSuite(TreeMapTest.class));
161 +        suite.addTest(new TestSuite(TreeSetTest.class));
162                  
163          return suite;
164      }
# Line 153 | Line 172 | public class JSR166TestCase extends Test
172  
173      /**
174       * Return the shortest timed delay. This could
175 <     * be reimplmented to use for example a Property.
175 >     * be reimplemented to use for example a Property.
176       */
177      protected long getShortDelay() {
178 <        return 100;
178 >        return 50;
179      }
180  
181  
# Line 277 | Line 296 | public class JSR166TestCase extends Test
296          try {
297              exec.shutdown();
298              assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
299 +        } catch(SecurityException ok) {
300 +            // Allowed in case test doesn't have privs
301          } catch(InterruptedException ie) {
302              fail("Unexpected exception");
303          }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines