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.56 by jsr166, Sun Oct 3 23:59:05 2010 UTC vs.
Revision 1.115 by jsr166, Wed May 14 21:06:38 2014 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.util.regex.Pattern;
30   import java.security.CodeSource;
31   import java.security.Permission;
32   import java.security.PermissionCollection;
# Line 60 | Line 76 | import java.security.SecurityPermission;
76   *
77   * </ol>
78   *
79 < * <p> <b>Other notes</b>
79 > * <p><b>Other notes</b>
80   * <ul>
81   *
82   * <li> Usually, there is one testcase method per JSR166 method
# Line 96 | Line 112 | public class JSR166TestCase extends Test
112      private static final boolean useSecurityManager =
113          Boolean.getBoolean("jsr166.useSecurityManager");
114  
115 +    protected static final boolean expensiveTests =
116 +        Boolean.getBoolean("jsr166.expensiveTests");
117 +
118 +    /**
119 +     * If true, report on stdout all "slow" tests, that is, ones that
120 +     * take more than profileThreshold milliseconds to execute.
121 +     */
122 +    private static final boolean profileTests =
123 +        Boolean.getBoolean("jsr166.profileTests");
124 +
125 +    /**
126 +     * The number of milliseconds that tests are permitted for
127 +     * execution without being reported, when profileTests is set.
128 +     */
129 +    private static final long profileThreshold =
130 +        Long.getLong("jsr166.profileThreshold", 100);
131 +
132 +    /**
133 +     * The number of repetitions per test (for tickling rare bugs).
134 +     */
135 +    private static final int runsPerTest =
136 +        Integer.getInteger("jsr166.runsPerTest", 1);
137 +
138 +    /**
139 +     * A filter for tests to run, matching strings of the form
140 +     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
141 +     * Usefully combined with jsr166.runsPerTest.
142 +     */
143 +    private static final Pattern methodFilter = methodFilter();
144 +
145 +    private static Pattern methodFilter() {
146 +        String regex = System.getProperty("jsr166.methodFilter");
147 +        return (regex == null) ? null : Pattern.compile(regex);
148 +    }
149 +
150 +    protected void runTest() throws Throwable {
151 +        if (methodFilter == null
152 +            || methodFilter.matcher(toString()).find()) {
153 +            for (int i = 0; i < runsPerTest; i++) {
154 +                if (profileTests)
155 +                    runTestProfiled();
156 +                else
157 +                    super.runTest();
158 +            }
159 +        }
160 +    }
161 +
162 +    protected void runTestProfiled() throws Throwable {
163 +        long t0 = System.nanoTime();
164 +        try {
165 +            super.runTest();
166 +        } finally {
167 +            long elapsedMillis =
168 +                (System.nanoTime() - t0) / (1000L * 1000L);
169 +            if (elapsedMillis >= profileThreshold)
170 +                System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
171 +        }
172 +    }
173 +
174      /**
175 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
175 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
176 >     * Optional command line arg provides the number of iterations to
177 >     * repeat running the tests.
178       */
179      public static void main(String[] args) {
180          if (useSecurityManager) {
# Line 116 | Line 193 | public class JSR166TestCase extends Test
193          System.exit(0);
194      }
195  
196 +    public static TestSuite newTestSuite(Object... suiteOrClasses) {
197 +        TestSuite suite = new TestSuite();
198 +        for (Object suiteOrClass : suiteOrClasses) {
199 +            if (suiteOrClass instanceof TestSuite)
200 +                suite.addTest((TestSuite) suiteOrClass);
201 +            else if (suiteOrClass instanceof Class)
202 +                suite.addTest(new TestSuite((Class<?>) suiteOrClass));
203 +            else
204 +                throw new ClassCastException("not a test suite or class");
205 +        }
206 +        return suite;
207 +    }
208 +
209 +    public static void addNamedTestClasses(TestSuite suite,
210 +                                           String... testClassNames) {
211 +        for (String testClassName : testClassNames) {
212 +            try {
213 +                Class<?> testClass = Class.forName(testClassName);
214 +                Method m = testClass.getDeclaredMethod("suite",
215 +                                                       new Class<?>[0]);
216 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
217 +            } catch (Exception e) {
218 +                throw new Error("Missing test class", e);
219 +            }
220 +        }
221 +    }
222 +
223 +    public static final double JAVA_CLASS_VERSION;
224 +    public static final String JAVA_SPECIFICATION_VERSION;
225 +    static {
226 +        try {
227 +            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
228 +                new java.security.PrivilegedAction<Double>() {
229 +                public Double run() {
230 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
231 +            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
232 +                new java.security.PrivilegedAction<String>() {
233 +                public String run() {
234 +                    return System.getProperty("java.specification.version");}});
235 +        } catch (Throwable t) {
236 +            throw new Error(t);
237 +        }
238 +    }
239 +
240 +    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
241 +    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
242 +    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
243 +    public static boolean atLeastJava9() {
244 +        // As of 2014-05, java9 still uses 52.0 class file version
245 +        return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
246 +    }
247 +
248      /**
249 <     * Collects all JSR166 unit tests as one suite
249 >     * Collects all JSR166 unit tests as one suite.
250       */
251      public static Test suite() {
252 <        TestSuite suite = new TestSuite("JSR166 Unit Tests");
253 <
254 <        suite.addTest(ForkJoinPoolTest.suite());
255 <        suite.addTest(ForkJoinTaskTest.suite());
256 <        suite.addTest(RecursiveActionTest.suite());
257 <        suite.addTest(RecursiveTaskTest.suite());
258 <        suite.addTest(LinkedTransferQueueTest.suite());
259 <        suite.addTest(PhaserTest.suite());
260 <        suite.addTest(ThreadLocalRandomTest.suite());
261 <        suite.addTest(AbstractExecutorServiceTest.suite());
262 <        suite.addTest(AbstractQueueTest.suite());
263 <        suite.addTest(AbstractQueuedSynchronizerTest.suite());
264 <        suite.addTest(AbstractQueuedLongSynchronizerTest.suite());
265 <        suite.addTest(ArrayBlockingQueueTest.suite());
266 <        suite.addTest(ArrayDequeTest.suite());
267 <        suite.addTest(AtomicBooleanTest.suite());
268 <        suite.addTest(AtomicIntegerArrayTest.suite());
269 <        suite.addTest(AtomicIntegerFieldUpdaterTest.suite());
270 <        suite.addTest(AtomicIntegerTest.suite());
271 <        suite.addTest(AtomicLongArrayTest.suite());
272 <        suite.addTest(AtomicLongFieldUpdaterTest.suite());
273 <        suite.addTest(AtomicLongTest.suite());
274 <        suite.addTest(AtomicMarkableReferenceTest.suite());
275 <        suite.addTest(AtomicReferenceArrayTest.suite());
276 <        suite.addTest(AtomicReferenceFieldUpdaterTest.suite());
277 <        suite.addTest(AtomicReferenceTest.suite());
278 <        suite.addTest(AtomicStampedReferenceTest.suite());
279 <        suite.addTest(ConcurrentHashMapTest.suite());
280 <        suite.addTest(ConcurrentLinkedDequeTest.suite());
281 <        suite.addTest(ConcurrentLinkedQueueTest.suite());
282 <        suite.addTest(ConcurrentSkipListMapTest.suite());
283 <        suite.addTest(ConcurrentSkipListSubMapTest.suite());
284 <        suite.addTest(ConcurrentSkipListSetTest.suite());
285 <        suite.addTest(ConcurrentSkipListSubSetTest.suite());
286 <        suite.addTest(CopyOnWriteArrayListTest.suite());
287 <        suite.addTest(CopyOnWriteArraySetTest.suite());
288 <        suite.addTest(CountDownLatchTest.suite());
289 <        suite.addTest(CyclicBarrierTest.suite());
290 <        suite.addTest(DelayQueueTest.suite());
291 <        suite.addTest(EntryTest.suite());
292 <        suite.addTest(ExchangerTest.suite());
293 <        suite.addTest(ExecutorsTest.suite());
294 <        suite.addTest(ExecutorCompletionServiceTest.suite());
295 <        suite.addTest(FutureTaskTest.suite());
296 <        suite.addTest(LinkedBlockingDequeTest.suite());
297 <        suite.addTest(LinkedBlockingQueueTest.suite());
298 <        suite.addTest(LinkedListTest.suite());
299 <        suite.addTest(LockSupportTest.suite());
300 <        suite.addTest(PriorityBlockingQueueTest.suite());
301 <        suite.addTest(PriorityQueueTest.suite());
302 <        suite.addTest(ReentrantLockTest.suite());
303 <        suite.addTest(ReentrantReadWriteLockTest.suite());
304 <        suite.addTest(ScheduledExecutorTest.suite());
305 <        suite.addTest(ScheduledExecutorSubclassTest.suite());
306 <        suite.addTest(SemaphoreTest.suite());
307 <        suite.addTest(SynchronousQueueTest.suite());
308 <        suite.addTest(SystemTest.suite());
309 <        suite.addTest(ThreadLocalTest.suite());
310 <        suite.addTest(ThreadPoolExecutorTest.suite());
311 <        suite.addTest(ThreadPoolExecutorSubclassTest.suite());
312 <        suite.addTest(ThreadTest.suite());
313 <        suite.addTest(TimeUnitTest.suite());
314 <        suite.addTest(TreeMapTest.suite());
315 <        suite.addTest(TreeSetTest.suite());
316 <        suite.addTest(TreeSubMapTest.suite());
317 <        suite.addTest(TreeSubSetTest.suite());
252 >        // Java7+ test classes
253 >        TestSuite suite = newTestSuite(
254 >            ForkJoinPoolTest.suite(),
255 >            ForkJoinTaskTest.suite(),
256 >            RecursiveActionTest.suite(),
257 >            RecursiveTaskTest.suite(),
258 >            LinkedTransferQueueTest.suite(),
259 >            PhaserTest.suite(),
260 >            ThreadLocalRandomTest.suite(),
261 >            AbstractExecutorServiceTest.suite(),
262 >            AbstractQueueTest.suite(),
263 >            AbstractQueuedSynchronizerTest.suite(),
264 >            AbstractQueuedLongSynchronizerTest.suite(),
265 >            ArrayBlockingQueueTest.suite(),
266 >            ArrayDequeTest.suite(),
267 >            AtomicBooleanTest.suite(),
268 >            AtomicIntegerArrayTest.suite(),
269 >            AtomicIntegerFieldUpdaterTest.suite(),
270 >            AtomicIntegerTest.suite(),
271 >            AtomicLongArrayTest.suite(),
272 >            AtomicLongFieldUpdaterTest.suite(),
273 >            AtomicLongTest.suite(),
274 >            AtomicMarkableReferenceTest.suite(),
275 >            AtomicReferenceArrayTest.suite(),
276 >            AtomicReferenceFieldUpdaterTest.suite(),
277 >            AtomicReferenceTest.suite(),
278 >            AtomicStampedReferenceTest.suite(),
279 >            ConcurrentHashMapTest.suite(),
280 >            ConcurrentLinkedDequeTest.suite(),
281 >            ConcurrentLinkedQueueTest.suite(),
282 >            ConcurrentSkipListMapTest.suite(),
283 >            ConcurrentSkipListSubMapTest.suite(),
284 >            ConcurrentSkipListSetTest.suite(),
285 >            ConcurrentSkipListSubSetTest.suite(),
286 >            CopyOnWriteArrayListTest.suite(),
287 >            CopyOnWriteArraySetTest.suite(),
288 >            CountDownLatchTest.suite(),
289 >            CyclicBarrierTest.suite(),
290 >            DelayQueueTest.suite(),
291 >            EntryTest.suite(),
292 >            ExchangerTest.suite(),
293 >            ExecutorsTest.suite(),
294 >            ExecutorCompletionServiceTest.suite(),
295 >            FutureTaskTest.suite(),
296 >            LinkedBlockingDequeTest.suite(),
297 >            LinkedBlockingQueueTest.suite(),
298 >            LinkedListTest.suite(),
299 >            LockSupportTest.suite(),
300 >            PriorityBlockingQueueTest.suite(),
301 >            PriorityQueueTest.suite(),
302 >            ReentrantLockTest.suite(),
303 >            ReentrantReadWriteLockTest.suite(),
304 >            ScheduledExecutorTest.suite(),
305 >            ScheduledExecutorSubclassTest.suite(),
306 >            SemaphoreTest.suite(),
307 >            SynchronousQueueTest.suite(),
308 >            SystemTest.suite(),
309 >            ThreadLocalTest.suite(),
310 >            ThreadPoolExecutorTest.suite(),
311 >            ThreadPoolExecutorSubclassTest.suite(),
312 >            ThreadTest.suite(),
313 >            TimeUnitTest.suite(),
314 >            TreeMapTest.suite(),
315 >            TreeSetTest.suite(),
316 >            TreeSubMapTest.suite(),
317 >            TreeSubSetTest.suite());
318 >
319 >        // Java8+ test classes
320 >        if (atLeastJava8()) {
321 >            String[] java8TestClassNames = {
322 >                "Atomic8Test",
323 >                "CompletableFutureTest",
324 >                "ConcurrentHashMap8Test",
325 >                "CountedCompleterTest",
326 >                "DoubleAccumulatorTest",
327 >                "DoubleAdderTest",
328 >                "ForkJoinPool8Test",
329 >                "ForkJoinTask8Test",
330 >                "LongAccumulatorTest",
331 >                "LongAdderTest",
332 >                "SplittableRandomTest",
333 >                "StampedLockTest",
334 >                "ThreadLocalRandom8Test",
335 >            };
336 >            addNamedTestClasses(suite, java8TestClassNames);
337 >        }
338 >
339 >        // Java9+ test classes
340 >        if (atLeastJava9()) {
341 >            String[] java9TestClassNames = {
342 >                "ThreadPoolExecutor9Test",
343 >            };
344 >            addNamedTestClasses(suite, java9TestClassNames);
345 >        }
346  
347          return suite;
348      }
349  
350 +    // Delays for timing-dependent tests, in milliseconds.
351  
352      public static long SHORT_DELAY_MS;
353      public static long SMALL_DELAY_MS;
354      public static long MEDIUM_DELAY_MS;
355      public static long LONG_DELAY_MS;
356  
199
357      /**
358       * Returns the shortest timed delay. This could
359       * be reimplemented to use for example a Property.
# Line 205 | Line 362 | public class JSR166TestCase extends Test
362          return 50;
363      }
364  
208
365      /**
366       * Sets delays as multiples of SHORT_DELAY.
367       */
# Line 213 | Line 369 | public class JSR166TestCase extends Test
369          SHORT_DELAY_MS = getShortDelay();
370          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
371          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
372 <        LONG_DELAY_MS   = SHORT_DELAY_MS * 50;
372 >        LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
373 >    }
374 >
375 >    /**
376 >     * Returns a timeout in milliseconds to be used in tests that
377 >     * verify that operations block or time out.
378 >     */
379 >    long timeoutMillis() {
380 >        return SHORT_DELAY_MS / 4;
381 >    }
382 >
383 >    /**
384 >     * Returns a new Date instance representing a time delayMillis
385 >     * milliseconds in the future.
386 >     */
387 >    Date delayedDate(long delayMillis) {
388 >        return new Date(System.currentTimeMillis() + delayMillis);
389      }
390  
391      /**
# Line 237 | Line 409 | public class JSR166TestCase extends Test
409      }
410  
411      /**
412 +     * Extra checks that get done for all test cases.
413 +     *
414       * Triggers test case failure if any thread assertions have failed,
415       * by rethrowing, in the test harness thread, any exception recorded
416       * earlier by threadRecordFailure.
417 +     *
418 +     * Triggers test case failure if interrupt status is set in the main thread.
419       */
420      public void tearDown() throws Exception {
421 <        Throwable t = threadFailure.get();
421 >        Throwable t = threadFailure.getAndSet(null);
422          if (t != null) {
423              if (t instanceof Error)
424                  throw (Error) t;
# Line 250 | Line 426 | public class JSR166TestCase extends Test
426                  throw (RuntimeException) t;
427              else if (t instanceof Exception)
428                  throw (Exception) t;
429 <            else
430 <                throw new AssertionError(t);
429 >            else {
430 >                AssertionFailedError afe =
431 >                    new AssertionFailedError(t.toString());
432 >                afe.initCause(t);
433 >                throw afe;
434 >            }
435 >        }
436 >
437 >        if (Thread.interrupted())
438 >            throw new AssertionFailedError("interrupt status set in main thread");
439 >
440 >        checkForkJoinPoolThreadLeaks();
441 >    }
442 >
443 >    /**
444 >     * Find missing try { ... } finally { joinPool(e); }
445 >     */
446 >    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
447 >        Thread[] survivors = new Thread[5];
448 >        int count = Thread.enumerate(survivors);
449 >        for (int i = 0; i < count; i++) {
450 >            Thread thread = survivors[i];
451 >            String name = thread.getName();
452 >            if (name.startsWith("ForkJoinPool-")) {
453 >                // give thread some time to terminate
454 >                thread.join(LONG_DELAY_MS);
455 >                if (!thread.isAlive()) continue;
456 >                thread.stop();
457 >                throw new AssertionFailedError
458 >                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
459 >                                   toString(), name));
460 >            }
461          }
462      }
463  
464      /**
465       * Just like fail(reason), but additionally recording (using
466 <     * threadRecordFailure) any AssertionError thrown, so that the current
467 <     * testcase will fail.
466 >     * threadRecordFailure) any AssertionFailedError thrown, so that
467 >     * the current testcase will fail.
468       */
469      public void threadFail(String reason) {
470          try {
471              fail(reason);
472 <        } catch (Throwable t) {
472 >        } catch (AssertionFailedError t) {
473              threadRecordFailure(t);
474              fail(reason);
475          }
# Line 271 | Line 477 | public class JSR166TestCase extends Test
477  
478      /**
479       * Just like assertTrue(b), but additionally recording (using
480 <     * threadRecordFailure) any AssertionError thrown, so that the current
481 <     * testcase will fail.
480 >     * threadRecordFailure) any AssertionFailedError thrown, so that
481 >     * the current testcase will fail.
482       */
483      public void threadAssertTrue(boolean b) {
484          try {
485              assertTrue(b);
486 <        } catch (AssertionError t) {
486 >        } catch (AssertionFailedError t) {
487              threadRecordFailure(t);
488              throw t;
489          }
# Line 285 | Line 491 | public class JSR166TestCase extends Test
491  
492      /**
493       * Just like assertFalse(b), but additionally recording (using
494 <     * threadRecordFailure) any AssertionError thrown, so that the
495 <     * current testcase will fail.
494 >     * threadRecordFailure) any AssertionFailedError thrown, so that
495 >     * the current testcase will fail.
496       */
497      public void threadAssertFalse(boolean b) {
498          try {
499              assertFalse(b);
500 <        } catch (AssertionError t) {
500 >        } catch (AssertionFailedError t) {
501              threadRecordFailure(t);
502              throw t;
503          }
# Line 299 | Line 505 | public class JSR166TestCase extends Test
505  
506      /**
507       * Just like assertNull(x), but additionally recording (using
508 <     * threadRecordFailure) any AssertionError thrown, so that the
509 <     * current testcase will fail.
508 >     * threadRecordFailure) any AssertionFailedError thrown, so that
509 >     * the current testcase will fail.
510       */
511      public void threadAssertNull(Object x) {
512          try {
513              assertNull(x);
514 <        } catch (AssertionError t) {
514 >        } catch (AssertionFailedError t) {
515              threadRecordFailure(t);
516              throw t;
517          }
# Line 313 | Line 519 | public class JSR166TestCase extends Test
519  
520      /**
521       * Just like assertEquals(x, y), but additionally recording (using
522 <     * threadRecordFailure) any AssertionError thrown, so that the
523 <     * current testcase will fail.
522 >     * threadRecordFailure) any AssertionFailedError thrown, so that
523 >     * the current testcase will fail.
524       */
525      public void threadAssertEquals(long x, long y) {
526          try {
527              assertEquals(x, y);
528 <        } catch (AssertionError t) {
528 >        } catch (AssertionFailedError t) {
529              threadRecordFailure(t);
530              throw t;
531          }
# Line 327 | Line 533 | public class JSR166TestCase extends Test
533  
534      /**
535       * Just like assertEquals(x, y), but additionally recording (using
536 <     * threadRecordFailure) any AssertionError thrown, so that the
537 <     * current testcase will fail.
536 >     * threadRecordFailure) any AssertionFailedError thrown, so that
537 >     * the current testcase will fail.
538       */
539      public void threadAssertEquals(Object x, Object y) {
540          try {
541              assertEquals(x, y);
542 <        } catch (AssertionError t) {
542 >        } catch (AssertionFailedError t) {
543              threadRecordFailure(t);
544              throw t;
545 +        } catch (Throwable t) {
546 +            threadUnexpectedException(t);
547          }
548      }
549  
550      /**
551       * Just like assertSame(x, y), but additionally recording (using
552 <     * threadRecordFailure) any AssertionError thrown, so that the
553 <     * current testcase will fail.
552 >     * threadRecordFailure) any AssertionFailedError thrown, so that
553 >     * the current testcase will fail.
554       */
555      public void threadAssertSame(Object x, Object y) {
556          try {
557              assertSame(x, y);
558 <        } catch (AssertionError t) {
558 >        } catch (AssertionFailedError t) {
559              threadRecordFailure(t);
560              throw t;
561          }
# Line 368 | Line 576 | public class JSR166TestCase extends Test
576      }
577  
578      /**
579 <     * Calls threadFail with message "Unexpected exception" + ex.
579 >     * Records the given exception using {@link #threadRecordFailure},
580 >     * then rethrows the exception, wrapping it in an
581 >     * AssertionFailedError if necessary.
582       */
583      public void threadUnexpectedException(Throwable t) {
584          threadRecordFailure(t);
585          t.printStackTrace();
376        // Rethrow, wrapping in an AssertionError if necessary
586          if (t instanceof RuntimeException)
587              throw (RuntimeException) t;
588          else if (t instanceof Error)
589              throw (Error) t;
590          else {
591 <            AssertionError ae = new AssertionError("unexpected exception: " + t);
592 <            t.initCause(t);
593 <            throw ae;
591 >            AssertionFailedError afe =
592 >                new AssertionFailedError("unexpected exception: " + t);
593 >            afe.initCause(t);
594 >            throw afe;
595 >        }
596 >    }
597 >
598 >    /**
599 >     * Delays, via Thread.sleep, for the given millisecond delay, but
600 >     * if the sleep is shorter than specified, may re-sleep or yield
601 >     * until time elapses.
602 >     */
603 >    static void delay(long millis) throws InterruptedException {
604 >        long startTime = System.nanoTime();
605 >        long ns = millis * 1000 * 1000;
606 >        for (;;) {
607 >            if (millis > 0L)
608 >                Thread.sleep(millis);
609 >            else // too short to sleep
610 >                Thread.yield();
611 >            long d = ns - (System.nanoTime() - startTime);
612 >            if (d > 0L)
613 >                millis = d / (1000 * 1000);
614 >            else
615 >                break;
616          }
617      }
618  
619      /**
620       * Waits out termination of a thread pool or fails doing so.
621       */
622 <    public void joinPool(ExecutorService exec) {
622 >    void joinPool(ExecutorService exec) {
623          try {
624              exec.shutdown();
625              assertTrue("ExecutorService did not terminate in a timely manner",
626 <                       exec.awaitTermination(LONG_DELAY_MS, MILLISECONDS));
626 >                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
627          } catch (SecurityException ok) {
628              // Allowed in case test doesn't have privs
629          } catch (InterruptedException ie) {
# Line 400 | Line 631 | public class JSR166TestCase extends Test
631          }
632      }
633  
634 +    /**
635 +     * A debugging tool to print all stack traces, as jstack does.
636 +     */
637 +    static void printAllStackTraces() {
638 +        for (ThreadInfo info :
639 +                 ManagementFactory.getThreadMXBean()
640 +                 .dumpAllThreads(true, true))
641 +            System.err.print(info);
642 +    }
643 +
644 +    /**
645 +     * Checks that thread does not terminate within the default
646 +     * millisecond delay of {@code timeoutMillis()}.
647 +     */
648 +    void assertThreadStaysAlive(Thread thread) {
649 +        assertThreadStaysAlive(thread, timeoutMillis());
650 +    }
651 +
652 +    /**
653 +     * Checks that thread does not terminate within the given millisecond delay.
654 +     */
655 +    void assertThreadStaysAlive(Thread thread, long millis) {
656 +        try {
657 +            // No need to optimize the failing case via Thread.join.
658 +            delay(millis);
659 +            assertTrue(thread.isAlive());
660 +        } catch (InterruptedException ie) {
661 +            fail("Unexpected InterruptedException");
662 +        }
663 +    }
664 +
665 +    /**
666 +     * Checks that the threads do not terminate within the default
667 +     * millisecond delay of {@code timeoutMillis()}.
668 +     */
669 +    void assertThreadsStayAlive(Thread... threads) {
670 +        assertThreadsStayAlive(timeoutMillis(), threads);
671 +    }
672 +
673 +    /**
674 +     * Checks that the threads do not terminate within the given millisecond delay.
675 +     */
676 +    void assertThreadsStayAlive(long millis, Thread... threads) {
677 +        try {
678 +            // No need to optimize the failing case via Thread.join.
679 +            delay(millis);
680 +            for (Thread thread : threads)
681 +                assertTrue(thread.isAlive());
682 +        } catch (InterruptedException ie) {
683 +            fail("Unexpected InterruptedException");
684 +        }
685 +    }
686 +
687 +    /**
688 +     * Checks that future.get times out, with the default timeout of
689 +     * {@code timeoutMillis()}.
690 +     */
691 +    void assertFutureTimesOut(Future future) {
692 +        assertFutureTimesOut(future, timeoutMillis());
693 +    }
694 +
695 +    /**
696 +     * Checks that future.get times out, with the given millisecond timeout.
697 +     */
698 +    void assertFutureTimesOut(Future future, long timeoutMillis) {
699 +        long startTime = System.nanoTime();
700 +        try {
701 +            future.get(timeoutMillis, MILLISECONDS);
702 +            shouldThrow();
703 +        } catch (TimeoutException success) {
704 +        } catch (Exception e) {
705 +            threadUnexpectedException(e);
706 +        } finally { future.cancel(true); }
707 +        assertTrue(millisElapsedSince(startTime) >= timeoutMillis);
708 +    }
709  
710      /**
711       * Fails with message "should throw exception".
# Line 416 | Line 722 | public class JSR166TestCase extends Test
722      }
723  
724      /**
419     * Fails with message "Unexpected exception: " + ex.
420     */
421    public void unexpectedException(Throwable ex) {
422        ex.printStackTrace();
423        fail("Unexpected exception: " + ex);
424    }
425
426
427    /**
725       * The number of elements to place in collections, arrays, etc.
726       */
727      public static final int SIZE = 20;
# Line 449 | Line 746 | public class JSR166TestCase extends Test
746      public static final Integer m6  = new Integer(-6);
747      public static final Integer m10 = new Integer(-10);
748  
452
749      /**
750       * Runs Runnable r with a security policy that permits precisely
751       * the specified permissions.  If there is no current security
# Line 461 | Line 757 | public class JSR166TestCase extends Test
757          SecurityManager sm = System.getSecurityManager();
758          if (sm == null) {
759              r.run();
760 +        }
761 +        runWithSecurityManagerWithPermissions(r, permissions);
762 +    }
763 +
764 +    /**
765 +     * Runs Runnable r with a security policy that permits precisely
766 +     * the specified permissions.  If there is no current security
767 +     * manager, a temporary one is set for the duration of the
768 +     * Runnable.  We require that any security manager permit
769 +     * getPolicy/setPolicy.
770 +     */
771 +    public void runWithSecurityManagerWithPermissions(Runnable r,
772 +                                                      Permission... permissions) {
773 +        SecurityManager sm = System.getSecurityManager();
774 +        if (sm == null) {
775              Policy savedPolicy = Policy.getPolicy();
776              try {
777                  Policy.setPolicy(permissivePolicy());
778                  System.setSecurityManager(new SecurityManager());
779 <                runWithPermissions(r, permissions);
779 >                runWithSecurityManagerWithPermissions(r, permissions);
780              } finally {
781                  System.setSecurityManager(null);
782                  Policy.setPolicy(savedPolicy);
# Line 513 | Line 824 | public class JSR166TestCase extends Test
824              return perms.implies(p);
825          }
826          public void refresh() {}
827 +        public String toString() {
828 +            List<Permission> ps = new ArrayList<Permission>();
829 +            for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
830 +                ps.add(e.nextElement());
831 +            return "AdjustablePolicy with permissions " + ps;
832 +        }
833      }
834  
835      /**
# Line 535 | Line 852 | public class JSR166TestCase extends Test
852      }
853  
854      /**
855 <     * Sleep until the timeout has elapsed, or interrupted.
856 <     * Does <em>NOT</em> throw InterruptedException.
855 >     * Sleeps until the given time has elapsed.
856 >     * Throws AssertionFailedError if interrupted.
857       */
858 <    void sleepTillInterrupted(long timeoutMillis) {
858 >    void sleep(long millis) {
859          try {
860 <            Thread.sleep(timeoutMillis);
861 <        } catch (InterruptedException wakeup) {}
860 >            delay(millis);
861 >        } catch (InterruptedException ie) {
862 >            AssertionFailedError afe =
863 >                new AssertionFailedError("Unexpected InterruptedException");
864 >            afe.initCause(ie);
865 >            throw afe;
866 >        }
867 >    }
868 >
869 >    /**
870 >     * Spin-waits up to the specified number of milliseconds for the given
871 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
872 >     */
873 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
874 >        long startTime = System.nanoTime();
875 >        for (;;) {
876 >            Thread.State s = thread.getState();
877 >            if (s == Thread.State.BLOCKED ||
878 >                s == Thread.State.WAITING ||
879 >                s == Thread.State.TIMED_WAITING)
880 >                return;
881 >            else if (s == Thread.State.TERMINATED)
882 >                fail("Unexpected thread termination");
883 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
884 >                threadAssertTrue(thread.isAlive());
885 >                return;
886 >            }
887 >            Thread.yield();
888 >        }
889 >    }
890 >
891 >    /**
892 >     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
893 >     * state: BLOCKED, WAITING, or TIMED_WAITING.
894 >     */
895 >    void waitForThreadToEnterWaitState(Thread thread) {
896 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
897 >    }
898 >
899 >    /**
900 >     * Returns the number of milliseconds since time given by
901 >     * startNanoTime, which must have been previously returned from a
902 >     * call to {@link System.nanoTime()}.
903 >     */
904 >    long millisElapsedSince(long startNanoTime) {
905 >        return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
906      }
907  
908      /**
909 <     * Returns a new started Thread running the given runnable.
909 >     * Returns a new started daemon Thread running the given runnable.
910       */
911      Thread newStartedThread(Runnable runnable) {
912          Thread t = new Thread(runnable);
913 +        t.setDaemon(true);
914          t.start();
915          return t;
916      }
917  
918 +    /**
919 +     * Waits for the specified time (in milliseconds) for the thread
920 +     * to terminate (using {@link Thread#join(long)}), else interrupts
921 +     * the thread (in the hope that it may terminate later) and fails.
922 +     */
923 +    void awaitTermination(Thread t, long timeoutMillis) {
924 +        try {
925 +            t.join(timeoutMillis);
926 +        } catch (InterruptedException ie) {
927 +            threadUnexpectedException(ie);
928 +        } finally {
929 +            if (t.getState() != Thread.State.TERMINATED) {
930 +                t.interrupt();
931 +                fail("Test timed out");
932 +            }
933 +        }
934 +    }
935 +
936 +    /**
937 +     * Waits for LONG_DELAY_MS milliseconds for the thread to
938 +     * terminate (using {@link Thread#join(long)}), else interrupts
939 +     * the thread (in the hope that it may terminate later) and fails.
940 +     */
941 +    void awaitTermination(Thread t) {
942 +        awaitTermination(t, LONG_DELAY_MS);
943 +    }
944 +
945      // Some convenient Runnable classes
946  
947      public abstract class CheckedRunnable implements Runnable {
# Line 615 | Line 1004 | public class JSR166TestCase extends Test
1004                  realRun();
1005                  threadShouldThrow("InterruptedException");
1006              } catch (InterruptedException success) {
1007 +                threadAssertFalse(Thread.interrupted());
1008              } catch (Throwable t) {
1009                  threadUnexpectedException(t);
1010              }
# Line 644 | Line 1034 | public class JSR166TestCase extends Test
1034                  threadShouldThrow("InterruptedException");
1035                  return result;
1036              } catch (InterruptedException success) {
1037 +                threadAssertFalse(Thread.interrupted());
1038              } catch (Throwable t) {
1039                  threadUnexpectedException(t);
1040              }
# Line 667 | Line 1058 | public class JSR166TestCase extends Test
1058  
1059      public Callable<String> latchAwaitingStringTask(final CountDownLatch latch) {
1060          return new CheckedCallable<String>() {
1061 <            public String realCall() {
1061 >            protected String realCall() {
1062                  try {
1063                      latch.await();
1064                  } catch (InterruptedException quittingTime) {}
# Line 675 | Line 1066 | public class JSR166TestCase extends Test
1066              }};
1067      }
1068  
1069 +    public Runnable awaiter(final CountDownLatch latch) {
1070 +        return new CheckedRunnable() {
1071 +            public void realRun() throws InterruptedException {
1072 +                await(latch);
1073 +            }};
1074 +    }
1075 +
1076 +    public void await(CountDownLatch latch) {
1077 +        try {
1078 +            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1079 +        } catch (Throwable t) {
1080 +            threadUnexpectedException(t);
1081 +        }
1082 +    }
1083 +
1084 +    public void await(Semaphore semaphore) {
1085 +        try {
1086 +            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1087 +        } catch (Throwable t) {
1088 +            threadUnexpectedException(t);
1089 +        }
1090 +    }
1091 +
1092 + //     /**
1093 + //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1094 + //      */
1095 + //     public void await(AtomicBoolean flag) {
1096 + //         await(flag, LONG_DELAY_MS);
1097 + //     }
1098 +
1099 + //     /**
1100 + //      * Spin-waits up to the specified timeout until flag becomes true.
1101 + //      */
1102 + //     public void await(AtomicBoolean flag, long timeoutMillis) {
1103 + //         long startTime = System.nanoTime();
1104 + //         while (!flag.get()) {
1105 + //             if (millisElapsedSince(startTime) > timeoutMillis)
1106 + //                 throw new AssertionFailedError("timed out");
1107 + //             Thread.yield();
1108 + //         }
1109 + //     }
1110 +
1111      public static class NPETask implements Callable<String> {
1112          public String call() { throw new NullPointerException(); }
1113      }
# Line 685 | Line 1118 | public class JSR166TestCase extends Test
1118  
1119      public class ShortRunnable extends CheckedRunnable {
1120          protected void realRun() throws Throwable {
1121 <            Thread.sleep(SHORT_DELAY_MS);
1121 >            delay(SHORT_DELAY_MS);
1122          }
1123      }
1124  
1125      public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1126          protected void realRun() throws InterruptedException {
1127 <            Thread.sleep(SHORT_DELAY_MS);
1127 >            delay(SHORT_DELAY_MS);
1128          }
1129      }
1130  
1131      public class SmallRunnable extends CheckedRunnable {
1132          protected void realRun() throws Throwable {
1133 <            Thread.sleep(SMALL_DELAY_MS);
1133 >            delay(SMALL_DELAY_MS);
1134          }
1135      }
1136  
1137      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1138          protected void realRun() {
1139              try {
1140 <                Thread.sleep(SMALL_DELAY_MS);
1140 >                delay(SMALL_DELAY_MS);
1141              } catch (InterruptedException ok) {}
1142          }
1143      }
1144  
1145      public class SmallCallable extends CheckedCallable {
1146          protected Object realCall() throws InterruptedException {
1147 <            Thread.sleep(SMALL_DELAY_MS);
1147 >            delay(SMALL_DELAY_MS);
1148              return Boolean.TRUE;
1149          }
1150      }
1151  
719    public class SmallInterruptedRunnable extends CheckedInterruptedRunnable {
720        protected void realRun() throws InterruptedException {
721            Thread.sleep(SMALL_DELAY_MS);
722        }
723    }
724
1152      public class MediumRunnable extends CheckedRunnable {
1153          protected void realRun() throws Throwable {
1154 <            Thread.sleep(MEDIUM_DELAY_MS);
1154 >            delay(MEDIUM_DELAY_MS);
1155          }
1156      }
1157  
1158      public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1159          protected void realRun() throws InterruptedException {
1160 <            Thread.sleep(MEDIUM_DELAY_MS);
1160 >            delay(MEDIUM_DELAY_MS);
1161          }
1162      }
1163  
1164 +    public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1165 +        return new CheckedRunnable() {
1166 +            protected void realRun() {
1167 +                try {
1168 +                    delay(timeoutMillis);
1169 +                } catch (InterruptedException ok) {}
1170 +            }};
1171 +    }
1172 +
1173      public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1174          protected void realRun() {
1175              try {
1176 <                Thread.sleep(MEDIUM_DELAY_MS);
1176 >                delay(MEDIUM_DELAY_MS);
1177              } catch (InterruptedException ok) {}
1178          }
1179      }
# Line 745 | Line 1181 | public class JSR166TestCase extends Test
1181      public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1182          protected void realRun() {
1183              try {
1184 <                Thread.sleep(LONG_DELAY_MS);
1184 >                delay(LONG_DELAY_MS);
1185              } catch (InterruptedException ok) {}
1186          }
1187      }
# Line 759 | Line 1195 | public class JSR166TestCase extends Test
1195          }
1196      }
1197  
1198 +    public interface TrackedRunnable extends Runnable {
1199 +        boolean isDone();
1200 +    }
1201 +
1202 +    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1203 +        return new TrackedRunnable() {
1204 +                private volatile boolean done = false;
1205 +                public boolean isDone() { return done; }
1206 +                public void run() {
1207 +                    try {
1208 +                        delay(timeoutMillis);
1209 +                        done = true;
1210 +                    } catch (InterruptedException ok) {}
1211 +                }
1212 +            };
1213 +    }
1214 +
1215      public static class TrackedShortRunnable implements Runnable {
1216          public volatile boolean done = false;
1217          public void run() {
1218              try {
1219 <                Thread.sleep(SMALL_DELAY_MS);
1219 >                delay(SHORT_DELAY_MS);
1220 >                done = true;
1221 >            } catch (InterruptedException ok) {}
1222 >        }
1223 >    }
1224 >
1225 >    public static class TrackedSmallRunnable implements Runnable {
1226 >        public volatile boolean done = false;
1227 >        public void run() {
1228 >            try {
1229 >                delay(SMALL_DELAY_MS);
1230                  done = true;
1231              } catch (InterruptedException ok) {}
1232          }
# Line 773 | Line 1236 | public class JSR166TestCase extends Test
1236          public volatile boolean done = false;
1237          public void run() {
1238              try {
1239 <                Thread.sleep(MEDIUM_DELAY_MS);
1239 >                delay(MEDIUM_DELAY_MS);
1240                  done = true;
1241              } catch (InterruptedException ok) {}
1242          }
# Line 783 | Line 1246 | public class JSR166TestCase extends Test
1246          public volatile boolean done = false;
1247          public void run() {
1248              try {
1249 <                Thread.sleep(LONG_DELAY_MS);
1249 >                delay(LONG_DELAY_MS);
1250                  done = true;
1251              } catch (InterruptedException ok) {}
1252          }
# Line 800 | Line 1263 | public class JSR166TestCase extends Test
1263          public volatile boolean done = false;
1264          public Object call() {
1265              try {
1266 <                Thread.sleep(SMALL_DELAY_MS);
1266 >                delay(SMALL_DELAY_MS);
1267                  done = true;
1268              } catch (InterruptedException ok) {}
1269              return Boolean.TRUE;
# Line 813 | Line 1276 | public class JSR166TestCase extends Test
1276      public abstract class CheckedRecursiveAction extends RecursiveAction {
1277          protected abstract void realCompute() throws Throwable;
1278  
1279 <        public final void compute() {
1279 >        @Override protected final void compute() {
1280              try {
1281                  realCompute();
1282              } catch (Throwable t) {
# Line 828 | Line 1291 | public class JSR166TestCase extends Test
1291      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1292          protected abstract T realCompute() throws Throwable;
1293  
1294 <        public final T compute() {
1294 >        @Override protected final T compute() {
1295              try {
1296                  return realCompute();
1297              } catch (Throwable t) {
# Line 846 | Line 1309 | public class JSR166TestCase extends Test
1309                                        ThreadPoolExecutor executor) {}
1310      }
1311  
1312 +    /**
1313 +     * A CyclicBarrier that uses timed await and fails with
1314 +     * AssertionFailedErrors instead of throwing checked exceptions.
1315 +     */
1316 +    public class CheckedBarrier extends CyclicBarrier {
1317 +        public CheckedBarrier(int parties) { super(parties); }
1318 +
1319 +        public int await() {
1320 +            try {
1321 +                return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1322 +            } catch (TimeoutException e) {
1323 +                throw new AssertionFailedError("timed out");
1324 +            } catch (Exception e) {
1325 +                AssertionFailedError afe =
1326 +                    new AssertionFailedError("Unexpected exception: " + e);
1327 +                afe.initCause(e);
1328 +                throw afe;
1329 +            }
1330 +        }
1331 +    }
1332 +
1333 +    void checkEmpty(BlockingQueue q) {
1334 +        try {
1335 +            assertTrue(q.isEmpty());
1336 +            assertEquals(0, q.size());
1337 +            assertNull(q.peek());
1338 +            assertNull(q.poll());
1339 +            assertNull(q.poll(0, MILLISECONDS));
1340 +            assertEquals(q.toString(), "[]");
1341 +            assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1342 +            assertFalse(q.iterator().hasNext());
1343 +            try {
1344 +                q.element();
1345 +                shouldThrow();
1346 +            } catch (NoSuchElementException success) {}
1347 +            try {
1348 +                q.iterator().next();
1349 +                shouldThrow();
1350 +            } catch (NoSuchElementException success) {}
1351 +            try {
1352 +                q.remove();
1353 +                shouldThrow();
1354 +            } catch (NoSuchElementException success) {}
1355 +        } catch (InterruptedException ie) {
1356 +            threadUnexpectedException(ie);
1357 +        }
1358 +    }
1359 +
1360 +    void assertSerialEquals(Object x, Object y) {
1361 +        assertTrue(Arrays.equals(serialBytes(x), serialBytes(y)));
1362 +    }
1363 +
1364 +    void assertNotSerialEquals(Object x, Object y) {
1365 +        assertFalse(Arrays.equals(serialBytes(x), serialBytes(y)));
1366 +    }
1367 +
1368 +    byte[] serialBytes(Object o) {
1369 +        try {
1370 +            ByteArrayOutputStream bos = new ByteArrayOutputStream();
1371 +            ObjectOutputStream oos = new ObjectOutputStream(bos);
1372 +            oos.writeObject(o);
1373 +            oos.flush();
1374 +            oos.close();
1375 +            return bos.toByteArray();
1376 +        } catch (Throwable t) {
1377 +            threadUnexpectedException(t);
1378 +            return new byte[0];
1379 +        }
1380 +    }
1381 +
1382 +    @SuppressWarnings("unchecked")
1383 +    <T> T serialClone(T o) {
1384 +        try {
1385 +            ObjectInputStream ois = new ObjectInputStream
1386 +                (new ByteArrayInputStream(serialBytes(o)));
1387 +            T clone = (T) ois.readObject();
1388 +            assertSame(o.getClass(), clone.getClass());
1389 +            return clone;
1390 +        } catch (Throwable t) {
1391 +            threadUnexpectedException(t);
1392 +            return null;
1393 +        }
1394 +    }
1395 +
1396 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1397 +                             Runnable... throwingActions) {
1398 +        for (Runnable throwingAction : throwingActions) {
1399 +            boolean threw = false;
1400 +            try { throwingAction.run(); }
1401 +            catch (Throwable t) {
1402 +                threw = true;
1403 +                if (!expectedExceptionClass.isInstance(t)) {
1404 +                    AssertionFailedError afe =
1405 +                        new AssertionFailedError
1406 +                        ("Expected " + expectedExceptionClass.getName() +
1407 +                         ", got " + t.getClass().getName());
1408 +                    afe.initCause(t);
1409 +                    threadUnexpectedException(afe);
1410 +                }
1411 +            }
1412 +            if (!threw)
1413 +                shouldThrow(expectedExceptionClass.getName());
1414 +        }
1415 +    }
1416   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines