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.15 by dl, Mon Dec 29 19:05:40 2003 UTC vs.
Revision 1.22 by dl, Tue Jan 20 20:20:56 2004 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(ArrayBlockingQueueTest.class));
115          suite.addTest(new TestSuite(AtomicBooleanTest.class));
# Line 156 | Line 166 | public class JSR166TestCase extends Test
166       * be reimplemented to use for example a Property.
167       */
168      protected long getShortDelay() {
169 <        return 100;
169 >        return 50;
170      }
171  
172  
# Line 277 | Line 287 | public class JSR166TestCase extends Test
287          try {
288              exec.shutdown();
289              assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
290 +        } catch(SecurityException ok) {
291 +            // Allowed in case test doesn't have privs
292          } catch(InterruptedException ie) {
293              fail("Unexpected exception");
294          }

Diff Legend

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