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.201 by jsr166, Sun Aug 28 18:10:37 2016 UTC vs.
Revision 1.262 by jsr166, Thu Sep 5 21:26:24 2019 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
2 > * Written by Doug Lea and Martin Buchholz with assistance from
3 > * members of JCP JSR-166 Expert Group and released to the public
4 > * domain, as explained at
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   * Other contributors include Andrew Wright, Jeffrey Hayes,
7   * Pat Fisher, Mike Judd.
# Line 8 | Line 9
9  
10   /*
11   * @test
12 < * @summary JSR-166 tck tests
13 < * @modules java.management
12 > * @summary JSR-166 tck tests, in a number of variations.
13 > *          The first is the conformance testing variant,
14 > *          while others also test implementation details.
15   * @build *
16 < * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
17 < * @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 -Djsr166.testImplementationDetails=true JSR166TestCase
18 < * @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -Djava.util.secureRandomSeed=true JSR166TestCase
16 > * @modules java.management
17 > * @run junit/othervm/timeout=1000 JSR166TestCase
18 > * @run junit/othervm/timeout=1000
19 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
20 > *      --add-opens java.base/java.lang=ALL-UNNAMED
21 > *      -Djsr166.testImplementationDetails=true
22 > *      JSR166TestCase
23 > * @run junit/othervm/timeout=1000
24 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
25 > *      --add-opens java.base/java.lang=ALL-UNNAMED
26 > *      -Djsr166.testImplementationDetails=true
27 > *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
28 > *      JSR166TestCase
29 > * @run junit/othervm/timeout=1000
30 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
31 > *      --add-opens java.base/java.lang=ALL-UNNAMED
32 > *      -Djsr166.testImplementationDetails=true
33 > *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
34 > *      -Djava.util.secureRandomSeed=true
35 > *      JSR166TestCase
36 > * @run junit/othervm/timeout=1000/policy=tck.policy
37 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
38 > *      --add-opens java.base/java.lang=ALL-UNNAMED
39 > *      -Djsr166.testImplementationDetails=true
40 > *      JSR166TestCase
41   */
42  
43   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 30 | Line 54 | import java.lang.management.ThreadMXBean
54   import java.lang.reflect.Constructor;
55   import java.lang.reflect.Method;
56   import java.lang.reflect.Modifier;
33 import java.nio.file.Files;
34 import java.nio.file.Paths;
57   import java.security.CodeSource;
58   import java.security.Permission;
59   import java.security.PermissionCollection;
# Line 41 | Line 63 | import java.security.ProtectionDomain;
63   import java.security.SecurityPermission;
64   import java.util.ArrayList;
65   import java.util.Arrays;
66 + import java.util.Collection;
67   import java.util.Collections;
68   import java.util.Date;
69 + import java.util.Deque;
70   import java.util.Enumeration;
71 + import java.util.HashSet;
72   import java.util.Iterator;
73   import java.util.List;
74   import java.util.NoSuchElementException;
75   import java.util.PropertyPermission;
76 + import java.util.Set;
77   import java.util.concurrent.BlockingQueue;
78   import java.util.concurrent.Callable;
79   import java.util.concurrent.CountDownLatch;
80   import java.util.concurrent.CyclicBarrier;
81   import java.util.concurrent.ExecutionException;
82 + import java.util.concurrent.Executor;
83   import java.util.concurrent.Executors;
84   import java.util.concurrent.ExecutorService;
85   import java.util.concurrent.ForkJoinPool;
86   import java.util.concurrent.Future;
87 + import java.util.concurrent.FutureTask;
88   import java.util.concurrent.RecursiveAction;
89   import java.util.concurrent.RecursiveTask;
90 + import java.util.concurrent.RejectedExecutionException;
91   import java.util.concurrent.RejectedExecutionHandler;
92   import java.util.concurrent.Semaphore;
93 + import java.util.concurrent.ScheduledExecutorService;
94 + import java.util.concurrent.ScheduledFuture;
95   import java.util.concurrent.SynchronousQueue;
96   import java.util.concurrent.ThreadFactory;
97   import java.util.concurrent.ThreadLocalRandom;
98   import java.util.concurrent.ThreadPoolExecutor;
99 + import java.util.concurrent.TimeUnit;
100   import java.util.concurrent.TimeoutException;
101   import java.util.concurrent.atomic.AtomicBoolean;
102   import java.util.concurrent.atomic.AtomicReference;
71 import java.util.regex.Matcher;
103   import java.util.regex.Pattern;
104  
74 import junit.framework.AssertionFailedError;
105   import junit.framework.Test;
106   import junit.framework.TestCase;
107   import junit.framework.TestResult;
# Line 87 | Line 117 | import junit.framework.TestSuite;
117   *
118   * <ol>
119   *
120 < * <li>All assertions in code running in generated threads must use
121 < * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
122 < * #threadAssertEquals}, or {@link #threadAssertNull}, (not
123 < * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
124 < * particularly recommended) for other code to use these forms too.
125 < * Only the most typically used JUnit assertion methods are defined
126 < * this way, but enough to live with.
120 > * <li>All code not running in the main test thread (manually spawned threads
121 > * or the common fork join pool) must be checked for failure (and completion!).
122 > * Mechanisms that can be used to ensure this are:
123 > *   <ol>
124 > *   <li>Signalling via a synchronizer like AtomicInteger or CountDownLatch
125 > *    that the task completed normally, which is checked before returning from
126 > *    the test method in the main thread.
127 > *   <li>Using the forms {@link #threadFail}, {@link #threadAssertTrue},
128 > *    or {@link #threadAssertNull}, (not {@code fail}, {@code assertTrue}, etc.)
129 > *    Only the most typically used JUnit assertion methods are defined
130 > *    this way, but enough to live with.
131 > *   <li>Recording failure explicitly using {@link #threadUnexpectedException}
132 > *    or {@link #threadRecordFailure}.
133 > *   <li>Using a wrapper like CheckedRunnable that uses one the mechanisms above.
134 > *   </ol>
135   *
136   * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
137   * to invoke {@code super.setUp} and {@code super.tearDown} within
# Line 250 | Line 288 | public class JSR166TestCase extends Test
288              // Avoid spurious reports with enormous runsPerTest.
289              // A single test case run should never take more than 1 second.
290              // But let's cap it at the high end too ...
291 <            final int timeoutMinutes =
292 <                Math.min(15, Math.max(runsPerTest / 60, 1));
291 >            final int timeoutMinutesMin = Math.max(runsPerTest / 60, 1)
292 >                * Math.max((int) delayFactor, 1);
293 >            final int timeoutMinutes = Math.min(15, timeoutMinutesMin);
294              for (TestCase lastTestCase = currentTestCase;;) {
295                  try { MINUTES.sleep(timeoutMinutes); }
296                  catch (InterruptedException unexpected) { break; }
# Line 278 | Line 317 | public class JSR166TestCase extends Test
317  
318   //     public static String cpuModel() {
319   //         try {
320 < //             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
320 > //             java.util.regex.Matcher matcher
321 > //               = Pattern.compile("model name\\s*: (.*)")
322   //                 .matcher(new String(
323 < //                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
323 > //                     java.nio.file.Files.readAllBytes(
324 > //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
325   //             matcher.find();
326   //             return matcher.group(1);
327   //         } catch (Exception ex) { return null; }
# Line 389 | Line 430 | public class JSR166TestCase extends Test
430          for (String testClassName : testClassNames) {
431              try {
432                  Class<?> testClass = Class.forName(testClassName);
433 <                Method m = testClass.getDeclaredMethod("suite",
393 <                                                       new Class<?>[0]);
433 >                Method m = testClass.getDeclaredMethod("suite");
434                  suite.addTest(newTestSuite((Test)m.invoke(null)));
435 <            } catch (Exception e) {
436 <                throw new Error("Missing test class", e);
435 >            } catch (ReflectiveOperationException e) {
436 >                throw new AssertionError("Missing test class", e);
437              }
438          }
439      }
# Line 415 | Line 455 | public class JSR166TestCase extends Test
455          }
456      }
457  
458 <    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
459 <    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
460 <    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
461 <    public static boolean atLeastJava9() {
462 <        return JAVA_CLASS_VERSION >= 53.0
463 <            // As of 2015-09, java9 still uses 52.0 class file version
464 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
465 <    }
466 <    public static boolean atLeastJava10() {
467 <        return JAVA_CLASS_VERSION >= 54.0
468 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
469 <    }
458 >    public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
459 >    public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
460 >    public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
461 >    public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
462 >    public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
463 >    public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
464 >    public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
465 >    public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
466 >    public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
467 >    public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
468 >    public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
469 >    public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
470  
471      /**
472       * Collects all JSR166 unit tests as one suite.
# Line 447 | Line 487 | public class JSR166TestCase extends Test
487              AbstractQueuedLongSynchronizerTest.suite(),
488              ArrayBlockingQueueTest.suite(),
489              ArrayDequeTest.suite(),
490 +            ArrayListTest.suite(),
491              AtomicBooleanTest.suite(),
492              AtomicIntegerArrayTest.suite(),
493              AtomicIntegerFieldUpdaterTest.suite(),
# Line 469 | Line 510 | public class JSR166TestCase extends Test
510              CopyOnWriteArrayListTest.suite(),
511              CopyOnWriteArraySetTest.suite(),
512              CountDownLatchTest.suite(),
513 +            CountedCompleterTest.suite(),
514              CyclicBarrierTest.suite(),
515              DelayQueueTest.suite(),
516              EntryTest.suite(),
# Line 476 | Line 518 | public class JSR166TestCase extends Test
518              ExecutorsTest.suite(),
519              ExecutorCompletionServiceTest.suite(),
520              FutureTaskTest.suite(),
521 +            HashtableTest.suite(),
522              LinkedBlockingDequeTest.suite(),
523              LinkedBlockingQueueTest.suite(),
524              LinkedListTest.suite(),
# Line 497 | Line 540 | public class JSR166TestCase extends Test
540              TreeMapTest.suite(),
541              TreeSetTest.suite(),
542              TreeSubMapTest.suite(),
543 <            TreeSubSetTest.suite());
543 >            TreeSubSetTest.suite(),
544 >            VectorTest.suite());
545  
546          // Java8+ test classes
547          if (atLeastJava8()) {
548              String[] java8TestClassNames = {
549 +                "ArrayDeque8Test",
550                  "Atomic8Test",
551                  "CompletableFutureTest",
552                  "ConcurrentHashMap8Test",
553 <                "CountedCompleterTest",
553 >                "CountedCompleter8Test",
554                  "DoubleAccumulatorTest",
555                  "DoubleAdderTest",
556                  "ForkJoinPool8Test",
557                  "ForkJoinTask8Test",
558 +                "HashMapTest",
559 +                "LinkedBlockingDeque8Test",
560 +                "LinkedBlockingQueue8Test",
561 +                "LinkedHashMapTest",
562                  "LongAccumulatorTest",
563                  "LongAdderTest",
564                  "SplittableRandomTest",
# Line 532 | Line 581 | public class JSR166TestCase extends Test
581                  "AtomicReference9Test",
582                  "AtomicReferenceArray9Test",
583                  "ExecutorCompletionService9Test",
584 +                "ForkJoinPool9Test",
585              };
586              addNamedTestClasses(suite, java9TestClassNames);
587          }
# Line 542 | Line 592 | public class JSR166TestCase extends Test
592      /** Returns list of junit-style test method names in given class. */
593      public static ArrayList<String> testMethodNames(Class<?> testClass) {
594          Method[] methods = testClass.getDeclaredMethods();
595 <        ArrayList<String> names = new ArrayList<String>(methods.length);
595 >        ArrayList<String> names = new ArrayList<>(methods.length);
596          for (Method method : methods) {
597              if (method.getName().startsWith("test")
598                  && Modifier.isPublic(method.getModifiers())
# Line 569 | Line 619 | public class JSR166TestCase extends Test
619              for (String methodName : testMethodNames(testClass))
620                  suite.addTest((Test) c.newInstance(data, methodName));
621              return suite;
622 <        } catch (Exception e) {
623 <            throw new Error(e);
622 >        } catch (ReflectiveOperationException e) {
623 >            throw new AssertionError(e);
624          }
625      }
626  
# Line 586 | Line 636 | public class JSR166TestCase extends Test
636          if (atLeastJava8()) {
637              String name = testClass.getName();
638              String name8 = name.replaceAll("Test$", "8Test");
639 <            if (name.equals(name8)) throw new Error(name);
639 >            if (name.equals(name8)) throw new AssertionError(name);
640              try {
641                  return (Test)
642                      Class.forName(name8)
643 <                    .getMethod("testSuite", new Class[] { dataClass })
643 >                    .getMethod("testSuite", dataClass)
644                      .invoke(null, data);
645 <            } catch (Exception e) {
646 <                throw new Error(e);
645 >            } catch (ReflectiveOperationException e) {
646 >                throw new AssertionError(e);
647              }
648          } else {
649              return new TestSuite();
# Line 608 | Line 658 | public class JSR166TestCase extends Test
658      public static long LONG_DELAY_MS;
659  
660      /**
661 +     * A delay significantly longer than LONG_DELAY_MS.
662 +     * Use this in a thread that is waited for via awaitTermination(Thread).
663 +     */
664 +    public static long LONGER_DELAY_MS;
665 +
666 +    private static final long RANDOM_TIMEOUT;
667 +    private static final long RANDOM_EXPIRED_TIMEOUT;
668 +    private static final TimeUnit RANDOM_TIMEUNIT;
669 +    static {
670 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
671 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
672 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
673 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
674 +        TimeUnit[] timeUnits = TimeUnit.values();
675 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
676 +    }
677 +
678 +    /**
679 +     * Returns a timeout for use when any value at all will do.
680 +     */
681 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
682 +
683 +    /**
684 +     * Returns a timeout that means "no waiting", i.e. not positive.
685 +     */
686 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
687 +
688 +    /**
689 +     * Returns a random non-null TimeUnit.
690 +     */
691 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
692 +
693 +    /**
694 +     * Returns a random boolean; a "coin flip".
695 +     */
696 +    static boolean randomBoolean() {
697 +        return ThreadLocalRandom.current().nextBoolean();
698 +    }
699 +
700 +    /**
701 +     * Returns a random element from given choices.
702 +     */
703 +    <T> T chooseRandomly(T... choices) {
704 +        return choices[ThreadLocalRandom.current().nextInt(choices.length)];
705 +    }
706 +
707 +    /**
708       * Returns the shortest timed delay. This can be scaled up for
709       * slow machines using the jsr166.delay.factor system property,
710       * or via jtreg's -timeoutFactor: flag.
# Line 625 | Line 722 | public class JSR166TestCase extends Test
722          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
723          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
724          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
725 +        LONGER_DELAY_MS = 2 * LONG_DELAY_MS;
726      }
727  
728 +    private static final long TIMEOUT_DELAY_MS
729 +        = (long) (12.0 * Math.cbrt(delayFactor));
730 +
731      /**
732 <     * Returns a timeout in milliseconds to be used in tests that
733 <     * verify that operations block or time out.
732 >     * Returns a timeout in milliseconds to be used in tests that verify
733 >     * that operations block or time out.  We want this to be longer
734 >     * than the OS scheduling quantum, but not too long, so don't scale
735 >     * linearly with delayFactor; we use "crazy" cube root instead.
736       */
737 <    long timeoutMillis() {
738 <        return SHORT_DELAY_MS / 4;
737 >    static long timeoutMillis() {
738 >        return TIMEOUT_DELAY_MS;
739      }
740  
741      /**
# Line 648 | Line 751 | public class JSR166TestCase extends Test
751       * The first exception encountered if any threadAssertXXX method fails.
752       */
753      private final AtomicReference<Throwable> threadFailure
754 <        = new AtomicReference<Throwable>(null);
754 >        = new AtomicReference<>(null);
755  
756      /**
757       * Records an exception so that it can be rethrown later in the test
# Line 658 | Line 761 | public class JSR166TestCase extends Test
761       */
762      public void threadRecordFailure(Throwable t) {
763          System.err.println(t);
764 <        dumpTestThreads();
765 <        threadFailure.compareAndSet(null, t);
764 >        if (threadFailure.compareAndSet(null, t))
765 >            dumpTestThreads();
766      }
767  
768      public void setUp() {
# Line 670 | Line 773 | public class JSR166TestCase extends Test
773          String msg = toString() + ": " + String.format(format, args);
774          System.err.println(msg);
775          dumpTestThreads();
776 <        throw new AssertionFailedError(msg);
776 >        throw new AssertionError(msg);
777      }
778  
779      /**
# Line 691 | Line 794 | public class JSR166TestCase extends Test
794                  throw (RuntimeException) t;
795              else if (t instanceof Exception)
796                  throw (Exception) t;
797 <            else {
798 <                AssertionFailedError afe =
696 <                    new AssertionFailedError(t.toString());
697 <                afe.initCause(t);
698 <                throw afe;
699 <            }
797 >            else
798 >                throw new AssertionError(t.toString(), t);
799          }
800  
801          if (Thread.interrupted())
# Line 730 | Line 829 | public class JSR166TestCase extends Test
829  
830      /**
831       * Just like fail(reason), but additionally recording (using
832 <     * threadRecordFailure) any AssertionFailedError thrown, so that
833 <     * the current testcase will fail.
832 >     * threadRecordFailure) any AssertionError thrown, so that the
833 >     * current testcase will fail.
834       */
835      public void threadFail(String reason) {
836          try {
837              fail(reason);
838 <        } catch (AssertionFailedError t) {
839 <            threadRecordFailure(t);
840 <            throw t;
838 >        } catch (AssertionError fail) {
839 >            threadRecordFailure(fail);
840 >            throw fail;
841          }
842      }
843  
844      /**
845       * Just like assertTrue(b), but additionally recording (using
846 <     * threadRecordFailure) any AssertionFailedError thrown, so that
847 <     * the current testcase will fail.
846 >     * threadRecordFailure) any AssertionError thrown, so that the
847 >     * current testcase will fail.
848       */
849      public void threadAssertTrue(boolean b) {
850          try {
851              assertTrue(b);
852 <        } catch (AssertionFailedError t) {
853 <            threadRecordFailure(t);
854 <            throw t;
852 >        } catch (AssertionError fail) {
853 >            threadRecordFailure(fail);
854 >            throw fail;
855          }
856      }
857  
858      /**
859       * Just like assertFalse(b), but additionally recording (using
860 <     * threadRecordFailure) any AssertionFailedError thrown, so that
861 <     * the current testcase will fail.
860 >     * threadRecordFailure) any AssertionError thrown, so that the
861 >     * current testcase will fail.
862       */
863      public void threadAssertFalse(boolean b) {
864          try {
865              assertFalse(b);
866 <        } catch (AssertionFailedError t) {
867 <            threadRecordFailure(t);
868 <            throw t;
866 >        } catch (AssertionError fail) {
867 >            threadRecordFailure(fail);
868 >            throw fail;
869          }
870      }
871  
872      /**
873       * Just like assertNull(x), but additionally recording (using
874 <     * threadRecordFailure) any AssertionFailedError thrown, so that
875 <     * the current testcase will fail.
874 >     * threadRecordFailure) any AssertionError thrown, so that the
875 >     * current testcase will fail.
876       */
877      public void threadAssertNull(Object x) {
878          try {
879              assertNull(x);
880 <        } catch (AssertionFailedError t) {
881 <            threadRecordFailure(t);
882 <            throw t;
880 >        } catch (AssertionError fail) {
881 >            threadRecordFailure(fail);
882 >            throw fail;
883          }
884      }
885  
886      /**
887       * Just like assertEquals(x, y), but additionally recording (using
888 <     * threadRecordFailure) any AssertionFailedError thrown, so that
889 <     * the current testcase will fail.
888 >     * threadRecordFailure) any AssertionError thrown, so that the
889 >     * current testcase will fail.
890       */
891      public void threadAssertEquals(long x, long y) {
892          try {
893              assertEquals(x, y);
894 <        } catch (AssertionFailedError t) {
895 <            threadRecordFailure(t);
896 <            throw t;
894 >        } catch (AssertionError fail) {
895 >            threadRecordFailure(fail);
896 >            throw fail;
897          }
898      }
899  
900      /**
901       * Just like assertEquals(x, y), but additionally recording (using
902 <     * threadRecordFailure) any AssertionFailedError thrown, so that
903 <     * the current testcase will fail.
902 >     * threadRecordFailure) any AssertionError thrown, so that the
903 >     * current testcase will fail.
904       */
905      public void threadAssertEquals(Object x, Object y) {
906          try {
907              assertEquals(x, y);
908 <        } catch (AssertionFailedError fail) {
908 >        } catch (AssertionError fail) {
909              threadRecordFailure(fail);
910              throw fail;
911          } catch (Throwable fail) {
# Line 816 | Line 915 | public class JSR166TestCase extends Test
915  
916      /**
917       * Just like assertSame(x, y), but additionally recording (using
918 <     * threadRecordFailure) any AssertionFailedError thrown, so that
919 <     * the current testcase will fail.
918 >     * threadRecordFailure) any AssertionError thrown, so that the
919 >     * current testcase will fail.
920       */
921      public void threadAssertSame(Object x, Object y) {
922          try {
923              assertSame(x, y);
924 <        } catch (AssertionFailedError fail) {
924 >        } catch (AssertionError fail) {
925              threadRecordFailure(fail);
926              throw fail;
927          }
# Line 844 | Line 943 | public class JSR166TestCase extends Test
943  
944      /**
945       * Records the given exception using {@link #threadRecordFailure},
946 <     * then rethrows the exception, wrapping it in an
947 <     * AssertionFailedError if necessary.
946 >     * then rethrows the exception, wrapping it in an AssertionError
947 >     * if necessary.
948       */
949      public void threadUnexpectedException(Throwable t) {
950          threadRecordFailure(t);
# Line 854 | Line 953 | public class JSR166TestCase extends Test
953              throw (RuntimeException) t;
954          else if (t instanceof Error)
955              throw (Error) t;
956 <        else {
957 <            AssertionFailedError afe =
859 <                new AssertionFailedError("unexpected exception: " + t);
860 <            afe.initCause(t);
861 <            throw afe;
862 <        }
956 >        else
957 >            throw new AssertionError("unexpected exception: " + t, t);
958      }
959  
960      /**
# Line 1005 | Line 1100 | public class JSR166TestCase extends Test
1100          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1101          System.err.println("------ stacktrace dump start ------");
1102          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1103 <            String name = info.getThreadName();
1103 >            final String name = info.getThreadName();
1104 >            String lockName;
1105              if ("Signal Dispatcher".equals(name))
1106                  continue;
1107              if ("Reference Handler".equals(name)
1108 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1108 >                && (lockName = info.getLockName()) != null
1109 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1110                  continue;
1111              if ("Finalizer".equals(name)
1112 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1112 >                && (lockName = info.getLockName()) != null
1113 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1114                  continue;
1115              if ("checkForWedgedTest".equals(name))
1116                  continue;
# Line 1024 | Line 1122 | public class JSR166TestCase extends Test
1122      }
1123  
1124      /**
1125 <     * Checks that thread does not terminate within the default
1028 <     * millisecond delay of {@code timeoutMillis()}.
1029 <     */
1030 <    void assertThreadStaysAlive(Thread thread) {
1031 <        assertThreadStaysAlive(thread, timeoutMillis());
1032 <    }
1033 <
1034 <    /**
1035 <     * Checks that thread does not terminate within the given millisecond delay.
1036 <     */
1037 <    void assertThreadStaysAlive(Thread thread, long millis) {
1038 <        try {
1039 <            // No need to optimize the failing case via Thread.join.
1040 <            delay(millis);
1041 <            assertTrue(thread.isAlive());
1042 <        } catch (InterruptedException fail) {
1043 <            threadFail("Unexpected InterruptedException");
1044 <        }
1045 <    }
1046 <
1047 <    /**
1048 <     * Checks that the threads do not terminate within the default
1049 <     * millisecond delay of {@code timeoutMillis()}.
1125 >     * Checks that thread eventually enters the expected blocked thread state.
1126       */
1127 <    void assertThreadsStayAlive(Thread... threads) {
1128 <        assertThreadsStayAlive(timeoutMillis(), threads);
1129 <    }
1130 <
1131 <    /**
1132 <     * Checks that the threads do not terminate within the given millisecond delay.
1133 <     */
1134 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1135 <        try {
1136 <            // No need to optimize the failing case via Thread.join.
1137 <            delay(millis);
1138 <            for (Thread thread : threads)
1139 <                assertTrue(thread.isAlive());
1064 <        } catch (InterruptedException fail) {
1065 <            threadFail("Unexpected InterruptedException");
1127 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1128 >        // always sleep at least 1 ms, with high probability avoiding
1129 >        // transitory states
1130 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1131 >            try { delay(1); }
1132 >            catch (InterruptedException fail) {
1133 >                throw new AssertionError("Unexpected InterruptedException", fail);
1134 >            }
1135 >            Thread.State s = thread.getState();
1136 >            if (s == expected)
1137 >                return;
1138 >            else if (s == Thread.State.TERMINATED)
1139 >                fail("Unexpected thread termination");
1140          }
1141 +        fail("timed out waiting for thread to enter thread state " + expected);
1142      }
1143  
1144      /**
# Line 1104 | Line 1179 | public class JSR166TestCase extends Test
1179      }
1180  
1181      /**
1182 +     * The maximum number of consecutive spurious wakeups we should
1183 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1184 +     */
1185 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1186 +
1187 +    /**
1188       * The number of elements to place in collections, arrays, etc.
1189       */
1190      public static final int SIZE = 20;
# Line 1207 | Line 1288 | public class JSR166TestCase extends Test
1288          }
1289          public void refresh() {}
1290          public String toString() {
1291 <            List<Permission> ps = new ArrayList<Permission>();
1291 >            List<Permission> ps = new ArrayList<>();
1292              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1293                  ps.add(e.nextElement());
1294              return "AdjustablePolicy with permissions " + ps;
# Line 1235 | Line 1316 | public class JSR166TestCase extends Test
1316  
1317      /**
1318       * Sleeps until the given time has elapsed.
1319 <     * Throws AssertionFailedError if interrupted.
1319 >     * Throws AssertionError if interrupted.
1320       */
1321      static void sleep(long millis) {
1322          try {
1323              delay(millis);
1324          } catch (InterruptedException fail) {
1325 <            AssertionFailedError afe =
1245 <                new AssertionFailedError("Unexpected InterruptedException");
1246 <            afe.initCause(fail);
1247 <            throw afe;
1325 >            throw new AssertionError("Unexpected InterruptedException", fail);
1326          }
1327      }
1328  
1329      /**
1330       * Spin-waits up to the specified number of milliseconds for the given
1331       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1332 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1333       */
1334 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1335 <        long startTime = 0L;
1336 <        for (;;) {
1337 <            Thread.State s = thread.getState();
1338 <            if (s == Thread.State.BLOCKED ||
1339 <                s == Thread.State.WAITING ||
1340 <                s == Thread.State.TIMED_WAITING)
1341 <                return;
1342 <            else if (s == Thread.State.TERMINATED)
1334 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1335 >                                       Callable<Boolean> waitingForGodot) {
1336 >        for (long startTime = 0L;;) {
1337 >            switch (thread.getState()) {
1338 >            default: break;
1339 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1340 >                try {
1341 >                    if (waitingForGodot == null || waitingForGodot.call())
1342 >                        return;
1343 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1344 >                break;
1345 >            case TERMINATED:
1346                  fail("Unexpected thread termination");
1347 <            else if (startTime == 0L)
1347 >            }
1348 >
1349 >            if (startTime == 0L)
1350                  startTime = System.nanoTime();
1351              else if (millisElapsedSince(startTime) > timeoutMillis) {
1352 <                threadAssertTrue(thread.isAlive());
1353 <                return;
1352 >                assertTrue(thread.isAlive());
1353 >                if (waitingForGodot == null
1354 >                    || thread.getState() == Thread.State.RUNNABLE)
1355 >                    fail("timed out waiting for thread to enter wait state");
1356 >                else
1357 >                    fail("timed out waiting for condition, thread state="
1358 >                         + thread.getState());
1359              }
1360              Thread.yield();
1361          }
1362      }
1363  
1364      /**
1365 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1366 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1365 >     * Spin-waits up to the specified number of milliseconds for the given
1366 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1367 >     */
1368 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1369 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1370 >    }
1371 >
1372 >    /**
1373 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1374 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1375       */
1376      void waitForThreadToEnterWaitState(Thread thread) {
1377 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1377 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1378 >    }
1379 >
1380 >    /**
1381 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1382 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1383 >     * and additionally satisfy the given condition.
1384 >     */
1385 >    void waitForThreadToEnterWaitState(Thread thread,
1386 >                                       Callable<Boolean> waitingForGodot) {
1387 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1388 >    }
1389 >
1390 >    /**
1391 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1392 >     * be interrupted.  Clears the interrupt status before returning.
1393 >     */
1394 >    void awaitInterrupted() {
1395 >        for (long startTime = 0L; !Thread.interrupted(); ) {
1396 >            if (startTime == 0L)
1397 >                startTime = System.nanoTime();
1398 >            else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1399 >                fail("timed out waiting for thread interrupt");
1400 >            Thread.yield();
1401 >        }
1402      }
1403  
1404      /**
# Line 1295 | Line 1416 | public class JSR166TestCase extends Test
1416   //             r.run();
1417   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1418   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1419 < //             throw new AssertionFailedError("did not return promptly");
1419 > //             throw new AssertionError("did not return promptly");
1420   //     }
1421  
1422   //     void assertTerminatesPromptly(Runnable r) {
# Line 1308 | Line 1429 | public class JSR166TestCase extends Test
1429       */
1430      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1431          long startTime = System.nanoTime();
1432 +        T actual = null;
1433          try {
1434 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1434 >            actual = f.get(timeoutMillis, MILLISECONDS);
1435          } catch (Throwable fail) { threadUnexpectedException(fail); }
1436 +        assertEquals(expectedValue, actual);
1437          if (millisElapsedSince(startTime) > timeoutMillis/2)
1438 <            throw new AssertionFailedError("timed get did not return promptly");
1438 >            throw new AssertionError("timed get did not return promptly");
1439      }
1440  
1441      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1334 | Line 1457 | public class JSR166TestCase extends Test
1457       * to terminate (using {@link Thread#join(long)}), else interrupts
1458       * the thread (in the hope that it may terminate later) and fails.
1459       */
1460 <    void awaitTermination(Thread t, long timeoutMillis) {
1460 >    void awaitTermination(Thread thread, long timeoutMillis) {
1461          try {
1462 <            t.join(timeoutMillis);
1462 >            thread.join(timeoutMillis);
1463          } catch (InterruptedException fail) {
1464              threadUnexpectedException(fail);
1465 <        } finally {
1466 <            if (t.getState() != Thread.State.TERMINATED) {
1467 <                t.interrupt();
1468 <                threadFail("timed out waiting for thread to terminate");
1465 >        }
1466 >        if (thread.getState() != Thread.State.TERMINATED) {
1467 >            String detail = String.format(
1468 >                    "timed out waiting for thread to terminate, thread=%s, state=%s" ,
1469 >                    thread, thread.getState());
1470 >            try {
1471 >                threadFail(detail);
1472 >            } finally {
1473 >                // Interrupt thread __after__ having reported its stack trace
1474 >                thread.interrupt();
1475              }
1476          }
1477      }
# Line 1370 | Line 1499 | public class JSR166TestCase extends Test
1499          }
1500      }
1501  
1373    public abstract class RunnableShouldThrow implements Runnable {
1374        protected abstract void realRun() throws Throwable;
1375
1376        final Class<?> exceptionClass;
1377
1378        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1379            this.exceptionClass = exceptionClass;
1380        }
1381
1382        public final void run() {
1383            try {
1384                realRun();
1385                threadShouldThrow(exceptionClass.getSimpleName());
1386            } catch (Throwable t) {
1387                if (! exceptionClass.isInstance(t))
1388                    threadUnexpectedException(t);
1389            }
1390        }
1391    }
1392
1502      public abstract class ThreadShouldThrow extends Thread {
1503          protected abstract void realRun() throws Throwable;
1504  
# Line 1402 | Line 1511 | public class JSR166TestCase extends Test
1511          public final void run() {
1512              try {
1513                  realRun();
1405                threadShouldThrow(exceptionClass.getSimpleName());
1514              } catch (Throwable t) {
1515                  if (! exceptionClass.isInstance(t))
1516                      threadUnexpectedException(t);
1517 +                return;
1518              }
1519 +            threadShouldThrow(exceptionClass.getSimpleName());
1520          }
1521      }
1522  
# Line 1416 | Line 1526 | public class JSR166TestCase extends Test
1526          public final void run() {
1527              try {
1528                  realRun();
1419                threadShouldThrow("InterruptedException");
1529              } catch (InterruptedException success) {
1530                  threadAssertFalse(Thread.interrupted());
1531 +                return;
1532              } catch (Throwable fail) {
1533                  threadUnexpectedException(fail);
1534              }
1535 +            threadShouldThrow("InterruptedException");
1536          }
1537      }
1538  
# Line 1433 | Line 1544 | public class JSR166TestCase extends Test
1544                  return realCall();
1545              } catch (Throwable fail) {
1546                  threadUnexpectedException(fail);
1436                return null;
1547              }
1548 <        }
1439 <    }
1440 <
1441 <    public abstract class CheckedInterruptedCallable<T>
1442 <        implements Callable<T> {
1443 <        protected abstract T realCall() throws Throwable;
1444 <
1445 <        public final T call() {
1446 <            try {
1447 <                T result = realCall();
1448 <                threadShouldThrow("InterruptedException");
1449 <                return result;
1450 <            } catch (InterruptedException success) {
1451 <                threadAssertFalse(Thread.interrupted());
1452 <            } catch (Throwable fail) {
1453 <                threadUnexpectedException(fail);
1454 <            }
1455 <            return null;
1548 >            throw new AssertionError("unreached");
1549          }
1550      }
1551  
# Line 1509 | Line 1602 | public class JSR166TestCase extends Test
1602      }
1603  
1604      public void await(CountDownLatch latch, long timeoutMillis) {
1605 +        boolean timedOut = false;
1606          try {
1607 <            if (!latch.await(timeoutMillis, MILLISECONDS))
1514 <                fail("timed out waiting for CountDownLatch for "
1515 <                     + (timeoutMillis/1000) + " sec");
1607 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1608          } catch (Throwable fail) {
1609              threadUnexpectedException(fail);
1610          }
1611 +        if (timedOut)
1612 +            fail("timed out waiting for CountDownLatch for "
1613 +                 + (timeoutMillis/1000) + " sec");
1614      }
1615  
1616      public void await(CountDownLatch latch) {
# Line 1523 | Line 1618 | public class JSR166TestCase extends Test
1618      }
1619  
1620      public void await(Semaphore semaphore) {
1621 +        boolean timedOut = false;
1622          try {
1623 <            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1624 <                fail("timed out waiting for Semaphore for "
1625 <                     + (LONG_DELAY_MS/1000) + " sec");
1623 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1624 >        } catch (Throwable fail) {
1625 >            threadUnexpectedException(fail);
1626 >        }
1627 >        if (timedOut)
1628 >            fail("timed out waiting for Semaphore for "
1629 >                 + (LONG_DELAY_MS/1000) + " sec");
1630 >    }
1631 >
1632 >    public void await(CyclicBarrier barrier) {
1633 >        try {
1634 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1635          } catch (Throwable fail) {
1636              threadUnexpectedException(fail);
1637          }
# Line 1546 | Line 1651 | public class JSR166TestCase extends Test
1651   //         long startTime = System.nanoTime();
1652   //         while (!flag.get()) {
1653   //             if (millisElapsedSince(startTime) > timeoutMillis)
1654 < //                 throw new AssertionFailedError("timed out");
1654 > //                 throw new AssertionError("timed out");
1655   //             Thread.yield();
1656   //         }
1657   //     }
# Line 1555 | Line 1660 | public class JSR166TestCase extends Test
1660          public String call() { throw new NullPointerException(); }
1661      }
1662  
1558    public static class CallableOne implements Callable<Integer> {
1559        public Integer call() { return one; }
1560    }
1561
1562    public class ShortRunnable extends CheckedRunnable {
1563        protected void realRun() throws Throwable {
1564            delay(SHORT_DELAY_MS);
1565        }
1566    }
1567
1568    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1569        protected void realRun() throws InterruptedException {
1570            delay(SHORT_DELAY_MS);
1571        }
1572    }
1573
1574    public class SmallRunnable extends CheckedRunnable {
1575        protected void realRun() throws Throwable {
1576            delay(SMALL_DELAY_MS);
1577        }
1578    }
1579
1580    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1581        protected void realRun() {
1582            try {
1583                delay(SMALL_DELAY_MS);
1584            } catch (InterruptedException ok) {}
1585        }
1586    }
1587
1588    public class SmallCallable extends CheckedCallable {
1589        protected Object realCall() throws InterruptedException {
1590            delay(SMALL_DELAY_MS);
1591            return Boolean.TRUE;
1592        }
1593    }
1594
1595    public class MediumRunnable extends CheckedRunnable {
1596        protected void realRun() throws Throwable {
1597            delay(MEDIUM_DELAY_MS);
1598        }
1599    }
1600
1601    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1602        protected void realRun() throws InterruptedException {
1603            delay(MEDIUM_DELAY_MS);
1604        }
1605    }
1606
1663      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1664          return new CheckedRunnable() {
1665              protected void realRun() {
# Line 1613 | Line 1669 | public class JSR166TestCase extends Test
1669              }};
1670      }
1671  
1616    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1617        protected void realRun() {
1618            try {
1619                delay(MEDIUM_DELAY_MS);
1620            } catch (InterruptedException ok) {}
1621        }
1622    }
1623
1624    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1625        protected void realRun() {
1626            try {
1627                delay(LONG_DELAY_MS);
1628            } catch (InterruptedException ok) {}
1629        }
1630    }
1631
1672      /**
1673       * For use as ThreadFactory in constructors
1674       */
# Line 1642 | Line 1682 | public class JSR166TestCase extends Test
1682          boolean isDone();
1683      }
1684  
1645    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1646        return new TrackedRunnable() {
1647                private volatile boolean done = false;
1648                public boolean isDone() { return done; }
1649                public void run() {
1650                    try {
1651                        delay(timeoutMillis);
1652                        done = true;
1653                    } catch (InterruptedException ok) {}
1654                }
1655            };
1656    }
1657
1658    public static class TrackedShortRunnable implements Runnable {
1659        public volatile boolean done = false;
1660        public void run() {
1661            try {
1662                delay(SHORT_DELAY_MS);
1663                done = true;
1664            } catch (InterruptedException ok) {}
1665        }
1666    }
1667
1668    public static class TrackedSmallRunnable implements Runnable {
1669        public volatile boolean done = false;
1670        public void run() {
1671            try {
1672                delay(SMALL_DELAY_MS);
1673                done = true;
1674            } catch (InterruptedException ok) {}
1675        }
1676    }
1677
1678    public static class TrackedMediumRunnable implements Runnable {
1679        public volatile boolean done = false;
1680        public void run() {
1681            try {
1682                delay(MEDIUM_DELAY_MS);
1683                done = true;
1684            } catch (InterruptedException ok) {}
1685        }
1686    }
1687
1688    public static class TrackedLongRunnable implements Runnable {
1689        public volatile boolean done = false;
1690        public void run() {
1691            try {
1692                delay(LONG_DELAY_MS);
1693                done = true;
1694            } catch (InterruptedException ok) {}
1695        }
1696    }
1697
1685      public static class TrackedNoOpRunnable implements Runnable {
1686          public volatile boolean done = false;
1687          public void run() {
# Line 1702 | Line 1689 | public class JSR166TestCase extends Test
1689          }
1690      }
1691  
1705    public static class TrackedCallable implements Callable {
1706        public volatile boolean done = false;
1707        public Object call() {
1708            try {
1709                delay(SMALL_DELAY_MS);
1710                done = true;
1711            } catch (InterruptedException ok) {}
1712            return Boolean.TRUE;
1713        }
1714    }
1715
1692      /**
1693       * Analog of CheckedRunnable for RecursiveAction
1694       */
# Line 1739 | Line 1715 | public class JSR166TestCase extends Test
1715                  return realCompute();
1716              } catch (Throwable fail) {
1717                  threadUnexpectedException(fail);
1742                return null;
1718              }
1719 +            throw new AssertionError("unreached");
1720          }
1721      }
1722  
# Line 1754 | Line 1730 | public class JSR166TestCase extends Test
1730  
1731      /**
1732       * A CyclicBarrier that uses timed await and fails with
1733 <     * AssertionFailedErrors instead of throwing checked exceptions.
1733 >     * AssertionErrors instead of throwing checked exceptions.
1734       */
1735 <    public class CheckedBarrier extends CyclicBarrier {
1735 >    public static class CheckedBarrier extends CyclicBarrier {
1736          public CheckedBarrier(int parties) { super(parties); }
1737  
1738          public int await() {
1739              try {
1740                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1741              } catch (TimeoutException timedOut) {
1742 <                throw new AssertionFailedError("timed out");
1742 >                throw new AssertionError("timed out");
1743              } catch (Exception fail) {
1744 <                AssertionFailedError afe =
1769 <                    new AssertionFailedError("Unexpected exception: " + fail);
1770 <                afe.initCause(fail);
1771 <                throw afe;
1744 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1745              }
1746          }
1747      }
# Line 1779 | Line 1752 | public class JSR166TestCase extends Test
1752              assertEquals(0, q.size());
1753              assertNull(q.peek());
1754              assertNull(q.poll());
1755 <            assertNull(q.poll(0, MILLISECONDS));
1755 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1756              assertEquals(q.toString(), "[]");
1757              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1758              assertFalse(q.iterator().hasNext());
# Line 1820 | Line 1793 | public class JSR166TestCase extends Test
1793          }
1794      }
1795  
1796 +    void assertImmutable(Object o) {
1797 +        if (o instanceof Collection) {
1798 +            assertThrows(
1799 +                UnsupportedOperationException.class,
1800 +                () -> ((Collection) o).add(null));
1801 +        }
1802 +    }
1803 +
1804      @SuppressWarnings("unchecked")
1805      <T> T serialClone(T o) {
1806 +        T clone = null;
1807          try {
1808              ObjectInputStream ois = new ObjectInputStream
1809                  (new ByteArrayInputStream(serialBytes(o)));
1810 <            T clone = (T) ois.readObject();
1829 <            assertSame(o.getClass(), clone.getClass());
1830 <            return clone;
1810 >            clone = (T) ois.readObject();
1811          } catch (Throwable fail) {
1812              threadUnexpectedException(fail);
1813 +        }
1814 +        if (o == clone) assertImmutable(o);
1815 +        else assertSame(o.getClass(), clone.getClass());
1816 +        return clone;
1817 +    }
1818 +
1819 +    /**
1820 +     * A version of serialClone that leaves error handling (for
1821 +     * e.g. NotSerializableException) up to the caller.
1822 +     */
1823 +    @SuppressWarnings("unchecked")
1824 +    <T> T serialClonePossiblyFailing(T o)
1825 +        throws ReflectiveOperationException, java.io.IOException {
1826 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1827 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1828 +        oos.writeObject(o);
1829 +        oos.flush();
1830 +        oos.close();
1831 +        ObjectInputStream ois = new ObjectInputStream
1832 +            (new ByteArrayInputStream(bos.toByteArray()));
1833 +        T clone = (T) ois.readObject();
1834 +        if (o == clone) assertImmutable(o);
1835 +        else assertSame(o.getClass(), clone.getClass());
1836 +        return clone;
1837 +    }
1838 +
1839 +    /**
1840 +     * If o implements Cloneable and has a public clone method,
1841 +     * returns a clone of o, else null.
1842 +     */
1843 +    @SuppressWarnings("unchecked")
1844 +    <T> T cloneableClone(T o) {
1845 +        if (!(o instanceof Cloneable)) return null;
1846 +        final T clone;
1847 +        try {
1848 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1849 +        } catch (NoSuchMethodException ok) {
1850              return null;
1851 +        } catch (ReflectiveOperationException unexpected) {
1852 +            throw new Error(unexpected);
1853          }
1854 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1855 +        assertSame(o.getClass(), clone.getClass());
1856 +        return clone;
1857      }
1858  
1859      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1860 <                             Runnable... throwingActions) {
1861 <        for (Runnable throwingAction : throwingActions) {
1860 >                             Action... throwingActions) {
1861 >        for (Action throwingAction : throwingActions) {
1862              boolean threw = false;
1863              try { throwingAction.run(); }
1864              catch (Throwable t) {
1865                  threw = true;
1866 <                if (!expectedExceptionClass.isInstance(t)) {
1867 <                    AssertionFailedError afe =
1868 <                        new AssertionFailedError
1869 <                        ("Expected " + expectedExceptionClass.getName() +
1870 <                         ", got " + t.getClass().getName());
1849 <                    afe.initCause(t);
1850 <                    threadUnexpectedException(afe);
1851 <                }
1866 >                if (!expectedExceptionClass.isInstance(t))
1867 >                    throw new AssertionError(
1868 >                            "Expected " + expectedExceptionClass.getName() +
1869 >                            ", got " + t.getClass().getName(),
1870 >                            t);
1871              }
1872              if (!threw)
1873                  shouldThrow(expectedExceptionClass.getName());
# Line 1880 | Line 1899 | public class JSR166TestCase extends Test
1899      static <T> void shuffle(T[] array) {
1900          Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1901      }
1902 +
1903 +    /**
1904 +     * Returns the same String as would be returned by {@link
1905 +     * Object#toString}, whether or not the given object's class
1906 +     * overrides toString().
1907 +     *
1908 +     * @see System#identityHashCode
1909 +     */
1910 +    static String identityString(Object x) {
1911 +        return x.getClass().getName()
1912 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1913 +    }
1914 +
1915 +    // --- Shared assertions for Executor tests ---
1916 +
1917 +    /**
1918 +     * Returns maximum number of tasks that can be submitted to given
1919 +     * pool (with bounded queue) before saturation (when submission
1920 +     * throws RejectedExecutionException).
1921 +     */
1922 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1923 +        BlockingQueue<Runnable> q = pool.getQueue();
1924 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1925 +    }
1926 +
1927 +    @SuppressWarnings("FutureReturnValueIgnored")
1928 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1929 +        try {
1930 +            e.execute((Runnable) null);
1931 +            shouldThrow();
1932 +        } catch (NullPointerException success) {}
1933 +
1934 +        if (! (e instanceof ExecutorService)) return;
1935 +        ExecutorService es = (ExecutorService) e;
1936 +        try {
1937 +            es.submit((Runnable) null);
1938 +            shouldThrow();
1939 +        } catch (NullPointerException success) {}
1940 +        try {
1941 +            es.submit((Runnable) null, Boolean.TRUE);
1942 +            shouldThrow();
1943 +        } catch (NullPointerException success) {}
1944 +        try {
1945 +            es.submit((Callable) null);
1946 +            shouldThrow();
1947 +        } catch (NullPointerException success) {}
1948 +
1949 +        if (! (e instanceof ScheduledExecutorService)) return;
1950 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1951 +        try {
1952 +            ses.schedule((Runnable) null,
1953 +                         randomTimeout(), randomTimeUnit());
1954 +            shouldThrow();
1955 +        } catch (NullPointerException success) {}
1956 +        try {
1957 +            ses.schedule((Callable) null,
1958 +                         randomTimeout(), randomTimeUnit());
1959 +            shouldThrow();
1960 +        } catch (NullPointerException success) {}
1961 +        try {
1962 +            ses.scheduleAtFixedRate((Runnable) null,
1963 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1964 +            shouldThrow();
1965 +        } catch (NullPointerException success) {}
1966 +        try {
1967 +            ses.scheduleWithFixedDelay((Runnable) null,
1968 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1969 +            shouldThrow();
1970 +        } catch (NullPointerException success) {}
1971 +    }
1972 +
1973 +    void setRejectedExecutionHandler(
1974 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1975 +        p.setRejectedExecutionHandler(handler);
1976 +        assertSame(handler, p.getRejectedExecutionHandler());
1977 +    }
1978 +
1979 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1980 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1981 +        final long savedTaskCount = p.getTaskCount();
1982 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1983 +        final int savedQueueSize = p.getQueue().size();
1984 +        final boolean stock = (p.getClass().getClassLoader() == null);
1985 +
1986 +        Runnable r = () -> {};
1987 +        Callable<Boolean> c = () -> Boolean.TRUE;
1988 +
1989 +        class Recorder implements RejectedExecutionHandler {
1990 +            public volatile Runnable r = null;
1991 +            public volatile ThreadPoolExecutor p = null;
1992 +            public void reset() { r = null; p = null; }
1993 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1994 +                assertNull(this.r);
1995 +                assertNull(this.p);
1996 +                this.r = r;
1997 +                this.p = p;
1998 +            }
1999 +        }
2000 +
2001 +        // check custom handler is invoked exactly once per task
2002 +        Recorder recorder = new Recorder();
2003 +        setRejectedExecutionHandler(p, recorder);
2004 +        for (int i = 2; i--> 0; ) {
2005 +            recorder.reset();
2006 +            p.execute(r);
2007 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
2008 +                assertSame(r, recorder.r);
2009 +            assertSame(p, recorder.p);
2010 +
2011 +            recorder.reset();
2012 +            assertFalse(p.submit(r).isDone());
2013 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2014 +            assertSame(p, recorder.p);
2015 +
2016 +            recorder.reset();
2017 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2018 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2019 +            assertSame(p, recorder.p);
2020 +
2021 +            recorder.reset();
2022 +            assertFalse(p.submit(c).isDone());
2023 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2024 +            assertSame(p, recorder.p);
2025 +
2026 +            if (p instanceof ScheduledExecutorService) {
2027 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2028 +                ScheduledFuture<?> future;
2029 +
2030 +                recorder.reset();
2031 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2032 +                assertFalse(future.isDone());
2033 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2034 +                assertSame(p, recorder.p);
2035 +
2036 +                recorder.reset();
2037 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2038 +                assertFalse(future.isDone());
2039 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2040 +                assertSame(p, recorder.p);
2041 +
2042 +                recorder.reset();
2043 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2044 +                assertFalse(future.isDone());
2045 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2046 +                assertSame(p, recorder.p);
2047 +
2048 +                recorder.reset();
2049 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2050 +                assertFalse(future.isDone());
2051 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2052 +                assertSame(p, recorder.p);
2053 +            }
2054 +        }
2055 +
2056 +        // Checking our custom handler above should be sufficient, but
2057 +        // we add some integration tests of standard handlers.
2058 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2059 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2060 +
2061 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2062 +        try {
2063 +            p.execute(setThread);
2064 +            shouldThrow();
2065 +        } catch (RejectedExecutionException success) {}
2066 +        assertNull(thread.get());
2067 +
2068 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2069 +        p.execute(setThread);
2070 +        assertNull(thread.get());
2071 +
2072 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2073 +        p.execute(setThread);
2074 +        if (p.isShutdown())
2075 +            assertNull(thread.get());
2076 +        else
2077 +            assertSame(Thread.currentThread(), thread.get());
2078 +
2079 +        setRejectedExecutionHandler(p, savedHandler);
2080 +
2081 +        // check that pool was not perturbed by handlers
2082 +        assertEquals(savedTaskCount, p.getTaskCount());
2083 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2084 +        assertEquals(savedQueueSize, p.getQueue().size());
2085 +    }
2086 +
2087 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2088 +        assertEquals(x, y);
2089 +        assertEquals(y, x);
2090 +        assertEquals(x.isEmpty(), y.isEmpty());
2091 +        assertEquals(x.size(), y.size());
2092 +        if (x instanceof List) {
2093 +            assertEquals(x.toString(), y.toString());
2094 +        }
2095 +        if (x instanceof List || x instanceof Set) {
2096 +            assertEquals(x.hashCode(), y.hashCode());
2097 +        }
2098 +        if (x instanceof List || x instanceof Deque) {
2099 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2100 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2101 +                                     y.toArray(new Object[0])));
2102 +        }
2103 +    }
2104 +
2105 +    /**
2106 +     * A weaker form of assertCollectionsEquals which does not insist
2107 +     * that the two collections satisfy Object#equals(Object), since
2108 +     * they may use identity semantics as Deques do.
2109 +     */
2110 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2111 +        if (x instanceof List || x instanceof Set)
2112 +            assertCollectionsEquals(x, y);
2113 +        else {
2114 +            assertEquals(x.isEmpty(), y.isEmpty());
2115 +            assertEquals(x.size(), y.size());
2116 +            assertEquals(new HashSet(x), new HashSet(y));
2117 +            if (x instanceof Deque) {
2118 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2119 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2120 +                                         y.toArray(new Object[0])));
2121 +            }
2122 +        }
2123 +    }
2124   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines