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.226 by jsr166, Sun May 14 00:37:42 2017 UTC vs.
Revision 1.266 by jsr166, Sat Sep 7 17:40:05 2019 UTC

# Line 66 | Line 66 | 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;
103   import java.util.regex.Pattern;
104  
96 import junit.framework.AssertionFailedError;
105   import junit.framework.Test;
106   import junit.framework.TestCase;
107   import junit.framework.TestResult;
# Line 109 | 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 268 | Line 284 | public class JSR166TestCase extends Test
284      static volatile TestCase currentTestCase;
285      // static volatile int currentRun = 0;
286      static {
287 <        Runnable checkForWedgedTest = new Runnable() { public void run() {
287 >        Runnable wedgedTestDetector = new Runnable() { public void run() {
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 293 | Line 310 | public class JSR166TestCase extends Test
310                  }
311                  lastTestCase = currentTestCase;
312              }}};
313 <        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
313 >        Thread thread = new Thread(wedgedTestDetector, "WedgedTestDetector");
314          thread.setDaemon(true);
315          thread.start();
316      }
# Line 413 | 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",
417 <                                                       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 439 | 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 502 | 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 538 | Line 555 | public class JSR166TestCase extends Test
555                  "DoubleAdderTest",
556                  "ForkJoinPool8Test",
557                  "ForkJoinTask8Test",
558 +                "HashMapTest",
559                  "LinkedBlockingDeque8Test",
560                  "LinkedBlockingQueue8Test",
561 +                "LinkedHashMapTest",
562                  "LongAccumulatorTest",
563                  "LongAdderTest",
564                  "SplittableRandomTest",
# Line 600 | 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 617 | 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 639 | 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 656 | 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
# Line 694 | 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 706 | 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 727 | 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 =
732 <                    new AssertionFailedError(t.toString());
733 <                afe.initCause(t);
734 <                throw afe;
735 <            }
797 >            else
798 >                throw new AssertionError(t.toString(), t);
799          }
800  
801          if (Thread.interrupted())
# Line 766 | 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 852 | 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 880 | 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 890 | 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 =
895 <                new AssertionFailedError("unexpected exception: " + t);
896 <            afe.initCause(t);
897 <            throw afe;
898 <        }
956 >        else
957 >            throw new AssertionError("unexpected exception: " + t, t);
958      }
959  
960      /**
# Line 1024 | Line 1083 | public class JSR166TestCase extends Test
1083          }
1084      }
1085  
1086 +    /** Returns true if thread info might be useful in a thread dump. */
1087 +    static boolean threadOfInterest(ThreadInfo info) {
1088 +        final String name = info.getThreadName();
1089 +        String lockName;
1090 +        if (name == null)
1091 +            return true;
1092 +        if (name.equals("Signal Dispatcher")
1093 +            || name.equals("WedgedTestDetector"))
1094 +            return false;
1095 +        if (name.equals("Reference Handler")) {
1096 +            // Reference Handler stacktrace changed in JDK-8156500
1097 +            StackTraceElement[] stackTrace; String methodName;
1098 +            if ((stackTrace = info.getStackTrace()) != null
1099 +                && stackTrace.length > 0
1100 +                && (methodName = stackTrace[0].getMethodName()) != null
1101 +                && methodName.equals("waitForReferencePendingList"))
1102 +                return false;
1103 +            // jdk8 Reference Handler stacktrace
1104 +            if ((lockName = info.getLockName()) != null
1105 +                && lockName.startsWith("java.lang.ref"))
1106 +                return false;
1107 +        }
1108 +        if ((name.equals("Finalizer") || name.equals("Common-Cleaner"))
1109 +            && (lockName = info.getLockName()) != null
1110 +            && lockName.startsWith("java.lang.ref"))
1111 +            return false;
1112 +        if (name.startsWith("ForkJoinPool.commonPool-worker")
1113 +            && (lockName = info.getLockName()) != null
1114 +            && lockName.startsWith("java.util.concurrent.ForkJoinPool"))
1115 +            return false;
1116 +        return true;
1117 +    }
1118 +
1119      /**
1120       * A debugging tool to print stack traces of most threads, as jstack does.
1121       * Uninteresting threads are filtered out.
# Line 1040 | Line 1132 | public class JSR166TestCase extends Test
1132  
1133          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1134          System.err.println("------ stacktrace dump start ------");
1135 <        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1136 <            final String name = info.getThreadName();
1137 <            String lockName;
1046 <            if ("Signal Dispatcher".equals(name))
1047 <                continue;
1048 <            if ("Reference Handler".equals(name)
1049 <                && (lockName = info.getLockName()) != null
1050 <                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1051 <                continue;
1052 <            if ("Finalizer".equals(name)
1053 <                && (lockName = info.getLockName()) != null
1054 <                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1055 <                continue;
1056 <            if ("checkForWedgedTest".equals(name))
1057 <                continue;
1058 <            System.err.print(info);
1059 <        }
1135 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true))
1136 >            if (threadOfInterest(info))
1137 >                System.err.print(info);
1138          System.err.println("------ stacktrace dump end ------");
1139  
1140          if (sm != null) System.setSecurityManager(sm);
# Line 1066 | Line 1144 | public class JSR166TestCase extends Test
1144       * Checks that thread eventually enters the expected blocked thread state.
1145       */
1146      void assertThreadBlocks(Thread thread, Thread.State expected) {
1147 <        // always sleep at least 1 ms, avoiding transitional states
1148 <        // with high probability
1147 >        // always sleep at least 1 ms, with high probability avoiding
1148 >        // transitory states
1149          for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1150              try { delay(1); }
1151              catch (InterruptedException fail) {
1152 <                fail("Unexpected InterruptedException");
1152 >                throw new AssertionError("Unexpected InterruptedException", fail);
1153              }
1154              Thread.State s = thread.getState();
1155              if (s == expected)
# Line 1083 | Line 1161 | public class JSR166TestCase extends Test
1161      }
1162  
1163      /**
1086     * Checks that thread does not terminate within the default
1087     * millisecond delay of {@code timeoutMillis()}.
1088     */
1089    void assertThreadStaysAlive(Thread thread) {
1090        assertThreadStaysAlive(thread, timeoutMillis());
1091    }
1092
1093    /**
1094     * Checks that thread does not terminate within the given millisecond delay.
1095     */
1096    void assertThreadStaysAlive(Thread thread, long millis) {
1097        try {
1098            // No need to optimize the failing case via Thread.join.
1099            delay(millis);
1100            assertTrue(thread.isAlive());
1101        } catch (InterruptedException fail) {
1102            threadFail("Unexpected InterruptedException");
1103        }
1104    }
1105
1106    /**
1107     * Checks that the threads do not terminate within the default
1108     * millisecond delay of {@code timeoutMillis()}.
1109     */
1110    void assertThreadsStayAlive(Thread... threads) {
1111        assertThreadsStayAlive(timeoutMillis(), threads);
1112    }
1113
1114    /**
1115     * Checks that the threads do not terminate within the given millisecond delay.
1116     */
1117    void assertThreadsStayAlive(long millis, Thread... threads) {
1118        try {
1119            // No need to optimize the failing case via Thread.join.
1120            delay(millis);
1121            for (Thread thread : threads)
1122                assertTrue(thread.isAlive());
1123        } catch (InterruptedException fail) {
1124            threadFail("Unexpected InterruptedException");
1125        }
1126    }
1127
1128    /**
1164       * Checks that future.get times out, with the default timeout of
1165       * {@code timeoutMillis()}.
1166       */
# Line 1300 | Line 1335 | public class JSR166TestCase extends Test
1335  
1336      /**
1337       * Sleeps until the given time has elapsed.
1338 <     * Throws AssertionFailedError if interrupted.
1338 >     * Throws AssertionError if interrupted.
1339       */
1340      static void sleep(long millis) {
1341          try {
1342              delay(millis);
1343          } catch (InterruptedException fail) {
1344 <            AssertionFailedError afe =
1310 <                new AssertionFailedError("Unexpected InterruptedException");
1311 <            afe.initCause(fail);
1312 <            throw afe;
1344 >            throw new AssertionError("Unexpected InterruptedException", fail);
1345          }
1346      }
1347  
1348      /**
1349       * Spin-waits up to the specified number of milliseconds for the given
1350       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1351 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1352       */
1353 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1354 <        long startTime = 0L;
1355 <        for (;;) {
1356 <            Thread.State s = thread.getState();
1357 <            if (s == Thread.State.BLOCKED ||
1358 <                s == Thread.State.WAITING ||
1359 <                s == Thread.State.TIMED_WAITING)
1360 <                return;
1361 <            else if (s == Thread.State.TERMINATED)
1353 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1354 >                                       Callable<Boolean> waitingForGodot) {
1355 >        for (long startTime = 0L;;) {
1356 >            switch (thread.getState()) {
1357 >            default: break;
1358 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1359 >                try {
1360 >                    if (waitingForGodot == null || waitingForGodot.call())
1361 >                        return;
1362 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1363 >                break;
1364 >            case TERMINATED:
1365                  fail("Unexpected thread termination");
1366 <            else if (startTime == 0L)
1366 >            }
1367 >
1368 >            if (startTime == 0L)
1369                  startTime = System.nanoTime();
1370              else if (millisElapsedSince(startTime) > timeoutMillis) {
1371 <                threadAssertTrue(thread.isAlive());
1372 <                fail("timed out waiting for thread to enter wait state");
1371 >                assertTrue(thread.isAlive());
1372 >                if (waitingForGodot == null
1373 >                    || thread.getState() == Thread.State.RUNNABLE)
1374 >                    fail("timed out waiting for thread to enter wait state");
1375 >                else
1376 >                    fail("timed out waiting for condition, thread state="
1377 >                         + thread.getState());
1378              }
1379              Thread.yield();
1380          }
# Line 1339 | Line 1382 | public class JSR166TestCase extends Test
1382  
1383      /**
1384       * Spin-waits up to the specified number of milliseconds for the given
1385 <     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1343 <     * and additionally satisfy the given condition.
1385 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1386       */
1387 <    void waitForThreadToEnterWaitState(
1388 <        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1347 <        long startTime = 0L;
1348 <        for (;;) {
1349 <            Thread.State s = thread.getState();
1350 <            if (s == Thread.State.BLOCKED ||
1351 <                s == Thread.State.WAITING ||
1352 <                s == Thread.State.TIMED_WAITING) {
1353 <                try {
1354 <                    if (waitingForGodot.call())
1355 <                        return;
1356 <                } catch (Throwable fail) { threadUnexpectedException(fail); }
1357 <            }
1358 <            else if (s == Thread.State.TERMINATED)
1359 <                fail("Unexpected thread termination");
1360 <            else if (startTime == 0L)
1361 <                startTime = System.nanoTime();
1362 <            else if (millisElapsedSince(startTime) > timeoutMillis) {
1363 <                threadAssertTrue(thread.isAlive());
1364 <                fail("timed out waiting for thread to enter wait state");
1365 <            }
1366 <            Thread.yield();
1367 <        }
1387 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1388 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1389      }
1390  
1391      /**
# Line 1372 | Line 1393 | public class JSR166TestCase extends Test
1393       * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1394       */
1395      void waitForThreadToEnterWaitState(Thread thread) {
1396 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1396 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1397      }
1398  
1399      /**
# Line 1380 | Line 1401 | public class JSR166TestCase extends Test
1401       * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1402       * and additionally satisfy the given condition.
1403       */
1404 <    void waitForThreadToEnterWaitState(
1405 <        Thread thread, Callable<Boolean> waitingForGodot) {
1404 >    void waitForThreadToEnterWaitState(Thread thread,
1405 >                                       Callable<Boolean> waitingForGodot) {
1406          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1407      }
1408  
1409      /**
1410 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1411 +     * be interrupted.  Clears the interrupt status before returning.
1412 +     */
1413 +    void awaitInterrupted() {
1414 +        for (long startTime = 0L; !Thread.interrupted(); ) {
1415 +            if (startTime == 0L)
1416 +                startTime = System.nanoTime();
1417 +            else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1418 +                fail("timed out waiting for thread interrupt");
1419 +            Thread.yield();
1420 +        }
1421 +    }
1422 +
1423 +    /**
1424       * Returns the number of milliseconds since time given by
1425       * startNanoTime, which must have been previously returned from a
1426       * call to {@link System#nanoTime()}.
# Line 1394 | Line 1429 | public class JSR166TestCase extends Test
1429          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1430      }
1431  
1397 //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1398 //         long startTime = System.nanoTime();
1399 //         try {
1400 //             r.run();
1401 //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1402 //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1403 //             throw new AssertionFailedError("did not return promptly");
1404 //     }
1405
1406 //     void assertTerminatesPromptly(Runnable r) {
1407 //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1408 //     }
1409
1432      /**
1433       * Checks that timed f.get() returns the expected value, and does not
1434       * wait for the timeout to elapse before returning.
1435       */
1436      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1437          long startTime = System.nanoTime();
1438 +        T actual = null;
1439          try {
1440 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1440 >            actual = f.get(timeoutMillis, MILLISECONDS);
1441          } catch (Throwable fail) { threadUnexpectedException(fail); }
1442 +        assertEquals(expectedValue, actual);
1443          if (millisElapsedSince(startTime) > timeoutMillis/2)
1444 <            throw new AssertionFailedError("timed get did not return promptly");
1444 >            throw new AssertionError("timed get did not return promptly");
1445      }
1446  
1447      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1439 | Line 1463 | public class JSR166TestCase extends Test
1463       * to terminate (using {@link Thread#join(long)}), else interrupts
1464       * the thread (in the hope that it may terminate later) and fails.
1465       */
1466 <    void awaitTermination(Thread t, long timeoutMillis) {
1466 >    void awaitTermination(Thread thread, long timeoutMillis) {
1467          try {
1468 <            t.join(timeoutMillis);
1468 >            thread.join(timeoutMillis);
1469          } catch (InterruptedException fail) {
1470              threadUnexpectedException(fail);
1471 <        } finally {
1472 <            if (t.getState() != Thread.State.TERMINATED) {
1473 <                t.interrupt();
1474 <                threadFail("timed out waiting for thread to terminate");
1471 >        }
1472 >        if (thread.getState() != Thread.State.TERMINATED) {
1473 >            String detail = String.format(
1474 >                    "timed out waiting for thread to terminate, thread=%s, state=%s" ,
1475 >                    thread, thread.getState());
1476 >            try {
1477 >                threadFail(detail);
1478 >            } finally {
1479 >                // Interrupt thread __after__ having reported its stack trace
1480 >                thread.interrupt();
1481              }
1482          }
1483      }
# Line 1475 | Line 1505 | public class JSR166TestCase extends Test
1505          }
1506      }
1507  
1478    public abstract class RunnableShouldThrow implements Runnable {
1479        protected abstract void realRun() throws Throwable;
1480
1481        final Class<?> exceptionClass;
1482
1483        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1484            this.exceptionClass = exceptionClass;
1485        }
1486
1487        public final void run() {
1488            try {
1489                realRun();
1490                threadShouldThrow(exceptionClass.getSimpleName());
1491            } catch (Throwable t) {
1492                if (! exceptionClass.isInstance(t))
1493                    threadUnexpectedException(t);
1494            }
1495        }
1496    }
1497
1508      public abstract class ThreadShouldThrow extends Thread {
1509          protected abstract void realRun() throws Throwable;
1510  
# Line 1507 | Line 1517 | public class JSR166TestCase extends Test
1517          public final void run() {
1518              try {
1519                  realRun();
1510                threadShouldThrow(exceptionClass.getSimpleName());
1520              } catch (Throwable t) {
1521                  if (! exceptionClass.isInstance(t))
1522                      threadUnexpectedException(t);
1523 +                return;
1524              }
1525 +            threadShouldThrow(exceptionClass.getSimpleName());
1526          }
1527      }
1528  
# Line 1521 | Line 1532 | public class JSR166TestCase extends Test
1532          public final void run() {
1533              try {
1534                  realRun();
1524                threadShouldThrow("InterruptedException");
1535              } catch (InterruptedException success) {
1536                  threadAssertFalse(Thread.interrupted());
1537 +                return;
1538              } catch (Throwable fail) {
1539                  threadUnexpectedException(fail);
1540              }
1541 +            threadShouldThrow("InterruptedException");
1542          }
1543      }
1544  
# Line 1538 | Line 1550 | public class JSR166TestCase extends Test
1550                  return realCall();
1551              } catch (Throwable fail) {
1552                  threadUnexpectedException(fail);
1541                return null;
1542            }
1543        }
1544    }
1545
1546    public abstract class CheckedInterruptedCallable<T>
1547        implements Callable<T> {
1548        protected abstract T realCall() throws Throwable;
1549
1550        public final T call() {
1551            try {
1552                T result = realCall();
1553                threadShouldThrow("InterruptedException");
1554                return result;
1555            } catch (InterruptedException success) {
1556                threadAssertFalse(Thread.interrupted());
1557            } catch (Throwable fail) {
1558                threadUnexpectedException(fail);
1553              }
1554 <            return null;
1554 >            throw new AssertionError("unreached");
1555          }
1556      }
1557  
# Line 1614 | Line 1608 | public class JSR166TestCase extends Test
1608      }
1609  
1610      public void await(CountDownLatch latch, long timeoutMillis) {
1611 +        boolean timedOut = false;
1612          try {
1613 <            if (!latch.await(timeoutMillis, MILLISECONDS))
1619 <                fail("timed out waiting for CountDownLatch for "
1620 <                     + (timeoutMillis/1000) + " sec");
1613 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1614          } catch (Throwable fail) {
1615              threadUnexpectedException(fail);
1616          }
1617 +        if (timedOut)
1618 +            fail("timed out waiting for CountDownLatch for "
1619 +                 + (timeoutMillis/1000) + " sec");
1620      }
1621  
1622      public void await(CountDownLatch latch) {
# Line 1628 | Line 1624 | public class JSR166TestCase extends Test
1624      }
1625  
1626      public void await(Semaphore semaphore) {
1627 +        boolean timedOut = false;
1628          try {
1629 <            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1633 <                fail("timed out waiting for Semaphore for "
1634 <                     + (LONG_DELAY_MS/1000) + " sec");
1629 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1630          } catch (Throwable fail) {
1631              threadUnexpectedException(fail);
1632          }
1633 +        if (timedOut)
1634 +            fail("timed out waiting for Semaphore for "
1635 +                 + (LONG_DELAY_MS/1000) + " sec");
1636      }
1637  
1638      public void await(CyclicBarrier barrier) {
# Line 1659 | Line 1657 | public class JSR166TestCase extends Test
1657   //         long startTime = System.nanoTime();
1658   //         while (!flag.get()) {
1659   //             if (millisElapsedSince(startTime) > timeoutMillis)
1660 < //                 throw new AssertionFailedError("timed out");
1660 > //                 throw new AssertionError("timed out");
1661   //             Thread.yield();
1662   //         }
1663   //     }
# Line 1668 | Line 1666 | public class JSR166TestCase extends Test
1666          public String call() { throw new NullPointerException(); }
1667      }
1668  
1671    public static class CallableOne implements Callable<Integer> {
1672        public Integer call() { return one; }
1673    }
1674
1675    public class ShortRunnable extends CheckedRunnable {
1676        protected void realRun() throws Throwable {
1677            delay(SHORT_DELAY_MS);
1678        }
1679    }
1680
1681    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1682        protected void realRun() throws InterruptedException {
1683            delay(SHORT_DELAY_MS);
1684        }
1685    }
1686
1687    public class SmallRunnable extends CheckedRunnable {
1688        protected void realRun() throws Throwable {
1689            delay(SMALL_DELAY_MS);
1690        }
1691    }
1692
1693    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1694        protected void realRun() {
1695            try {
1696                delay(SMALL_DELAY_MS);
1697            } catch (InterruptedException ok) {}
1698        }
1699    }
1700
1701    public class SmallCallable extends CheckedCallable {
1702        protected Object realCall() throws InterruptedException {
1703            delay(SMALL_DELAY_MS);
1704            return Boolean.TRUE;
1705        }
1706    }
1707
1708    public class MediumRunnable extends CheckedRunnable {
1709        protected void realRun() throws Throwable {
1710            delay(MEDIUM_DELAY_MS);
1711        }
1712    }
1713
1714    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1715        protected void realRun() throws InterruptedException {
1716            delay(MEDIUM_DELAY_MS);
1717        }
1718    }
1719
1669      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1670          return new CheckedRunnable() {
1671              protected void realRun() {
# Line 1726 | Line 1675 | public class JSR166TestCase extends Test
1675              }};
1676      }
1677  
1729    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1730        protected void realRun() {
1731            try {
1732                delay(MEDIUM_DELAY_MS);
1733            } catch (InterruptedException ok) {}
1734        }
1735    }
1736
1737    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1738        protected void realRun() {
1739            try {
1740                delay(LONG_DELAY_MS);
1741            } catch (InterruptedException ok) {}
1742        }
1743    }
1744
1678      /**
1679       * For use as ThreadFactory in constructors
1680       */
# Line 1755 | Line 1688 | public class JSR166TestCase extends Test
1688          boolean isDone();
1689      }
1690  
1758    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1759        return new TrackedRunnable() {
1760                private volatile boolean done = false;
1761                public boolean isDone() { return done; }
1762                public void run() {
1763                    try {
1764                        delay(timeoutMillis);
1765                        done = true;
1766                    } catch (InterruptedException ok) {}
1767                }
1768            };
1769    }
1770
1771    public static class TrackedShortRunnable implements Runnable {
1772        public volatile boolean done = false;
1773        public void run() {
1774            try {
1775                delay(SHORT_DELAY_MS);
1776                done = true;
1777            } catch (InterruptedException ok) {}
1778        }
1779    }
1780
1781    public static class TrackedSmallRunnable implements Runnable {
1782        public volatile boolean done = false;
1783        public void run() {
1784            try {
1785                delay(SMALL_DELAY_MS);
1786                done = true;
1787            } catch (InterruptedException ok) {}
1788        }
1789    }
1790
1791    public static class TrackedMediumRunnable implements Runnable {
1792        public volatile boolean done = false;
1793        public void run() {
1794            try {
1795                delay(MEDIUM_DELAY_MS);
1796                done = true;
1797            } catch (InterruptedException ok) {}
1798        }
1799    }
1800
1801    public static class TrackedLongRunnable implements Runnable {
1802        public volatile boolean done = false;
1803        public void run() {
1804            try {
1805                delay(LONG_DELAY_MS);
1806                done = true;
1807            } catch (InterruptedException ok) {}
1808        }
1809    }
1810
1691      public static class TrackedNoOpRunnable implements Runnable {
1692          public volatile boolean done = false;
1693          public void run() {
# Line 1815 | Line 1695 | public class JSR166TestCase extends Test
1695          }
1696      }
1697  
1818    public static class TrackedCallable implements Callable {
1819        public volatile boolean done = false;
1820        public Object call() {
1821            try {
1822                delay(SMALL_DELAY_MS);
1823                done = true;
1824            } catch (InterruptedException ok) {}
1825            return Boolean.TRUE;
1826        }
1827    }
1828
1698      /**
1699       * Analog of CheckedRunnable for RecursiveAction
1700       */
# Line 1852 | Line 1721 | public class JSR166TestCase extends Test
1721                  return realCompute();
1722              } catch (Throwable fail) {
1723                  threadUnexpectedException(fail);
1855                return null;
1724              }
1725 +            throw new AssertionError("unreached");
1726          }
1727      }
1728  
# Line 1867 | Line 1736 | public class JSR166TestCase extends Test
1736  
1737      /**
1738       * A CyclicBarrier that uses timed await and fails with
1739 <     * AssertionFailedErrors instead of throwing checked exceptions.
1739 >     * AssertionErrors instead of throwing checked exceptions.
1740       */
1741      public static class CheckedBarrier extends CyclicBarrier {
1742          public CheckedBarrier(int parties) { super(parties); }
# Line 1876 | Line 1745 | public class JSR166TestCase extends Test
1745              try {
1746                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1747              } catch (TimeoutException timedOut) {
1748 <                throw new AssertionFailedError("timed out");
1748 >                throw new AssertionError("timed out");
1749              } catch (Exception fail) {
1750 <                AssertionFailedError afe =
1882 <                    new AssertionFailedError("Unexpected exception: " + fail);
1883 <                afe.initCause(fail);
1884 <                throw afe;
1750 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1751              }
1752          }
1753      }
# Line 1892 | Line 1758 | public class JSR166TestCase extends Test
1758              assertEquals(0, q.size());
1759              assertNull(q.peek());
1760              assertNull(q.poll());
1761 <            assertNull(q.poll(0, MILLISECONDS));
1761 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1762              assertEquals(q.toString(), "[]");
1763              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1764              assertFalse(q.iterator().hasNext());
# Line 1933 | Line 1799 | public class JSR166TestCase extends Test
1799          }
1800      }
1801  
1802 <    void assertImmutable(final Object o) {
1802 >    void assertImmutable(Object o) {
1803          if (o instanceof Collection) {
1804              assertThrows(
1805                  UnsupportedOperationException.class,
1806 <                new Runnable() { public void run() {
1941 <                        ((Collection) o).add(null);}});
1806 >                () -> ((Collection) o).add(null));
1807          }
1808      }
1809  
1810      @SuppressWarnings("unchecked")
1811      <T> T serialClone(T o) {
1812 +        T clone = null;
1813          try {
1814              ObjectInputStream ois = new ObjectInputStream
1815                  (new ByteArrayInputStream(serialBytes(o)));
1816 <            T clone = (T) ois.readObject();
1951 <            if (o == clone) assertImmutable(o);
1952 <            assertSame(o.getClass(), clone.getClass());
1953 <            return clone;
1816 >            clone = (T) ois.readObject();
1817          } catch (Throwable fail) {
1818              threadUnexpectedException(fail);
1956            return null;
1819          }
1820 +        if (o == clone) assertImmutable(o);
1821 +        else assertSame(o.getClass(), clone.getClass());
1822 +        return clone;
1823      }
1824  
1825      /**
# Line 1973 | Line 1838 | public class JSR166TestCase extends Test
1838              (new ByteArrayInputStream(bos.toByteArray()));
1839          T clone = (T) ois.readObject();
1840          if (o == clone) assertImmutable(o);
1841 <        assertSame(o.getClass(), clone.getClass());
1841 >        else assertSame(o.getClass(), clone.getClass());
1842          return clone;
1843      }
1844  
# Line 1998 | Line 1863 | public class JSR166TestCase extends Test
1863      }
1864  
1865      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1866 <                             Runnable... throwingActions) {
1867 <        for (Runnable throwingAction : throwingActions) {
1866 >                             Action... throwingActions) {
1867 >        for (Action throwingAction : throwingActions) {
1868              boolean threw = false;
1869              try { throwingAction.run(); }
1870              catch (Throwable t) {
1871                  threw = true;
1872 <                if (!expectedExceptionClass.isInstance(t)) {
1873 <                    AssertionFailedError afe =
1874 <                        new AssertionFailedError
1875 <                        ("Expected " + expectedExceptionClass.getName() +
1876 <                         ", got " + t.getClass().getName());
2012 <                    afe.initCause(t);
2013 <                    threadUnexpectedException(afe);
2014 <                }
1872 >                if (!expectedExceptionClass.isInstance(t))
1873 >                    throw new AssertionError(
1874 >                            "Expected " + expectedExceptionClass.getName() +
1875 >                            ", got " + t.getClass().getName(),
1876 >                            t);
1877              }
1878              if (!threw)
1879                  shouldThrow(expectedExceptionClass.getName());
# Line 2043 | Line 1905 | public class JSR166TestCase extends Test
1905      static <T> void shuffle(T[] array) {
1906          Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1907      }
1908 +
1909 +    /**
1910 +     * Returns the same String as would be returned by {@link
1911 +     * Object#toString}, whether or not the given object's class
1912 +     * overrides toString().
1913 +     *
1914 +     * @see System#identityHashCode
1915 +     */
1916 +    static String identityString(Object x) {
1917 +        return x.getClass().getName()
1918 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1919 +    }
1920 +
1921 +    // --- Shared assertions for Executor tests ---
1922 +
1923 +    /**
1924 +     * Returns maximum number of tasks that can be submitted to given
1925 +     * pool (with bounded queue) before saturation (when submission
1926 +     * throws RejectedExecutionException).
1927 +     */
1928 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1929 +        BlockingQueue<Runnable> q = pool.getQueue();
1930 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1931 +    }
1932 +
1933 +    @SuppressWarnings("FutureReturnValueIgnored")
1934 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1935 +        try {
1936 +            e.execute((Runnable) null);
1937 +            shouldThrow();
1938 +        } catch (NullPointerException success) {}
1939 +
1940 +        if (! (e instanceof ExecutorService)) return;
1941 +        ExecutorService es = (ExecutorService) e;
1942 +        try {
1943 +            es.submit((Runnable) null);
1944 +            shouldThrow();
1945 +        } catch (NullPointerException success) {}
1946 +        try {
1947 +            es.submit((Runnable) null, Boolean.TRUE);
1948 +            shouldThrow();
1949 +        } catch (NullPointerException success) {}
1950 +        try {
1951 +            es.submit((Callable) null);
1952 +            shouldThrow();
1953 +        } catch (NullPointerException success) {}
1954 +
1955 +        if (! (e instanceof ScheduledExecutorService)) return;
1956 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1957 +        try {
1958 +            ses.schedule((Runnable) null,
1959 +                         randomTimeout(), randomTimeUnit());
1960 +            shouldThrow();
1961 +        } catch (NullPointerException success) {}
1962 +        try {
1963 +            ses.schedule((Callable) null,
1964 +                         randomTimeout(), randomTimeUnit());
1965 +            shouldThrow();
1966 +        } catch (NullPointerException success) {}
1967 +        try {
1968 +            ses.scheduleAtFixedRate((Runnable) null,
1969 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1970 +            shouldThrow();
1971 +        } catch (NullPointerException success) {}
1972 +        try {
1973 +            ses.scheduleWithFixedDelay((Runnable) null,
1974 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1975 +            shouldThrow();
1976 +        } catch (NullPointerException success) {}
1977 +    }
1978 +
1979 +    void setRejectedExecutionHandler(
1980 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1981 +        p.setRejectedExecutionHandler(handler);
1982 +        assertSame(handler, p.getRejectedExecutionHandler());
1983 +    }
1984 +
1985 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1986 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1987 +        final long savedTaskCount = p.getTaskCount();
1988 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1989 +        final int savedQueueSize = p.getQueue().size();
1990 +        final boolean stock = (p.getClass().getClassLoader() == null);
1991 +
1992 +        Runnable r = () -> {};
1993 +        Callable<Boolean> c = () -> Boolean.TRUE;
1994 +
1995 +        class Recorder implements RejectedExecutionHandler {
1996 +            public volatile Runnable r = null;
1997 +            public volatile ThreadPoolExecutor p = null;
1998 +            public void reset() { r = null; p = null; }
1999 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
2000 +                assertNull(this.r);
2001 +                assertNull(this.p);
2002 +                this.r = r;
2003 +                this.p = p;
2004 +            }
2005 +        }
2006 +
2007 +        // check custom handler is invoked exactly once per task
2008 +        Recorder recorder = new Recorder();
2009 +        setRejectedExecutionHandler(p, recorder);
2010 +        for (int i = 2; i--> 0; ) {
2011 +            recorder.reset();
2012 +            p.execute(r);
2013 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
2014 +                assertSame(r, recorder.r);
2015 +            assertSame(p, recorder.p);
2016 +
2017 +            recorder.reset();
2018 +            assertFalse(p.submit(r).isDone());
2019 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2020 +            assertSame(p, recorder.p);
2021 +
2022 +            recorder.reset();
2023 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2024 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2025 +            assertSame(p, recorder.p);
2026 +
2027 +            recorder.reset();
2028 +            assertFalse(p.submit(c).isDone());
2029 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2030 +            assertSame(p, recorder.p);
2031 +
2032 +            if (p instanceof ScheduledExecutorService) {
2033 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2034 +                ScheduledFuture<?> future;
2035 +
2036 +                recorder.reset();
2037 +                future = s.schedule(r, 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.schedule(c, randomTimeout(), randomTimeUnit());
2044 +                assertFalse(future.isDone());
2045 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2046 +                assertSame(p, recorder.p);
2047 +
2048 +                recorder.reset();
2049 +                future = s.scheduleAtFixedRate(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 +                recorder.reset();
2055 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2056 +                assertFalse(future.isDone());
2057 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2058 +                assertSame(p, recorder.p);
2059 +            }
2060 +        }
2061 +
2062 +        // Checking our custom handler above should be sufficient, but
2063 +        // we add some integration tests of standard handlers.
2064 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2065 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2066 +
2067 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2068 +        try {
2069 +            p.execute(setThread);
2070 +            shouldThrow();
2071 +        } catch (RejectedExecutionException success) {}
2072 +        assertNull(thread.get());
2073 +
2074 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2075 +        p.execute(setThread);
2076 +        assertNull(thread.get());
2077 +
2078 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2079 +        p.execute(setThread);
2080 +        if (p.isShutdown())
2081 +            assertNull(thread.get());
2082 +        else
2083 +            assertSame(Thread.currentThread(), thread.get());
2084 +
2085 +        setRejectedExecutionHandler(p, savedHandler);
2086 +
2087 +        // check that pool was not perturbed by handlers
2088 +        assertEquals(savedTaskCount, p.getTaskCount());
2089 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2090 +        assertEquals(savedQueueSize, p.getQueue().size());
2091 +    }
2092 +
2093 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2094 +        assertEquals(x, y);
2095 +        assertEquals(y, x);
2096 +        assertEquals(x.isEmpty(), y.isEmpty());
2097 +        assertEquals(x.size(), y.size());
2098 +        if (x instanceof List) {
2099 +            assertEquals(x.toString(), y.toString());
2100 +        }
2101 +        if (x instanceof List || x instanceof Set) {
2102 +            assertEquals(x.hashCode(), y.hashCode());
2103 +        }
2104 +        if (x instanceof List || x instanceof Deque) {
2105 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2106 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2107 +                                     y.toArray(new Object[0])));
2108 +        }
2109 +    }
2110 +
2111 +    /**
2112 +     * A weaker form of assertCollectionsEquals which does not insist
2113 +     * that the two collections satisfy Object#equals(Object), since
2114 +     * they may use identity semantics as Deques do.
2115 +     */
2116 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2117 +        if (x instanceof List || x instanceof Set)
2118 +            assertCollectionsEquals(x, y);
2119 +        else {
2120 +            assertEquals(x.isEmpty(), y.isEmpty());
2121 +            assertEquals(x.size(), y.size());
2122 +            assertEquals(new HashSet(x), new HashSet(y));
2123 +            if (x instanceof Deque) {
2124 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2125 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2126 +                                         y.toArray(new Object[0])));
2127 +            }
2128 +        }
2129 +    }
2130   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines