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.26 by dl, Thu Mar 31 15:24:29 2005 UTC vs.
Revision 1.27 by jsr166, Thu May 12 03:20:56 2005 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(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));
120 <        suite.addTest(new TestSuite(AtomicIntegerTest.class));
121 <        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
122 <        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
123 <        suite.addTest(new TestSuite(AtomicLongTest.class));
124 <        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
125 <        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
126 <        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
127 <        suite.addTest(new TestSuite(AtomicReferenceTest.class));
128 <        suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
117 >        suite.addTest(new TestSuite(AtomicBooleanTest.class));
118 >        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
119 >        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
120 >        suite.addTest(new TestSuite(AtomicIntegerTest.class));
121 >        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
122 >        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
123 >        suite.addTest(new TestSuite(AtomicLongTest.class));
124 >        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
125 >        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
126 >        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
127 >        suite.addTest(new TestSuite(AtomicReferenceTest.class));
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));
# Line 161 | Line 161 | public class JSR166TestCase extends Test
161          suite.addTest(new TestSuite(TreeSetTest.class));
162          suite.addTest(new TestSuite(TreeSubMapTest.class));
163          suite.addTest(new TestSuite(TreeSubSetTest.class));
164 <                
164 >
165          return suite;
166      }
167  
# Line 173 | Line 173 | public class JSR166TestCase extends Test
173  
174  
175      /**
176 <     * Return the shortest timed delay. This could
176 >     * Returns the shortest timed delay. This could
177       * be reimplemented to use for example a Property.
178 <     */
178 >     */
179      protected long getShortDelay() {
180          return 50;
181      }
182  
183  
184      /**
185 <     * Set delays as multiples of SHORT_DELAY.
185 >     * Sets delays as multiples of SHORT_DELAY.
186       */
187      protected  void setDelays() {
188          SHORT_DELAY_MS = getShortDelay();
# Line 197 | Line 197 | public class JSR166TestCase extends Test
197      volatile boolean threadFailed;
198  
199      /**
200 <     * Initialize test to indicate that no thread assertions have failed
200 >     * Initializes test to indicate that no thread assertions have failed
201       */
202 <    public void setUp() {
202 >    public void setUp() {
203          setDelays();
204 <        threadFailed = false;  
204 >        threadFailed = false;
205      }
206  
207      /**
208 <     * Trigger test case failure if any thread assertions have failed
208 >     * Triggers test case failure if any thread assertions have failed
209       */
210 <    public void tearDown() {
211 <        assertFalse(threadFailed);  
210 >    public void tearDown() {
211 >        assertFalse(threadFailed);
212      }
213  
214      /**
215       * Fail, also setting status to indicate current testcase should fail
216 <     */
216 >     */
217      public void threadFail(String reason) {
218          threadFailed = true;
219          fail(reason);
# Line 222 | Line 222 | public class JSR166TestCase extends Test
222      /**
223       * If expression not true, set status to indicate current testcase
224       * should fail
225 <     */
225 >     */
226      public void threadAssertTrue(boolean b) {
227          if (!b) {
228              threadFailed = true;
# Line 233 | Line 233 | public class JSR166TestCase extends Test
233      /**
234       * If expression not false, set status to indicate current testcase
235       * should fail
236 <     */
236 >     */
237      public void threadAssertFalse(boolean b) {
238          if (b) {
239              threadFailed = true;
# Line 244 | Line 244 | public class JSR166TestCase extends Test
244      /**
245       * If argument not null, set status to indicate current testcase
246       * should fail
247 <     */
247 >     */
248      public void threadAssertNull(Object x) {
249          if (x != null) {
250              threadFailed = true;
# Line 255 | Line 255 | public class JSR166TestCase extends Test
255      /**
256       * If arguments not equal, set status to indicate current testcase
257       * should fail
258 <     */
258 >     */
259      public void threadAssertEquals(long x, long y) {
260          if (x != y) {
261              threadFailed = true;
# Line 266 | Line 266 | public class JSR166TestCase extends Test
266      /**
267       * If arguments not equal, set status to indicate current testcase
268       * should fail
269 <     */
269 >     */
270      public void threadAssertEquals(Object x, Object y) {
271          if (x != y && (x == null || !x.equals(y))) {
272              threadFailed = true;
# Line 276 | Line 276 | public class JSR166TestCase extends Test
276  
277      /**
278       * threadFail with message "should throw exception"
279 <     */
279 >     */
280      public void threadShouldThrow() {
281          threadFailed = true;
282          fail("should throw exception");
# Line 308 | Line 308 | public class JSR166TestCase extends Test
308  
309      /**
310       * fail with message "should throw exception"
311 <     */
311 >     */
312      public void shouldThrow() {
313          fail("Should throw exception");
314      }
# Line 507 | Line 507 | public class JSR166TestCase extends Test
507      static class SimpleThreadFactory implements ThreadFactory{
508          public Thread newThread(Runnable r){
509              return new Thread(r);
510 <        }  
510 >        }
511      }
512  
513      static class TrackedShortRunnable implements Runnable {
# Line 567 | Line 567 | public class JSR166TestCase extends Test
567       * For use as RejectedExecutionHandler in constructors
568       */
569      static class NoOpREHandler implements RejectedExecutionHandler{
570 <        public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
570 >        public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
571      }
572 <
573 <    
572 >
573 >
574   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines