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.9 by dl, Thu Dec 4 20:54:46 2003 UTC vs.
Revision 1.21 by dl, Fri Jan 16 16:49:40 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      }
100  
101      /**
# Line 98 | Line 104 | public class JSR166TestCase extends Test
104      public static Test suite ( ) {
105          TestSuite suite = new TestSuite("JSR166 Unit Tests");
106          
107 +        suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
108 +        suite.addTest(new TestSuite(AbstractQueueTest.class));
109 +        suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
110          suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
111          suite.addTest(new TestSuite(AtomicBooleanTest.class));
112          suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
# Line 120 | Line 129 | public class JSR166TestCase extends Test
129          suite.addTest(new TestSuite(DelayQueueTest.class));
130          suite.addTest(new TestSuite(ExchangerTest.class));
131          suite.addTest(new TestSuite(ExecutorsTest.class));
132 +        suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
133          suite.addTest(new TestSuite(FutureTaskTest.class));
134          suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
135          suite.addTest(new TestSuite(LinkedListTest.class));
136          suite.addTest(new TestSuite(LockSupportTest.class));
137          suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
138          suite.addTest(new TestSuite(PriorityQueueTest.class));
129 –        suite.addTest(new TestSuite(PrivilegedFutureTaskTest.class));
139          suite.addTest(new TestSuite(ReentrantLockTest.class));
140          suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
141          suite.addTest(new TestSuite(ScheduledExecutorTest.class));
# Line 150 | Line 159 | public class JSR166TestCase extends Test
159  
160      /**
161       * Return the shortest timed delay. This could
162 <     * be reimplmented to use for example a Property.
162 >     * be reimplemented to use for example a Property.
163       */
164      protected long getShortDelay() {
165 <        return 100;
165 >        return 50;
166      }
167  
168  
# Line 352 | Line 361 | public class JSR166TestCase extends Test
361          public Object call() { return Boolean.TRUE; }
362      }
363  
364 +    static final String TEST_STRING = "a test string";
365 +
366 +    static class StringTask implements Callable<String> {
367 +        public String call() { return TEST_STRING; }
368 +    }
369 +
370 +    static class NPETask implements Callable<String> {
371 +        public String call() { throw new NullPointerException(); }
372 +    }
373 +
374 +    static class CallableOne implements Callable<Integer> {
375 +        public Integer call() { return one; }
376 +    }
377 +
378      class ShortRunnable implements Runnable {
379          public void run() {
380              try {
# Line 451 | Line 474 | public class JSR166TestCase extends Test
474          }
475      }
476  
477 +    class LongPossiblyInterruptedRunnable implements Runnable {
478 +        public void run() {
479 +            try {
480 +                Thread.sleep(LONG_DELAY_MS);
481 +            }
482 +            catch(InterruptedException success) {
483 +            }
484 +        }
485 +    }
486 +
487      /**
488       * For use as ThreadFactory in constructors
489       */
# Line 512 | Line 545 | public class JSR166TestCase extends Test
545          }
546      }
547  
548 +
549      /**
550       * For use as RejectedExecutionHandler in constructors
551       */

Diff Legend

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