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.199 by jsr166, Sat Aug 6 16:24:05 2016 UTC vs.
Revision 1.251 by jsr166, Wed Dec 12 16:59:55 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;
69 import java.util.regex.Matcher;
103   import java.util.regex.Pattern;
104  
72 import junit.framework.AssertionFailedError;
105   import junit.framework.Test;
106   import junit.framework.TestCase;
107   import junit.framework.TestResult;
# Line 85 | 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 276 | 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 387 | 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",
391 <                                                       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 413 | 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
422 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
423 <    }
424 <    public static boolean atLeastJava10() {
425 <        return JAVA_CLASS_VERSION >= 54.0
426 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
427 <    }
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 445 | 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 467 | 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 495 | 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 +                "LinkedHashMapTest",
554                  "LongAccumulatorTest",
555                  "LongAdderTest",
556                  "SplittableRandomTest",
# Line 530 | Line 573 | public class JSR166TestCase extends Test
573                  "AtomicReference9Test",
574                  "AtomicReferenceArray9Test",
575                  "ExecutorCompletionService9Test",
576 +                "ForkJoinPool9Test",
577              };
578              addNamedTestClasses(suite, java9TestClassNames);
579          }
# Line 540 | Line 584 | public class JSR166TestCase extends Test
584      /** Returns list of junit-style test method names in given class. */
585      public static ArrayList<String> testMethodNames(Class<?> testClass) {
586          Method[] methods = testClass.getDeclaredMethods();
587 <        ArrayList<String> names = new ArrayList<String>(methods.length);
587 >        ArrayList<String> names = new ArrayList<>(methods.length);
588          for (Method method : methods) {
589              if (method.getName().startsWith("test")
590                  && Modifier.isPublic(method.getModifiers())
# Line 567 | Line 611 | public class JSR166TestCase extends Test
611              for (String methodName : testMethodNames(testClass))
612                  suite.addTest((Test) c.newInstance(data, methodName));
613              return suite;
614 <        } catch (Exception e) {
615 <            throw new Error(e);
614 >        } catch (ReflectiveOperationException e) {
615 >            throw new AssertionError(e);
616          }
617      }
618  
# Line 584 | Line 628 | public class JSR166TestCase extends Test
628          if (atLeastJava8()) {
629              String name = testClass.getName();
630              String name8 = name.replaceAll("Test$", "8Test");
631 <            if (name.equals(name8)) throw new Error(name);
631 >            if (name.equals(name8)) throw new AssertionError(name);
632              try {
633                  return (Test)
634                      Class.forName(name8)
635 <                    .getMethod("testSuite", new Class[] { dataClass })
635 >                    .getMethod("testSuite", dataClass)
636                      .invoke(null, data);
637 <            } catch (Exception e) {
638 <                throw new Error(e);
637 >            } catch (ReflectiveOperationException e) {
638 >                throw new AssertionError(e);
639              }
640          } else {
641              return new TestSuite();
# Line 605 | Line 649 | public class JSR166TestCase extends Test
649      public static long MEDIUM_DELAY_MS;
650      public static long LONG_DELAY_MS;
651  
652 +    private static final long RANDOM_TIMEOUT;
653 +    private static final long RANDOM_EXPIRED_TIMEOUT;
654 +    private static final TimeUnit RANDOM_TIMEUNIT;
655 +    static {
656 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
657 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
658 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
659 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
660 +        TimeUnit[] timeUnits = TimeUnit.values();
661 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
662 +    }
663 +
664 +    /**
665 +     * Returns a timeout for use when any value at all will do.
666 +     */
667 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
668 +
669 +    /**
670 +     * Returns a timeout that means "no waiting", i.e. not positive.
671 +     */
672 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
673 +
674 +    /**
675 +     * Returns a random non-null TimeUnit.
676 +     */
677 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
678 +
679      /**
680       * Returns the shortest timed delay. This can be scaled up for
681       * slow machines using the jsr166.delay.factor system property,
# Line 625 | Line 696 | public class JSR166TestCase extends Test
696          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
697      }
698  
699 +    private static final long TIMEOUT_DELAY_MS
700 +        = (long) (12.0 * Math.cbrt(delayFactor));
701 +
702      /**
703 <     * Returns a timeout in milliseconds to be used in tests that
704 <     * verify that operations block or time out.
703 >     * Returns a timeout in milliseconds to be used in tests that verify
704 >     * that operations block or time out.  We want this to be longer
705 >     * than the OS scheduling quantum, but not too long, so don't scale
706 >     * linearly with delayFactor; we use "crazy" cube root instead.
707       */
708 <    long timeoutMillis() {
709 <        return SHORT_DELAY_MS / 4;
708 >    static long timeoutMillis() {
709 >        return TIMEOUT_DELAY_MS;
710      }
711  
712      /**
# Line 646 | Line 722 | public class JSR166TestCase extends Test
722       * The first exception encountered if any threadAssertXXX method fails.
723       */
724      private final AtomicReference<Throwable> threadFailure
725 <        = new AtomicReference<Throwable>(null);
725 >        = new AtomicReference<>(null);
726  
727      /**
728       * Records an exception so that it can be rethrown later in the test
# Line 668 | Line 744 | public class JSR166TestCase extends Test
744          String msg = toString() + ": " + String.format(format, args);
745          System.err.println(msg);
746          dumpTestThreads();
747 <        throw new AssertionFailedError(msg);
747 >        throw new AssertionError(msg);
748      }
749  
750      /**
# Line 689 | Line 765 | public class JSR166TestCase extends Test
765                  throw (RuntimeException) t;
766              else if (t instanceof Exception)
767                  throw (Exception) t;
768 <            else {
769 <                AssertionFailedError afe =
694 <                    new AssertionFailedError(t.toString());
695 <                afe.initCause(t);
696 <                throw afe;
697 <            }
768 >            else
769 >                throw new AssertionError(t.toString(), t);
770          }
771  
772          if (Thread.interrupted())
# Line 728 | Line 800 | public class JSR166TestCase extends Test
800  
801      /**
802       * Just like fail(reason), but additionally recording (using
803 <     * threadRecordFailure) any AssertionFailedError thrown, so that
804 <     * the current testcase will fail.
803 >     * threadRecordFailure) any AssertionError thrown, so that the
804 >     * current testcase will fail.
805       */
806      public void threadFail(String reason) {
807          try {
808              fail(reason);
809 <        } catch (AssertionFailedError t) {
810 <            threadRecordFailure(t);
811 <            throw t;
809 >        } catch (AssertionError fail) {
810 >            threadRecordFailure(fail);
811 >            throw fail;
812          }
813      }
814  
815      /**
816       * Just like assertTrue(b), but additionally recording (using
817 <     * threadRecordFailure) any AssertionFailedError thrown, so that
818 <     * the current testcase will fail.
817 >     * threadRecordFailure) any AssertionError thrown, so that the
818 >     * current testcase will fail.
819       */
820      public void threadAssertTrue(boolean b) {
821          try {
822              assertTrue(b);
823 <        } catch (AssertionFailedError t) {
824 <            threadRecordFailure(t);
825 <            throw t;
823 >        } catch (AssertionError fail) {
824 >            threadRecordFailure(fail);
825 >            throw fail;
826          }
827      }
828  
829      /**
830       * Just like assertFalse(b), but additionally recording (using
831 <     * threadRecordFailure) any AssertionFailedError thrown, so that
832 <     * the current testcase will fail.
831 >     * threadRecordFailure) any AssertionError thrown, so that the
832 >     * current testcase will fail.
833       */
834      public void threadAssertFalse(boolean b) {
835          try {
836              assertFalse(b);
837 <        } catch (AssertionFailedError t) {
838 <            threadRecordFailure(t);
839 <            throw t;
837 >        } catch (AssertionError fail) {
838 >            threadRecordFailure(fail);
839 >            throw fail;
840          }
841      }
842  
843      /**
844       * Just like assertNull(x), but additionally recording (using
845 <     * threadRecordFailure) any AssertionFailedError thrown, so that
846 <     * the current testcase will fail.
845 >     * threadRecordFailure) any AssertionError thrown, so that the
846 >     * current testcase will fail.
847       */
848      public void threadAssertNull(Object x) {
849          try {
850              assertNull(x);
851 <        } catch (AssertionFailedError t) {
852 <            threadRecordFailure(t);
853 <            throw t;
851 >        } catch (AssertionError fail) {
852 >            threadRecordFailure(fail);
853 >            throw fail;
854          }
855      }
856  
857      /**
858       * Just like assertEquals(x, y), but additionally recording (using
859 <     * threadRecordFailure) any AssertionFailedError thrown, so that
860 <     * the current testcase will fail.
859 >     * threadRecordFailure) any AssertionError thrown, so that the
860 >     * current testcase will fail.
861       */
862      public void threadAssertEquals(long x, long y) {
863          try {
864              assertEquals(x, y);
865 <        } catch (AssertionFailedError t) {
866 <            threadRecordFailure(t);
867 <            throw t;
865 >        } catch (AssertionError fail) {
866 >            threadRecordFailure(fail);
867 >            throw fail;
868          }
869      }
870  
871      /**
872       * Just like assertEquals(x, y), but additionally recording (using
873 <     * threadRecordFailure) any AssertionFailedError thrown, so that
874 <     * the current testcase will fail.
873 >     * threadRecordFailure) any AssertionError thrown, so that the
874 >     * current testcase will fail.
875       */
876      public void threadAssertEquals(Object x, Object y) {
877          try {
878              assertEquals(x, y);
879 <        } catch (AssertionFailedError fail) {
879 >        } catch (AssertionError fail) {
880              threadRecordFailure(fail);
881              throw fail;
882          } catch (Throwable fail) {
# Line 814 | Line 886 | public class JSR166TestCase extends Test
886  
887      /**
888       * Just like assertSame(x, y), but additionally recording (using
889 <     * threadRecordFailure) any AssertionFailedError thrown, so that
890 <     * the current testcase will fail.
889 >     * threadRecordFailure) any AssertionError thrown, so that the
890 >     * current testcase will fail.
891       */
892      public void threadAssertSame(Object x, Object y) {
893          try {
894              assertSame(x, y);
895 <        } catch (AssertionFailedError fail) {
895 >        } catch (AssertionError fail) {
896              threadRecordFailure(fail);
897              throw fail;
898          }
# Line 842 | Line 914 | public class JSR166TestCase extends Test
914  
915      /**
916       * Records the given exception using {@link #threadRecordFailure},
917 <     * then rethrows the exception, wrapping it in an
918 <     * AssertionFailedError if necessary.
917 >     * then rethrows the exception, wrapping it in an AssertionError
918 >     * if necessary.
919       */
920      public void threadUnexpectedException(Throwable t) {
921          threadRecordFailure(t);
# Line 852 | Line 924 | public class JSR166TestCase extends Test
924              throw (RuntimeException) t;
925          else if (t instanceof Error)
926              throw (Error) t;
927 <        else {
928 <            AssertionFailedError afe =
857 <                new AssertionFailedError("unexpected exception: " + t);
858 <            afe.initCause(t);
859 <            throw afe;
860 <        }
927 >        else
928 >            throw new AssertionError("unexpected exception: " + t, t);
929      }
930  
931      /**
# Line 1003 | Line 1071 | public class JSR166TestCase extends Test
1071          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1072          System.err.println("------ stacktrace dump start ------");
1073          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1074 <            String name = info.getThreadName();
1074 >            final String name = info.getThreadName();
1075 >            String lockName;
1076              if ("Signal Dispatcher".equals(name))
1077                  continue;
1078              if ("Reference Handler".equals(name)
1079 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1079 >                && (lockName = info.getLockName()) != null
1080 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1081                  continue;
1082              if ("Finalizer".equals(name)
1083 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1083 >                && (lockName = info.getLockName()) != null
1084 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1085                  continue;
1086              if ("checkForWedgedTest".equals(name))
1087                  continue;
# Line 1022 | Line 1093 | public class JSR166TestCase extends Test
1093      }
1094  
1095      /**
1096 <     * Checks that thread does not terminate within the default
1026 <     * millisecond delay of {@code timeoutMillis()}.
1096 >     * Checks that thread eventually enters the expected blocked thread state.
1097       */
1098 <    void assertThreadStaysAlive(Thread thread) {
1099 <        assertThreadStaysAlive(thread, timeoutMillis());
1100 <    }
1101 <
1102 <    /**
1103 <     * Checks that thread does not terminate within the given millisecond delay.
1104 <     */
1105 <    void assertThreadStaysAlive(Thread thread, long millis) {
1106 <        try {
1107 <            // No need to optimize the failing case via Thread.join.
1108 <            delay(millis);
1109 <            assertTrue(thread.isAlive());
1110 <        } catch (InterruptedException fail) {
1041 <            threadFail("Unexpected InterruptedException");
1042 <        }
1043 <    }
1044 <
1045 <    /**
1046 <     * Checks that the threads do not terminate within the default
1047 <     * millisecond delay of {@code timeoutMillis()}.
1048 <     */
1049 <    void assertThreadsStayAlive(Thread... threads) {
1050 <        assertThreadsStayAlive(timeoutMillis(), threads);
1051 <    }
1052 <
1053 <    /**
1054 <     * Checks that the threads do not terminate within the given millisecond delay.
1055 <     */
1056 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1057 <        try {
1058 <            // No need to optimize the failing case via Thread.join.
1059 <            delay(millis);
1060 <            for (Thread thread : threads)
1061 <                assertTrue(thread.isAlive());
1062 <        } catch (InterruptedException fail) {
1063 <            threadFail("Unexpected InterruptedException");
1098 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1099 >        // always sleep at least 1 ms, with high probability avoiding
1100 >        // transitory states
1101 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1102 >            try { delay(1); }
1103 >            catch (InterruptedException fail) {
1104 >                throw new AssertionError("Unexpected InterruptedException", fail);
1105 >            }
1106 >            Thread.State s = thread.getState();
1107 >            if (s == expected)
1108 >                return;
1109 >            else if (s == Thread.State.TERMINATED)
1110 >                fail("Unexpected thread termination");
1111          }
1112 +        fail("timed out waiting for thread to enter thread state " + expected);
1113      }
1114  
1115      /**
# Line 1102 | Line 1150 | public class JSR166TestCase extends Test
1150      }
1151  
1152      /**
1153 +     * The maximum number of consecutive spurious wakeups we should
1154 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1155 +     */
1156 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1157 +
1158 +    /**
1159       * The number of elements to place in collections, arrays, etc.
1160       */
1161      public static final int SIZE = 20;
# Line 1205 | Line 1259 | public class JSR166TestCase extends Test
1259          }
1260          public void refresh() {}
1261          public String toString() {
1262 <            List<Permission> ps = new ArrayList<Permission>();
1262 >            List<Permission> ps = new ArrayList<>();
1263              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1264                  ps.add(e.nextElement());
1265              return "AdjustablePolicy with permissions " + ps;
# Line 1233 | Line 1287 | public class JSR166TestCase extends Test
1287  
1288      /**
1289       * Sleeps until the given time has elapsed.
1290 <     * Throws AssertionFailedError if interrupted.
1290 >     * Throws AssertionError if interrupted.
1291       */
1292 <    void sleep(long millis) {
1292 >    static void sleep(long millis) {
1293          try {
1294              delay(millis);
1295          } catch (InterruptedException fail) {
1296 <            AssertionFailedError afe =
1243 <                new AssertionFailedError("Unexpected InterruptedException");
1244 <            afe.initCause(fail);
1245 <            throw afe;
1296 >            throw new AssertionError("Unexpected InterruptedException", fail);
1297          }
1298      }
1299  
1300      /**
1301       * Spin-waits up to the specified number of milliseconds for the given
1302       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1303 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1304       */
1305 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1306 <        long startTime = 0L;
1307 <        for (;;) {
1308 <            Thread.State s = thread.getState();
1309 <            if (s == Thread.State.BLOCKED ||
1310 <                s == Thread.State.WAITING ||
1311 <                s == Thread.State.TIMED_WAITING)
1312 <                return;
1313 <            else if (s == Thread.State.TERMINATED)
1305 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1306 >                                       Callable<Boolean> waitingForGodot) {
1307 >        for (long startTime = 0L;;) {
1308 >            switch (thread.getState()) {
1309 >            default: break;
1310 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1311 >                try {
1312 >                    if (waitingForGodot == null || waitingForGodot.call())
1313 >                        return;
1314 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1315 >                break;
1316 >            case TERMINATED:
1317                  fail("Unexpected thread termination");
1318 <            else if (startTime == 0L)
1318 >            }
1319 >
1320 >            if (startTime == 0L)
1321                  startTime = System.nanoTime();
1322              else if (millisElapsedSince(startTime) > timeoutMillis) {
1323 <                threadAssertTrue(thread.isAlive());
1324 <                return;
1323 >                assertTrue(thread.isAlive());
1324 >                if (waitingForGodot == null
1325 >                    || thread.getState() == Thread.State.RUNNABLE)
1326 >                    fail("timed out waiting for thread to enter wait state");
1327 >                else
1328 >                    fail("timed out waiting for condition, thread state="
1329 >                         + thread.getState());
1330              }
1331              Thread.yield();
1332          }
1333      }
1334  
1335      /**
1336 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1337 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1336 >     * Spin-waits up to the specified number of milliseconds for the given
1337 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1338 >     */
1339 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1340 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1341 >    }
1342 >
1343 >    /**
1344 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1345 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1346       */
1347      void waitForThreadToEnterWaitState(Thread thread) {
1348 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1348 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1349 >    }
1350 >
1351 >    /**
1352 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1353 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1354 >     * and additionally satisfy the given condition.
1355 >     */
1356 >    void waitForThreadToEnterWaitState(Thread thread,
1357 >                                       Callable<Boolean> waitingForGodot) {
1358 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1359      }
1360  
1361      /**
# Line 1293 | Line 1373 | public class JSR166TestCase extends Test
1373   //             r.run();
1374   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1375   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1376 < //             throw new AssertionFailedError("did not return promptly");
1376 > //             throw new AssertionError("did not return promptly");
1377   //     }
1378  
1379   //     void assertTerminatesPromptly(Runnable r) {
# Line 1306 | Line 1386 | public class JSR166TestCase extends Test
1386       */
1387      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1388          long startTime = System.nanoTime();
1389 +        T actual = null;
1390          try {
1391 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1391 >            actual = f.get(timeoutMillis, MILLISECONDS);
1392          } catch (Throwable fail) { threadUnexpectedException(fail); }
1393 +        assertEquals(expectedValue, actual);
1394          if (millisElapsedSince(startTime) > timeoutMillis/2)
1395 <            throw new AssertionFailedError("timed get did not return promptly");
1395 >            throw new AssertionError("timed get did not return promptly");
1396      }
1397  
1398      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1368 | Line 1450 | public class JSR166TestCase extends Test
1450          }
1451      }
1452  
1371    public abstract class RunnableShouldThrow implements Runnable {
1372        protected abstract void realRun() throws Throwable;
1373
1374        final Class<?> exceptionClass;
1375
1376        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1377            this.exceptionClass = exceptionClass;
1378        }
1379
1380        public final void run() {
1381            try {
1382                realRun();
1383                threadShouldThrow(exceptionClass.getSimpleName());
1384            } catch (Throwable t) {
1385                if (! exceptionClass.isInstance(t))
1386                    threadUnexpectedException(t);
1387            }
1388        }
1389    }
1390
1453      public abstract class ThreadShouldThrow extends Thread {
1454          protected abstract void realRun() throws Throwable;
1455  
# Line 1400 | Line 1462 | public class JSR166TestCase extends Test
1462          public final void run() {
1463              try {
1464                  realRun();
1403                threadShouldThrow(exceptionClass.getSimpleName());
1465              } catch (Throwable t) {
1466                  if (! exceptionClass.isInstance(t))
1467                      threadUnexpectedException(t);
1468 +                return;
1469              }
1470 +            threadShouldThrow(exceptionClass.getSimpleName());
1471          }
1472      }
1473  
# Line 1414 | Line 1477 | public class JSR166TestCase extends Test
1477          public final void run() {
1478              try {
1479                  realRun();
1417                threadShouldThrow("InterruptedException");
1480              } catch (InterruptedException success) {
1481                  threadAssertFalse(Thread.interrupted());
1482 +                return;
1483              } catch (Throwable fail) {
1484                  threadUnexpectedException(fail);
1485              }
1486 +            threadShouldThrow("InterruptedException");
1487          }
1488      }
1489  
# Line 1431 | Line 1495 | public class JSR166TestCase extends Test
1495                  return realCall();
1496              } catch (Throwable fail) {
1497                  threadUnexpectedException(fail);
1434                return null;
1498              }
1499 <        }
1437 <    }
1438 <
1439 <    public abstract class CheckedInterruptedCallable<T>
1440 <        implements Callable<T> {
1441 <        protected abstract T realCall() throws Throwable;
1442 <
1443 <        public final T call() {
1444 <            try {
1445 <                T result = realCall();
1446 <                threadShouldThrow("InterruptedException");
1447 <                return result;
1448 <            } catch (InterruptedException success) {
1449 <                threadAssertFalse(Thread.interrupted());
1450 <            } catch (Throwable fail) {
1451 <                threadUnexpectedException(fail);
1452 <            }
1453 <            return null;
1499 >            throw new AssertionError("unreached");
1500          }
1501      }
1502  
# Line 1507 | Line 1553 | public class JSR166TestCase extends Test
1553      }
1554  
1555      public void await(CountDownLatch latch, long timeoutMillis) {
1556 +        boolean timedOut = false;
1557          try {
1558 <            if (!latch.await(timeoutMillis, MILLISECONDS))
1512 <                fail("timed out waiting for CountDownLatch for "
1513 <                     + (timeoutMillis/1000) + " sec");
1558 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1559          } catch (Throwable fail) {
1560              threadUnexpectedException(fail);
1561          }
1562 +        if (timedOut)
1563 +            fail("timed out waiting for CountDownLatch for "
1564 +                 + (timeoutMillis/1000) + " sec");
1565      }
1566  
1567      public void await(CountDownLatch latch) {
# Line 1521 | Line 1569 | public class JSR166TestCase extends Test
1569      }
1570  
1571      public void await(Semaphore semaphore) {
1572 +        boolean timedOut = false;
1573 +        try {
1574 +            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1575 +        } catch (Throwable fail) {
1576 +            threadUnexpectedException(fail);
1577 +        }
1578 +        if (timedOut)
1579 +            fail("timed out waiting for Semaphore for "
1580 +                 + (LONG_DELAY_MS/1000) + " sec");
1581 +    }
1582 +
1583 +    public void await(CyclicBarrier barrier) {
1584          try {
1585 <            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1526 <                fail("timed out waiting for Semaphore for "
1527 <                     + (LONG_DELAY_MS/1000) + " sec");
1585 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1586          } catch (Throwable fail) {
1587              threadUnexpectedException(fail);
1588          }
# Line 1544 | Line 1602 | public class JSR166TestCase extends Test
1602   //         long startTime = System.nanoTime();
1603   //         while (!flag.get()) {
1604   //             if (millisElapsedSince(startTime) > timeoutMillis)
1605 < //                 throw new AssertionFailedError("timed out");
1605 > //                 throw new AssertionError("timed out");
1606   //             Thread.yield();
1607   //         }
1608   //     }
# Line 1553 | Line 1611 | public class JSR166TestCase extends Test
1611          public String call() { throw new NullPointerException(); }
1612      }
1613  
1556    public static class CallableOne implements Callable<Integer> {
1557        public Integer call() { return one; }
1558    }
1559
1560    public class ShortRunnable extends CheckedRunnable {
1561        protected void realRun() throws Throwable {
1562            delay(SHORT_DELAY_MS);
1563        }
1564    }
1565
1566    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1567        protected void realRun() throws InterruptedException {
1568            delay(SHORT_DELAY_MS);
1569        }
1570    }
1571
1572    public class SmallRunnable extends CheckedRunnable {
1573        protected void realRun() throws Throwable {
1574            delay(SMALL_DELAY_MS);
1575        }
1576    }
1577
1578    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1579        protected void realRun() {
1580            try {
1581                delay(SMALL_DELAY_MS);
1582            } catch (InterruptedException ok) {}
1583        }
1584    }
1585
1586    public class SmallCallable extends CheckedCallable {
1587        protected Object realCall() throws InterruptedException {
1588            delay(SMALL_DELAY_MS);
1589            return Boolean.TRUE;
1590        }
1591    }
1592
1593    public class MediumRunnable extends CheckedRunnable {
1594        protected void realRun() throws Throwable {
1595            delay(MEDIUM_DELAY_MS);
1596        }
1597    }
1598
1599    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1600        protected void realRun() throws InterruptedException {
1601            delay(MEDIUM_DELAY_MS);
1602        }
1603    }
1604
1614      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1615          return new CheckedRunnable() {
1616              protected void realRun() {
# Line 1611 | Line 1620 | public class JSR166TestCase extends Test
1620              }};
1621      }
1622  
1614    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1615        protected void realRun() {
1616            try {
1617                delay(MEDIUM_DELAY_MS);
1618            } catch (InterruptedException ok) {}
1619        }
1620    }
1621
1622    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1623        protected void realRun() {
1624            try {
1625                delay(LONG_DELAY_MS);
1626            } catch (InterruptedException ok) {}
1627        }
1628    }
1629
1623      /**
1624       * For use as ThreadFactory in constructors
1625       */
# Line 1640 | Line 1633 | public class JSR166TestCase extends Test
1633          boolean isDone();
1634      }
1635  
1643    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1644        return new TrackedRunnable() {
1645                private volatile boolean done = false;
1646                public boolean isDone() { return done; }
1647                public void run() {
1648                    try {
1649                        delay(timeoutMillis);
1650                        done = true;
1651                    } catch (InterruptedException ok) {}
1652                }
1653            };
1654    }
1655
1656    public static class TrackedShortRunnable implements Runnable {
1657        public volatile boolean done = false;
1658        public void run() {
1659            try {
1660                delay(SHORT_DELAY_MS);
1661                done = true;
1662            } catch (InterruptedException ok) {}
1663        }
1664    }
1665
1666    public static class TrackedSmallRunnable implements Runnable {
1667        public volatile boolean done = false;
1668        public void run() {
1669            try {
1670                delay(SMALL_DELAY_MS);
1671                done = true;
1672            } catch (InterruptedException ok) {}
1673        }
1674    }
1675
1676    public static class TrackedMediumRunnable implements Runnable {
1677        public volatile boolean done = false;
1678        public void run() {
1679            try {
1680                delay(MEDIUM_DELAY_MS);
1681                done = true;
1682            } catch (InterruptedException ok) {}
1683        }
1684    }
1685
1686    public static class TrackedLongRunnable implements Runnable {
1687        public volatile boolean done = false;
1688        public void run() {
1689            try {
1690                delay(LONG_DELAY_MS);
1691                done = true;
1692            } catch (InterruptedException ok) {}
1693        }
1694    }
1695
1636      public static class TrackedNoOpRunnable implements Runnable {
1637          public volatile boolean done = false;
1638          public void run() {
# Line 1700 | Line 1640 | public class JSR166TestCase extends Test
1640          }
1641      }
1642  
1703    public static class TrackedCallable implements Callable {
1704        public volatile boolean done = false;
1705        public Object call() {
1706            try {
1707                delay(SMALL_DELAY_MS);
1708                done = true;
1709            } catch (InterruptedException ok) {}
1710            return Boolean.TRUE;
1711        }
1712    }
1713
1643      /**
1644       * Analog of CheckedRunnable for RecursiveAction
1645       */
# Line 1737 | Line 1666 | public class JSR166TestCase extends Test
1666                  return realCompute();
1667              } catch (Throwable fail) {
1668                  threadUnexpectedException(fail);
1740                return null;
1669              }
1670 +            throw new AssertionError("unreached");
1671          }
1672      }
1673  
# Line 1752 | Line 1681 | public class JSR166TestCase extends Test
1681  
1682      /**
1683       * A CyclicBarrier that uses timed await and fails with
1684 <     * AssertionFailedErrors instead of throwing checked exceptions.
1684 >     * AssertionErrors instead of throwing checked exceptions.
1685       */
1686 <    public class CheckedBarrier extends CyclicBarrier {
1686 >    public static class CheckedBarrier extends CyclicBarrier {
1687          public CheckedBarrier(int parties) { super(parties); }
1688  
1689          public int await() {
1690              try {
1691                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1692              } catch (TimeoutException timedOut) {
1693 <                throw new AssertionFailedError("timed out");
1693 >                throw new AssertionError("timed out");
1694              } catch (Exception fail) {
1695 <                AssertionFailedError afe =
1767 <                    new AssertionFailedError("Unexpected exception: " + fail);
1768 <                afe.initCause(fail);
1769 <                throw afe;
1695 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1696              }
1697          }
1698      }
# Line 1777 | Line 1703 | public class JSR166TestCase extends Test
1703              assertEquals(0, q.size());
1704              assertNull(q.peek());
1705              assertNull(q.poll());
1706 <            assertNull(q.poll(0, MILLISECONDS));
1706 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1707              assertEquals(q.toString(), "[]");
1708              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1709              assertFalse(q.iterator().hasNext());
# Line 1818 | Line 1744 | public class JSR166TestCase extends Test
1744          }
1745      }
1746  
1747 +    void assertImmutable(final Object o) {
1748 +        if (o instanceof Collection) {
1749 +            assertThrows(
1750 +                UnsupportedOperationException.class,
1751 +                new Runnable() { public void run() {
1752 +                        ((Collection) o).add(null);}});
1753 +        }
1754 +    }
1755 +
1756      @SuppressWarnings("unchecked")
1757      <T> T serialClone(T o) {
1758 +        T clone = null;
1759          try {
1760              ObjectInputStream ois = new ObjectInputStream
1761                  (new ByteArrayInputStream(serialBytes(o)));
1762 <            T clone = (T) ois.readObject();
1827 <            assertSame(o.getClass(), clone.getClass());
1828 <            return clone;
1762 >            clone = (T) ois.readObject();
1763          } catch (Throwable fail) {
1764              threadUnexpectedException(fail);
1765 +        }
1766 +        if (o == clone) assertImmutable(o);
1767 +        else assertSame(o.getClass(), clone.getClass());
1768 +        return clone;
1769 +    }
1770 +
1771 +    /**
1772 +     * A version of serialClone that leaves error handling (for
1773 +     * e.g. NotSerializableException) up to the caller.
1774 +     */
1775 +    @SuppressWarnings("unchecked")
1776 +    <T> T serialClonePossiblyFailing(T o)
1777 +        throws ReflectiveOperationException, java.io.IOException {
1778 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1779 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1780 +        oos.writeObject(o);
1781 +        oos.flush();
1782 +        oos.close();
1783 +        ObjectInputStream ois = new ObjectInputStream
1784 +            (new ByteArrayInputStream(bos.toByteArray()));
1785 +        T clone = (T) ois.readObject();
1786 +        if (o == clone) assertImmutable(o);
1787 +        else assertSame(o.getClass(), clone.getClass());
1788 +        return clone;
1789 +    }
1790 +
1791 +    /**
1792 +     * If o implements Cloneable and has a public clone method,
1793 +     * returns a clone of o, else null.
1794 +     */
1795 +    @SuppressWarnings("unchecked")
1796 +    <T> T cloneableClone(T o) {
1797 +        if (!(o instanceof Cloneable)) return null;
1798 +        final T clone;
1799 +        try {
1800 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1801 +        } catch (NoSuchMethodException ok) {
1802              return null;
1803 +        } catch (ReflectiveOperationException unexpected) {
1804 +            throw new Error(unexpected);
1805          }
1806 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1807 +        assertSame(o.getClass(), clone.getClass());
1808 +        return clone;
1809      }
1810  
1811      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
# Line 1839 | Line 1815 | public class JSR166TestCase extends Test
1815              try { throwingAction.run(); }
1816              catch (Throwable t) {
1817                  threw = true;
1818 <                if (!expectedExceptionClass.isInstance(t)) {
1819 <                    AssertionFailedError afe =
1820 <                        new AssertionFailedError
1821 <                        ("Expected " + expectedExceptionClass.getName() +
1822 <                         ", got " + t.getClass().getName());
1847 <                    afe.initCause(t);
1848 <                    threadUnexpectedException(afe);
1849 <                }
1818 >                if (!expectedExceptionClass.isInstance(t))
1819 >                    throw new AssertionError(
1820 >                            "Expected " + expectedExceptionClass.getName() +
1821 >                            ", got " + t.getClass().getName(),
1822 >                            t);
1823              }
1824              if (!threw)
1825                  shouldThrow(expectedExceptionClass.getName());
# Line 1875 | Line 1848 | public class JSR166TestCase extends Test
1848                                 1000L, MILLISECONDS,
1849                                 new SynchronousQueue<Runnable>());
1850  
1851 +    static <T> void shuffle(T[] array) {
1852 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1853 +    }
1854 +
1855 +    /**
1856 +     * Returns the same String as would be returned by {@link
1857 +     * Object#toString}, whether or not the given object's class
1858 +     * overrides toString().
1859 +     *
1860 +     * @see System#identityHashCode
1861 +     */
1862 +    static String identityString(Object x) {
1863 +        return x.getClass().getName()
1864 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1865 +    }
1866 +
1867 +    // --- Shared assertions for Executor tests ---
1868 +
1869 +    /**
1870 +     * Returns maximum number of tasks that can be submitted to given
1871 +     * pool (with bounded queue) before saturation (when submission
1872 +     * throws RejectedExecutionException).
1873 +     */
1874 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1875 +        BlockingQueue<Runnable> q = pool.getQueue();
1876 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1877 +    }
1878 +
1879 +    @SuppressWarnings("FutureReturnValueIgnored")
1880 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1881 +        try {
1882 +            e.execute((Runnable) null);
1883 +            shouldThrow();
1884 +        } catch (NullPointerException success) {}
1885 +
1886 +        if (! (e instanceof ExecutorService)) return;
1887 +        ExecutorService es = (ExecutorService) e;
1888 +        try {
1889 +            es.submit((Runnable) null);
1890 +            shouldThrow();
1891 +        } catch (NullPointerException success) {}
1892 +        try {
1893 +            es.submit((Runnable) null, Boolean.TRUE);
1894 +            shouldThrow();
1895 +        } catch (NullPointerException success) {}
1896 +        try {
1897 +            es.submit((Callable) null);
1898 +            shouldThrow();
1899 +        } catch (NullPointerException success) {}
1900 +
1901 +        if (! (e instanceof ScheduledExecutorService)) return;
1902 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1903 +        try {
1904 +            ses.schedule((Runnable) null,
1905 +                         randomTimeout(), randomTimeUnit());
1906 +            shouldThrow();
1907 +        } catch (NullPointerException success) {}
1908 +        try {
1909 +            ses.schedule((Callable) null,
1910 +                         randomTimeout(), randomTimeUnit());
1911 +            shouldThrow();
1912 +        } catch (NullPointerException success) {}
1913 +        try {
1914 +            ses.scheduleAtFixedRate((Runnable) null,
1915 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1916 +            shouldThrow();
1917 +        } catch (NullPointerException success) {}
1918 +        try {
1919 +            ses.scheduleWithFixedDelay((Runnable) null,
1920 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1921 +            shouldThrow();
1922 +        } catch (NullPointerException success) {}
1923 +    }
1924 +
1925 +    void setRejectedExecutionHandler(
1926 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1927 +        p.setRejectedExecutionHandler(handler);
1928 +        assertSame(handler, p.getRejectedExecutionHandler());
1929 +    }
1930 +
1931 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1932 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1933 +        final long savedTaskCount = p.getTaskCount();
1934 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1935 +        final int savedQueueSize = p.getQueue().size();
1936 +        final boolean stock = (p.getClass().getClassLoader() == null);
1937 +
1938 +        Runnable r = () -> {};
1939 +        Callable<Boolean> c = () -> Boolean.TRUE;
1940 +
1941 +        class Recorder implements RejectedExecutionHandler {
1942 +            public volatile Runnable r = null;
1943 +            public volatile ThreadPoolExecutor p = null;
1944 +            public void reset() { r = null; p = null; }
1945 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1946 +                assertNull(this.r);
1947 +                assertNull(this.p);
1948 +                this.r = r;
1949 +                this.p = p;
1950 +            }
1951 +        }
1952 +
1953 +        // check custom handler is invoked exactly once per task
1954 +        Recorder recorder = new Recorder();
1955 +        setRejectedExecutionHandler(p, recorder);
1956 +        for (int i = 2; i--> 0; ) {
1957 +            recorder.reset();
1958 +            p.execute(r);
1959 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1960 +                assertSame(r, recorder.r);
1961 +            assertSame(p, recorder.p);
1962 +
1963 +            recorder.reset();
1964 +            assertFalse(p.submit(r).isDone());
1965 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1966 +            assertSame(p, recorder.p);
1967 +
1968 +            recorder.reset();
1969 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
1970 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1971 +            assertSame(p, recorder.p);
1972 +
1973 +            recorder.reset();
1974 +            assertFalse(p.submit(c).isDone());
1975 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1976 +            assertSame(p, recorder.p);
1977 +
1978 +            if (p instanceof ScheduledExecutorService) {
1979 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
1980 +                ScheduledFuture<?> future;
1981 +
1982 +                recorder.reset();
1983 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
1984 +                assertFalse(future.isDone());
1985 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1986 +                assertSame(p, recorder.p);
1987 +
1988 +                recorder.reset();
1989 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
1990 +                assertFalse(future.isDone());
1991 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1992 +                assertSame(p, recorder.p);
1993 +
1994 +                recorder.reset();
1995 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1996 +                assertFalse(future.isDone());
1997 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1998 +                assertSame(p, recorder.p);
1999 +
2000 +                recorder.reset();
2001 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2002 +                assertFalse(future.isDone());
2003 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2004 +                assertSame(p, recorder.p);
2005 +            }
2006 +        }
2007 +
2008 +        // Checking our custom handler above should be sufficient, but
2009 +        // we add some integration tests of standard handlers.
2010 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2011 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2012 +
2013 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2014 +        try {
2015 +            p.execute(setThread);
2016 +            shouldThrow();
2017 +        } catch (RejectedExecutionException success) {}
2018 +        assertNull(thread.get());
2019 +
2020 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2021 +        p.execute(setThread);
2022 +        assertNull(thread.get());
2023 +
2024 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2025 +        p.execute(setThread);
2026 +        if (p.isShutdown())
2027 +            assertNull(thread.get());
2028 +        else
2029 +            assertSame(Thread.currentThread(), thread.get());
2030 +
2031 +        setRejectedExecutionHandler(p, savedHandler);
2032 +
2033 +        // check that pool was not perturbed by handlers
2034 +        assertEquals(savedTaskCount, p.getTaskCount());
2035 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2036 +        assertEquals(savedQueueSize, p.getQueue().size());
2037 +    }
2038 +
2039 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2040 +        assertEquals(x, y);
2041 +        assertEquals(y, x);
2042 +        assertEquals(x.isEmpty(), y.isEmpty());
2043 +        assertEquals(x.size(), y.size());
2044 +        if (x instanceof List) {
2045 +            assertEquals(x.toString(), y.toString());
2046 +        }
2047 +        if (x instanceof List || x instanceof Set) {
2048 +            assertEquals(x.hashCode(), y.hashCode());
2049 +        }
2050 +        if (x instanceof List || x instanceof Deque) {
2051 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2052 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2053 +                                     y.toArray(new Object[0])));
2054 +        }
2055 +    }
2056 +
2057 +    /**
2058 +     * A weaker form of assertCollectionsEquals which does not insist
2059 +     * that the two collections satisfy Object#equals(Object), since
2060 +     * they may use identity semantics as Deques do.
2061 +     */
2062 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2063 +        if (x instanceof List || x instanceof Set)
2064 +            assertCollectionsEquals(x, y);
2065 +        else {
2066 +            assertEquals(x.isEmpty(), y.isEmpty());
2067 +            assertEquals(x.size(), y.size());
2068 +            assertEquals(new HashSet(x), new HashSet(y));
2069 +            if (x instanceof Deque) {
2070 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2071 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2072 +                                         y.toArray(new Object[0])));
2073 +            }
2074 +        }
2075 +    }
2076   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines