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.229 by jsr166, Sun May 14 03:15:37 2017 UTC vs.
Revision 1.261 by jsr166, Thu Sep 5 20:51:26 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 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 1071 | Line 1130 | public class JSR166TestCase extends Test
1130          for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1131              try { delay(1); }
1132              catch (InterruptedException fail) {
1133 <                fail("Unexpected InterruptedException");
1133 >                throw new AssertionError("Unexpected InterruptedException", fail);
1134              }
1135              Thread.State s = thread.getState();
1136              if (s == expected)
# Line 1257 | Line 1316 | public class JSR166TestCase extends Test
1316  
1317      /**
1318       * Sleeps until the given time has elapsed.
1319 <     * Throws AssertionFailedError if interrupted.
1319 >     * Throws AssertionError if interrupted.
1320       */
1321      static void sleep(long millis) {
1322          try {
1323              delay(millis);
1324          } catch (InterruptedException fail) {
1325 <            AssertionFailedError afe =
1267 <                new AssertionFailedError("Unexpected InterruptedException");
1268 <            afe.initCause(fail);
1269 <            throw afe;
1325 >            throw new AssertionError("Unexpected InterruptedException", fail);
1326          }
1327      }
1328  
1329      /**
1330       * Spin-waits up to the specified number of milliseconds for the given
1331       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1332 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1333       */
1334 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1335 <        long startTime = 0L;
1336 <        for (;;) {
1337 <            Thread.State s = thread.getState();
1338 <            if (s == Thread.State.BLOCKED ||
1339 <                s == Thread.State.WAITING ||
1340 <                s == Thread.State.TIMED_WAITING)
1341 <                return;
1342 <            else if (s == Thread.State.TERMINATED)
1334 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1335 >                                       Callable<Boolean> waitingForGodot) {
1336 >        for (long startTime = 0L;;) {
1337 >            switch (thread.getState()) {
1338 >            default: break;
1339 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1340 >                try {
1341 >                    if (waitingForGodot == null || waitingForGodot.call())
1342 >                        return;
1343 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1344 >                break;
1345 >            case TERMINATED:
1346                  fail("Unexpected thread termination");
1347 <            else if (startTime == 0L)
1347 >            }
1348 >
1349 >            if (startTime == 0L)
1350                  startTime = System.nanoTime();
1351              else if (millisElapsedSince(startTime) > timeoutMillis) {
1352 <                threadAssertTrue(thread.isAlive());
1353 <                fail("timed out waiting for thread to enter wait state");
1352 >                assertTrue(thread.isAlive());
1353 >                if (waitingForGodot == null
1354 >                    || thread.getState() == Thread.State.RUNNABLE)
1355 >                    fail("timed out waiting for thread to enter wait state");
1356 >                else
1357 >                    fail("timed out waiting for condition, thread state="
1358 >                         + thread.getState());
1359              }
1360              Thread.yield();
1361          }
# Line 1296 | Line 1363 | public class JSR166TestCase extends Test
1363  
1364      /**
1365       * Spin-waits up to the specified number of milliseconds for the given
1366 <     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1300 <     * and additionally satisfy the given condition.
1366 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1367       */
1368 <    void waitForThreadToEnterWaitState(
1369 <        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1304 <        long startTime = 0L;
1305 <        for (;;) {
1306 <            Thread.State s = thread.getState();
1307 <            if (s == Thread.State.BLOCKED ||
1308 <                s == Thread.State.WAITING ||
1309 <                s == Thread.State.TIMED_WAITING) {
1310 <                try {
1311 <                    if (waitingForGodot.call())
1312 <                        return;
1313 <                } catch (Throwable fail) { threadUnexpectedException(fail); }
1314 <            }
1315 <            else if (s == Thread.State.TERMINATED)
1316 <                fail("Unexpected thread termination");
1317 <            else if (startTime == 0L)
1318 <                startTime = System.nanoTime();
1319 <            else if (millisElapsedSince(startTime) > timeoutMillis) {
1320 <                threadAssertTrue(thread.isAlive());
1321 <                fail("timed out waiting for thread to enter wait state");
1322 <            }
1323 <            Thread.yield();
1324 <        }
1368 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1369 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1370      }
1371  
1372      /**
# Line 1329 | Line 1374 | public class JSR166TestCase extends Test
1374       * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1375       */
1376      void waitForThreadToEnterWaitState(Thread thread) {
1377 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1377 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1378      }
1379  
1380      /**
# Line 1337 | Line 1382 | public class JSR166TestCase extends Test
1382       * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1383       * and additionally satisfy the given condition.
1384       */
1385 <    void waitForThreadToEnterWaitState(
1386 <        Thread thread, Callable<Boolean> waitingForGodot) {
1385 >    void waitForThreadToEnterWaitState(Thread thread,
1386 >                                       Callable<Boolean> waitingForGodot) {
1387          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1388      }
1389  
1390      /**
1391 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1392 +     * be interrupted.  Clears the interrupt status before returning.
1393 +     */
1394 +    void awaitInterrupted() {
1395 +        for (long startTime = 0L; !Thread.interrupted(); ) {
1396 +            if (startTime == 0L)
1397 +                startTime = System.nanoTime();
1398 +            else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1399 +                fail("timed out waiting for thread interrupt");
1400 +            Thread.yield();
1401 +        }
1402 +    }
1403 +
1404 +    /**
1405       * Returns the number of milliseconds since time given by
1406       * startNanoTime, which must have been previously returned from a
1407       * call to {@link System#nanoTime()}.
# Line 1357 | Line 1416 | public class JSR166TestCase extends Test
1416   //             r.run();
1417   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1418   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1419 < //             throw new AssertionFailedError("did not return promptly");
1419 > //             throw new AssertionError("did not return promptly");
1420   //     }
1421  
1422   //     void assertTerminatesPromptly(Runnable r) {
# Line 1370 | Line 1429 | public class JSR166TestCase extends Test
1429       */
1430      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1431          long startTime = System.nanoTime();
1432 +        T actual = null;
1433          try {
1434 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1434 >            actual = f.get(timeoutMillis, MILLISECONDS);
1435          } catch (Throwable fail) { threadUnexpectedException(fail); }
1436 +        assertEquals(expectedValue, actual);
1437          if (millisElapsedSince(startTime) > timeoutMillis/2)
1438 <            throw new AssertionFailedError("timed get did not return promptly");
1438 >            throw new AssertionError("timed get did not return promptly");
1439      }
1440  
1441      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1396 | Line 1457 | public class JSR166TestCase extends Test
1457       * to terminate (using {@link Thread#join(long)}), else interrupts
1458       * the thread (in the hope that it may terminate later) and fails.
1459       */
1460 <    void awaitTermination(Thread t, long timeoutMillis) {
1460 >    void awaitTermination(Thread thread, long timeoutMillis) {
1461          try {
1462 <            t.join(timeoutMillis);
1462 >            thread.join(timeoutMillis);
1463          } catch (InterruptedException fail) {
1464              threadUnexpectedException(fail);
1465 <        } finally {
1466 <            if (t.getState() != Thread.State.TERMINATED) {
1467 <                t.interrupt();
1468 <                threadFail("timed out waiting for thread to terminate");
1465 >        }
1466 >        if (thread.getState() != Thread.State.TERMINATED) {
1467 >            String detail = String.format(
1468 >                    "timed out waiting for thread to terminate, thread=%s, state=%s" ,
1469 >                    thread, thread.getState());
1470 >            try {
1471 >                threadFail(detail);
1472 >            } finally {
1473 >                // Interrupt thread __after__ having reported its stack trace
1474 >                thread.interrupt();
1475              }
1476          }
1477      }
# Line 1432 | Line 1499 | public class JSR166TestCase extends Test
1499          }
1500      }
1501  
1435    public abstract class RunnableShouldThrow implements Runnable {
1436        protected abstract void realRun() throws Throwable;
1437
1438        final Class<?> exceptionClass;
1439
1440        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1441            this.exceptionClass = exceptionClass;
1442        }
1443
1444        public final void run() {
1445            try {
1446                realRun();
1447                threadShouldThrow(exceptionClass.getSimpleName());
1448            } catch (Throwable t) {
1449                if (! exceptionClass.isInstance(t))
1450                    threadUnexpectedException(t);
1451            }
1452        }
1453    }
1454
1502      public abstract class ThreadShouldThrow extends Thread {
1503          protected abstract void realRun() throws Throwable;
1504  
# Line 1464 | Line 1511 | public class JSR166TestCase extends Test
1511          public final void run() {
1512              try {
1513                  realRun();
1467                threadShouldThrow(exceptionClass.getSimpleName());
1514              } catch (Throwable t) {
1515                  if (! exceptionClass.isInstance(t))
1516                      threadUnexpectedException(t);
1517 +                return;
1518              }
1519 +            threadShouldThrow(exceptionClass.getSimpleName());
1520          }
1521      }
1522  
# Line 1478 | Line 1526 | public class JSR166TestCase extends Test
1526          public final void run() {
1527              try {
1528                  realRun();
1481                threadShouldThrow("InterruptedException");
1529              } catch (InterruptedException success) {
1530                  threadAssertFalse(Thread.interrupted());
1531 +                return;
1532              } catch (Throwable fail) {
1533                  threadUnexpectedException(fail);
1534              }
1535 +            threadShouldThrow("InterruptedException");
1536          }
1537      }
1538  
# Line 1495 | Line 1544 | public class JSR166TestCase extends Test
1544                  return realCall();
1545              } catch (Throwable fail) {
1546                  threadUnexpectedException(fail);
1498                return null;
1499            }
1500        }
1501    }
1502
1503    public abstract class CheckedInterruptedCallable<T>
1504        implements Callable<T> {
1505        protected abstract T realCall() throws Throwable;
1506
1507        public final T call() {
1508            try {
1509                T result = realCall();
1510                threadShouldThrow("InterruptedException");
1511                return result;
1512            } catch (InterruptedException success) {
1513                threadAssertFalse(Thread.interrupted());
1514            } catch (Throwable fail) {
1515                threadUnexpectedException(fail);
1547              }
1548 <            return null;
1548 >            throw new AssertionError("unreached");
1549          }
1550      }
1551  
# Line 1571 | Line 1602 | public class JSR166TestCase extends Test
1602      }
1603  
1604      public void await(CountDownLatch latch, long timeoutMillis) {
1605 +        boolean timedOut = false;
1606          try {
1607 <            if (!latch.await(timeoutMillis, MILLISECONDS))
1576 <                fail("timed out waiting for CountDownLatch for "
1577 <                     + (timeoutMillis/1000) + " sec");
1607 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1608          } catch (Throwable fail) {
1609              threadUnexpectedException(fail);
1610          }
1611 +        if (timedOut)
1612 +            fail("timed out waiting for CountDownLatch for "
1613 +                 + (timeoutMillis/1000) + " sec");
1614      }
1615  
1616      public void await(CountDownLatch latch) {
# Line 1585 | Line 1618 | public class JSR166TestCase extends Test
1618      }
1619  
1620      public void await(Semaphore semaphore) {
1621 +        boolean timedOut = false;
1622          try {
1623 <            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1590 <                fail("timed out waiting for Semaphore for "
1591 <                     + (LONG_DELAY_MS/1000) + " sec");
1623 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1624          } catch (Throwable fail) {
1625              threadUnexpectedException(fail);
1626          }
1627 +        if (timedOut)
1628 +            fail("timed out waiting for Semaphore for "
1629 +                 + (LONG_DELAY_MS/1000) + " sec");
1630      }
1631  
1632      public void await(CyclicBarrier barrier) {
# Line 1616 | Line 1651 | public class JSR166TestCase extends Test
1651   //         long startTime = System.nanoTime();
1652   //         while (!flag.get()) {
1653   //             if (millisElapsedSince(startTime) > timeoutMillis)
1654 < //                 throw new AssertionFailedError("timed out");
1654 > //                 throw new AssertionError("timed out");
1655   //             Thread.yield();
1656   //         }
1657   //     }
# Line 1625 | Line 1660 | public class JSR166TestCase extends Test
1660          public String call() { throw new NullPointerException(); }
1661      }
1662  
1628    public static class CallableOne implements Callable<Integer> {
1629        public Integer call() { return one; }
1630    }
1631
1632    public class ShortRunnable extends CheckedRunnable {
1633        protected void realRun() throws Throwable {
1634            delay(SHORT_DELAY_MS);
1635        }
1636    }
1637
1638    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1639        protected void realRun() throws InterruptedException {
1640            delay(SHORT_DELAY_MS);
1641        }
1642    }
1643
1644    public class SmallRunnable extends CheckedRunnable {
1645        protected void realRun() throws Throwable {
1646            delay(SMALL_DELAY_MS);
1647        }
1648    }
1649
1650    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1651        protected void realRun() {
1652            try {
1653                delay(SMALL_DELAY_MS);
1654            } catch (InterruptedException ok) {}
1655        }
1656    }
1657
1658    public class SmallCallable extends CheckedCallable {
1659        protected Object realCall() throws InterruptedException {
1660            delay(SMALL_DELAY_MS);
1661            return Boolean.TRUE;
1662        }
1663    }
1664
1665    public class MediumRunnable extends CheckedRunnable {
1666        protected void realRun() throws Throwable {
1667            delay(MEDIUM_DELAY_MS);
1668        }
1669    }
1670
1671    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1672        protected void realRun() throws InterruptedException {
1673            delay(MEDIUM_DELAY_MS);
1674        }
1675    }
1676
1663      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1664          return new CheckedRunnable() {
1665              protected void realRun() {
# Line 1683 | Line 1669 | public class JSR166TestCase extends Test
1669              }};
1670      }
1671  
1686    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1687        protected void realRun() {
1688            try {
1689                delay(MEDIUM_DELAY_MS);
1690            } catch (InterruptedException ok) {}
1691        }
1692    }
1693
1694    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1695        protected void realRun() {
1696            try {
1697                delay(LONG_DELAY_MS);
1698            } catch (InterruptedException ok) {}
1699        }
1700    }
1701
1672      /**
1673       * For use as ThreadFactory in constructors
1674       */
# Line 1712 | Line 1682 | public class JSR166TestCase extends Test
1682          boolean isDone();
1683      }
1684  
1715    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1716        return new TrackedRunnable() {
1717                private volatile boolean done = false;
1718                public boolean isDone() { return done; }
1719                public void run() {
1720                    try {
1721                        delay(timeoutMillis);
1722                        done = true;
1723                    } catch (InterruptedException ok) {}
1724                }
1725            };
1726    }
1727
1728    public static class TrackedShortRunnable implements Runnable {
1729        public volatile boolean done = false;
1730        public void run() {
1731            try {
1732                delay(SHORT_DELAY_MS);
1733                done = true;
1734            } catch (InterruptedException ok) {}
1735        }
1736    }
1737
1738    public static class TrackedSmallRunnable implements Runnable {
1739        public volatile boolean done = false;
1740        public void run() {
1741            try {
1742                delay(SMALL_DELAY_MS);
1743                done = true;
1744            } catch (InterruptedException ok) {}
1745        }
1746    }
1747
1748    public static class TrackedMediumRunnable implements Runnable {
1749        public volatile boolean done = false;
1750        public void run() {
1751            try {
1752                delay(MEDIUM_DELAY_MS);
1753                done = true;
1754            } catch (InterruptedException ok) {}
1755        }
1756    }
1757
1758    public static class TrackedLongRunnable implements Runnable {
1759        public volatile boolean done = false;
1760        public void run() {
1761            try {
1762                delay(LONG_DELAY_MS);
1763                done = true;
1764            } catch (InterruptedException ok) {}
1765        }
1766    }
1767
1685      public static class TrackedNoOpRunnable implements Runnable {
1686          public volatile boolean done = false;
1687          public void run() {
# Line 1772 | Line 1689 | public class JSR166TestCase extends Test
1689          }
1690      }
1691  
1775    public static class TrackedCallable implements Callable {
1776        public volatile boolean done = false;
1777        public Object call() {
1778            try {
1779                delay(SMALL_DELAY_MS);
1780                done = true;
1781            } catch (InterruptedException ok) {}
1782            return Boolean.TRUE;
1783        }
1784    }
1785
1692      /**
1693       * Analog of CheckedRunnable for RecursiveAction
1694       */
# Line 1809 | Line 1715 | public class JSR166TestCase extends Test
1715                  return realCompute();
1716              } catch (Throwable fail) {
1717                  threadUnexpectedException(fail);
1812                return null;
1718              }
1719 +            throw new AssertionError("unreached");
1720          }
1721      }
1722  
# Line 1824 | Line 1730 | public class JSR166TestCase extends Test
1730  
1731      /**
1732       * A CyclicBarrier that uses timed await and fails with
1733 <     * AssertionFailedErrors instead of throwing checked exceptions.
1733 >     * AssertionErrors instead of throwing checked exceptions.
1734       */
1735      public static class CheckedBarrier extends CyclicBarrier {
1736          public CheckedBarrier(int parties) { super(parties); }
# Line 1833 | Line 1739 | public class JSR166TestCase extends Test
1739              try {
1740                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1741              } catch (TimeoutException timedOut) {
1742 <                throw new AssertionFailedError("timed out");
1742 >                throw new AssertionError("timed out");
1743              } catch (Exception fail) {
1744 <                AssertionFailedError afe =
1839 <                    new AssertionFailedError("Unexpected exception: " + fail);
1840 <                afe.initCause(fail);
1841 <                throw afe;
1744 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1745              }
1746          }
1747      }
# Line 1849 | Line 1752 | public class JSR166TestCase extends Test
1752              assertEquals(0, q.size());
1753              assertNull(q.peek());
1754              assertNull(q.poll());
1755 <            assertNull(q.poll(0, MILLISECONDS));
1755 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1756              assertEquals(q.toString(), "[]");
1757              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1758              assertFalse(q.iterator().hasNext());
# Line 1890 | Line 1793 | public class JSR166TestCase extends Test
1793          }
1794      }
1795  
1796 <    void assertImmutable(final Object o) {
1796 >    void assertImmutable(Object o) {
1797          if (o instanceof Collection) {
1798              assertThrows(
1799                  UnsupportedOperationException.class,
1800 <                new Runnable() { public void run() {
1898 <                        ((Collection) o).add(null);}});
1800 >                () -> ((Collection) o).add(null));
1801          }
1802      }
1803  
1804      @SuppressWarnings("unchecked")
1805      <T> T serialClone(T o) {
1806 +        T clone = null;
1807          try {
1808              ObjectInputStream ois = new ObjectInputStream
1809                  (new ByteArrayInputStream(serialBytes(o)));
1810 <            T clone = (T) ois.readObject();
1908 <            if (o == clone) assertImmutable(o);
1909 <            assertSame(o.getClass(), clone.getClass());
1910 <            return clone;
1810 >            clone = (T) ois.readObject();
1811          } catch (Throwable fail) {
1812              threadUnexpectedException(fail);
1913            return null;
1813          }
1814 +        if (o == clone) assertImmutable(o);
1815 +        else assertSame(o.getClass(), clone.getClass());
1816 +        return clone;
1817      }
1818  
1819      /**
# Line 1930 | Line 1832 | public class JSR166TestCase extends Test
1832              (new ByteArrayInputStream(bos.toByteArray()));
1833          T clone = (T) ois.readObject();
1834          if (o == clone) assertImmutable(o);
1835 <        assertSame(o.getClass(), clone.getClass());
1835 >        else assertSame(o.getClass(), clone.getClass());
1836          return clone;
1837      }
1838  
# Line 1955 | Line 1857 | public class JSR166TestCase extends Test
1857      }
1858  
1859      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1860 <                             Runnable... throwingActions) {
1861 <        for (Runnable throwingAction : throwingActions) {
1860 >                             Action... throwingActions) {
1861 >        for (Action throwingAction : throwingActions) {
1862              boolean threw = false;
1863              try { throwingAction.run(); }
1864              catch (Throwable t) {
1865                  threw = true;
1866 <                if (!expectedExceptionClass.isInstance(t)) {
1867 <                    AssertionFailedError afe =
1868 <                        new AssertionFailedError
1869 <                        ("Expected " + expectedExceptionClass.getName() +
1870 <                         ", got " + t.getClass().getName());
1969 <                    afe.initCause(t);
1970 <                    threadUnexpectedException(afe);
1971 <                }
1866 >                if (!expectedExceptionClass.isInstance(t))
1867 >                    throw new AssertionError(
1868 >                            "Expected " + expectedExceptionClass.getName() +
1869 >                            ", got " + t.getClass().getName(),
1870 >                            t);
1871              }
1872              if (!threw)
1873                  shouldThrow(expectedExceptionClass.getName());
# Line 2000 | Line 1899 | public class JSR166TestCase extends Test
1899      static <T> void shuffle(T[] array) {
1900          Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1901      }
1902 +
1903 +    /**
1904 +     * Returns the same String as would be returned by {@link
1905 +     * Object#toString}, whether or not the given object's class
1906 +     * overrides toString().
1907 +     *
1908 +     * @see System#identityHashCode
1909 +     */
1910 +    static String identityString(Object x) {
1911 +        return x.getClass().getName()
1912 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1913 +    }
1914 +
1915 +    // --- Shared assertions for Executor tests ---
1916 +
1917 +    /**
1918 +     * Returns maximum number of tasks that can be submitted to given
1919 +     * pool (with bounded queue) before saturation (when submission
1920 +     * throws RejectedExecutionException).
1921 +     */
1922 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1923 +        BlockingQueue<Runnable> q = pool.getQueue();
1924 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1925 +    }
1926 +
1927 +    @SuppressWarnings("FutureReturnValueIgnored")
1928 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1929 +        try {
1930 +            e.execute((Runnable) null);
1931 +            shouldThrow();
1932 +        } catch (NullPointerException success) {}
1933 +
1934 +        if (! (e instanceof ExecutorService)) return;
1935 +        ExecutorService es = (ExecutorService) e;
1936 +        try {
1937 +            es.submit((Runnable) null);
1938 +            shouldThrow();
1939 +        } catch (NullPointerException success) {}
1940 +        try {
1941 +            es.submit((Runnable) null, Boolean.TRUE);
1942 +            shouldThrow();
1943 +        } catch (NullPointerException success) {}
1944 +        try {
1945 +            es.submit((Callable) null);
1946 +            shouldThrow();
1947 +        } catch (NullPointerException success) {}
1948 +
1949 +        if (! (e instanceof ScheduledExecutorService)) return;
1950 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1951 +        try {
1952 +            ses.schedule((Runnable) null,
1953 +                         randomTimeout(), randomTimeUnit());
1954 +            shouldThrow();
1955 +        } catch (NullPointerException success) {}
1956 +        try {
1957 +            ses.schedule((Callable) null,
1958 +                         randomTimeout(), randomTimeUnit());
1959 +            shouldThrow();
1960 +        } catch (NullPointerException success) {}
1961 +        try {
1962 +            ses.scheduleAtFixedRate((Runnable) null,
1963 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1964 +            shouldThrow();
1965 +        } catch (NullPointerException success) {}
1966 +        try {
1967 +            ses.scheduleWithFixedDelay((Runnable) null,
1968 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1969 +            shouldThrow();
1970 +        } catch (NullPointerException success) {}
1971 +    }
1972 +
1973 +    void setRejectedExecutionHandler(
1974 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1975 +        p.setRejectedExecutionHandler(handler);
1976 +        assertSame(handler, p.getRejectedExecutionHandler());
1977 +    }
1978 +
1979 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1980 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1981 +        final long savedTaskCount = p.getTaskCount();
1982 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1983 +        final int savedQueueSize = p.getQueue().size();
1984 +        final boolean stock = (p.getClass().getClassLoader() == null);
1985 +
1986 +        Runnable r = () -> {};
1987 +        Callable<Boolean> c = () -> Boolean.TRUE;
1988 +
1989 +        class Recorder implements RejectedExecutionHandler {
1990 +            public volatile Runnable r = null;
1991 +            public volatile ThreadPoolExecutor p = null;
1992 +            public void reset() { r = null; p = null; }
1993 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1994 +                assertNull(this.r);
1995 +                assertNull(this.p);
1996 +                this.r = r;
1997 +                this.p = p;
1998 +            }
1999 +        }
2000 +
2001 +        // check custom handler is invoked exactly once per task
2002 +        Recorder recorder = new Recorder();
2003 +        setRejectedExecutionHandler(p, recorder);
2004 +        for (int i = 2; i--> 0; ) {
2005 +            recorder.reset();
2006 +            p.execute(r);
2007 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
2008 +                assertSame(r, recorder.r);
2009 +            assertSame(p, recorder.p);
2010 +
2011 +            recorder.reset();
2012 +            assertFalse(p.submit(r).isDone());
2013 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2014 +            assertSame(p, recorder.p);
2015 +
2016 +            recorder.reset();
2017 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2018 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2019 +            assertSame(p, recorder.p);
2020 +
2021 +            recorder.reset();
2022 +            assertFalse(p.submit(c).isDone());
2023 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2024 +            assertSame(p, recorder.p);
2025 +
2026 +            if (p instanceof ScheduledExecutorService) {
2027 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2028 +                ScheduledFuture<?> future;
2029 +
2030 +                recorder.reset();
2031 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2032 +                assertFalse(future.isDone());
2033 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2034 +                assertSame(p, recorder.p);
2035 +
2036 +                recorder.reset();
2037 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2038 +                assertFalse(future.isDone());
2039 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2040 +                assertSame(p, recorder.p);
2041 +
2042 +                recorder.reset();
2043 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2044 +                assertFalse(future.isDone());
2045 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2046 +                assertSame(p, recorder.p);
2047 +
2048 +                recorder.reset();
2049 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2050 +                assertFalse(future.isDone());
2051 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2052 +                assertSame(p, recorder.p);
2053 +            }
2054 +        }
2055 +
2056 +        // Checking our custom handler above should be sufficient, but
2057 +        // we add some integration tests of standard handlers.
2058 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2059 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2060 +
2061 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2062 +        try {
2063 +            p.execute(setThread);
2064 +            shouldThrow();
2065 +        } catch (RejectedExecutionException success) {}
2066 +        assertNull(thread.get());
2067 +
2068 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2069 +        p.execute(setThread);
2070 +        assertNull(thread.get());
2071 +
2072 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2073 +        p.execute(setThread);
2074 +        if (p.isShutdown())
2075 +            assertNull(thread.get());
2076 +        else
2077 +            assertSame(Thread.currentThread(), thread.get());
2078 +
2079 +        setRejectedExecutionHandler(p, savedHandler);
2080 +
2081 +        // check that pool was not perturbed by handlers
2082 +        assertEquals(savedTaskCount, p.getTaskCount());
2083 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2084 +        assertEquals(savedQueueSize, p.getQueue().size());
2085 +    }
2086 +
2087 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2088 +        assertEquals(x, y);
2089 +        assertEquals(y, x);
2090 +        assertEquals(x.isEmpty(), y.isEmpty());
2091 +        assertEquals(x.size(), y.size());
2092 +        if (x instanceof List) {
2093 +            assertEquals(x.toString(), y.toString());
2094 +        }
2095 +        if (x instanceof List || x instanceof Set) {
2096 +            assertEquals(x.hashCode(), y.hashCode());
2097 +        }
2098 +        if (x instanceof List || x instanceof Deque) {
2099 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2100 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2101 +                                     y.toArray(new Object[0])));
2102 +        }
2103 +    }
2104 +
2105 +    /**
2106 +     * A weaker form of assertCollectionsEquals which does not insist
2107 +     * that the two collections satisfy Object#equals(Object), since
2108 +     * they may use identity semantics as Deques do.
2109 +     */
2110 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2111 +        if (x instanceof List || x instanceof Set)
2112 +            assertCollectionsEquals(x, y);
2113 +        else {
2114 +            assertEquals(x.isEmpty(), y.isEmpty());
2115 +            assertEquals(x.size(), y.size());
2116 +            assertEquals(new HashSet(x), new HashSet(y));
2117 +            if (x instanceof Deque) {
2118 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2119 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2120 +                                         y.toArray(new Object[0])));
2121 +            }
2122 +        }
2123 +    }
2124   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines