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.202 by jsr166, Thu Sep 15 00:32:45 2016 UTC vs.
Revision 1.249 by jsr166, Sat Nov 24 21:41:20 2018 UTC

# Line 1 | Line 1
1   /*
2 < * Written by Doug Lea with assistance from members of JCP JSR-166
3 < * Expert Group and released to the public domain, as explained at
2 > * Written by Doug Lea and Martin Buchholz with assistance from
3 > * members of JCP JSR-166 Expert Group and released to the public
4 > * domain, as explained at
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   * Other contributors include Andrew Wright, Jeffrey Hayes,
7   * Pat Fisher, Mike Judd.
# Line 8 | Line 9
9  
10   /*
11   * @test
12 < * @summary JSR-166 tck tests
13 < * @modules java.management
12 > * @summary JSR-166 tck tests, in a number of variations.
13 > *          The first is the conformance testing variant,
14 > *          while others also test implementation details.
15   * @build *
16 < * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
17 < * @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 -Djsr166.testImplementationDetails=true JSR166TestCase
18 < * @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -Djava.util.secureRandomSeed=true JSR166TestCase
16 > * @modules java.management
17 > * @run junit/othervm/timeout=1000 JSR166TestCase
18 > * @run junit/othervm/timeout=1000
19 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
20 > *      --add-opens java.base/java.lang=ALL-UNNAMED
21 > *      -Djsr166.testImplementationDetails=true
22 > *      JSR166TestCase
23 > * @run junit/othervm/timeout=1000
24 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
25 > *      --add-opens java.base/java.lang=ALL-UNNAMED
26 > *      -Djsr166.testImplementationDetails=true
27 > *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
28 > *      JSR166TestCase
29 > * @run junit/othervm/timeout=1000
30 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
31 > *      --add-opens java.base/java.lang=ALL-UNNAMED
32 > *      -Djsr166.testImplementationDetails=true
33 > *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
34 > *      -Djava.util.secureRandomSeed=true
35 > *      JSR166TestCase
36 > * @run junit/othervm/timeout=1000/policy=tck.policy
37 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
38 > *      --add-opens java.base/java.lang=ALL-UNNAMED
39 > *      -Djsr166.testImplementationDetails=true
40 > *      JSR166TestCase
41   */
42  
43   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 30 | Line 54 | import java.lang.management.ThreadMXBean
54   import java.lang.reflect.Constructor;
55   import java.lang.reflect.Method;
56   import java.lang.reflect.Modifier;
33 import java.nio.file.Files;
34 import java.nio.file.Paths;
57   import java.security.CodeSource;
58   import java.security.Permission;
59   import java.security.PermissionCollection;
# Line 41 | Line 63 | import java.security.ProtectionDomain;
63   import java.security.SecurityPermission;
64   import java.util.ArrayList;
65   import java.util.Arrays;
66 + import java.util.Collection;
67   import java.util.Collections;
68   import java.util.Date;
69 + import java.util.Deque;
70   import java.util.Enumeration;
71 + import java.util.HashSet;
72   import java.util.Iterator;
73   import java.util.List;
74   import java.util.NoSuchElementException;
75   import java.util.PropertyPermission;
76 + import java.util.Set;
77   import java.util.concurrent.BlockingQueue;
78   import java.util.concurrent.Callable;
79   import java.util.concurrent.CountDownLatch;
80   import java.util.concurrent.CyclicBarrier;
81   import java.util.concurrent.ExecutionException;
82 + import java.util.concurrent.Executor;
83   import java.util.concurrent.Executors;
84   import java.util.concurrent.ExecutorService;
85   import java.util.concurrent.ForkJoinPool;
86   import java.util.concurrent.Future;
87 + import java.util.concurrent.FutureTask;
88   import java.util.concurrent.RecursiveAction;
89   import java.util.concurrent.RecursiveTask;
90 + import java.util.concurrent.RejectedExecutionException;
91   import java.util.concurrent.RejectedExecutionHandler;
92   import java.util.concurrent.Semaphore;
93 + import java.util.concurrent.ScheduledExecutorService;
94 + import java.util.concurrent.ScheduledFuture;
95   import java.util.concurrent.SynchronousQueue;
96   import java.util.concurrent.ThreadFactory;
97   import java.util.concurrent.ThreadLocalRandom;
98   import java.util.concurrent.ThreadPoolExecutor;
99 + import java.util.concurrent.TimeUnit;
100   import java.util.concurrent.TimeoutException;
101   import java.util.concurrent.atomic.AtomicBoolean;
102   import java.util.concurrent.atomic.AtomicReference;
71 import java.util.regex.Matcher;
103   import java.util.regex.Pattern;
104  
74 import junit.framework.AssertionFailedError;
105   import junit.framework.Test;
106   import junit.framework.TestCase;
107   import junit.framework.TestResult;
# Line 87 | Line 117 | import junit.framework.TestSuite;
117   *
118   * <ol>
119   *
120 < * <li>All assertions in code running in generated threads must use
121 < * the forms {@link #threadFail}, {@link #threadAssertTrue}, {@link
122 < * #threadAssertEquals}, or {@link #threadAssertNull}, (not
123 < * {@code fail}, {@code assertTrue}, etc.) It is OK (but not
124 < * particularly recommended) for other code to use these forms too.
125 < * Only the most typically used JUnit assertion methods are defined
126 < * this way, but enough to live with.
120 > * <li>All code not running in the main test thread (manually spawned threads
121 > * or the common fork join pool) must be checked for failure (and completion!).
122 > * Mechanisms that can be used to ensure this are:
123 > *   <ol>
124 > *   <li>Signalling via a synchronizer like AtomicInteger or CountDownLatch
125 > *    that the task completed normally, which is checked before returning from
126 > *    the test method in the main thread.
127 > *   <li>Using the forms {@link #threadFail}, {@link #threadAssertTrue},
128 > *    or {@link #threadAssertNull}, (not {@code fail}, {@code assertTrue}, etc.)
129 > *    Only the most typically used JUnit assertion methods are defined
130 > *    this way, but enough to live with.
131 > *   <li>Recording failure explicitly using {@link #threadUnexpectedException}
132 > *    or {@link #threadRecordFailure}.
133 > *   <li>Using a wrapper like CheckedRunnable that uses one the mechanisms above.
134 > *   </ol>
135   *
136   * <li>If you override {@link #setUp} or {@link #tearDown}, make sure
137   * to invoke {@code super.setUp} and {@code super.tearDown} within
# Line 278 | Line 316 | public class JSR166TestCase extends Test
316  
317   //     public static String cpuModel() {
318   //         try {
319 < //             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
319 > //             java.util.regex.Matcher matcher
320 > //               = Pattern.compile("model name\\s*: (.*)")
321   //                 .matcher(new String(
322 < //                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
322 > //                     java.nio.file.Files.readAllBytes(
323 > //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
324   //             matcher.find();
325   //             return matcher.group(1);
326   //         } catch (Exception ex) { return null; }
# Line 389 | Line 429 | public class JSR166TestCase extends Test
429          for (String testClassName : testClassNames) {
430              try {
431                  Class<?> testClass = Class.forName(testClassName);
432 <                Method m = testClass.getDeclaredMethod("suite",
393 <                                                       new Class<?>[0]);
432 >                Method m = testClass.getDeclaredMethod("suite");
433                  suite.addTest(newTestSuite((Test)m.invoke(null)));
434 <            } catch (Exception e) {
435 <                throw new Error("Missing test class", e);
434 >            } catch (ReflectiveOperationException e) {
435 >                throw new AssertionError("Missing test class", e);
436              }
437          }
438      }
# Line 415 | Line 454 | public class JSR166TestCase extends Test
454          }
455      }
456  
457 <    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
458 <    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
459 <    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
460 <    public static boolean atLeastJava9() {
461 <        return JAVA_CLASS_VERSION >= 53.0
462 <            // As of 2015-09, java9 still uses 52.0 class file version
424 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
425 <    }
426 <    public static boolean atLeastJava10() {
427 <        return JAVA_CLASS_VERSION >= 54.0
428 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
429 <    }
457 >    public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
458 >    public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
459 >    public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
460 >    public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
461 >    public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
462 >    public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
463  
464      /**
465       * Collects all JSR166 unit tests as one suite.
# Line 447 | Line 480 | public class JSR166TestCase extends Test
480              AbstractQueuedLongSynchronizerTest.suite(),
481              ArrayBlockingQueueTest.suite(),
482              ArrayDequeTest.suite(),
483 +            ArrayListTest.suite(),
484              AtomicBooleanTest.suite(),
485              AtomicIntegerArrayTest.suite(),
486              AtomicIntegerFieldUpdaterTest.suite(),
# Line 469 | Line 503 | public class JSR166TestCase extends Test
503              CopyOnWriteArrayListTest.suite(),
504              CopyOnWriteArraySetTest.suite(),
505              CountDownLatchTest.suite(),
506 +            CountedCompleterTest.suite(),
507              CyclicBarrierTest.suite(),
508              DelayQueueTest.suite(),
509              EntryTest.suite(),
# Line 497 | Line 532 | public class JSR166TestCase extends Test
532              TreeMapTest.suite(),
533              TreeSetTest.suite(),
534              TreeSubMapTest.suite(),
535 <            TreeSubSetTest.suite());
535 >            TreeSubSetTest.suite(),
536 >            VectorTest.suite());
537  
538          // Java8+ test classes
539          if (atLeastJava8()) {
540              String[] java8TestClassNames = {
541 +                "ArrayDeque8Test",
542                  "Atomic8Test",
543                  "CompletableFutureTest",
544                  "ConcurrentHashMap8Test",
545 <                "CountedCompleterTest",
545 >                "CountedCompleter8Test",
546                  "DoubleAccumulatorTest",
547                  "DoubleAdderTest",
548                  "ForkJoinPool8Test",
549                  "ForkJoinTask8Test",
550 +                "HashMapTest",
551 +                "LinkedBlockingDeque8Test",
552 +                "LinkedBlockingQueue8Test",
553                  "LongAccumulatorTest",
554                  "LongAdderTest",
555                  "SplittableRandomTest",
# Line 532 | Line 572 | public class JSR166TestCase extends Test
572                  "AtomicReference9Test",
573                  "AtomicReferenceArray9Test",
574                  "ExecutorCompletionService9Test",
575 +                "ForkJoinPool9Test",
576              };
577              addNamedTestClasses(suite, java9TestClassNames);
578          }
# Line 542 | Line 583 | public class JSR166TestCase extends Test
583      /** Returns list of junit-style test method names in given class. */
584      public static ArrayList<String> testMethodNames(Class<?> testClass) {
585          Method[] methods = testClass.getDeclaredMethods();
586 <        ArrayList<String> names = new ArrayList<String>(methods.length);
586 >        ArrayList<String> names = new ArrayList<>(methods.length);
587          for (Method method : methods) {
588              if (method.getName().startsWith("test")
589                  && Modifier.isPublic(method.getModifiers())
# Line 569 | Line 610 | public class JSR166TestCase extends Test
610              for (String methodName : testMethodNames(testClass))
611                  suite.addTest((Test) c.newInstance(data, methodName));
612              return suite;
613 <        } catch (Exception e) {
614 <            throw new Error(e);
613 >        } catch (ReflectiveOperationException e) {
614 >            throw new AssertionError(e);
615          }
616      }
617  
# Line 586 | Line 627 | public class JSR166TestCase extends Test
627          if (atLeastJava8()) {
628              String name = testClass.getName();
629              String name8 = name.replaceAll("Test$", "8Test");
630 <            if (name.equals(name8)) throw new Error(name);
630 >            if (name.equals(name8)) throw new AssertionError(name);
631              try {
632                  return (Test)
633                      Class.forName(name8)
634 <                    .getMethod("testSuite", new Class[] { dataClass })
634 >                    .getMethod("testSuite", dataClass)
635                      .invoke(null, data);
636 <            } catch (Exception e) {
637 <                throw new Error(e);
636 >            } catch (ReflectiveOperationException e) {
637 >                throw new AssertionError(e);
638              }
639          } else {
640              return new TestSuite();
# Line 607 | Line 648 | public class JSR166TestCase extends Test
648      public static long MEDIUM_DELAY_MS;
649      public static long LONG_DELAY_MS;
650  
651 +    private static final long RANDOM_TIMEOUT;
652 +    private static final long RANDOM_EXPIRED_TIMEOUT;
653 +    private static final TimeUnit RANDOM_TIMEUNIT;
654 +    static {
655 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
656 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
657 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
658 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
659 +        TimeUnit[] timeUnits = TimeUnit.values();
660 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
661 +    }
662 +
663 +    /**
664 +     * Returns a timeout for use when any value at all will do.
665 +     */
666 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
667 +
668 +    /**
669 +     * Returns a timeout that means "no waiting", i.e. not positive.
670 +     */
671 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
672 +
673 +    /**
674 +     * Returns a random non-null TimeUnit.
675 +     */
676 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
677 +
678      /**
679       * Returns the shortest timed delay. This can be scaled up for
680       * slow machines using the jsr166.delay.factor system property,
# Line 627 | Line 695 | public class JSR166TestCase extends Test
695          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
696      }
697  
698 +    private static final long TIMEOUT_DELAY_MS
699 +        = (long) (12.0 * Math.cbrt(delayFactor));
700 +
701      /**
702 <     * Returns a timeout in milliseconds to be used in tests that
703 <     * verify that operations block or time out.
702 >     * Returns a timeout in milliseconds to be used in tests that verify
703 >     * that operations block or time out.  We want this to be longer
704 >     * than the OS scheduling quantum, but not too long, so don't scale
705 >     * linearly with delayFactor; we use "crazy" cube root instead.
706       */
707 <    long timeoutMillis() {
708 <        return SHORT_DELAY_MS / 4;
707 >    static long timeoutMillis() {
708 >        return TIMEOUT_DELAY_MS;
709      }
710  
711      /**
# Line 648 | Line 721 | public class JSR166TestCase extends Test
721       * The first exception encountered if any threadAssertXXX method fails.
722       */
723      private final AtomicReference<Throwable> threadFailure
724 <        = new AtomicReference<Throwable>(null);
724 >        = new AtomicReference<>(null);
725  
726      /**
727       * Records an exception so that it can be rethrown later in the test
# Line 670 | Line 743 | public class JSR166TestCase extends Test
743          String msg = toString() + ": " + String.format(format, args);
744          System.err.println(msg);
745          dumpTestThreads();
746 <        throw new AssertionFailedError(msg);
746 >        throw new AssertionError(msg);
747      }
748  
749      /**
# Line 691 | Line 764 | public class JSR166TestCase extends Test
764                  throw (RuntimeException) t;
765              else if (t instanceof Exception)
766                  throw (Exception) t;
767 <            else {
768 <                AssertionFailedError afe =
696 <                    new AssertionFailedError(t.toString());
697 <                afe.initCause(t);
698 <                throw afe;
699 <            }
767 >            else
768 >                throw new AssertionError(t.toString(), t);
769          }
770  
771          if (Thread.interrupted())
# Line 730 | Line 799 | public class JSR166TestCase extends Test
799  
800      /**
801       * Just like fail(reason), but additionally recording (using
802 <     * threadRecordFailure) any AssertionFailedError thrown, so that
803 <     * the current testcase will fail.
802 >     * threadRecordFailure) any AssertionError thrown, so that the
803 >     * current testcase will fail.
804       */
805      public void threadFail(String reason) {
806          try {
807              fail(reason);
808 <        } catch (AssertionFailedError t) {
809 <            threadRecordFailure(t);
810 <            throw t;
808 >        } catch (AssertionError fail) {
809 >            threadRecordFailure(fail);
810 >            throw fail;
811          }
812      }
813  
814      /**
815       * Just like assertTrue(b), but additionally recording (using
816 <     * threadRecordFailure) any AssertionFailedError thrown, so that
817 <     * the current testcase will fail.
816 >     * threadRecordFailure) any AssertionError thrown, so that the
817 >     * current testcase will fail.
818       */
819      public void threadAssertTrue(boolean b) {
820          try {
821              assertTrue(b);
822 <        } catch (AssertionFailedError t) {
823 <            threadRecordFailure(t);
824 <            throw t;
822 >        } catch (AssertionError fail) {
823 >            threadRecordFailure(fail);
824 >            throw fail;
825          }
826      }
827  
828      /**
829       * Just like assertFalse(b), but additionally recording (using
830 <     * threadRecordFailure) any AssertionFailedError thrown, so that
831 <     * the current testcase will fail.
830 >     * threadRecordFailure) any AssertionError thrown, so that the
831 >     * current testcase will fail.
832       */
833      public void threadAssertFalse(boolean b) {
834          try {
835              assertFalse(b);
836 <        } catch (AssertionFailedError t) {
837 <            threadRecordFailure(t);
838 <            throw t;
836 >        } catch (AssertionError fail) {
837 >            threadRecordFailure(fail);
838 >            throw fail;
839          }
840      }
841  
842      /**
843       * Just like assertNull(x), but additionally recording (using
844 <     * threadRecordFailure) any AssertionFailedError thrown, so that
845 <     * the current testcase will fail.
844 >     * threadRecordFailure) any AssertionError thrown, so that the
845 >     * current testcase will fail.
846       */
847      public void threadAssertNull(Object x) {
848          try {
849              assertNull(x);
850 <        } catch (AssertionFailedError t) {
851 <            threadRecordFailure(t);
852 <            throw t;
850 >        } catch (AssertionError fail) {
851 >            threadRecordFailure(fail);
852 >            throw fail;
853          }
854      }
855  
856      /**
857       * Just like assertEquals(x, y), but additionally recording (using
858 <     * threadRecordFailure) any AssertionFailedError thrown, so that
859 <     * the current testcase will fail.
858 >     * threadRecordFailure) any AssertionError thrown, so that the
859 >     * current testcase will fail.
860       */
861      public void threadAssertEquals(long x, long y) {
862          try {
863              assertEquals(x, y);
864 <        } catch (AssertionFailedError t) {
865 <            threadRecordFailure(t);
866 <            throw t;
864 >        } catch (AssertionError fail) {
865 >            threadRecordFailure(fail);
866 >            throw fail;
867          }
868      }
869  
870      /**
871       * Just like assertEquals(x, y), but additionally recording (using
872 <     * threadRecordFailure) any AssertionFailedError thrown, so that
873 <     * the current testcase will fail.
872 >     * threadRecordFailure) any AssertionError thrown, so that the
873 >     * current testcase will fail.
874       */
875      public void threadAssertEquals(Object x, Object y) {
876          try {
877              assertEquals(x, y);
878 <        } catch (AssertionFailedError fail) {
878 >        } catch (AssertionError fail) {
879              threadRecordFailure(fail);
880              throw fail;
881          } catch (Throwable fail) {
# Line 816 | Line 885 | public class JSR166TestCase extends Test
885  
886      /**
887       * Just like assertSame(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 threadAssertSame(Object x, Object y) {
892          try {
893              assertSame(x, y);
894 <        } catch (AssertionFailedError fail) {
894 >        } catch (AssertionError fail) {
895              threadRecordFailure(fail);
896              throw fail;
897          }
# Line 844 | Line 913 | public class JSR166TestCase extends Test
913  
914      /**
915       * Records the given exception using {@link #threadRecordFailure},
916 <     * then rethrows the exception, wrapping it in an
917 <     * AssertionFailedError if necessary.
916 >     * then rethrows the exception, wrapping it in an AssertionError
917 >     * if necessary.
918       */
919      public void threadUnexpectedException(Throwable t) {
920          threadRecordFailure(t);
# Line 854 | Line 923 | public class JSR166TestCase extends Test
923              throw (RuntimeException) t;
924          else if (t instanceof Error)
925              throw (Error) t;
926 <        else {
927 <            AssertionFailedError afe =
859 <                new AssertionFailedError("unexpected exception: " + t);
860 <            afe.initCause(t);
861 <            throw afe;
862 <        }
926 >        else
927 >            throw new AssertionError("unexpected exception: " + t, t);
928      }
929  
930      /**
# Line 1005 | Line 1070 | public class JSR166TestCase extends Test
1070          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1071          System.err.println("------ stacktrace dump start ------");
1072          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1073 <            String name = info.getThreadName();
1073 >            final String name = info.getThreadName();
1074 >            String lockName;
1075              if ("Signal Dispatcher".equals(name))
1076                  continue;
1077              if ("Reference Handler".equals(name)
1078 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1078 >                && (lockName = info.getLockName()) != null
1079 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1080                  continue;
1081              if ("Finalizer".equals(name)
1082 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1082 >                && (lockName = info.getLockName()) != null
1083 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1084                  continue;
1085              if ("checkForWedgedTest".equals(name))
1086                  continue;
# Line 1024 | Line 1092 | public class JSR166TestCase extends Test
1092      }
1093  
1094      /**
1095 <     * Checks that thread does not terminate within the default
1028 <     * millisecond delay of {@code timeoutMillis()}.
1095 >     * Checks that thread eventually enters the expected blocked thread state.
1096       */
1097 <    void assertThreadStaysAlive(Thread thread) {
1098 <        assertThreadStaysAlive(thread, timeoutMillis());
1099 <    }
1100 <
1101 <    /**
1102 <     * Checks that thread does not terminate within the given millisecond delay.
1103 <     */
1104 <    void assertThreadStaysAlive(Thread thread, long millis) {
1105 <        try {
1106 <            // No need to optimize the failing case via Thread.join.
1107 <            delay(millis);
1108 <            assertTrue(thread.isAlive());
1109 <        } catch (InterruptedException fail) {
1043 <            threadFail("Unexpected InterruptedException");
1044 <        }
1045 <    }
1046 <
1047 <    /**
1048 <     * Checks that the threads do not terminate within the default
1049 <     * millisecond delay of {@code timeoutMillis()}.
1050 <     */
1051 <    void assertThreadsStayAlive(Thread... threads) {
1052 <        assertThreadsStayAlive(timeoutMillis(), threads);
1053 <    }
1054 <
1055 <    /**
1056 <     * Checks that the threads do not terminate within the given millisecond delay.
1057 <     */
1058 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1059 <        try {
1060 <            // No need to optimize the failing case via Thread.join.
1061 <            delay(millis);
1062 <            for (Thread thread : threads)
1063 <                assertTrue(thread.isAlive());
1064 <        } catch (InterruptedException fail) {
1065 <            threadFail("Unexpected InterruptedException");
1097 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1098 >        // always sleep at least 1 ms, with high probability avoiding
1099 >        // transitory states
1100 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1101 >            try { delay(1); }
1102 >            catch (InterruptedException fail) {
1103 >                throw new AssertionError("Unexpected InterruptedException", fail);
1104 >            }
1105 >            Thread.State s = thread.getState();
1106 >            if (s == expected)
1107 >                return;
1108 >            else if (s == Thread.State.TERMINATED)
1109 >                fail("Unexpected thread termination");
1110          }
1111 +        fail("timed out waiting for thread to enter thread state " + expected);
1112      }
1113  
1114      /**
# Line 1104 | Line 1149 | public class JSR166TestCase extends Test
1149      }
1150  
1151      /**
1152 +     * The maximum number of consecutive spurious wakeups we should
1153 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1154 +     */
1155 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1156 +
1157 +    /**
1158       * The number of elements to place in collections, arrays, etc.
1159       */
1160      public static final int SIZE = 20;
# Line 1207 | Line 1258 | public class JSR166TestCase extends Test
1258          }
1259          public void refresh() {}
1260          public String toString() {
1261 <            List<Permission> ps = new ArrayList<Permission>();
1261 >            List<Permission> ps = new ArrayList<>();
1262              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1263                  ps.add(e.nextElement());
1264              return "AdjustablePolicy with permissions " + ps;
# Line 1235 | Line 1286 | public class JSR166TestCase extends Test
1286  
1287      /**
1288       * Sleeps until the given time has elapsed.
1289 <     * Throws AssertionFailedError if interrupted.
1289 >     * Throws AssertionError if interrupted.
1290       */
1291      static void sleep(long millis) {
1292          try {
1293              delay(millis);
1294          } catch (InterruptedException fail) {
1295 <            AssertionFailedError afe =
1245 <                new AssertionFailedError("Unexpected InterruptedException");
1246 <            afe.initCause(fail);
1247 <            throw afe;
1295 >            throw new AssertionError("Unexpected InterruptedException", fail);
1296          }
1297      }
1298  
1299      /**
1300       * Spin-waits up to the specified number of milliseconds for the given
1301       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1302 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1303       */
1304 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1305 <        long startTime = 0L;
1306 <        for (;;) {
1307 <            Thread.State s = thread.getState();
1308 <            if (s == Thread.State.BLOCKED ||
1309 <                s == Thread.State.WAITING ||
1310 <                s == Thread.State.TIMED_WAITING)
1311 <                return;
1312 <            else if (s == Thread.State.TERMINATED)
1304 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1305 >                                       Callable<Boolean> waitingForGodot) {
1306 >        for (long startTime = 0L;;) {
1307 >            switch (thread.getState()) {
1308 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1309 >                try {
1310 >                    if (waitingForGodot == null || waitingForGodot.call())
1311 >                        return;
1312 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1313 >                break;
1314 >            case TERMINATED:
1315                  fail("Unexpected thread termination");
1316 <            else if (startTime == 0L)
1316 >            }
1317 >
1318 >            if (startTime == 0L)
1319                  startTime = System.nanoTime();
1320              else if (millisElapsedSince(startTime) > timeoutMillis) {
1321 <                threadAssertTrue(thread.isAlive());
1322 <                return;
1321 >                assertTrue(thread.isAlive());
1322 >                if (waitingForGodot == null
1323 >                    || thread.getState() == Thread.State.RUNNABLE)
1324 >                    fail("timed out waiting for thread to enter wait state");
1325 >                else
1326 >                    fail("timed out waiting for condition, thread state="
1327 >                         + thread.getState());
1328              }
1329              Thread.yield();
1330          }
1331      }
1332  
1333      /**
1334 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1335 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1334 >     * Spin-waits up to the specified number of milliseconds for the given
1335 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1336 >     */
1337 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1338 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1339 >    }
1340 >
1341 >    /**
1342 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1343 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1344       */
1345      void waitForThreadToEnterWaitState(Thread thread) {
1346 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1346 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1347 >    }
1348 >
1349 >    /**
1350 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1351 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1352 >     * and additionally satisfy the given condition.
1353 >     */
1354 >    void waitForThreadToEnterWaitState(Thread thread,
1355 >                                       Callable<Boolean> waitingForGodot) {
1356 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1357      }
1358  
1359      /**
# Line 1295 | Line 1371 | public class JSR166TestCase extends Test
1371   //             r.run();
1372   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1373   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1374 < //             throw new AssertionFailedError("did not return promptly");
1374 > //             throw new AssertionError("did not return promptly");
1375   //     }
1376  
1377   //     void assertTerminatesPromptly(Runnable r) {
# Line 1308 | Line 1384 | public class JSR166TestCase extends Test
1384       */
1385      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1386          long startTime = System.nanoTime();
1387 +        T actual = null;
1388          try {
1389 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1389 >            actual = f.get(timeoutMillis, MILLISECONDS);
1390          } catch (Throwable fail) { threadUnexpectedException(fail); }
1391 +        assertEquals(expectedValue, actual);
1392          if (millisElapsedSince(startTime) > timeoutMillis/2)
1393 <            throw new AssertionFailedError("timed get did not return promptly");
1393 >            throw new AssertionError("timed get did not return promptly");
1394      }
1395  
1396      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1370 | Line 1448 | public class JSR166TestCase extends Test
1448          }
1449      }
1450  
1373    public abstract class RunnableShouldThrow implements Runnable {
1374        protected abstract void realRun() throws Throwable;
1375
1376        final Class<?> exceptionClass;
1377
1378        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1379            this.exceptionClass = exceptionClass;
1380        }
1381
1382        public final void run() {
1383            try {
1384                realRun();
1385                threadShouldThrow(exceptionClass.getSimpleName());
1386            } catch (Throwable t) {
1387                if (! exceptionClass.isInstance(t))
1388                    threadUnexpectedException(t);
1389            }
1390        }
1391    }
1392
1451      public abstract class ThreadShouldThrow extends Thread {
1452          protected abstract void realRun() throws Throwable;
1453  
# Line 1402 | Line 1460 | public class JSR166TestCase extends Test
1460          public final void run() {
1461              try {
1462                  realRun();
1405                threadShouldThrow(exceptionClass.getSimpleName());
1463              } catch (Throwable t) {
1464                  if (! exceptionClass.isInstance(t))
1465                      threadUnexpectedException(t);
1466 +                return;
1467              }
1468 +            threadShouldThrow(exceptionClass.getSimpleName());
1469          }
1470      }
1471  
# Line 1416 | Line 1475 | public class JSR166TestCase extends Test
1475          public final void run() {
1476              try {
1477                  realRun();
1419                threadShouldThrow("InterruptedException");
1478              } catch (InterruptedException success) {
1479                  threadAssertFalse(Thread.interrupted());
1480 +                return;
1481              } catch (Throwable fail) {
1482                  threadUnexpectedException(fail);
1483              }
1484 +            threadShouldThrow("InterruptedException");
1485          }
1486      }
1487  
# Line 1433 | Line 1493 | public class JSR166TestCase extends Test
1493                  return realCall();
1494              } catch (Throwable fail) {
1495                  threadUnexpectedException(fail);
1436                return null;
1496              }
1497 <        }
1439 <    }
1440 <
1441 <    public abstract class CheckedInterruptedCallable<T>
1442 <        implements Callable<T> {
1443 <        protected abstract T realCall() throws Throwable;
1444 <
1445 <        public final T call() {
1446 <            try {
1447 <                T result = realCall();
1448 <                threadShouldThrow("InterruptedException");
1449 <                return result;
1450 <            } catch (InterruptedException success) {
1451 <                threadAssertFalse(Thread.interrupted());
1452 <            } catch (Throwable fail) {
1453 <                threadUnexpectedException(fail);
1454 <            }
1455 <            return null;
1497 >            throw new AssertionError("unreached");
1498          }
1499      }
1500  
# Line 1509 | Line 1551 | public class JSR166TestCase extends Test
1551      }
1552  
1553      public void await(CountDownLatch latch, long timeoutMillis) {
1554 +        boolean timedOut = false;
1555          try {
1556 <            if (!latch.await(timeoutMillis, MILLISECONDS))
1514 <                fail("timed out waiting for CountDownLatch for "
1515 <                     + (timeoutMillis/1000) + " sec");
1556 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1557          } catch (Throwable fail) {
1558              threadUnexpectedException(fail);
1559          }
1560 +        if (timedOut)
1561 +            fail("timed out waiting for CountDownLatch for "
1562 +                 + (timeoutMillis/1000) + " sec");
1563      }
1564  
1565      public void await(CountDownLatch latch) {
# Line 1523 | Line 1567 | public class JSR166TestCase extends Test
1567      }
1568  
1569      public void await(Semaphore semaphore) {
1570 +        boolean timedOut = false;
1571 +        try {
1572 +            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1573 +        } catch (Throwable fail) {
1574 +            threadUnexpectedException(fail);
1575 +        }
1576 +        if (timedOut)
1577 +            fail("timed out waiting for Semaphore for "
1578 +                 + (LONG_DELAY_MS/1000) + " sec");
1579 +    }
1580 +
1581 +    public void await(CyclicBarrier barrier) {
1582          try {
1583 <            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1528 <                fail("timed out waiting for Semaphore for "
1529 <                     + (LONG_DELAY_MS/1000) + " sec");
1583 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1584          } catch (Throwable fail) {
1585              threadUnexpectedException(fail);
1586          }
# Line 1546 | Line 1600 | public class JSR166TestCase extends Test
1600   //         long startTime = System.nanoTime();
1601   //         while (!flag.get()) {
1602   //             if (millisElapsedSince(startTime) > timeoutMillis)
1603 < //                 throw new AssertionFailedError("timed out");
1603 > //                 throw new AssertionError("timed out");
1604   //             Thread.yield();
1605   //         }
1606   //     }
# Line 1555 | Line 1609 | public class JSR166TestCase extends Test
1609          public String call() { throw new NullPointerException(); }
1610      }
1611  
1558    public static class CallableOne implements Callable<Integer> {
1559        public Integer call() { return one; }
1560    }
1561
1562    public class ShortRunnable extends CheckedRunnable {
1563        protected void realRun() throws Throwable {
1564            delay(SHORT_DELAY_MS);
1565        }
1566    }
1567
1568    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1569        protected void realRun() throws InterruptedException {
1570            delay(SHORT_DELAY_MS);
1571        }
1572    }
1573
1574    public class SmallRunnable extends CheckedRunnable {
1575        protected void realRun() throws Throwable {
1576            delay(SMALL_DELAY_MS);
1577        }
1578    }
1579
1580    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1581        protected void realRun() {
1582            try {
1583                delay(SMALL_DELAY_MS);
1584            } catch (InterruptedException ok) {}
1585        }
1586    }
1587
1588    public class SmallCallable extends CheckedCallable {
1589        protected Object realCall() throws InterruptedException {
1590            delay(SMALL_DELAY_MS);
1591            return Boolean.TRUE;
1592        }
1593    }
1594
1595    public class MediumRunnable extends CheckedRunnable {
1596        protected void realRun() throws Throwable {
1597            delay(MEDIUM_DELAY_MS);
1598        }
1599    }
1600
1601    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1602        protected void realRun() throws InterruptedException {
1603            delay(MEDIUM_DELAY_MS);
1604        }
1605    }
1606
1612      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1613          return new CheckedRunnable() {
1614              protected void realRun() {
# Line 1613 | Line 1618 | public class JSR166TestCase extends Test
1618              }};
1619      }
1620  
1616    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1617        protected void realRun() {
1618            try {
1619                delay(MEDIUM_DELAY_MS);
1620            } catch (InterruptedException ok) {}
1621        }
1622    }
1623
1624    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1625        protected void realRun() {
1626            try {
1627                delay(LONG_DELAY_MS);
1628            } catch (InterruptedException ok) {}
1629        }
1630    }
1631
1621      /**
1622       * For use as ThreadFactory in constructors
1623       */
# Line 1642 | Line 1631 | public class JSR166TestCase extends Test
1631          boolean isDone();
1632      }
1633  
1645    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1646        return new TrackedRunnable() {
1647                private volatile boolean done = false;
1648                public boolean isDone() { return done; }
1649                public void run() {
1650                    try {
1651                        delay(timeoutMillis);
1652                        done = true;
1653                    } catch (InterruptedException ok) {}
1654                }
1655            };
1656    }
1657
1658    public static class TrackedShortRunnable implements Runnable {
1659        public volatile boolean done = false;
1660        public void run() {
1661            try {
1662                delay(SHORT_DELAY_MS);
1663                done = true;
1664            } catch (InterruptedException ok) {}
1665        }
1666    }
1667
1668    public static class TrackedSmallRunnable implements Runnable {
1669        public volatile boolean done = false;
1670        public void run() {
1671            try {
1672                delay(SMALL_DELAY_MS);
1673                done = true;
1674            } catch (InterruptedException ok) {}
1675        }
1676    }
1677
1678    public static class TrackedMediumRunnable implements Runnable {
1679        public volatile boolean done = false;
1680        public void run() {
1681            try {
1682                delay(MEDIUM_DELAY_MS);
1683                done = true;
1684            } catch (InterruptedException ok) {}
1685        }
1686    }
1687
1688    public static class TrackedLongRunnable implements Runnable {
1689        public volatile boolean done = false;
1690        public void run() {
1691            try {
1692                delay(LONG_DELAY_MS);
1693                done = true;
1694            } catch (InterruptedException ok) {}
1695        }
1696    }
1697
1634      public static class TrackedNoOpRunnable implements Runnable {
1635          public volatile boolean done = false;
1636          public void run() {
# Line 1702 | Line 1638 | public class JSR166TestCase extends Test
1638          }
1639      }
1640  
1705    public static class TrackedCallable implements Callable {
1706        public volatile boolean done = false;
1707        public Object call() {
1708            try {
1709                delay(SMALL_DELAY_MS);
1710                done = true;
1711            } catch (InterruptedException ok) {}
1712            return Boolean.TRUE;
1713        }
1714    }
1715
1641      /**
1642       * Analog of CheckedRunnable for RecursiveAction
1643       */
# Line 1739 | Line 1664 | public class JSR166TestCase extends Test
1664                  return realCompute();
1665              } catch (Throwable fail) {
1666                  threadUnexpectedException(fail);
1742                return null;
1667              }
1668 +            throw new AssertionError("unreached");
1669          }
1670      }
1671  
# Line 1754 | Line 1679 | public class JSR166TestCase extends Test
1679  
1680      /**
1681       * A CyclicBarrier that uses timed await and fails with
1682 <     * AssertionFailedErrors instead of throwing checked exceptions.
1682 >     * AssertionErrors instead of throwing checked exceptions.
1683       */
1684      public static class CheckedBarrier extends CyclicBarrier {
1685          public CheckedBarrier(int parties) { super(parties); }
# Line 1763 | Line 1688 | public class JSR166TestCase extends Test
1688              try {
1689                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1690              } catch (TimeoutException timedOut) {
1691 <                throw new AssertionFailedError("timed out");
1691 >                throw new AssertionError("timed out");
1692              } catch (Exception fail) {
1693 <                AssertionFailedError afe =
1769 <                    new AssertionFailedError("Unexpected exception: " + fail);
1770 <                afe.initCause(fail);
1771 <                throw afe;
1693 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1694              }
1695          }
1696      }
# Line 1779 | Line 1701 | public class JSR166TestCase extends Test
1701              assertEquals(0, q.size());
1702              assertNull(q.peek());
1703              assertNull(q.poll());
1704 <            assertNull(q.poll(0, MILLISECONDS));
1704 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1705              assertEquals(q.toString(), "[]");
1706              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1707              assertFalse(q.iterator().hasNext());
# Line 1820 | Line 1742 | public class JSR166TestCase extends Test
1742          }
1743      }
1744  
1745 +    void assertImmutable(final Object o) {
1746 +        if (o instanceof Collection) {
1747 +            assertThrows(
1748 +                UnsupportedOperationException.class,
1749 +                new Runnable() { public void run() {
1750 +                        ((Collection) o).add(null);}});
1751 +        }
1752 +    }
1753 +
1754      @SuppressWarnings("unchecked")
1755      <T> T serialClone(T o) {
1756 +        T clone = null;
1757          try {
1758              ObjectInputStream ois = new ObjectInputStream
1759                  (new ByteArrayInputStream(serialBytes(o)));
1760 <            T clone = (T) ois.readObject();
1829 <            assertSame(o.getClass(), clone.getClass());
1830 <            return clone;
1760 >            clone = (T) ois.readObject();
1761          } catch (Throwable fail) {
1762              threadUnexpectedException(fail);
1763 +        }
1764 +        if (o == clone) assertImmutable(o);
1765 +        else assertSame(o.getClass(), clone.getClass());
1766 +        return clone;
1767 +    }
1768 +
1769 +    /**
1770 +     * A version of serialClone that leaves error handling (for
1771 +     * e.g. NotSerializableException) up to the caller.
1772 +     */
1773 +    @SuppressWarnings("unchecked")
1774 +    <T> T serialClonePossiblyFailing(T o)
1775 +        throws ReflectiveOperationException, java.io.IOException {
1776 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1777 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1778 +        oos.writeObject(o);
1779 +        oos.flush();
1780 +        oos.close();
1781 +        ObjectInputStream ois = new ObjectInputStream
1782 +            (new ByteArrayInputStream(bos.toByteArray()));
1783 +        T clone = (T) ois.readObject();
1784 +        if (o == clone) assertImmutable(o);
1785 +        else assertSame(o.getClass(), clone.getClass());
1786 +        return clone;
1787 +    }
1788 +
1789 +    /**
1790 +     * If o implements Cloneable and has a public clone method,
1791 +     * returns a clone of o, else null.
1792 +     */
1793 +    @SuppressWarnings("unchecked")
1794 +    <T> T cloneableClone(T o) {
1795 +        if (!(o instanceof Cloneable)) return null;
1796 +        final T clone;
1797 +        try {
1798 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1799 +        } catch (NoSuchMethodException ok) {
1800              return null;
1801 +        } catch (ReflectiveOperationException unexpected) {
1802 +            throw new Error(unexpected);
1803          }
1804 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1805 +        assertSame(o.getClass(), clone.getClass());
1806 +        return clone;
1807      }
1808  
1809      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
# Line 1841 | Line 1813 | public class JSR166TestCase extends Test
1813              try { throwingAction.run(); }
1814              catch (Throwable t) {
1815                  threw = true;
1816 <                if (!expectedExceptionClass.isInstance(t)) {
1817 <                    AssertionFailedError afe =
1818 <                        new AssertionFailedError
1819 <                        ("Expected " + expectedExceptionClass.getName() +
1820 <                         ", got " + t.getClass().getName());
1849 <                    afe.initCause(t);
1850 <                    threadUnexpectedException(afe);
1851 <                }
1816 >                if (!expectedExceptionClass.isInstance(t))
1817 >                    throw new AssertionError(
1818 >                            "Expected " + expectedExceptionClass.getName() +
1819 >                            ", got " + t.getClass().getName(),
1820 >                            t);
1821              }
1822              if (!threw)
1823                  shouldThrow(expectedExceptionClass.getName());
# Line 1880 | Line 1849 | public class JSR166TestCase extends Test
1849      static <T> void shuffle(T[] array) {
1850          Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1851      }
1852 +
1853 +    /**
1854 +     * Returns the same String as would be returned by {@link
1855 +     * Object#toString}, whether or not the given object's class
1856 +     * overrides toString().
1857 +     *
1858 +     * @see System#identityHashCode
1859 +     */
1860 +    static String identityString(Object x) {
1861 +        return x.getClass().getName()
1862 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1863 +    }
1864 +
1865 +    // --- Shared assertions for Executor tests ---
1866 +
1867 +    /**
1868 +     * Returns maximum number of tasks that can be submitted to given
1869 +     * pool (with bounded queue) before saturation (when submission
1870 +     * throws RejectedExecutionException).
1871 +     */
1872 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1873 +        BlockingQueue<Runnable> q = pool.getQueue();
1874 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1875 +    }
1876 +
1877 +    @SuppressWarnings("FutureReturnValueIgnored")
1878 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1879 +        try {
1880 +            e.execute((Runnable) null);
1881 +            shouldThrow();
1882 +        } catch (NullPointerException success) {}
1883 +
1884 +        if (! (e instanceof ExecutorService)) return;
1885 +        ExecutorService es = (ExecutorService) e;
1886 +        try {
1887 +            es.submit((Runnable) null);
1888 +            shouldThrow();
1889 +        } catch (NullPointerException success) {}
1890 +        try {
1891 +            es.submit((Runnable) null, Boolean.TRUE);
1892 +            shouldThrow();
1893 +        } catch (NullPointerException success) {}
1894 +        try {
1895 +            es.submit((Callable) null);
1896 +            shouldThrow();
1897 +        } catch (NullPointerException success) {}
1898 +
1899 +        if (! (e instanceof ScheduledExecutorService)) return;
1900 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1901 +        try {
1902 +            ses.schedule((Runnable) null,
1903 +                         randomTimeout(), randomTimeUnit());
1904 +            shouldThrow();
1905 +        } catch (NullPointerException success) {}
1906 +        try {
1907 +            ses.schedule((Callable) null,
1908 +                         randomTimeout(), randomTimeUnit());
1909 +            shouldThrow();
1910 +        } catch (NullPointerException success) {}
1911 +        try {
1912 +            ses.scheduleAtFixedRate((Runnable) null,
1913 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1914 +            shouldThrow();
1915 +        } catch (NullPointerException success) {}
1916 +        try {
1917 +            ses.scheduleWithFixedDelay((Runnable) null,
1918 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1919 +            shouldThrow();
1920 +        } catch (NullPointerException success) {}
1921 +    }
1922 +
1923 +    void setRejectedExecutionHandler(
1924 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1925 +        p.setRejectedExecutionHandler(handler);
1926 +        assertSame(handler, p.getRejectedExecutionHandler());
1927 +    }
1928 +
1929 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1930 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1931 +        final long savedTaskCount = p.getTaskCount();
1932 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1933 +        final int savedQueueSize = p.getQueue().size();
1934 +        final boolean stock = (p.getClass().getClassLoader() == null);
1935 +
1936 +        Runnable r = () -> {};
1937 +        Callable<Boolean> c = () -> Boolean.TRUE;
1938 +
1939 +        class Recorder implements RejectedExecutionHandler {
1940 +            public volatile Runnable r = null;
1941 +            public volatile ThreadPoolExecutor p = null;
1942 +            public void reset() { r = null; p = null; }
1943 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1944 +                assertNull(this.r);
1945 +                assertNull(this.p);
1946 +                this.r = r;
1947 +                this.p = p;
1948 +            }
1949 +        }
1950 +
1951 +        // check custom handler is invoked exactly once per task
1952 +        Recorder recorder = new Recorder();
1953 +        setRejectedExecutionHandler(p, recorder);
1954 +        for (int i = 2; i--> 0; ) {
1955 +            recorder.reset();
1956 +            p.execute(r);
1957 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1958 +                assertSame(r, recorder.r);
1959 +            assertSame(p, recorder.p);
1960 +
1961 +            recorder.reset();
1962 +            assertFalse(p.submit(r).isDone());
1963 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1964 +            assertSame(p, recorder.p);
1965 +
1966 +            recorder.reset();
1967 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
1968 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1969 +            assertSame(p, recorder.p);
1970 +
1971 +            recorder.reset();
1972 +            assertFalse(p.submit(c).isDone());
1973 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1974 +            assertSame(p, recorder.p);
1975 +
1976 +            if (p instanceof ScheduledExecutorService) {
1977 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
1978 +                ScheduledFuture<?> future;
1979 +
1980 +                recorder.reset();
1981 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
1982 +                assertFalse(future.isDone());
1983 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1984 +                assertSame(p, recorder.p);
1985 +
1986 +                recorder.reset();
1987 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
1988 +                assertFalse(future.isDone());
1989 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1990 +                assertSame(p, recorder.p);
1991 +
1992 +                recorder.reset();
1993 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1994 +                assertFalse(future.isDone());
1995 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1996 +                assertSame(p, recorder.p);
1997 +
1998 +                recorder.reset();
1999 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2000 +                assertFalse(future.isDone());
2001 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2002 +                assertSame(p, recorder.p);
2003 +            }
2004 +        }
2005 +
2006 +        // Checking our custom handler above should be sufficient, but
2007 +        // we add some integration tests of standard handlers.
2008 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2009 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2010 +
2011 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2012 +        try {
2013 +            p.execute(setThread);
2014 +            shouldThrow();
2015 +        } catch (RejectedExecutionException success) {}
2016 +        assertNull(thread.get());
2017 +
2018 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2019 +        p.execute(setThread);
2020 +        assertNull(thread.get());
2021 +
2022 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2023 +        p.execute(setThread);
2024 +        if (p.isShutdown())
2025 +            assertNull(thread.get());
2026 +        else
2027 +            assertSame(Thread.currentThread(), thread.get());
2028 +
2029 +        setRejectedExecutionHandler(p, savedHandler);
2030 +
2031 +        // check that pool was not perturbed by handlers
2032 +        assertEquals(savedTaskCount, p.getTaskCount());
2033 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2034 +        assertEquals(savedQueueSize, p.getQueue().size());
2035 +    }
2036 +
2037 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2038 +        assertEquals(x, y);
2039 +        assertEquals(y, x);
2040 +        assertEquals(x.isEmpty(), y.isEmpty());
2041 +        assertEquals(x.size(), y.size());
2042 +        if (x instanceof List) {
2043 +            assertEquals(x.toString(), y.toString());
2044 +        }
2045 +        if (x instanceof List || x instanceof Set) {
2046 +            assertEquals(x.hashCode(), y.hashCode());
2047 +        }
2048 +        if (x instanceof List || x instanceof Deque) {
2049 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2050 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2051 +                                     y.toArray(new Object[0])));
2052 +        }
2053 +    }
2054 +
2055 +    /**
2056 +     * A weaker form of assertCollectionsEquals which does not insist
2057 +     * that the two collections satisfy Object#equals(Object), since
2058 +     * they may use identity semantics as Deques do.
2059 +     */
2060 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2061 +        if (x instanceof List || x instanceof Set)
2062 +            assertCollectionsEquals(x, y);
2063 +        else {
2064 +            assertEquals(x.isEmpty(), y.isEmpty());
2065 +            assertEquals(x.size(), y.size());
2066 +            assertEquals(new HashSet(x), new HashSet(y));
2067 +            if (x instanceof Deque) {
2068 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2069 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2070 +                                         y.toArray(new Object[0])));
2071 +            }
2072 +        }
2073 +    }
2074   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines