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.260 by jsr166, Thu Sep 5 17:27:07 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 272 | 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 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 638 | Line 657 | public class JSR166TestCase extends Test
657      public static long MEDIUM_DELAY_MS;
658      public static long LONG_DELAY_MS;
659  
660 +    private static final long RANDOM_TIMEOUT;
661 +    private static final long RANDOM_EXPIRED_TIMEOUT;
662 +    private static final TimeUnit RANDOM_TIMEUNIT;
663 +    static {
664 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
665 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
666 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
667 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
668 +        TimeUnit[] timeUnits = TimeUnit.values();
669 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
670 +    }
671 +
672 +    /**
673 +     * Returns a timeout for use when any value at all will do.
674 +     */
675 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
676 +
677 +    /**
678 +     * Returns a timeout that means "no waiting", i.e. not positive.
679 +     */
680 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
681 +
682 +    /**
683 +     * Returns a random non-null TimeUnit.
684 +     */
685 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
686 +
687 +    /**
688 +     * Returns a random boolean; a "coin flip".
689 +     */
690 +    static boolean randomBoolean() {
691 +        return ThreadLocalRandom.current().nextBoolean();
692 +    }
693 +
694 +    /**
695 +     * Returns a random element from given choices.
696 +     */
697 +    <T> T chooseRandomly(T... choices) {
698 +        return choices[ThreadLocalRandom.current().nextInt(choices.length)];
699 +    }
700 +
701      /**
702       * Returns the shortest timed delay. This can be scaled up for
703       * slow machines using the jsr166.delay.factor system property,
# Line 694 | Line 754 | public class JSR166TestCase extends Test
754       */
755      public void threadRecordFailure(Throwable t) {
756          System.err.println(t);
757 <        dumpTestThreads();
758 <        threadFailure.compareAndSet(null, t);
757 >        if (threadFailure.compareAndSet(null, t))
758 >            dumpTestThreads();
759      }
760  
761      public void setUp() {
# Line 706 | Line 766 | public class JSR166TestCase extends Test
766          String msg = toString() + ": " + String.format(format, args);
767          System.err.println(msg);
768          dumpTestThreads();
769 <        throw new AssertionFailedError(msg);
769 >        throw new AssertionError(msg);
770      }
771  
772      /**
# Line 727 | Line 787 | public class JSR166TestCase extends Test
787                  throw (RuntimeException) t;
788              else if (t instanceof Exception)
789                  throw (Exception) t;
790 <            else {
791 <                AssertionFailedError afe =
732 <                    new AssertionFailedError(t.toString());
733 <                afe.initCause(t);
734 <                throw afe;
735 <            }
790 >            else
791 >                throw new AssertionError(t.toString(), t);
792          }
793  
794          if (Thread.interrupted())
# Line 766 | Line 822 | public class JSR166TestCase extends Test
822  
823      /**
824       * Just like fail(reason), but additionally recording (using
825 <     * threadRecordFailure) any AssertionFailedError thrown, so that
826 <     * the current testcase will fail.
825 >     * threadRecordFailure) any AssertionError thrown, so that the
826 >     * current testcase will fail.
827       */
828      public void threadFail(String reason) {
829          try {
830              fail(reason);
831 <        } catch (AssertionFailedError t) {
832 <            threadRecordFailure(t);
833 <            throw t;
831 >        } catch (AssertionError fail) {
832 >            threadRecordFailure(fail);
833 >            throw fail;
834          }
835      }
836  
837      /**
838       * Just like assertTrue(b), but additionally recording (using
839 <     * threadRecordFailure) any AssertionFailedError thrown, so that
840 <     * the current testcase will fail.
839 >     * threadRecordFailure) any AssertionError thrown, so that the
840 >     * current testcase will fail.
841       */
842      public void threadAssertTrue(boolean b) {
843          try {
844              assertTrue(b);
845 <        } catch (AssertionFailedError t) {
846 <            threadRecordFailure(t);
847 <            throw t;
845 >        } catch (AssertionError fail) {
846 >            threadRecordFailure(fail);
847 >            throw fail;
848          }
849      }
850  
851      /**
852       * Just like assertFalse(b), but additionally recording (using
853 <     * threadRecordFailure) any AssertionFailedError thrown, so that
854 <     * the current testcase will fail.
853 >     * threadRecordFailure) any AssertionError thrown, so that the
854 >     * current testcase will fail.
855       */
856      public void threadAssertFalse(boolean b) {
857          try {
858              assertFalse(b);
859 <        } catch (AssertionFailedError t) {
860 <            threadRecordFailure(t);
861 <            throw t;
859 >        } catch (AssertionError fail) {
860 >            threadRecordFailure(fail);
861 >            throw fail;
862          }
863      }
864  
865      /**
866       * Just like assertNull(x), but additionally recording (using
867 <     * threadRecordFailure) any AssertionFailedError thrown, so that
868 <     * the current testcase will fail.
867 >     * threadRecordFailure) any AssertionError thrown, so that the
868 >     * current testcase will fail.
869       */
870      public void threadAssertNull(Object x) {
871          try {
872              assertNull(x);
873 <        } catch (AssertionFailedError t) {
874 <            threadRecordFailure(t);
875 <            throw t;
873 >        } catch (AssertionError fail) {
874 >            threadRecordFailure(fail);
875 >            throw fail;
876          }
877      }
878  
879      /**
880       * Just like assertEquals(x, y), but additionally recording (using
881 <     * threadRecordFailure) any AssertionFailedError thrown, so that
882 <     * the current testcase will fail.
881 >     * threadRecordFailure) any AssertionError thrown, so that the
882 >     * current testcase will fail.
883       */
884      public void threadAssertEquals(long x, long y) {
885          try {
886              assertEquals(x, y);
887 <        } catch (AssertionFailedError t) {
888 <            threadRecordFailure(t);
889 <            throw t;
887 >        } catch (AssertionError fail) {
888 >            threadRecordFailure(fail);
889 >            throw fail;
890          }
891      }
892  
893      /**
894       * Just like assertEquals(x, y), but additionally recording (using
895 <     * threadRecordFailure) any AssertionFailedError thrown, so that
896 <     * the current testcase will fail.
895 >     * threadRecordFailure) any AssertionError thrown, so that the
896 >     * current testcase will fail.
897       */
898      public void threadAssertEquals(Object x, Object y) {
899          try {
900              assertEquals(x, y);
901 <        } catch (AssertionFailedError fail) {
901 >        } catch (AssertionError fail) {
902              threadRecordFailure(fail);
903              throw fail;
904          } catch (Throwable fail) {
# Line 852 | Line 908 | public class JSR166TestCase extends Test
908  
909      /**
910       * Just like assertSame(x, y), but additionally recording (using
911 <     * threadRecordFailure) any AssertionFailedError thrown, so that
912 <     * the current testcase will fail.
911 >     * threadRecordFailure) any AssertionError thrown, so that the
912 >     * current testcase will fail.
913       */
914      public void threadAssertSame(Object x, Object y) {
915          try {
916              assertSame(x, y);
917 <        } catch (AssertionFailedError fail) {
917 >        } catch (AssertionError fail) {
918              threadRecordFailure(fail);
919              throw fail;
920          }
# Line 880 | Line 936 | public class JSR166TestCase extends Test
936  
937      /**
938       * Records the given exception using {@link #threadRecordFailure},
939 <     * then rethrows the exception, wrapping it in an
940 <     * AssertionFailedError if necessary.
939 >     * then rethrows the exception, wrapping it in an AssertionError
940 >     * if necessary.
941       */
942      public void threadUnexpectedException(Throwable t) {
943          threadRecordFailure(t);
# Line 890 | Line 946 | public class JSR166TestCase extends Test
946              throw (RuntimeException) t;
947          else if (t instanceof Error)
948              throw (Error) t;
949 <        else {
950 <            AssertionFailedError afe =
895 <                new AssertionFailedError("unexpected exception: " + t);
896 <            afe.initCause(t);
897 <            throw afe;
898 <        }
949 >        else
950 >            throw new AssertionError("unexpected exception: " + t, t);
951      }
952  
953      /**
# Line 1066 | Line 1118 | public class JSR166TestCase extends Test
1118       * Checks that thread eventually enters the expected blocked thread state.
1119       */
1120      void assertThreadBlocks(Thread thread, Thread.State expected) {
1121 <        // always sleep at least 1 ms, avoiding transitional states
1122 <        // with high probability
1121 >        // always sleep at least 1 ms, with high probability avoiding
1122 >        // transitory states
1123          for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1124              try { delay(1); }
1125              catch (InterruptedException fail) {
1126 <                fail("Unexpected InterruptedException");
1126 >                throw new AssertionError("Unexpected InterruptedException", fail);
1127              }
1128              Thread.State s = thread.getState();
1129              if (s == expected)
# Line 1083 | Line 1135 | public class JSR166TestCase extends Test
1135      }
1136  
1137      /**
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    /**
1138       * Checks that future.get times out, with the default timeout of
1139       * {@code timeoutMillis()}.
1140       */
# Line 1300 | Line 1309 | public class JSR166TestCase extends Test
1309  
1310      /**
1311       * Sleeps until the given time has elapsed.
1312 <     * Throws AssertionFailedError if interrupted.
1312 >     * Throws AssertionError if interrupted.
1313       */
1314      static void sleep(long millis) {
1315          try {
1316              delay(millis);
1317          } catch (InterruptedException fail) {
1318 <            AssertionFailedError afe =
1310 <                new AssertionFailedError("Unexpected InterruptedException");
1311 <            afe.initCause(fail);
1312 <            throw afe;
1318 >            throw new AssertionError("Unexpected InterruptedException", fail);
1319          }
1320      }
1321  
1322      /**
1323       * Spin-waits up to the specified number of milliseconds for the given
1324       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1325 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1326       */
1327 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1328 <        long startTime = 0L;
1329 <        for (;;) {
1330 <            Thread.State s = thread.getState();
1331 <            if (s == Thread.State.BLOCKED ||
1332 <                s == Thread.State.WAITING ||
1333 <                s == Thread.State.TIMED_WAITING)
1334 <                return;
1335 <            else if (s == Thread.State.TERMINATED)
1327 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1328 >                                       Callable<Boolean> waitingForGodot) {
1329 >        for (long startTime = 0L;;) {
1330 >            switch (thread.getState()) {
1331 >            default: break;
1332 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1333 >                try {
1334 >                    if (waitingForGodot == null || waitingForGodot.call())
1335 >                        return;
1336 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1337 >                break;
1338 >            case TERMINATED:
1339                  fail("Unexpected thread termination");
1340 <            else if (startTime == 0L)
1340 >            }
1341 >
1342 >            if (startTime == 0L)
1343                  startTime = System.nanoTime();
1344              else if (millisElapsedSince(startTime) > timeoutMillis) {
1345 <                threadAssertTrue(thread.isAlive());
1346 <                fail("timed out waiting for thread to enter wait state");
1345 >                assertTrue(thread.isAlive());
1346 >                if (waitingForGodot == null
1347 >                    || thread.getState() == Thread.State.RUNNABLE)
1348 >                    fail("timed out waiting for thread to enter wait state");
1349 >                else
1350 >                    fail("timed out waiting for condition, thread state="
1351 >                         + thread.getState());
1352              }
1353              Thread.yield();
1354          }
# Line 1339 | Line 1356 | public class JSR166TestCase extends Test
1356  
1357      /**
1358       * Spin-waits up to the specified number of milliseconds for the given
1359 <     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1343 <     * and additionally satisfy the given condition.
1359 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1360       */
1361 <    void waitForThreadToEnterWaitState(
1362 <        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 <        }
1361 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1362 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1363      }
1364  
1365      /**
# Line 1372 | Line 1367 | public class JSR166TestCase extends Test
1367       * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1368       */
1369      void waitForThreadToEnterWaitState(Thread thread) {
1370 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1370 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1371      }
1372  
1373      /**
# Line 1380 | Line 1375 | public class JSR166TestCase extends Test
1375       * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1376       * and additionally satisfy the given condition.
1377       */
1378 <    void waitForThreadToEnterWaitState(
1379 <        Thread thread, Callable<Boolean> waitingForGodot) {
1378 >    void waitForThreadToEnterWaitState(Thread thread,
1379 >                                       Callable<Boolean> waitingForGodot) {
1380          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1381      }
1382  
1383      /**
1384 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1385 +     * be interrupted.  Clears the interrupt status before returning.
1386 +     */
1387 +    void awaitInterrupted() {
1388 +        for (long startTime = 0L; !Thread.interrupted(); ) {
1389 +            if (startTime == 0L)
1390 +                startTime = System.nanoTime();
1391 +            else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1392 +                fail("timed out waiting for thread interrupt");
1393 +            Thread.yield();
1394 +        }
1395 +    }
1396 +
1397 +    /**
1398       * Returns the number of milliseconds since time given by
1399       * startNanoTime, which must have been previously returned from a
1400       * call to {@link System#nanoTime()}.
# Line 1400 | Line 1409 | public class JSR166TestCase extends Test
1409   //             r.run();
1410   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1411   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1412 < //             throw new AssertionFailedError("did not return promptly");
1412 > //             throw new AssertionError("did not return promptly");
1413   //     }
1414  
1415   //     void assertTerminatesPromptly(Runnable r) {
# Line 1413 | Line 1422 | public class JSR166TestCase extends Test
1422       */
1423      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1424          long startTime = System.nanoTime();
1425 +        T actual = null;
1426          try {
1427 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1427 >            actual = f.get(timeoutMillis, MILLISECONDS);
1428          } catch (Throwable fail) { threadUnexpectedException(fail); }
1429 +        assertEquals(expectedValue, actual);
1430          if (millisElapsedSince(startTime) > timeoutMillis/2)
1431 <            throw new AssertionFailedError("timed get did not return promptly");
1431 >            throw new AssertionError("timed get did not return promptly");
1432      }
1433  
1434      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1444 | Line 1455 | public class JSR166TestCase extends Test
1455              t.join(timeoutMillis);
1456          } catch (InterruptedException fail) {
1457              threadUnexpectedException(fail);
1458 <        } finally {
1459 <            if (t.getState() != Thread.State.TERMINATED) {
1460 <                t.interrupt();
1461 <                threadFail("timed out waiting for thread to terminate");
1462 <            }
1458 >        }
1459 >        Thread.State state;
1460 >        if ((state = t.getState()) != Thread.State.TERMINATED) {
1461 >            t.interrupt();
1462 >            threadFail("timed out waiting for thread to terminate; "
1463 >                       + "state=" + state);
1464          }
1465      }
1466  
# Line 1475 | Line 1487 | public class JSR166TestCase extends Test
1487          }
1488      }
1489  
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
1490      public abstract class ThreadShouldThrow extends Thread {
1491          protected abstract void realRun() throws Throwable;
1492  
# Line 1507 | Line 1499 | public class JSR166TestCase extends Test
1499          public final void run() {
1500              try {
1501                  realRun();
1510                threadShouldThrow(exceptionClass.getSimpleName());
1502              } catch (Throwable t) {
1503                  if (! exceptionClass.isInstance(t))
1504                      threadUnexpectedException(t);
1505 +                return;
1506              }
1507 +            threadShouldThrow(exceptionClass.getSimpleName());
1508          }
1509      }
1510  
# Line 1521 | Line 1514 | public class JSR166TestCase extends Test
1514          public final void run() {
1515              try {
1516                  realRun();
1524                threadShouldThrow("InterruptedException");
1517              } catch (InterruptedException success) {
1518                  threadAssertFalse(Thread.interrupted());
1519 +                return;
1520              } catch (Throwable fail) {
1521                  threadUnexpectedException(fail);
1522              }
1523 +            threadShouldThrow("InterruptedException");
1524          }
1525      }
1526  
# Line 1538 | Line 1532 | public class JSR166TestCase extends Test
1532                  return realCall();
1533              } catch (Throwable fail) {
1534                  threadUnexpectedException(fail);
1541                return null;
1535              }
1536 <        }
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);
1559 <            }
1560 <            return null;
1536 >            throw new AssertionError("unreached");
1537          }
1538      }
1539  
# Line 1614 | Line 1590 | public class JSR166TestCase extends Test
1590      }
1591  
1592      public void await(CountDownLatch latch, long timeoutMillis) {
1593 +        boolean timedOut = false;
1594          try {
1595 <            if (!latch.await(timeoutMillis, MILLISECONDS))
1619 <                fail("timed out waiting for CountDownLatch for "
1620 <                     + (timeoutMillis/1000) + " sec");
1595 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1596          } catch (Throwable fail) {
1597              threadUnexpectedException(fail);
1598          }
1599 +        if (timedOut)
1600 +            fail("timed out waiting for CountDownLatch for "
1601 +                 + (timeoutMillis/1000) + " sec");
1602      }
1603  
1604      public void await(CountDownLatch latch) {
# Line 1628 | Line 1606 | public class JSR166TestCase extends Test
1606      }
1607  
1608      public void await(Semaphore semaphore) {
1609 +        boolean timedOut = false;
1610          try {
1611 <            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1633 <                fail("timed out waiting for Semaphore for "
1634 <                     + (LONG_DELAY_MS/1000) + " sec");
1611 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1612          } catch (Throwable fail) {
1613              threadUnexpectedException(fail);
1614          }
1615 +        if (timedOut)
1616 +            fail("timed out waiting for Semaphore for "
1617 +                 + (LONG_DELAY_MS/1000) + " sec");
1618      }
1619  
1620      public void await(CyclicBarrier barrier) {
# Line 1659 | Line 1639 | public class JSR166TestCase extends Test
1639   //         long startTime = System.nanoTime();
1640   //         while (!flag.get()) {
1641   //             if (millisElapsedSince(startTime) > timeoutMillis)
1642 < //                 throw new AssertionFailedError("timed out");
1642 > //                 throw new AssertionError("timed out");
1643   //             Thread.yield();
1644   //         }
1645   //     }
# Line 1668 | Line 1648 | public class JSR166TestCase extends Test
1648          public String call() { throw new NullPointerException(); }
1649      }
1650  
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
1651      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1652          return new CheckedRunnable() {
1653              protected void realRun() {
# Line 1726 | Line 1657 | public class JSR166TestCase extends Test
1657              }};
1658      }
1659  
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
1660      /**
1661       * For use as ThreadFactory in constructors
1662       */
# Line 1755 | Line 1670 | public class JSR166TestCase extends Test
1670          boolean isDone();
1671      }
1672  
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
1673      public static class TrackedNoOpRunnable implements Runnable {
1674          public volatile boolean done = false;
1675          public void run() {
# Line 1815 | Line 1677 | public class JSR166TestCase extends Test
1677          }
1678      }
1679  
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
1680      /**
1681       * Analog of CheckedRunnable for RecursiveAction
1682       */
# Line 1852 | Line 1703 | public class JSR166TestCase extends Test
1703                  return realCompute();
1704              } catch (Throwable fail) {
1705                  threadUnexpectedException(fail);
1855                return null;
1706              }
1707 +            throw new AssertionError("unreached");
1708          }
1709      }
1710  
# Line 1867 | Line 1718 | public class JSR166TestCase extends Test
1718  
1719      /**
1720       * A CyclicBarrier that uses timed await and fails with
1721 <     * AssertionFailedErrors instead of throwing checked exceptions.
1721 >     * AssertionErrors instead of throwing checked exceptions.
1722       */
1723      public static class CheckedBarrier extends CyclicBarrier {
1724          public CheckedBarrier(int parties) { super(parties); }
# Line 1876 | Line 1727 | public class JSR166TestCase extends Test
1727              try {
1728                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1729              } catch (TimeoutException timedOut) {
1730 <                throw new AssertionFailedError("timed out");
1730 >                throw new AssertionError("timed out");
1731              } catch (Exception fail) {
1732 <                AssertionFailedError afe =
1882 <                    new AssertionFailedError("Unexpected exception: " + fail);
1883 <                afe.initCause(fail);
1884 <                throw afe;
1732 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1733              }
1734          }
1735      }
# Line 1892 | Line 1740 | public class JSR166TestCase extends Test
1740              assertEquals(0, q.size());
1741              assertNull(q.peek());
1742              assertNull(q.poll());
1743 <            assertNull(q.poll(0, MILLISECONDS));
1743 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1744              assertEquals(q.toString(), "[]");
1745              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1746              assertFalse(q.iterator().hasNext());
# Line 1933 | Line 1781 | public class JSR166TestCase extends Test
1781          }
1782      }
1783  
1784 <    void assertImmutable(final Object o) {
1784 >    void assertImmutable(Object o) {
1785          if (o instanceof Collection) {
1786              assertThrows(
1787                  UnsupportedOperationException.class,
1788 <                new Runnable() { public void run() {
1941 <                        ((Collection) o).add(null);}});
1788 >                () -> ((Collection) o).add(null));
1789          }
1790      }
1791  
1792      @SuppressWarnings("unchecked")
1793      <T> T serialClone(T o) {
1794 +        T clone = null;
1795          try {
1796              ObjectInputStream ois = new ObjectInputStream
1797                  (new ByteArrayInputStream(serialBytes(o)));
1798 <            T clone = (T) ois.readObject();
1951 <            if (o == clone) assertImmutable(o);
1952 <            assertSame(o.getClass(), clone.getClass());
1953 <            return clone;
1798 >            clone = (T) ois.readObject();
1799          } catch (Throwable fail) {
1800              threadUnexpectedException(fail);
1956            return null;
1801          }
1802 +        if (o == clone) assertImmutable(o);
1803 +        else assertSame(o.getClass(), clone.getClass());
1804 +        return clone;
1805      }
1806  
1807      /**
# Line 1973 | Line 1820 | public class JSR166TestCase extends Test
1820              (new ByteArrayInputStream(bos.toByteArray()));
1821          T clone = (T) ois.readObject();
1822          if (o == clone) assertImmutable(o);
1823 <        assertSame(o.getClass(), clone.getClass());
1823 >        else assertSame(o.getClass(), clone.getClass());
1824          return clone;
1825      }
1826  
# Line 1998 | Line 1845 | public class JSR166TestCase extends Test
1845      }
1846  
1847      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1848 <                             Runnable... throwingActions) {
1849 <        for (Runnable throwingAction : throwingActions) {
1848 >                             Action... throwingActions) {
1849 >        for (Action throwingAction : throwingActions) {
1850              boolean threw = false;
1851              try { throwingAction.run(); }
1852              catch (Throwable t) {
1853                  threw = true;
1854 <                if (!expectedExceptionClass.isInstance(t)) {
1855 <                    AssertionFailedError afe =
1856 <                        new AssertionFailedError
1857 <                        ("Expected " + expectedExceptionClass.getName() +
1858 <                         ", got " + t.getClass().getName());
2012 <                    afe.initCause(t);
2013 <                    threadUnexpectedException(afe);
2014 <                }
1854 >                if (!expectedExceptionClass.isInstance(t))
1855 >                    throw new AssertionError(
1856 >                            "Expected " + expectedExceptionClass.getName() +
1857 >                            ", got " + t.getClass().getName(),
1858 >                            t);
1859              }
1860              if (!threw)
1861                  shouldThrow(expectedExceptionClass.getName());
# Line 2043 | Line 1887 | public class JSR166TestCase extends Test
1887      static <T> void shuffle(T[] array) {
1888          Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1889      }
1890 +
1891 +    /**
1892 +     * Returns the same String as would be returned by {@link
1893 +     * Object#toString}, whether or not the given object's class
1894 +     * overrides toString().
1895 +     *
1896 +     * @see System#identityHashCode
1897 +     */
1898 +    static String identityString(Object x) {
1899 +        return x.getClass().getName()
1900 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1901 +    }
1902 +
1903 +    // --- Shared assertions for Executor tests ---
1904 +
1905 +    /**
1906 +     * Returns maximum number of tasks that can be submitted to given
1907 +     * pool (with bounded queue) before saturation (when submission
1908 +     * throws RejectedExecutionException).
1909 +     */
1910 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1911 +        BlockingQueue<Runnable> q = pool.getQueue();
1912 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1913 +    }
1914 +
1915 +    @SuppressWarnings("FutureReturnValueIgnored")
1916 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1917 +        try {
1918 +            e.execute((Runnable) null);
1919 +            shouldThrow();
1920 +        } catch (NullPointerException success) {}
1921 +
1922 +        if (! (e instanceof ExecutorService)) return;
1923 +        ExecutorService es = (ExecutorService) e;
1924 +        try {
1925 +            es.submit((Runnable) null);
1926 +            shouldThrow();
1927 +        } catch (NullPointerException success) {}
1928 +        try {
1929 +            es.submit((Runnable) null, Boolean.TRUE);
1930 +            shouldThrow();
1931 +        } catch (NullPointerException success) {}
1932 +        try {
1933 +            es.submit((Callable) null);
1934 +            shouldThrow();
1935 +        } catch (NullPointerException success) {}
1936 +
1937 +        if (! (e instanceof ScheduledExecutorService)) return;
1938 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1939 +        try {
1940 +            ses.schedule((Runnable) null,
1941 +                         randomTimeout(), randomTimeUnit());
1942 +            shouldThrow();
1943 +        } catch (NullPointerException success) {}
1944 +        try {
1945 +            ses.schedule((Callable) null,
1946 +                         randomTimeout(), randomTimeUnit());
1947 +            shouldThrow();
1948 +        } catch (NullPointerException success) {}
1949 +        try {
1950 +            ses.scheduleAtFixedRate((Runnable) null,
1951 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1952 +            shouldThrow();
1953 +        } catch (NullPointerException success) {}
1954 +        try {
1955 +            ses.scheduleWithFixedDelay((Runnable) null,
1956 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1957 +            shouldThrow();
1958 +        } catch (NullPointerException success) {}
1959 +    }
1960 +
1961 +    void setRejectedExecutionHandler(
1962 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1963 +        p.setRejectedExecutionHandler(handler);
1964 +        assertSame(handler, p.getRejectedExecutionHandler());
1965 +    }
1966 +
1967 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1968 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1969 +        final long savedTaskCount = p.getTaskCount();
1970 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1971 +        final int savedQueueSize = p.getQueue().size();
1972 +        final boolean stock = (p.getClass().getClassLoader() == null);
1973 +
1974 +        Runnable r = () -> {};
1975 +        Callable<Boolean> c = () -> Boolean.TRUE;
1976 +
1977 +        class Recorder implements RejectedExecutionHandler {
1978 +            public volatile Runnable r = null;
1979 +            public volatile ThreadPoolExecutor p = null;
1980 +            public void reset() { r = null; p = null; }
1981 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1982 +                assertNull(this.r);
1983 +                assertNull(this.p);
1984 +                this.r = r;
1985 +                this.p = p;
1986 +            }
1987 +        }
1988 +
1989 +        // check custom handler is invoked exactly once per task
1990 +        Recorder recorder = new Recorder();
1991 +        setRejectedExecutionHandler(p, recorder);
1992 +        for (int i = 2; i--> 0; ) {
1993 +            recorder.reset();
1994 +            p.execute(r);
1995 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1996 +                assertSame(r, recorder.r);
1997 +            assertSame(p, recorder.p);
1998 +
1999 +            recorder.reset();
2000 +            assertFalse(p.submit(r).isDone());
2001 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2002 +            assertSame(p, recorder.p);
2003 +
2004 +            recorder.reset();
2005 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2006 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2007 +            assertSame(p, recorder.p);
2008 +
2009 +            recorder.reset();
2010 +            assertFalse(p.submit(c).isDone());
2011 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2012 +            assertSame(p, recorder.p);
2013 +
2014 +            if (p instanceof ScheduledExecutorService) {
2015 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2016 +                ScheduledFuture<?> future;
2017 +
2018 +                recorder.reset();
2019 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2020 +                assertFalse(future.isDone());
2021 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2022 +                assertSame(p, recorder.p);
2023 +
2024 +                recorder.reset();
2025 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2026 +                assertFalse(future.isDone());
2027 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2028 +                assertSame(p, recorder.p);
2029 +
2030 +                recorder.reset();
2031 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2032 +                assertFalse(future.isDone());
2033 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2034 +                assertSame(p, recorder.p);
2035 +
2036 +                recorder.reset();
2037 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2038 +                assertFalse(future.isDone());
2039 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2040 +                assertSame(p, recorder.p);
2041 +            }
2042 +        }
2043 +
2044 +        // Checking our custom handler above should be sufficient, but
2045 +        // we add some integration tests of standard handlers.
2046 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2047 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2048 +
2049 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2050 +        try {
2051 +            p.execute(setThread);
2052 +            shouldThrow();
2053 +        } catch (RejectedExecutionException success) {}
2054 +        assertNull(thread.get());
2055 +
2056 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2057 +        p.execute(setThread);
2058 +        assertNull(thread.get());
2059 +
2060 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2061 +        p.execute(setThread);
2062 +        if (p.isShutdown())
2063 +            assertNull(thread.get());
2064 +        else
2065 +            assertSame(Thread.currentThread(), thread.get());
2066 +
2067 +        setRejectedExecutionHandler(p, savedHandler);
2068 +
2069 +        // check that pool was not perturbed by handlers
2070 +        assertEquals(savedTaskCount, p.getTaskCount());
2071 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2072 +        assertEquals(savedQueueSize, p.getQueue().size());
2073 +    }
2074 +
2075 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2076 +        assertEquals(x, y);
2077 +        assertEquals(y, x);
2078 +        assertEquals(x.isEmpty(), y.isEmpty());
2079 +        assertEquals(x.size(), y.size());
2080 +        if (x instanceof List) {
2081 +            assertEquals(x.toString(), y.toString());
2082 +        }
2083 +        if (x instanceof List || x instanceof Set) {
2084 +            assertEquals(x.hashCode(), y.hashCode());
2085 +        }
2086 +        if (x instanceof List || x instanceof Deque) {
2087 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2088 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2089 +                                     y.toArray(new Object[0])));
2090 +        }
2091 +    }
2092 +
2093 +    /**
2094 +     * A weaker form of assertCollectionsEquals which does not insist
2095 +     * that the two collections satisfy Object#equals(Object), since
2096 +     * they may use identity semantics as Deques do.
2097 +     */
2098 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2099 +        if (x instanceof List || x instanceof Set)
2100 +            assertCollectionsEquals(x, y);
2101 +        else {
2102 +            assertEquals(x.isEmpty(), y.isEmpty());
2103 +            assertEquals(x.size(), y.size());
2104 +            assertEquals(new HashSet(x), new HashSet(y));
2105 +            if (x instanceof Deque) {
2106 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2107 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2108 +                                         y.toArray(new Object[0])));
2109 +            }
2110 +        }
2111 +    }
2112   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines