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.22 by dl, Tue Jan 20 20:20:56 2004 UTC vs.
Revision 1.29 by dl, Sat Oct 1 17:05:38 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(AtomicBooleanTest.class));
117 <        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
118 <        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
119 <        suite.addTest(new TestSuite(AtomicIntegerTest.class));
120 <        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
121 <        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
122 <        suite.addTest(new TestSuite(AtomicLongTest.class));
123 <        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
124 <        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
125 <        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
126 <        suite.addTest(new TestSuite(AtomicReferenceTest.class));
127 <        suite.addTest(new TestSuite(AtomicStampedReferenceTest.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));
129          suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
130          suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
131 +        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
132 +        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
133 +        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
134 +        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
135          suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
136          suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
137          suite.addTest(new TestSuite(CountDownLatchTest.class));
138          suite.addTest(new TestSuite(CyclicBarrierTest.class));
139          suite.addTest(new TestSuite(DelayQueueTest.class));
140 +        suite.addTest(new TestSuite(EntryTest.class));
141          suite.addTest(new TestSuite(ExchangerTest.class));
142          suite.addTest(new TestSuite(ExecutorsTest.class));
143          suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
144          suite.addTest(new TestSuite(FutureTaskTest.class));
145 +        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
146          suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
147          suite.addTest(new TestSuite(LinkedListTest.class));
148          suite.addTest(new TestSuite(LockSupportTest.class));
# Line 143 | Line 151 | public class JSR166TestCase extends Test
151          suite.addTest(new TestSuite(ReentrantLockTest.class));
152          suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
153          suite.addTest(new TestSuite(ScheduledExecutorTest.class));
154 +        suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
155          suite.addTest(new TestSuite(SemaphoreTest.class));
156          suite.addTest(new TestSuite(SynchronousQueueTest.class));
157          suite.addTest(new TestSuite(SystemTest.class));
158          suite.addTest(new TestSuite(ThreadLocalTest.class));
159          suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
160 +        suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
161          suite.addTest(new TestSuite(ThreadTest.class));
162          suite.addTest(new TestSuite(TimeUnitTest.class));
163 <                
163 >        suite.addTest(new TestSuite(TreeMapTest.class));
164 >        suite.addTest(new TestSuite(TreeSetTest.class));
165 >        suite.addTest(new TestSuite(TreeSubMapTest.class));
166 >        suite.addTest(new TestSuite(TreeSubSetTest.class));
167 >
168          return suite;
169      }
170  
# Line 162 | Line 176 | public class JSR166TestCase extends Test
176  
177  
178      /**
179 <     * Return the shortest timed delay. This could
179 >     * Returns the shortest timed delay. This could
180       * be reimplemented to use for example a Property.
181 <     */
181 >     */
182      protected long getShortDelay() {
183          return 50;
184      }
185  
186  
187      /**
188 <     * Set delays as multiples of SHORT_DELAY.
188 >     * Sets delays as multiples of SHORT_DELAY.
189       */
190      protected  void setDelays() {
191          SHORT_DELAY_MS = getShortDelay();
# Line 186 | Line 200 | public class JSR166TestCase extends Test
200      volatile boolean threadFailed;
201  
202      /**
203 <     * Initialize test to indicate that no thread assertions have failed
203 >     * Initializes test to indicate that no thread assertions have failed
204       */
205 <    public void setUp() {
205 >    public void setUp() {
206          setDelays();
207 <        threadFailed = false;  
207 >        threadFailed = false;
208      }
209  
210      /**
211 <     * Trigger test case failure if any thread assertions have failed
211 >     * Triggers test case failure if any thread assertions have failed
212       */
213 <    public void tearDown() {
214 <        assertFalse(threadFailed);  
213 >    public void tearDown() {
214 >        assertFalse(threadFailed);
215      }
216  
217      /**
218       * Fail, also setting status to indicate current testcase should fail
219 <     */
219 >     */
220      public void threadFail(String reason) {
221          threadFailed = true;
222          fail(reason);
# Line 211 | Line 225 | public class JSR166TestCase extends Test
225      /**
226       * If expression not true, set status to indicate current testcase
227       * should fail
228 <     */
228 >     */
229      public void threadAssertTrue(boolean b) {
230          if (!b) {
231              threadFailed = true;
# Line 222 | Line 236 | public class JSR166TestCase extends Test
236      /**
237       * If expression not false, set status to indicate current testcase
238       * should fail
239 <     */
239 >     */
240      public void threadAssertFalse(boolean b) {
241          if (b) {
242              threadFailed = true;
# Line 233 | Line 247 | public class JSR166TestCase extends Test
247      /**
248       * If argument not null, set status to indicate current testcase
249       * should fail
250 <     */
250 >     */
251      public void threadAssertNull(Object x) {
252          if (x != null) {
253              threadFailed = true;
# Line 244 | Line 258 | public class JSR166TestCase extends Test
258      /**
259       * If arguments not equal, set status to indicate current testcase
260       * should fail
261 <     */
261 >     */
262      public void threadAssertEquals(long x, long y) {
263          if (x != y) {
264              threadFailed = true;
# Line 255 | Line 269 | public class JSR166TestCase extends Test
269      /**
270       * If arguments not equal, set status to indicate current testcase
271       * should fail
272 <     */
272 >     */
273      public void threadAssertEquals(Object x, Object y) {
274          if (x != y && (x == null || !x.equals(y))) {
275              threadFailed = true;
# Line 265 | Line 279 | public class JSR166TestCase extends Test
279  
280      /**
281       * threadFail with message "should throw exception"
282 <     */
282 >     */
283      public void threadShouldThrow() {
284          threadFailed = true;
285          fail("should throw exception");
# Line 297 | Line 311 | public class JSR166TestCase extends Test
311  
312      /**
313       * fail with message "should throw exception"
314 <     */
314 >     */
315      public void shouldThrow() {
316          fail("Should throw exception");
317      }
# Line 496 | Line 510 | public class JSR166TestCase extends Test
510      static class SimpleThreadFactory implements ThreadFactory{
511          public Thread newThread(Runnable r){
512              return new Thread(r);
513 <        }  
513 >        }
514      }
515  
516      static class TrackedShortRunnable implements Runnable {
# Line 556 | Line 570 | public class JSR166TestCase extends Test
570       * For use as RejectedExecutionHandler in constructors
571       */
572      static class NoOpREHandler implements RejectedExecutionHandler{
573 <        public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
573 >        public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
574      }
575 <
576 <    
575 >
576 >
577   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines