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.8 by dl, Mon Nov 3 13:50:07 2003 UTC vs.
Revision 1.22 by dl, Tue Jan 20 20:20:56 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 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(AtomicBooleanTest.class));
116          suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
# Line 111 | Line 124 | public class JSR166TestCase extends Test
124          suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
125          suite.addTest(new TestSuite(AtomicReferenceTest.class));
126          suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
114 –        suite.addTest(new TestSuite(CancellableTaskTest.class));
127          suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
128          suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
129          suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
# Line 121 | Line 133 | public class JSR166TestCase extends Test
133          suite.addTest(new TestSuite(DelayQueueTest.class));
134          suite.addTest(new TestSuite(ExchangerTest.class));
135          suite.addTest(new TestSuite(ExecutorsTest.class));
136 +        suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
137          suite.addTest(new TestSuite(FutureTaskTest.class));
138          suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
139          suite.addTest(new TestSuite(LinkedListTest.class));
140          suite.addTest(new TestSuite(LockSupportTest.class));
141          suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
142          suite.addTest(new TestSuite(PriorityQueueTest.class));
130 –        suite.addTest(new TestSuite(PrivilegedFutureTaskTest.class));
143          suite.addTest(new TestSuite(ReentrantLockTest.class));
144          suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
145          suite.addTest(new TestSuite(ScheduledExecutorTest.class));
# Line 151 | Line 163 | public class JSR166TestCase extends Test
163  
164      /**
165       * Return the shortest timed delay. This could
166 <     * be reimplmented to use for example a Property.
166 >     * be reimplemented to use for example a Property.
167       */
168      protected long getShortDelay() {
169 <        return 100;
169 >        return 50;
170      }
171  
172  
# Line 275 | 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          }
# Line 353 | Line 367 | public class JSR166TestCase extends Test
367          public Object call() { return Boolean.TRUE; }
368      }
369  
370 +    static final String TEST_STRING = "a test string";
371 +
372 +    static class StringTask implements Callable<String> {
373 +        public String call() { return TEST_STRING; }
374 +    }
375 +
376 +    static class NPETask implements Callable<String> {
377 +        public String call() { throw new NullPointerException(); }
378 +    }
379 +
380 +    static class CallableOne implements Callable<Integer> {
381 +        public Integer call() { return one; }
382 +    }
383 +
384      class ShortRunnable implements Runnable {
385          public void run() {
386              try {
# Line 452 | Line 480 | public class JSR166TestCase extends Test
480          }
481      }
482  
483 +    class LongPossiblyInterruptedRunnable implements Runnable {
484 +        public void run() {
485 +            try {
486 +                Thread.sleep(LONG_DELAY_MS);
487 +            }
488 +            catch(InterruptedException success) {
489 +            }
490 +        }
491 +    }
492 +
493      /**
494       * For use as ThreadFactory in constructors
495       */
# Line 513 | Line 551 | public class JSR166TestCase extends Test
551          }
552      }
553  
554 +
555      /**
556       * For use as RejectedExecutionHandler in constructors
557       */

Diff Legend

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