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.23 by dl, Tue Dec 28 16:15:59 2004 UTC vs.
Revision 1.32 by dl, Fri Jul 31 23:02:49 2009 UTC

# Line 2 | Line 2
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.
5 > * Other contributors include Andrew Wright, Jeffrey Hayes,
6 > * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
# Line 17 | Line 17 | import java.security.*;
17   * utility methods and classes, as well as a simple framework for
18   * helping to make sure that assertions failing in generated threads
19   * cause the associated test that generated them to itself fail (which
20 < * JUnit doe not otherwise arrange).  The rules for creating such
20 > * JUnit does not otherwise arrange).  The rules for creating such
21   * tests are:
22   *
23   * <ol>
24   *
25   * <li> All assertions in code running in generated threads must use
26 < * the forms {@link #threadFail} , {@link #threadAssertTrue} {@link
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.
# Line 44 | Line 44 | import java.security.*;
44   * is always discriminable as larger than SHORT and smaller than
45   * MEDIUM.  And so on. These constants are set to conservative values,
46   * but even so, if there is ever any doubt, they can all be increased
47 < * in one spot to rerun tests on slower platforms</li>
47 > * in one spot to rerun tests on slower platforms.</li>
48   *
49   * <li> All threads generated must be joined inside each test case
50   * method (or <tt>fail</tt> to do so) before returning from the
# Line 63 | Line 63 | import java.security.*;
63   * "normal" behaviors differ significantly. And sometimes testcases
64   * cover multiple methods when they cannot be tested in
65   * isolation.</li>
66 < *
66 > *
67   * <li> The documentation style for testcases is to provide as javadoc
68   * a simple sentence or two describing the property that the testcase
69   * method purports to test. The javadocs do not say anything about how
# Line 88 | Line 88 | import java.security.*;
88   public class JSR166TestCase extends TestCase {
89      /**
90       * Runs all JSR166 unit tests using junit.textui.TestRunner
91 <     */
91 >     */
92      public static void main (String[] args) {
93          int iters = 1;
94 <        if (args.length > 0)
94 >        if (args.length > 0)
95              iters = Integer.parseInt(args[0]);
96          Test s = suite();
97          for (int i = 0; i < iters; ++i) {
# Line 104 | Line 104 | public class JSR166TestCase extends Test
104  
105      /**
106       * Collects all JSR166 unit tests as one suite
107 <     */
107 >     */
108      public static Test suite ( ) {
109          TestSuite suite = new TestSuite("JSR166 Unit Tests");
110 <        
110 >
111 >        suite.addTest(new TestSuite(ForkJoinPoolTest.class));
112 >        suite.addTest(new TestSuite(ForkJoinTaskTest.class));
113 >        suite.addTest(new TestSuite(RecursiveActionTest.class));
114 >        suite.addTest(new TestSuite(RecursiveTaskTest.class));
115 >        suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
116 >        suite.addTest(new TestSuite(PhaserTest.class));
117 >        suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
118          suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
119          suite.addTest(new TestSuite(AbstractQueueTest.class));
120          suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
121 +        suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
122          suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
123          suite.addTest(new TestSuite(ArrayDequeTest.class));
124 <        suite.addTest(new TestSuite(AtomicBooleanTest.class));
125 <        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
126 <        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
127 <        suite.addTest(new TestSuite(AtomicIntegerTest.class));
128 <        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
129 <        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
130 <        suite.addTest(new TestSuite(AtomicLongTest.class));
131 <        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
132 <        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
133 <        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
134 <        suite.addTest(new TestSuite(AtomicReferenceTest.class));
135 <        suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
124 >        suite.addTest(new TestSuite(AtomicBooleanTest.class));
125 >        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
126 >        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
127 >        suite.addTest(new TestSuite(AtomicIntegerTest.class));
128 >        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
129 >        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
130 >        suite.addTest(new TestSuite(AtomicLongTest.class));
131 >        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
132 >        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
133 >        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
134 >        suite.addTest(new TestSuite(AtomicReferenceTest.class));
135 >        suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
136          suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
137          suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
138          suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
# Line 136 | Line 144 | public class JSR166TestCase extends Test
144          suite.addTest(new TestSuite(CountDownLatchTest.class));
145          suite.addTest(new TestSuite(CyclicBarrierTest.class));
146          suite.addTest(new TestSuite(DelayQueueTest.class));
147 +        suite.addTest(new TestSuite(EntryTest.class));
148          suite.addTest(new TestSuite(ExchangerTest.class));
149          suite.addTest(new TestSuite(ExecutorsTest.class));
150          suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
# Line 149 | Line 158 | public class JSR166TestCase extends Test
158          suite.addTest(new TestSuite(ReentrantLockTest.class));
159          suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
160          suite.addTest(new TestSuite(ScheduledExecutorTest.class));
161 +        suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
162          suite.addTest(new TestSuite(SemaphoreTest.class));
163          suite.addTest(new TestSuite(SynchronousQueueTest.class));
164          suite.addTest(new TestSuite(SystemTest.class));
165          suite.addTest(new TestSuite(ThreadLocalTest.class));
166          suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
167 +        suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
168          suite.addTest(new TestSuite(ThreadTest.class));
169 +        suite.addTest(new TestSuite(TimeUnitTest.class));
170          suite.addTest(new TestSuite(TreeMapTest.class));
171          suite.addTest(new TestSuite(TreeSetTest.class));
172 <                
172 >        suite.addTest(new TestSuite(TreeSubMapTest.class));
173 >        suite.addTest(new TestSuite(TreeSubSetTest.class));
174 >
175          return suite;
176      }
177  
# Line 169 | Line 183 | public class JSR166TestCase extends Test
183  
184  
185      /**
186 <     * Return the shortest timed delay. This could
186 >     * Returns the shortest timed delay. This could
187       * be reimplemented to use for example a Property.
188 <     */
188 >     */
189      protected long getShortDelay() {
190          return 50;
191      }
192  
193  
194      /**
195 <     * Set delays as multiples of SHORT_DELAY.
195 >     * Sets delays as multiples of SHORT_DELAY.
196       */
197      protected  void setDelays() {
198          SHORT_DELAY_MS = getShortDelay();
# Line 193 | Line 207 | public class JSR166TestCase extends Test
207      volatile boolean threadFailed;
208  
209      /**
210 <     * Initialize test to indicate that no thread assertions have failed
210 >     * Initializes test to indicate that no thread assertions have failed
211       */
212 <    public void setUp() {
212 >    public void setUp() {
213          setDelays();
214 <        threadFailed = false;  
214 >        threadFailed = false;
215      }
216  
217      /**
218 <     * Trigger test case failure if any thread assertions have failed
218 >     * Triggers test case failure if any thread assertions have failed
219       */
220 <    public void tearDown() {
221 <        assertFalse(threadFailed);  
220 >    public void tearDown() {
221 >        assertFalse(threadFailed);
222      }
223  
224      /**
225       * Fail, also setting status to indicate current testcase should fail
226 <     */
226 >     */
227      public void threadFail(String reason) {
228          threadFailed = true;
229          fail(reason);
# Line 218 | Line 232 | public class JSR166TestCase extends Test
232      /**
233       * If expression not true, set status to indicate current testcase
234       * should fail
235 <     */
235 >     */
236      public void threadAssertTrue(boolean b) {
237          if (!b) {
238              threadFailed = true;
# Line 229 | Line 243 | public class JSR166TestCase extends Test
243      /**
244       * If expression not false, set status to indicate current testcase
245       * should fail
246 <     */
246 >     */
247      public void threadAssertFalse(boolean b) {
248          if (b) {
249              threadFailed = true;
# Line 240 | Line 254 | public class JSR166TestCase extends Test
254      /**
255       * If argument not null, set status to indicate current testcase
256       * should fail
257 <     */
257 >     */
258      public void threadAssertNull(Object x) {
259          if (x != null) {
260              threadFailed = true;
# Line 251 | Line 265 | public class JSR166TestCase extends Test
265      /**
266       * If arguments not equal, set status to indicate current testcase
267       * should fail
268 <     */
268 >     */
269      public void threadAssertEquals(long x, long y) {
270          if (x != y) {
271              threadFailed = true;
# Line 262 | Line 276 | public class JSR166TestCase extends Test
276      /**
277       * If arguments not equal, set status to indicate current testcase
278       * should fail
279 <     */
279 >     */
280      public void threadAssertEquals(Object x, Object y) {
281          if (x != y && (x == null || !x.equals(y))) {
282              threadFailed = true;
# Line 274 | Line 288 | public class JSR166TestCase extends Test
288       * threadFail with message "should throw exception"
289       */
290      public void threadShouldThrow() {
291 <        threadFailed = true;
292 <        fail("should throw exception");
291 >       try {
292 >           threadFailed = true;
293 >           fail("should throw exception");
294 >       } catch (AssertionFailedError e) {
295 >           e.printStackTrace();
296 >           throw e;
297 >       }
298      }
299  
300      /**
# Line 286 | Line 305 | public class JSR166TestCase extends Test
305          fail("Unexpected exception");
306      }
307  
308 +    /**
309 +     * threadFail with message "Unexpected exception", with argument
310 +     */
311 +    public void threadUnexpectedException(Throwable ex) {
312 +        threadFailed = true;
313 +        ex.printStackTrace();
314 +        fail("Unexpected exception: " + ex);
315 +    }
316  
317      /**
318       * Wait out termination of a thread pool or fail doing so
# Line 304 | Line 331 | public class JSR166TestCase extends Test
331  
332      /**
333       * fail with message "should throw exception"
334 <     */
334 >     */
335      public void shouldThrow() {
336          fail("Should throw exception");
337      }
# Line 339 | Line 366 | public class JSR166TestCase extends Test
366      static final Integer m3  = new Integer(-3);
367      static final Integer m4 = new Integer(-4);
368      static final Integer m5 = new Integer(-5);
369 +    static final Integer m6 = new Integer(-6);
370      static final Integer m10 = new Integer(-10);
371  
372  
# Line 394 | Line 422 | public class JSR166TestCase extends Test
422                  Thread.sleep(SHORT_DELAY_MS);
423              }
424              catch(Exception e) {
425 <                threadUnexpectedException();
425 >                threadUnexpectedException(e);
426              }
427          }
428      }
# Line 416 | Line 444 | public class JSR166TestCase extends Test
444                  Thread.sleep(SMALL_DELAY_MS);
445              }
446              catch(Exception e) {
447 <                threadUnexpectedException();
447 >                threadUnexpectedException(e);
448              }
449          }
450      }
# Line 437 | Line 465 | public class JSR166TestCase extends Test
465                  Thread.sleep(SMALL_DELAY_MS);
466              }
467              catch(Exception e) {
468 <                threadUnexpectedException();
468 >                threadUnexpectedException(e);
469              }
470              return Boolean.TRUE;
471          }
# Line 461 | Line 489 | public class JSR166TestCase extends Test
489                  Thread.sleep(MEDIUM_DELAY_MS);
490              }
491              catch(Exception e) {
492 <                threadUnexpectedException();
492 >                threadUnexpectedException(e);
493              }
494          }
495      }
# Line 503 | Line 531 | public class JSR166TestCase extends Test
531      static class SimpleThreadFactory implements ThreadFactory{
532          public Thread newThread(Runnable r){
533              return new Thread(r);
534 <        }  
534 >        }
535      }
536  
537      static class TrackedShortRunnable implements Runnable {
# Line 563 | Line 591 | public class JSR166TestCase extends Test
591       * For use as RejectedExecutionHandler in constructors
592       */
593      static class NoOpREHandler implements RejectedExecutionHandler{
594 <        public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
594 >        public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
595      }
596 <
597 <    
596 >
597 >
598   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines