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.39 by jsr166, Tue Nov 17 21:51:45 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.*;
10   import java.util.*;
11   import java.util.concurrent.*;
12 + import static java.util.concurrent.TimeUnit.MILLISECONDS;
13   import java.io.*;
14   import java.security.*;
15  
# Line 17 | Line 18 | import java.security.*;
18   * utility methods and classes, as well as a simple framework for
19   * helping to make sure that assertions failing in generated threads
20   * cause the associated test that generated them to itself fail (which
21 < * JUnit doe not otherwise arrange).  The rules for creating such
21 > * JUnit does not otherwise arrange).  The rules for creating such
22   * tests are:
23   *
24   * <ol>
25   *
26   * <li> All assertions in code running in generated threads must use
27 < * the forms {@link #threadFail} , {@link #threadAssertTrue} {@link
27 > * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
28   * #threadAssertEquals}, or {@link #threadAssertNull}, (not
29   * <tt>fail</tt>, <tt>assertTrue</tt>, etc.) It is OK (but not
30   * particularly recommended) for other code to use these forms too.
# Line 44 | Line 45 | import java.security.*;
45   * is always discriminable as larger than SHORT and smaller than
46   * MEDIUM.  And so on. These constants are set to conservative values,
47   * but even so, if there is ever any doubt, they can all be increased
48 < * in one spot to rerun tests on slower platforms</li>
48 > * in one spot to rerun tests on slower platforms.</li>
49   *
50   * <li> All threads generated must be joined inside each test case
51   * method (or <tt>fail</tt> to do so) before returning from the
# Line 63 | Line 64 | import java.security.*;
64   * "normal" behaviors differ significantly. And sometimes testcases
65   * cover multiple methods when they cannot be tested in
66   * isolation.</li>
67 < *
67 > *
68   * <li> The documentation style for testcases is to provide as javadoc
69   * a simple sentence or two describing the property that the testcase
70   * method purports to test. The javadocs do not say anything about how
# Line 88 | Line 89 | import java.security.*;
89   public class JSR166TestCase extends TestCase {
90      /**
91       * Runs all JSR166 unit tests using junit.textui.TestRunner
92 <     */
92 >     */
93      public static void main (String[] args) {
94          int iters = 1;
95 <        if (args.length > 0)
95 >        if (args.length > 0)
96              iters = Integer.parseInt(args[0]);
97          Test s = suite();
98          for (int i = 0; i < iters; ++i) {
# Line 104 | Line 105 | public class JSR166TestCase extends Test
105  
106      /**
107       * Collects all JSR166 unit tests as one suite
108 <     */
108 >     */
109      public static Test suite ( ) {
110          TestSuite suite = new TestSuite("JSR166 Unit Tests");
111 <        
111 >
112 >        suite.addTest(new TestSuite(ForkJoinPoolTest.class));
113 >        suite.addTest(new TestSuite(ForkJoinTaskTest.class));
114 >        suite.addTest(new TestSuite(RecursiveActionTest.class));
115 >        suite.addTest(new TestSuite(RecursiveTaskTest.class));
116 >        suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
117 >        suite.addTest(new TestSuite(PhaserTest.class));
118 >        suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
119          suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
120          suite.addTest(new TestSuite(AbstractQueueTest.class));
121          suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
122 +        suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
123          suite.addTest(new TestSuite(ArrayBlockingQueueTest.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(ArrayDequeTest.class));
125 >        suite.addTest(new TestSuite(AtomicBooleanTest.class));
126 >        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
127 >        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
128 >        suite.addTest(new TestSuite(AtomicIntegerTest.class));
129 >        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
130 >        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
131 >        suite.addTest(new TestSuite(AtomicLongTest.class));
132 >        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
133 >        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
134 >        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
135 >        suite.addTest(new TestSuite(AtomicReferenceTest.class));
136 >        suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
137          suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
138          suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
139 +        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
140 +        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
141 +        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
142 +        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
143          suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
144          suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
145          suite.addTest(new TestSuite(CountDownLatchTest.class));
146          suite.addTest(new TestSuite(CyclicBarrierTest.class));
147          suite.addTest(new TestSuite(DelayQueueTest.class));
148 +        suite.addTest(new TestSuite(EntryTest.class));
149          suite.addTest(new TestSuite(ExchangerTest.class));
150          suite.addTest(new TestSuite(ExecutorsTest.class));
151          suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
152          suite.addTest(new TestSuite(FutureTaskTest.class));
153 +        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
154          suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
155          suite.addTest(new TestSuite(LinkedListTest.class));
156          suite.addTest(new TestSuite(LockSupportTest.class));
# Line 143 | Line 159 | public class JSR166TestCase extends Test
159          suite.addTest(new TestSuite(ReentrantLockTest.class));
160          suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
161          suite.addTest(new TestSuite(ScheduledExecutorTest.class));
162 +        suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
163          suite.addTest(new TestSuite(SemaphoreTest.class));
164          suite.addTest(new TestSuite(SynchronousQueueTest.class));
165          suite.addTest(new TestSuite(SystemTest.class));
166          suite.addTest(new TestSuite(ThreadLocalTest.class));
167          suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
168 +        suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
169          suite.addTest(new TestSuite(ThreadTest.class));
170          suite.addTest(new TestSuite(TimeUnitTest.class));
171 <                
171 >        suite.addTest(new TestSuite(TreeMapTest.class));
172 >        suite.addTest(new TestSuite(TreeSetTest.class));
173 >        suite.addTest(new TestSuite(TreeSubMapTest.class));
174 >        suite.addTest(new TestSuite(TreeSubSetTest.class));
175 >
176          return suite;
177      }
178  
# Line 162 | Line 184 | public class JSR166TestCase extends Test
184  
185  
186      /**
187 <     * Return the shortest timed delay. This could
187 >     * Returns the shortest timed delay. This could
188       * be reimplemented to use for example a Property.
189 <     */
189 >     */
190      protected long getShortDelay() {
191          return 50;
192      }
193  
194  
195      /**
196 <     * Set delays as multiples of SHORT_DELAY.
196 >     * Sets delays as multiples of SHORT_DELAY.
197       */
198      protected  void setDelays() {
199          SHORT_DELAY_MS = getShortDelay();
# Line 186 | Line 208 | public class JSR166TestCase extends Test
208      volatile boolean threadFailed;
209  
210      /**
211 <     * Initialize test to indicate that no thread assertions have failed
211 >     * Initializes test to indicate that no thread assertions have failed
212       */
213 <    public void setUp() {
213 >    public void setUp() {
214          setDelays();
215 <        threadFailed = false;  
215 >        threadFailed = false;
216      }
217  
218      /**
219 <     * Trigger test case failure if any thread assertions have failed
219 >     * Triggers test case failure if any thread assertions have failed
220       */
221 <    public void tearDown() {
222 <        assertFalse(threadFailed);  
221 >    public void tearDown() {
222 >        assertFalse(threadFailed);
223      }
224  
225      /**
226       * Fail, also setting status to indicate current testcase should fail
227 <     */
227 >     */
228      public void threadFail(String reason) {
229          threadFailed = true;
230          fail(reason);
# Line 211 | Line 233 | public class JSR166TestCase extends Test
233      /**
234       * If expression not true, set status to indicate current testcase
235       * should fail
236 <     */
236 >     */
237      public void threadAssertTrue(boolean b) {
238          if (!b) {
239              threadFailed = true;
# Line 222 | Line 244 | public class JSR166TestCase extends Test
244      /**
245       * If expression not false, set status to indicate current testcase
246       * should fail
247 <     */
247 >     */
248      public void threadAssertFalse(boolean b) {
249          if (b) {
250              threadFailed = true;
# Line 233 | Line 255 | public class JSR166TestCase extends Test
255      /**
256       * If argument not null, set status to indicate current testcase
257       * should fail
258 <     */
258 >     */
259      public void threadAssertNull(Object x) {
260          if (x != null) {
261              threadFailed = true;
# Line 244 | 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(long x, long y) {
271          if (x != y) {
272              threadFailed = true;
# Line 255 | Line 277 | public class JSR166TestCase extends Test
277      /**
278       * If arguments not equal, set status to indicate current testcase
279       * should fail
280 <     */
280 >     */
281      public void threadAssertEquals(Object x, Object y) {
282          if (x != y && (x == null || !x.equals(y))) {
283              threadFailed = true;
# Line 265 | Line 287 | public class JSR166TestCase extends Test
287  
288      /**
289       * threadFail with message "should throw exception"
290 <     */
290 >     */
291      public void threadShouldThrow() {
292          threadFailed = true;
293          fail("should throw exception");
# Line 279 | Line 301 | public class JSR166TestCase extends Test
301          fail("Unexpected exception");
302      }
303  
304 +    /**
305 +     * threadFail with message "Unexpected exception", with argument
306 +     */
307 +    public void threadUnexpectedException(Throwable ex) {
308 +        threadFailed = true;
309 +        ex.printStackTrace();
310 +        fail("Unexpected exception: " + ex);
311 +    }
312  
313      /**
314       * Wait out termination of a thread pool or fail doing so
# Line 286 | Line 316 | public class JSR166TestCase extends Test
316      public void joinPool(ExecutorService exec) {
317          try {
318              exec.shutdown();
319 <            assertTrue(exec.awaitTermination(LONG_DELAY_MS, TimeUnit.MILLISECONDS));
320 <        } catch(SecurityException ok) {
319 >            assertTrue(exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
320 >        } catch (SecurityException ok) {
321              // Allowed in case test doesn't have privs
322 <        } catch(InterruptedException ie) {
322 >        } catch (InterruptedException ie) {
323              fail("Unexpected exception");
324          }
325      }
# Line 297 | Line 327 | public class JSR166TestCase extends Test
327  
328      /**
329       * fail with message "should throw exception"
330 <     */
330 >     */
331      public void shouldThrow() {
332          fail("Should throw exception");
333      }
# Line 309 | Line 339 | public class JSR166TestCase extends Test
339          fail("Unexpected exception");
340      }
341  
342 +    /**
343 +     * fail with message "Unexpected exception", with argument
344 +     */
345 +    public void unexpectedException(Throwable ex) {
346 +        ex.printStackTrace();
347 +        fail("Unexpected exception: " + ex);
348 +    }
349 +
350  
351      /**
352       * The number of elements to place in collections, arrays, etc.
# Line 332 | Line 370 | public class JSR166TestCase extends Test
370      static final Integer m3  = new Integer(-3);
371      static final Integer m4 = new Integer(-4);
372      static final Integer m5 = new Integer(-5);
373 +    static final Integer m6 = new Integer(-6);
374      static final Integer m10 = new Integer(-10);
375  
376  
# Line 356 | Line 395 | public class JSR166TestCase extends Test
395          public void refresh() {}
396      }
397  
398 +    /**
399 +     * Sleep until the timeout has elapsed, or interrupted.
400 +     * Does <em>NOT</em> throw InterruptedException.
401 +     */
402 +    void sleepTillInterrupted(long timeoutMillis) {
403 +        try {
404 +            Thread.sleep(timeoutMillis);
405 +        } catch (InterruptedException wakeup) {
406 +        }
407 +    }
408 +
409 +    /**
410 +     * Returns a new started Thread running the given runnable.
411 +     */
412 +    Thread newStartedThread(Runnable runnable) {
413 +        Thread t = new Thread(runnable);
414 +        t.start();
415 +        return t;
416 +    }
417  
418      // Some convenient Runnable classes
419  
420 +    abstract class CheckedRunnable implements Runnable {
421 +        abstract void realRun() throws Throwable;
422 +
423 +        public final void run() {
424 +            try {
425 +                realRun();
426 +            } catch (Throwable t) {
427 +                threadUnexpectedException(t);
428 +            }
429 +        }
430 +    }
431 +
432 +    abstract class CheckedInterruptedRunnable implements Runnable {
433 +        abstract void realRun() throws Throwable;
434 +
435 +        public final void run() {
436 +            try {
437 +                realRun();
438 +                threadShouldThrow();
439 +            } catch (InterruptedException success) {
440 +            } catch (Throwable t) {
441 +                threadUnexpectedException(t);
442 +            }
443 +        }
444 +    }
445 +
446 +    abstract class CheckedCallable<T> implements Callable<T> {
447 +        abstract T realCall() throws Throwable;
448 +
449 +        public final T call() {
450 +            try {
451 +                return realCall();
452 +            } catch (Throwable t) {
453 +                threadUnexpectedException(t);
454 +                return null;
455 +            }
456 +        }
457 +    }
458 +
459      static class NoOpRunnable implements Runnable {
460          public void run() {}
461      }
# Line 381 | Line 478 | public class JSR166TestCase extends Test
478          public Integer call() { return one; }
479      }
480  
481 <    class ShortRunnable implements Runnable {
482 <        public void run() {
483 <            try {
387 <                Thread.sleep(SHORT_DELAY_MS);
388 <            }
389 <            catch(Exception e) {
390 <                threadUnexpectedException();
391 <            }
481 >    class ShortRunnable extends CheckedRunnable {
482 >        void realRun() throws Throwable {
483 >            Thread.sleep(SHORT_DELAY_MS);
484          }
485      }
486  
487 <    class ShortInterruptedRunnable implements Runnable {
488 <        public void run() {
489 <            try {
398 <                Thread.sleep(SHORT_DELAY_MS);
399 <                threadShouldThrow();
400 <            }
401 <            catch(InterruptedException success) {
402 <            }
487 >    class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
488 >        void realRun() throws InterruptedException {
489 >            Thread.sleep(SHORT_DELAY_MS);
490          }
491      }
492  
493 <    class SmallRunnable implements Runnable {
494 <        public void run() {
495 <            try {
409 <                Thread.sleep(SMALL_DELAY_MS);
410 <            }
411 <            catch(Exception e) {
412 <                threadUnexpectedException();
413 <            }
493 >    class SmallRunnable extends CheckedRunnable {
494 >        void realRun() throws Throwable {
495 >            Thread.sleep(SMALL_DELAY_MS);
496          }
497      }
498  
499 <    class SmallPossiblyInterruptedRunnable implements Runnable {
500 <        public void run() {
499 >    class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
500 >        void realRun() {
501              try {
502                  Thread.sleep(SMALL_DELAY_MS);
503              }
504 <            catch(Exception e) {
504 >            catch (InterruptedException ok) {
505              }
506          }
507      }
508  
509 <    class SmallCallable implements Callable {
510 <        public Object call() {
511 <            try {
430 <                Thread.sleep(SMALL_DELAY_MS);
431 <            }
432 <            catch(Exception e) {
433 <                threadUnexpectedException();
434 <            }
509 >    class SmallCallable extends CheckedCallable {
510 >        Object realCall() throws Throwable {
511 >            Thread.sleep(SMALL_DELAY_MS);
512              return Boolean.TRUE;
513          }
514      }
515  
516 <    class SmallInterruptedRunnable implements Runnable {
517 <        public void run() {
518 <            try {
442 <                Thread.sleep(SMALL_DELAY_MS);
443 <                threadShouldThrow();
444 <            }
445 <            catch(InterruptedException success) {
446 <            }
516 >    class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
517 >        void realRun() throws InterruptedException {
518 >            Thread.sleep(SMALL_DELAY_MS);
519          }
520      }
521  
522 <
523 <    class MediumRunnable implements Runnable {
524 <        public void run() {
453 <            try {
454 <                Thread.sleep(MEDIUM_DELAY_MS);
455 <            }
456 <            catch(Exception e) {
457 <                threadUnexpectedException();
458 <            }
522 >    class MediumRunnable extends CheckedRunnable {
523 >        void realRun() throws Throwable {
524 >            Thread.sleep(MEDIUM_DELAY_MS);
525          }
526      }
527  
528 <    class MediumInterruptedRunnable implements Runnable {
529 <        public void run() {
530 <            try {
465 <                Thread.sleep(MEDIUM_DELAY_MS);
466 <                threadShouldThrow();
467 <            }
468 <            catch(InterruptedException success) {
469 <            }
528 >    class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
529 >        void realRun() throws InterruptedException {
530 >            Thread.sleep(MEDIUM_DELAY_MS);
531          }
532      }
533  
534 <    class MediumPossiblyInterruptedRunnable implements Runnable {
535 <        public void run() {
534 >    class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
535 >        void realRun() {
536              try {
537                  Thread.sleep(MEDIUM_DELAY_MS);
538              }
539 <            catch(InterruptedException success) {
539 >            catch (InterruptedException ok) {
540              }
541          }
542      }
543  
544 <    class LongPossiblyInterruptedRunnable implements Runnable {
545 <        public void run() {
544 >    class LongPossiblyInterruptedRunnable extends CheckedRunnable {
545 >        void realRun() {
546              try {
547                  Thread.sleep(LONG_DELAY_MS);
548              }
549 <            catch(InterruptedException success) {
549 >            catch (InterruptedException ok) {
550              }
551          }
552      }
# Line 493 | Line 554 | public class JSR166TestCase extends Test
554      /**
555       * For use as ThreadFactory in constructors
556       */
557 <    static class SimpleThreadFactory implements ThreadFactory{
558 <        public Thread newThread(Runnable r){
557 >    static class SimpleThreadFactory implements ThreadFactory {
558 >        public Thread newThread(Runnable r) {
559              return new Thread(r);
560 <        }  
560 >        }
561      }
562  
563      static class TrackedShortRunnable implements Runnable {
# Line 505 | Line 566 | public class JSR166TestCase extends Test
566              try {
567                  Thread.sleep(SMALL_DELAY_MS);
568                  done = true;
569 <            } catch(Exception e){
569 >            } catch (InterruptedException ok) {
570              }
571          }
572      }
# Line 516 | Line 577 | public class JSR166TestCase extends Test
577              try {
578                  Thread.sleep(MEDIUM_DELAY_MS);
579                  done = true;
580 <            } catch(Exception e){
580 >            } catch (InterruptedException ok) {
581              }
582          }
583      }
# Line 527 | Line 588 | public class JSR166TestCase extends Test
588              try {
589                  Thread.sleep(LONG_DELAY_MS);
590                  done = true;
591 <            } catch(Exception e){
591 >            } catch (InterruptedException ok) {
592              }
593          }
594      }
# Line 545 | Line 606 | public class JSR166TestCase extends Test
606              try {
607                  Thread.sleep(SMALL_DELAY_MS);
608                  done = true;
609 <            } catch(Exception e){
609 >            } catch (InterruptedException ok) {
610              }
611              return Boolean.TRUE;
612          }
# Line 555 | Line 616 | public class JSR166TestCase extends Test
616      /**
617       * For use as RejectedExecutionHandler in constructors
618       */
619 <    static class NoOpREHandler implements RejectedExecutionHandler{
620 <        public void rejectedExecution(Runnable r, ThreadPoolExecutor executor){}
619 >    static class NoOpREHandler implements RejectedExecutionHandler {
620 >        public void rejectedExecution(Runnable r,
621 >                                      ThreadPoolExecutor executor) {}
622      }
623 <
562 <    
623 >
624   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines