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.54 by jsr166, Fri Sep 17 00:52:36 2010 UTC vs.
Revision 1.111 by dl, Sun Jul 21 22:24:18 2013 UTC

# Line 1 | Line 1
1   /*
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
4 > * http://creativecommons.org/publicdomain/zero/1.0/
5   * Other contributors include Andrew Wright, Jeffrey Hayes,
6   * Pat Fisher, Mike Judd.
7   */
8  
9   import junit.framework.*;
10 + import java.io.ByteArrayInputStream;
11 + import java.io.ByteArrayOutputStream;
12 + import java.io.ObjectInputStream;
13 + import java.io.ObjectOutputStream;
14 + import java.lang.management.ManagementFactory;
15 + import java.lang.management.ThreadInfo;
16 + import java.lang.reflect.Method;
17 + import java.util.ArrayList;
18 + import java.util.Arrays;
19 + import java.util.Date;
20 + import java.util.Enumeration;
21 + import java.util.List;
22 + import java.util.NoSuchElementException;
23   import java.util.PropertyPermission;
24   import java.util.concurrent.*;
25 + import java.util.concurrent.atomic.AtomicBoolean;
26   import java.util.concurrent.atomic.AtomicReference;
27   import static java.util.concurrent.TimeUnit.MILLISECONDS;
28 + import static java.util.concurrent.TimeUnit.NANOSECONDS;
29   import java.security.CodeSource;
30   import java.security.Permission;
31   import java.security.PermissionCollection;
# Line 60 | Line 75 | import java.security.SecurityPermission;
75   *
76   * </ol>
77   *
78 < * <p> <b>Other notes</b>
78 > * <p><b>Other notes</b>
79   * <ul>
80   *
81   * <li> Usually, there is one testcase method per JSR166 method
# Line 96 | Line 111 | public class JSR166TestCase extends Test
111      private static final boolean useSecurityManager =
112          Boolean.getBoolean("jsr166.useSecurityManager");
113  
114 +    protected static final boolean expensiveTests =
115 +        Boolean.getBoolean("jsr166.expensiveTests");
116 +
117 +    /**
118 +     * If true, report on stdout all "slow" tests, that is, ones that
119 +     * take more than profileThreshold milliseconds to execute.
120 +     */
121 +    private static final boolean profileTests =
122 +        Boolean.getBoolean("jsr166.profileTests");
123 +
124 +    /**
125 +     * The number of milliseconds that tests are permitted for
126 +     * execution without being reported, when profileTests is set.
127 +     */
128 +    private static final long profileThreshold =
129 +        Long.getLong("jsr166.profileThreshold", 100);
130 +
131      /**
132 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
132 >     * The number of repetitions per test (for tickling rare bugs).
133 >     */
134 >    private static final int runsPerTest =
135 >        Integer.getInteger("jsr166.runsPerTest", 1);
136 >
137 >    protected void runTest() throws Throwable {
138 >        for (int i = 0; i < runsPerTest; i++) {
139 >            if (profileTests)
140 >                runTestProfiled();
141 >            else
142 >                super.runTest();
143 >        }
144 >    }
145 >
146 >    protected void runTestProfiled() throws Throwable {
147 >        long t0 = System.nanoTime();
148 >        try {
149 >            super.runTest();
150 >        } finally {
151 >            long elapsedMillis =
152 >                (System.nanoTime() - t0) / (1000L * 1000L);
153 >            if (elapsedMillis >= profileThreshold)
154 >                System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
155 >        }
156 >    }
157 >
158 >    /**
159 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
160 >     * Optional command line arg provides the number of iterations to
161 >     * repeat running the tests.
162       */
163      public static void main(String[] args) {
164          if (useSecurityManager) {
# Line 105 | Line 166 | public class JSR166TestCase extends Test
166              Policy.setPolicy(permissivePolicy());
167              System.setSecurityManager(new SecurityManager());
168          }
169 <        int iters = 1;
170 <        if (args.length > 0)
110 <            iters = Integer.parseInt(args[0]);
169 >        int iters = (args.length == 0) ? 1 : Integer.parseInt(args[0]);
170 >
171          Test s = suite();
172          for (int i = 0; i < iters; ++i) {
173              junit.textui.TestRunner.run(s);
# Line 117 | Line 177 | public class JSR166TestCase extends Test
177          System.exit(0);
178      }
179  
180 +    public static TestSuite newTestSuite(Object... suiteOrClasses) {
181 +        TestSuite suite = new TestSuite();
182 +        for (Object suiteOrClass : suiteOrClasses) {
183 +            if (suiteOrClass instanceof TestSuite)
184 +                suite.addTest((TestSuite) suiteOrClass);
185 +            else if (suiteOrClass instanceof Class)
186 +                suite.addTest(new TestSuite((Class<?>) suiteOrClass));
187 +            else
188 +                throw new ClassCastException("not a test suite or class");
189 +        }
190 +        return suite;
191 +    }
192 +
193 +    public static void addNamedTestClasses(TestSuite suite,
194 +                                           String... testClassNames) {
195 +        for (String testClassName : testClassNames) {
196 +            try {
197 +                Class<?> testClass = Class.forName(testClassName);
198 +                Method m = testClass.getDeclaredMethod("suite",
199 +                                                       new Class<?>[0]);
200 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
201 +            } catch (Exception e) {
202 +                throw new Error("Missing test class", e);
203 +            }
204 +        }
205 +    }
206 +
207 +    public static final double JAVA_CLASS_VERSION;
208 +    static {
209 +        try {
210 +            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
211 +                new java.security.PrivilegedAction<Double>() {
212 +                public Double run() {
213 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
214 +        } catch (Throwable t) {
215 +            throw new Error(t);
216 +        }
217 +    }
218 +
219 +    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
220 +    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
221 +    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
222 +
223      /**
224 <     * Collects all JSR166 unit tests as one suite
224 >     * Collects all JSR166 unit tests as one suite.
225       */
226      public static Test suite() {
227 <        TestSuite suite = new TestSuite("JSR166 Unit Tests");
228 <
229 <        suite.addTest(new TestSuite(ForkJoinPoolTest.class));
230 <        suite.addTest(new TestSuite(ForkJoinTaskTest.class));
231 <        suite.addTest(new TestSuite(RecursiveActionTest.class));
232 <        suite.addTest(new TestSuite(RecursiveTaskTest.class));
233 <        suite.addTest(new TestSuite(LinkedTransferQueueTest.class));
234 <        suite.addTest(new TestSuite(PhaserTest.class));
235 <        suite.addTest(new TestSuite(ThreadLocalRandomTest.class));
236 <        suite.addTest(new TestSuite(AbstractExecutorServiceTest.class));
237 <        suite.addTest(new TestSuite(AbstractQueueTest.class));
238 <        suite.addTest(new TestSuite(AbstractQueuedSynchronizerTest.class));
239 <        suite.addTest(new TestSuite(AbstractQueuedLongSynchronizerTest.class));
240 <        suite.addTest(new TestSuite(ArrayBlockingQueueTest.class));
241 <        suite.addTest(new TestSuite(ArrayDequeTest.class));
242 <        suite.addTest(new TestSuite(AtomicBooleanTest.class));
243 <        suite.addTest(new TestSuite(AtomicIntegerArrayTest.class));
244 <        suite.addTest(new TestSuite(AtomicIntegerFieldUpdaterTest.class));
245 <        suite.addTest(new TestSuite(AtomicIntegerTest.class));
246 <        suite.addTest(new TestSuite(AtomicLongArrayTest.class));
247 <        suite.addTest(new TestSuite(AtomicLongFieldUpdaterTest.class));
248 <        suite.addTest(new TestSuite(AtomicLongTest.class));
249 <        suite.addTest(new TestSuite(AtomicMarkableReferenceTest.class));
250 <        suite.addTest(new TestSuite(AtomicReferenceArrayTest.class));
251 <        suite.addTest(new TestSuite(AtomicReferenceFieldUpdaterTest.class));
252 <        suite.addTest(new TestSuite(AtomicReferenceTest.class));
253 <        suite.addTest(new TestSuite(AtomicStampedReferenceTest.class));
254 <        suite.addTest(new TestSuite(ConcurrentHashMapTest.class));
255 <        suite.addTest(new TestSuite(ConcurrentLinkedDequeTest.class));
256 <        suite.addTest(new TestSuite(ConcurrentLinkedQueueTest.class));
257 <        suite.addTest(new TestSuite(ConcurrentSkipListMapTest.class));
258 <        suite.addTest(new TestSuite(ConcurrentSkipListSubMapTest.class));
259 <        suite.addTest(new TestSuite(ConcurrentSkipListSetTest.class));
260 <        suite.addTest(new TestSuite(ConcurrentSkipListSubSetTest.class));
261 <        suite.addTest(new TestSuite(CopyOnWriteArrayListTest.class));
262 <        suite.addTest(new TestSuite(CopyOnWriteArraySetTest.class));
263 <        suite.addTest(new TestSuite(CountDownLatchTest.class));
264 <        suite.addTest(new TestSuite(CyclicBarrierTest.class));
265 <        suite.addTest(new TestSuite(DelayQueueTest.class));
266 <        suite.addTest(new TestSuite(EntryTest.class));
267 <        suite.addTest(new TestSuite(ExchangerTest.class));
268 <        suite.addTest(new TestSuite(ExecutorsTest.class));
269 <        suite.addTest(new TestSuite(ExecutorCompletionServiceTest.class));
270 <        suite.addTest(new TestSuite(FutureTaskTest.class));
271 <        suite.addTest(new TestSuite(LinkedBlockingDequeTest.class));
272 <        suite.addTest(new TestSuite(LinkedBlockingQueueTest.class));
273 <        suite.addTest(new TestSuite(LinkedListTest.class));
274 <        suite.addTest(new TestSuite(LockSupportTest.class));
275 <        suite.addTest(new TestSuite(PriorityBlockingQueueTest.class));
276 <        suite.addTest(new TestSuite(PriorityQueueTest.class));
277 <        suite.addTest(new TestSuite(ReentrantLockTest.class));
278 <        suite.addTest(new TestSuite(ReentrantReadWriteLockTest.class));
279 <        suite.addTest(new TestSuite(ScheduledExecutorTest.class));
280 <        suite.addTest(new TestSuite(ScheduledExecutorSubclassTest.class));
281 <        suite.addTest(new TestSuite(SemaphoreTest.class));
282 <        suite.addTest(new TestSuite(SynchronousQueueTest.class));
283 <        suite.addTest(new TestSuite(SystemTest.class));
284 <        suite.addTest(new TestSuite(ThreadLocalTest.class));
285 <        suite.addTest(new TestSuite(ThreadPoolExecutorTest.class));
286 <        suite.addTest(new TestSuite(ThreadPoolExecutorSubclassTest.class));
287 <        suite.addTest(new TestSuite(ThreadTest.class));
288 <        suite.addTest(new TestSuite(TimeUnitTest.class));
289 <        suite.addTest(new TestSuite(TreeMapTest.class));
290 <        suite.addTest(new TestSuite(TreeSetTest.class));
291 <        suite.addTest(new TestSuite(TreeSubMapTest.class));
292 <        suite.addTest(new TestSuite(TreeSubSetTest.class));
227 >        // Java7+ test classes
228 >        TestSuite suite = newTestSuite(
229 >            ForkJoinPoolTest.suite(),
230 >            ForkJoinTaskTest.suite(),
231 >            RecursiveActionTest.suite(),
232 >            RecursiveTaskTest.suite(),
233 >            LinkedTransferQueueTest.suite(),
234 >            PhaserTest.suite(),
235 >            ThreadLocalRandomTest.suite(),
236 >            AbstractExecutorServiceTest.suite(),
237 >            AbstractQueueTest.suite(),
238 >            AbstractQueuedSynchronizerTest.suite(),
239 >            AbstractQueuedLongSynchronizerTest.suite(),
240 >            ArrayBlockingQueueTest.suite(),
241 >            ArrayDequeTest.suite(),
242 >            AtomicBooleanTest.suite(),
243 >            AtomicIntegerArrayTest.suite(),
244 >            AtomicIntegerFieldUpdaterTest.suite(),
245 >            AtomicIntegerTest.suite(),
246 >            AtomicLongArrayTest.suite(),
247 >            AtomicLongFieldUpdaterTest.suite(),
248 >            AtomicLongTest.suite(),
249 >            AtomicMarkableReferenceTest.suite(),
250 >            AtomicReferenceArrayTest.suite(),
251 >            AtomicReferenceFieldUpdaterTest.suite(),
252 >            AtomicReferenceTest.suite(),
253 >            AtomicStampedReferenceTest.suite(),
254 >            ConcurrentHashMapTest.suite(),
255 >            ConcurrentLinkedDequeTest.suite(),
256 >            ConcurrentLinkedQueueTest.suite(),
257 >            ConcurrentSkipListMapTest.suite(),
258 >            ConcurrentSkipListSubMapTest.suite(),
259 >            ConcurrentSkipListSetTest.suite(),
260 >            ConcurrentSkipListSubSetTest.suite(),
261 >            CopyOnWriteArrayListTest.suite(),
262 >            CopyOnWriteArraySetTest.suite(),
263 >            CountDownLatchTest.suite(),
264 >            CyclicBarrierTest.suite(),
265 >            DelayQueueTest.suite(),
266 >            EntryTest.suite(),
267 >            ExchangerTest.suite(),
268 >            ExecutorsTest.suite(),
269 >            ExecutorCompletionServiceTest.suite(),
270 >            FutureTaskTest.suite(),
271 >            LinkedBlockingDequeTest.suite(),
272 >            LinkedBlockingQueueTest.suite(),
273 >            LinkedListTest.suite(),
274 >            LockSupportTest.suite(),
275 >            PriorityBlockingQueueTest.suite(),
276 >            PriorityQueueTest.suite(),
277 >            ReentrantLockTest.suite(),
278 >            ReentrantReadWriteLockTest.suite(),
279 >            ScheduledExecutorTest.suite(),
280 >            ScheduledExecutorSubclassTest.suite(),
281 >            SemaphoreTest.suite(),
282 >            SynchronousQueueTest.suite(),
283 >            SystemTest.suite(),
284 >            ThreadLocalTest.suite(),
285 >            ThreadPoolExecutorTest.suite(),
286 >            ThreadPoolExecutorSubclassTest.suite(),
287 >            ThreadTest.suite(),
288 >            TimeUnitTest.suite(),
289 >            TreeMapTest.suite(),
290 >            TreeSetTest.suite(),
291 >            TreeSubMapTest.suite(),
292 >            TreeSubSetTest.suite());
293 >
294 >        // Java8+ test classes
295 >        if (atLeastJava8()) {
296 >            String[] java8TestClassNames = {
297 >                "CompletableFutureTest",
298 >                "ConcurrentHashMap8Test",
299 >                "CountedCompleterTest",
300 >                "DoubleAccumulatorTest",
301 >                "DoubleAdderTest",
302 >                "ForkJoinPool8Test",
303 >                "ForkJoinTask8Test",
304 >                "LongAccumulatorTest",
305 >                "LongAdderTest",
306 >                "SplittableRandomTest",
307 >                "StampedLockTest",
308 >            };
309 >            addNamedTestClasses(suite, java8TestClassNames);
310 >        }
311  
312          return suite;
313      }
314  
315 +    // Delays for timing-dependent tests, in milliseconds.
316  
317      public static long SHORT_DELAY_MS;
318      public static long SMALL_DELAY_MS;
319      public static long MEDIUM_DELAY_MS;
320      public static long LONG_DELAY_MS;
321  
200
322      /**
323       * Returns the shortest timed delay. This could
324       * be reimplemented to use for example a Property.
# Line 206 | Line 327 | public class JSR166TestCase extends Test
327          return 50;
328      }
329  
209
330      /**
331       * Sets delays as multiples of SHORT_DELAY.
332       */
# Line 214 | Line 334 | public class JSR166TestCase extends Test
334          SHORT_DELAY_MS = getShortDelay();
335          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
336          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
337 <        LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
337 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
338 >    }
339 >
340 >    /**
341 >     * Returns a timeout in milliseconds to be used in tests that
342 >     * verify that operations block or time out.
343 >     */
344 >    long timeoutMillis() {
345 >        return SHORT_DELAY_MS / 4;
346 >    }
347 >
348 >    /**
349 >     * Returns a new Date instance representing a time delayMillis
350 >     * milliseconds in the future.
351 >     */
352 >    Date delayedDate(long delayMillis) {
353 >        return new Date(System.currentTimeMillis() + delayMillis);
354      }
355  
356      /**
# Line 238 | Line 374 | public class JSR166TestCase extends Test
374      }
375  
376      /**
377 +     * Extra checks that get done for all test cases.
378 +     *
379       * Triggers test case failure if any thread assertions have failed,
380       * by rethrowing, in the test harness thread, any exception recorded
381       * earlier by threadRecordFailure.
382 +     *
383 +     * Triggers test case failure if interrupt status is set in the main thread.
384       */
385      public void tearDown() throws Exception {
386 <        Throwable t = threadFailure.get();
386 >        Throwable t = threadFailure.getAndSet(null);
387          if (t != null) {
388              if (t instanceof Error)
389                  throw (Error) t;
# Line 251 | Line 391 | public class JSR166TestCase extends Test
391                  throw (RuntimeException) t;
392              else if (t instanceof Exception)
393                  throw (Exception) t;
394 <            else
395 <                throw new AssertionError(t);
394 >            else {
395 >                AssertionFailedError afe =
396 >                    new AssertionFailedError(t.toString());
397 >                afe.initCause(t);
398 >                throw afe;
399 >            }
400 >        }
401 >
402 >        if (Thread.interrupted())
403 >            throw new AssertionFailedError("interrupt status set in main thread");
404 >
405 >        checkForkJoinPoolThreadLeaks();
406 >    }
407 >
408 >    /**
409 >     * Find missing try { ... } finally { joinPool(e); }
410 >     */
411 >    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
412 >        Thread[] survivors = new Thread[5];
413 >        int count = Thread.enumerate(survivors);
414 >        for (int i = 0; i < count; i++) {
415 >            Thread thread = survivors[i];
416 >            String name = thread.getName();
417 >            if (name.startsWith("ForkJoinPool-")) {
418 >                // give thread some time to terminate
419 >                thread.join(LONG_DELAY_MS);
420 >                if (!thread.isAlive()) continue;
421 >                thread.stop();
422 >                throw new AssertionFailedError
423 >                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
424 >                                   toString(), name));
425 >            }
426          }
427      }
428  
429      /**
430       * Just like fail(reason), but additionally recording (using
431 <     * threadRecordFailure) any AssertionError thrown, so that the current
432 <     * testcase will fail.
431 >     * threadRecordFailure) any AssertionFailedError thrown, so that
432 >     * the current testcase will fail.
433       */
434      public void threadFail(String reason) {
435          try {
436              fail(reason);
437 <        } catch (Throwable t) {
437 >        } catch (AssertionFailedError t) {
438              threadRecordFailure(t);
439              fail(reason);
440          }
# Line 272 | Line 442 | public class JSR166TestCase extends Test
442  
443      /**
444       * Just like assertTrue(b), but additionally recording (using
445 <     * threadRecordFailure) any AssertionError thrown, so that the current
446 <     * testcase will fail.
445 >     * threadRecordFailure) any AssertionFailedError thrown, so that
446 >     * the current testcase will fail.
447       */
448      public void threadAssertTrue(boolean b) {
449          try {
450              assertTrue(b);
451 <        } catch (AssertionError t) {
451 >        } catch (AssertionFailedError t) {
452              threadRecordFailure(t);
453              throw t;
454          }
# Line 286 | Line 456 | public class JSR166TestCase extends Test
456  
457      /**
458       * Just like assertFalse(b), but additionally recording (using
459 <     * threadRecordFailure) any AssertionError thrown, so that the
460 <     * current testcase will fail.
459 >     * threadRecordFailure) any AssertionFailedError thrown, so that
460 >     * the current testcase will fail.
461       */
462      public void threadAssertFalse(boolean b) {
463          try {
464              assertFalse(b);
465 <        } catch (AssertionError t) {
465 >        } catch (AssertionFailedError t) {
466              threadRecordFailure(t);
467              throw t;
468          }
# Line 300 | Line 470 | public class JSR166TestCase extends Test
470  
471      /**
472       * Just like assertNull(x), but additionally recording (using
473 <     * threadRecordFailure) any AssertionError thrown, so that the
474 <     * current testcase will fail.
473 >     * threadRecordFailure) any AssertionFailedError thrown, so that
474 >     * the current testcase will fail.
475       */
476      public void threadAssertNull(Object x) {
477          try {
478              assertNull(x);
479 <        } catch (AssertionError t) {
479 >        } catch (AssertionFailedError t) {
480              threadRecordFailure(t);
481              throw t;
482          }
# Line 314 | Line 484 | public class JSR166TestCase extends Test
484  
485      /**
486       * Just like assertEquals(x, y), but additionally recording (using
487 <     * threadRecordFailure) any AssertionError thrown, so that the
488 <     * current testcase will fail.
487 >     * threadRecordFailure) any AssertionFailedError thrown, so that
488 >     * the current testcase will fail.
489       */
490      public void threadAssertEquals(long x, long y) {
491          try {
492              assertEquals(x, y);
493 <        } catch (AssertionError t) {
493 >        } catch (AssertionFailedError t) {
494              threadRecordFailure(t);
495              throw t;
496          }
# Line 328 | Line 498 | public class JSR166TestCase extends Test
498  
499      /**
500       * Just like assertEquals(x, y), but additionally recording (using
501 <     * threadRecordFailure) any AssertionError thrown, so that the
502 <     * current testcase will fail.
501 >     * threadRecordFailure) any AssertionFailedError thrown, so that
502 >     * the current testcase will fail.
503       */
504      public void threadAssertEquals(Object x, Object y) {
505          try {
506              assertEquals(x, y);
507 <        } catch (AssertionError t) {
507 >        } catch (AssertionFailedError t) {
508              threadRecordFailure(t);
509              throw t;
510 +        } catch (Throwable t) {
511 +            threadUnexpectedException(t);
512          }
513      }
514  
515      /**
516       * Just like assertSame(x, y), but additionally recording (using
517 <     * threadRecordFailure) any AssertionError thrown, so that the
518 <     * current testcase will fail.
517 >     * threadRecordFailure) any AssertionFailedError thrown, so that
518 >     * the current testcase will fail.
519       */
520      public void threadAssertSame(Object x, Object y) {
521          try {
522              assertSame(x, y);
523 <        } catch (AssertionError t) {
523 >        } catch (AssertionFailedError t) {
524              threadRecordFailure(t);
525              throw t;
526          }
# Line 369 | Line 541 | public class JSR166TestCase extends Test
541      }
542  
543      /**
544 <     * Calls threadFail with message "Unexpected exception" + ex.
544 >     * Records the given exception using {@link #threadRecordFailure},
545 >     * then rethrows the exception, wrapping it in an
546 >     * AssertionFailedError if necessary.
547       */
548      public void threadUnexpectedException(Throwable t) {
549          threadRecordFailure(t);
550          t.printStackTrace();
377        // Rethrow, wrapping in an AssertionError if necessary
551          if (t instanceof RuntimeException)
552              throw (RuntimeException) t;
553          else if (t instanceof Error)
554              throw (Error) t;
555          else {
556 <            AssertionError ae = new AssertionError("unexpected exception: " + t);
557 <            t.initCause(t);
558 <            throw ae;
559 <        }            
556 >            AssertionFailedError afe =
557 >                new AssertionFailedError("unexpected exception: " + t);
558 >            afe.initCause(t);
559 >            throw afe;
560 >        }
561 >    }
562 >
563 >    /**
564 >     * Delays, via Thread.sleep, for the given millisecond delay, but
565 >     * if the sleep is shorter than specified, may re-sleep or yield
566 >     * until time elapses.
567 >     */
568 >    static void delay(long millis) throws InterruptedException {
569 >        long startTime = System.nanoTime();
570 >        long ns = millis * 1000 * 1000;
571 >        for (;;) {
572 >            if (millis > 0L)
573 >                Thread.sleep(millis);
574 >            else // too short to sleep
575 >                Thread.yield();
576 >            long d = ns - (System.nanoTime() - startTime);
577 >            if (d > 0L)
578 >                millis = d / (1000 * 1000);
579 >            else
580 >                break;
581 >        }
582      }
583  
584      /**
585       * Waits out termination of a thread pool or fails doing so.
586       */
587 <    public void joinPool(ExecutorService exec) {
587 >    void joinPool(ExecutorService exec) {
588          try {
589              exec.shutdown();
590              assertTrue("ExecutorService did not terminate in a timely manner",
591 <                       exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
591 >                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
592          } catch (SecurityException ok) {
593              // Allowed in case test doesn't have privs
594          } catch (InterruptedException ie) {
# Line 401 | Line 596 | public class JSR166TestCase extends Test
596          }
597      }
598  
599 +    /**
600 +     * A debugging tool to print all stack traces, as jstack does.
601 +     */
602 +    static void printAllStackTraces() {
603 +        for (ThreadInfo info :
604 +                 ManagementFactory.getThreadMXBean()
605 +                 .dumpAllThreads(true, true))
606 +            System.err.print(info);
607 +    }
608 +
609 +    /**
610 +     * Checks that thread does not terminate within the default
611 +     * millisecond delay of {@code timeoutMillis()}.
612 +     */
613 +    void assertThreadStaysAlive(Thread thread) {
614 +        assertThreadStaysAlive(thread, timeoutMillis());
615 +    }
616 +
617 +    /**
618 +     * Checks that thread does not terminate within the given millisecond delay.
619 +     */
620 +    void assertThreadStaysAlive(Thread thread, long millis) {
621 +        try {
622 +            // No need to optimize the failing case via Thread.join.
623 +            delay(millis);
624 +            assertTrue(thread.isAlive());
625 +        } catch (InterruptedException ie) {
626 +            fail("Unexpected InterruptedException");
627 +        }
628 +    }
629 +
630 +    /**
631 +     * Checks that the threads do not terminate within the default
632 +     * millisecond delay of {@code timeoutMillis()}.
633 +     */
634 +    void assertThreadsStayAlive(Thread... threads) {
635 +        assertThreadsStayAlive(timeoutMillis(), threads);
636 +    }
637 +
638 +    /**
639 +     * Checks that the threads do not terminate within the given millisecond delay.
640 +     */
641 +    void assertThreadsStayAlive(long millis, Thread... threads) {
642 +        try {
643 +            // No need to optimize the failing case via Thread.join.
644 +            delay(millis);
645 +            for (Thread thread : threads)
646 +                assertTrue(thread.isAlive());
647 +        } catch (InterruptedException ie) {
648 +            fail("Unexpected InterruptedException");
649 +        }
650 +    }
651 +
652 +    /**
653 +     * Checks that future.get times out, with the default timeout of
654 +     * {@code timeoutMillis()}.
655 +     */
656 +    void assertFutureTimesOut(Future future) {
657 +        assertFutureTimesOut(future, timeoutMillis());
658 +    }
659 +
660 +    /**
661 +     * Checks that future.get times out, with the given millisecond timeout.
662 +     */
663 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
664 +        long startTime = System.nanoTime();
665 +        try {
666 +            future.get(timeoutMillis, MILLISECONDS);
667 +            shouldThrow();
668 +        } catch (TimeoutException success) {
669 +        } catch (Exception e) {
670 +            threadUnexpectedException(e);
671 +        } finally { future.cancel(true); }
672 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
673 +    }
674  
675      /**
676       * Fails with message "should throw exception".
# Line 417 | Line 687 | public class JSR166TestCase extends Test
687      }
688  
689      /**
420     * Fails with message "Unexpected exception: " + ex.
421     */
422    public void unexpectedException(Throwable ex) {
423        ex.printStackTrace();
424        fail("Unexpected exception: " + ex);
425    }
426
427
428    /**
690       * The number of elements to place in collections, arrays, etc.
691       */
692      public static final int SIZE = 20;
# Line 450 | Line 711 | public class JSR166TestCase extends Test
711      public static final Integer m6  = new Integer(-6);
712      public static final Integer m10 = new Integer(-10);
713  
453
714      /**
715       * Runs Runnable r with a security policy that permits precisely
716       * the specified permissions.  If there is no current security
# Line 462 | Line 722 | public class JSR166TestCase extends Test
722          SecurityManager sm = System.getSecurityManager();
723          if (sm == null) {
724              r.run();
725 +        }
726 +        runWithSecurityManagerWithPermissions(r, permissions);
727 +    }
728 +
729 +    /**
730 +     * Runs Runnable r with a security policy that permits precisely
731 +     * the specified permissions.  If there is no current security
732 +     * manager, a temporary one is set for the duration of the
733 +     * Runnable.  We require that any security manager permit
734 +     * getPolicy/setPolicy.
735 +     */
736 +    public void runWithSecurityManagerWithPermissions(Runnable r,
737 +                                                      Permission... permissions) {
738 +        SecurityManager sm = System.getSecurityManager();
739 +        if (sm == null) {
740              Policy savedPolicy = Policy.getPolicy();
741              try {
742                  Policy.setPolicy(permissivePolicy());
743                  System.setSecurityManager(new SecurityManager());
744 <                runWithPermissions(r, permissions);
744 >                runWithSecurityManagerWithPermissions(r, permissions);
745              } finally {
746                  System.setSecurityManager(null);
747                  Policy.setPolicy(savedPolicy);
# Line 514 | Line 789 | public class JSR166TestCase extends Test
789              return perms.implies(p);
790          }
791          public void refresh() {}
792 +        public String toString() {
793 +            List<Permission> ps = new ArrayList<Permission>();
794 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
795 +                ps.add(e.nextElement());
796 +            return "AdjustablePolicy with permissions " + ps;
797 +        }
798      }
799  
800      /**
# Line 536 | Line 817 | public class JSR166TestCase extends Test
817      }
818  
819      /**
820 <     * Sleep until the timeout has elapsed, or interrupted.
821 <     * Does <em>NOT</em> throw InterruptedException.
820 >     * Sleeps until the given time has elapsed.
821 >     * Throws AssertionFailedError if interrupted.
822       */
823 <    void sleepTillInterrupted(long timeoutMillis) {
823 >    void sleep(long millis) {
824          try {
825 <            Thread.sleep(timeoutMillis);
826 <        } catch (InterruptedException wakeup) {}
825 >            delay(millis);
826 >        } catch (InterruptedException ie) {
827 >            AssertionFailedError afe =
828 >                new AssertionFailedError("Unexpected InterruptedException");
829 >            afe.initCause(ie);
830 >            throw afe;
831 >        }
832      }
833  
834      /**
835 <     * Returns a new started Thread running the given runnable.
835 >     * Spin-waits up to the specified number of milliseconds for the given
836 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
837 >     */
838 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
839 >        long startTime = System.nanoTime();
840 >        for (;;) {
841 >            Thread.State s = thread.getState();
842 >            if (s == Thread.State.BLOCKED ||
843 >                s == Thread.State.WAITING ||
844 >                s == Thread.State.TIMED_WAITING)
845 >                return;
846 >            else if (s == Thread.State.TERMINATED)
847 >                fail("Unexpected thread termination");
848 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
849 >                threadAssertTrue(thread.isAlive());
850 >                return;
851 >            }
852 >            Thread.yield();
853 >        }
854 >    }
855 >
856 >    /**
857 >     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
858 >     * state: BLOCKED, WAITING, or TIMED_WAITING.
859 >     */
860 >    void waitForThreadToEnterWaitState(Thread thread) {
861 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
862 >    }
863 >
864 >    /**
865 >     * Returns the number of milliseconds since time given by
866 >     * startNanoTime, which must have been previously returned from a
867 >     * call to {@link System.nanoTime()}.
868 >     */
869 >    long millisElapsedSince(long startNanoTime) {
870 >        return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
871 >    }
872 >
873 >    /**
874 >     * Returns a new started daemon Thread running the given runnable.
875       */
876      Thread newStartedThread(Runnable runnable) {
877          Thread t = new Thread(runnable);
878 +        t.setDaemon(true);
879          t.start();
880          return t;
881      }
882  
883 +    /**
884 +     * Waits for the specified time (in milliseconds) for the thread
885 +     * to terminate (using {@link Thread#join(long)}), else interrupts
886 +     * the thread (in the hope that it may terminate later) and fails.
887 +     */
888 +    void awaitTermination(Thread t, long timeoutMillis) {
889 +        try {
890 +            t.join(timeoutMillis);
891 +        } catch (InterruptedException ie) {
892 +            threadUnexpectedException(ie);
893 +        } finally {
894 +            if (t.getState() != Thread.State.TERMINATED) {
895 +                t.interrupt();
896 +                fail("Test timed out");
897 +            }
898 +        }
899 +    }
900 +
901 +    /**
902 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
903 +     * terminate (using {@link Thread#join(long)}), else interrupts
904 +     * the thread (in the hope that it may terminate later) and fails.
905 +     */
906 +    void awaitTermination(Thread t) {
907 +        awaitTermination(t, LONG_DELAY_MS);
908 +    }
909 +
910      // Some convenient Runnable classes
911  
912      public abstract class CheckedRunnable implements Runnable {
# Line 616 | Line 969 | public class JSR166TestCase extends Test
969                  realRun();
970                  threadShouldThrow("InterruptedException");
971              } catch (InterruptedException success) {
972 +                threadAssertFalse(Thread.interrupted());
973              } catch (Throwable t) {
974                  threadUnexpectedException(t);
975              }
# Line 645 | Line 999 | public class JSR166TestCase extends Test
999                  threadShouldThrow("InterruptedException");
1000                  return result;
1001              } catch (InterruptedException success) {
1002 +                threadAssertFalse(Thread.interrupted());
1003              } catch (Throwable t) {
1004                  threadUnexpectedException(t);
1005              }
# Line 668 | Line 1023 | public class JSR166TestCase extends Test
1023  
1024      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
1025          return new CheckedCallable<String>() {
1026 <            public String realCall() {
1026 >            protected String realCall() {
1027                  try {
1028                      latch.await();
1029                  } catch (InterruptedException quittingTime) {}
# Line 676 | Line 1031 | public class JSR166TestCase extends Test
1031              }};
1032      }
1033  
1034 +    public Runnable awaiter(final CountDownLatch latch) {
1035 +        return new CheckedRunnable() {
1036 +            public void realRun() throws InterruptedException {
1037 +                await(latch);
1038 +            }};
1039 +    }
1040 +
1041 +    public void await(CountDownLatch latch) {
1042 +        try {
1043 +            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1044 +        } catch (Throwable t) {
1045 +            threadUnexpectedException(t);
1046 +        }
1047 +    }
1048 +
1049 +    public void await(Semaphore semaphore) {
1050 +        try {
1051 +            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1052 +        } catch (Throwable t) {
1053 +            threadUnexpectedException(t);
1054 +        }
1055 +    }
1056 +
1057 + //     /**
1058 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1059 + //      */
1060 + //     public void await(AtomicBoolean flag) {
1061 + //         await(flag, LONG_DELAY_MS);
1062 + //     }
1063 +
1064 + //     /**
1065 + //      * Spin-waits up to the specified timeout until flag becomes true.
1066 + //      */
1067 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
1068 + //         long startTime = System.nanoTime();
1069 + //         while (!flag.get()) {
1070 + //             if (millisElapsedSince(startTime) > timeoutMillis)
1071 + //                 throw new AssertionFailedError("timed out");
1072 + //             Thread.yield();
1073 + //         }
1074 + //     }
1075 +
1076      public static class NPETask implements Callable<String> {
1077          public String call() { throw new NullPointerException(); }
1078      }
# Line 686 | Line 1083 | public class JSR166TestCase extends Test
1083  
1084      public class ShortRunnable extends CheckedRunnable {
1085          protected void realRun() throws Throwable {
1086 <            Thread.sleep(SHORT_DELAY_MS);
1086 >            delay(SHORT_DELAY_MS);
1087          }
1088      }
1089  
1090      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1091          protected void realRun() throws InterruptedException {
1092 <            Thread.sleep(SHORT_DELAY_MS);
1092 >            delay(SHORT_DELAY_MS);
1093          }
1094      }
1095  
1096      public class SmallRunnable extends CheckedRunnable {
1097          protected void realRun() throws Throwable {
1098 <            Thread.sleep(SMALL_DELAY_MS);
1098 >            delay(SMALL_DELAY_MS);
1099          }
1100      }
1101  
1102      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1103          protected void realRun() {
1104              try {
1105 <                Thread.sleep(SMALL_DELAY_MS);
1105 >                delay(SMALL_DELAY_MS);
1106              } catch (InterruptedException ok) {}
1107          }
1108      }
1109  
1110      public class SmallCallable extends CheckedCallable {
1111          protected Object realCall() throws InterruptedException {
1112 <            Thread.sleep(SMALL_DELAY_MS);
1112 >            delay(SMALL_DELAY_MS);
1113              return Boolean.TRUE;
1114          }
1115      }
1116  
720    public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
721        protected void realRun() throws InterruptedException {
722            Thread.sleep(SMALL_DELAY_MS);
723        }
724    }
725
1117      public class MediumRunnable extends CheckedRunnable {
1118          protected void realRun() throws Throwable {
1119 <            Thread.sleep(MEDIUM_DELAY_MS);
1119 >            delay(MEDIUM_DELAY_MS);
1120          }
1121      }
1122  
1123      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1124          protected void realRun() throws InterruptedException {
1125 <            Thread.sleep(MEDIUM_DELAY_MS);
1125 >            delay(MEDIUM_DELAY_MS);
1126          }
1127      }
1128  
1129 +    public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1130 +        return new CheckedRunnable() {
1131 +            protected void realRun() {
1132 +                try {
1133 +                    delay(timeoutMillis);
1134 +                } catch (InterruptedException ok) {}
1135 +            }};
1136 +    }
1137 +
1138      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1139          protected void realRun() {
1140              try {
1141 <                Thread.sleep(MEDIUM_DELAY_MS);
1141 >                delay(MEDIUM_DELAY_MS);
1142              } catch (InterruptedException ok) {}
1143          }
1144      }
# Line 746 | Line 1146 | public class JSR166TestCase extends Test
1146      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1147          protected void realRun() {
1148              try {
1149 <                Thread.sleep(LONG_DELAY_MS);
1149 >                delay(LONG_DELAY_MS);
1150              } catch (InterruptedException ok) {}
1151          }
1152      }
# Line 760 | Line 1160 | public class JSR166TestCase extends Test
1160          }
1161      }
1162  
1163 +    public interface TrackedRunnable extends Runnable {
1164 +        boolean isDone();
1165 +    }
1166 +
1167 +    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1168 +        return new TrackedRunnable() {
1169 +                private volatile boolean done = false;
1170 +                public boolean isDone() { return done; }
1171 +                public void run() {
1172 +                    try {
1173 +                        delay(timeoutMillis);
1174 +                        done = true;
1175 +                    } catch (InterruptedException ok) {}
1176 +                }
1177 +            };
1178 +    }
1179 +
1180      public static class TrackedShortRunnable implements Runnable {
1181          public volatile boolean done = false;
1182          public void run() {
1183              try {
1184 <                Thread.sleep(SMALL_DELAY_MS);
1184 >                delay(SHORT_DELAY_MS);
1185 >                done = true;
1186 >            } catch (InterruptedException ok) {}
1187 >        }
1188 >    }
1189 >
1190 >    public static class TrackedSmallRunnable implements Runnable {
1191 >        public volatile boolean done = false;
1192 >        public void run() {
1193 >            try {
1194 >                delay(SMALL_DELAY_MS);
1195                  done = true;
1196              } catch (InterruptedException ok) {}
1197          }
# Line 774 | Line 1201 | public class JSR166TestCase extends Test
1201          public volatile boolean done = false;
1202          public void run() {
1203              try {
1204 <                Thread.sleep(MEDIUM_DELAY_MS);
1204 >                delay(MEDIUM_DELAY_MS);
1205                  done = true;
1206              } catch (InterruptedException ok) {}
1207          }
# Line 784 | Line 1211 | public class JSR166TestCase extends Test
1211          public volatile boolean done = false;
1212          public void run() {
1213              try {
1214 <                Thread.sleep(LONG_DELAY_MS);
1214 >                delay(LONG_DELAY_MS);
1215                  done = true;
1216              } catch (InterruptedException ok) {}
1217          }
# Line 801 | Line 1228 | public class JSR166TestCase extends Test
1228          public volatile boolean done = false;
1229          public Object call() {
1230              try {
1231 <                Thread.sleep(SMALL_DELAY_MS);
1231 >                delay(SMALL_DELAY_MS);
1232                  done = true;
1233              } catch (InterruptedException ok) {}
1234              return Boolean.TRUE;
# Line 814 | Line 1241 | public class JSR166TestCase extends Test
1241      public abstract class CheckedRecursiveAction extends RecursiveAction {
1242          protected abstract void realCompute() throws Throwable;
1243  
1244 <        public final void compute() {
1244 >        @Override protected final void compute() {
1245              try {
1246                  realCompute();
1247              } catch (Throwable t) {
# Line 829 | Line 1256 | public class JSR166TestCase extends Test
1256      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1257          protected abstract T realCompute() throws Throwable;
1258  
1259 <        public final T compute() {
1259 >        @Override protected final T compute() {
1260              try {
1261                  return realCompute();
1262              } catch (Throwable t) {
# Line 847 | Line 1274 | public class JSR166TestCase extends Test
1274                                        ThreadPoolExecutor executor) {}
1275      }
1276  
1277 +    /**
1278 +     * A CyclicBarrier that uses timed await and fails with
1279 +     * AssertionFailedErrors instead of throwing checked exceptions.
1280 +     */
1281 +    public class CheckedBarrier extends CyclicBarrier {
1282 +        public CheckedBarrier(int parties) { super(parties); }
1283 +
1284 +        public int await() {
1285 +            try {
1286 +                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1287 +            } catch (TimeoutException e) {
1288 +                throw new AssertionFailedError("timed out");
1289 +            } catch (Exception e) {
1290 +                AssertionFailedError afe =
1291 +                    new AssertionFailedError("Unexpected exception: " + e);
1292 +                afe.initCause(e);
1293 +                throw afe;
1294 +            }
1295 +        }
1296 +    }
1297 +
1298 +    void checkEmpty(BlockingQueue q) {
1299 +        try {
1300 +            assertTrue(q.isEmpty());
1301 +            assertEquals(0, q.size());
1302 +            assertNull(q.peek());
1303 +            assertNull(q.poll());
1304 +            assertNull(q.poll(0, MILLISECONDS));
1305 +            assertEquals(q.toString(), "[]");
1306 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1307 +            assertFalse(q.iterator().hasNext());
1308 +            try {
1309 +                q.element();
1310 +                shouldThrow();
1311 +            } catch (NoSuchElementException success) {}
1312 +            try {
1313 +                q.iterator().next();
1314 +                shouldThrow();
1315 +            } catch (NoSuchElementException success) {}
1316 +            try {
1317 +                q.remove();
1318 +                shouldThrow();
1319 +            } catch (NoSuchElementException success) {}
1320 +        } catch (InterruptedException ie) {
1321 +            threadUnexpectedException(ie);
1322 +        }
1323 +    }
1324 +
1325 +    void assertSerialEquals(Object x, Object y) {
1326 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1327 +    }
1328 +
1329 +    void assertNotSerialEquals(Object x, Object y) {
1330 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1331 +    }
1332 +
1333 +    byte[] serialBytes(Object o) {
1334 +        try {
1335 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1336 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1337 +            oos.writeObject(o);
1338 +            oos.flush();
1339 +            oos.close();
1340 +            return bos.toByteArray();
1341 +        } catch (Throwable t) {
1342 +            threadUnexpectedException(t);
1343 +            return new byte[0];
1344 +        }
1345 +    }
1346 +
1347 +    @SuppressWarnings("unchecked")
1348 +    <T> T serialClone(T o) {
1349 +        try {
1350 +            ObjectInputStream ois = new ObjectInputStream
1351 +                (new ByteArrayInputStream(serialBytes(o)));
1352 +            T clone = (T) ois.readObject();
1353 +            assertSame(o.getClass(), clone.getClass());
1354 +            return clone;
1355 +        } catch (Throwable t) {
1356 +            threadUnexpectedException(t);
1357 +            return null;
1358 +        }
1359 +    }
1360 +
1361 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1362 +                             Runnable... throwingActions) {
1363 +        for (Runnable throwingAction : throwingActions) {
1364 +            boolean threw = false;
1365 +            try { throwingAction.run(); }
1366 +            catch (Throwable t) {
1367 +                threw = true;
1368 +                if (!expectedExceptionClass.isInstance(t)) {
1369 +                    AssertionFailedError afe =
1370 +                        new AssertionFailedError
1371 +                        ("Expected " + expectedExceptionClass.getName() +
1372 +                         ", got " + t.getClass().getName());
1373 +                    afe.initCause(t);
1374 +                    threadUnexpectedException(afe);
1375 +                }
1376 +            }
1377 +            if (!threw)
1378 +                shouldThrow(expectedExceptionClass.getName());
1379 +        }
1380 +    }
1381   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines