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.254 by jsr166, Wed Apr 24 17:36:09 2019 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
463 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
464 <    }
465 <    public static boolean atLeastJava10() {
466 <        return JAVA_CLASS_VERSION >= 54.0
467 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
468 <    }
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 >    public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
464 >    public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
465 >    public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
466 >    public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
467 >    public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
468 >    public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
469  
470      /**
471       * Collects all JSR166 unit tests as one suite.
# Line 447 | Line 486 | public class JSR166TestCase extends Test
486              AbstractQueuedLongSynchronizerTest.suite(),
487              ArrayBlockingQueueTest.suite(),
488              ArrayDequeTest.suite(),
489 +            ArrayListTest.suite(),
490              AtomicBooleanTest.suite(),
491              AtomicIntegerArrayTest.suite(),
492              AtomicIntegerFieldUpdaterTest.suite(),
# Line 469 | Line 509 | public class JSR166TestCase extends Test
509              CopyOnWriteArrayListTest.suite(),
510              CopyOnWriteArraySetTest.suite(),
511              CountDownLatchTest.suite(),
512 +            CountedCompleterTest.suite(),
513              CyclicBarrierTest.suite(),
514              DelayQueueTest.suite(),
515              EntryTest.suite(),
# Line 476 | Line 517 | public class JSR166TestCase extends Test
517              ExecutorsTest.suite(),
518              ExecutorCompletionServiceTest.suite(),
519              FutureTaskTest.suite(),
520 +            HashtableTest.suite(),
521              LinkedBlockingDequeTest.suite(),
522              LinkedBlockingQueueTest.suite(),
523              LinkedListTest.suite(),
# Line 497 | Line 539 | public class JSR166TestCase extends Test
539              TreeMapTest.suite(),
540              TreeSetTest.suite(),
541              TreeSubMapTest.suite(),
542 <            TreeSubSetTest.suite());
542 >            TreeSubSetTest.suite(),
543 >            VectorTest.suite());
544  
545          // Java8+ test classes
546          if (atLeastJava8()) {
547              String[] java8TestClassNames = {
548 +                "ArrayDeque8Test",
549                  "Atomic8Test",
550                  "CompletableFutureTest",
551                  "ConcurrentHashMap8Test",
552 <                "CountedCompleterTest",
552 >                "CountedCompleter8Test",
553                  "DoubleAccumulatorTest",
554                  "DoubleAdderTest",
555                  "ForkJoinPool8Test",
556                  "ForkJoinTask8Test",
557 +                "HashMapTest",
558 +                "LinkedBlockingDeque8Test",
559 +                "LinkedBlockingQueue8Test",
560 +                "LinkedHashMapTest",
561                  "LongAccumulatorTest",
562                  "LongAdderTest",
563                  "SplittableRandomTest",
# Line 532 | Line 580 | public class JSR166TestCase extends Test
580                  "AtomicReference9Test",
581                  "AtomicReferenceArray9Test",
582                  "ExecutorCompletionService9Test",
583 +                "ForkJoinPool9Test",
584              };
585              addNamedTestClasses(suite, java9TestClassNames);
586          }
# Line 542 | Line 591 | public class JSR166TestCase extends Test
591      /** Returns list of junit-style test method names in given class. */
592      public static ArrayList<String> testMethodNames(Class<?> testClass) {
593          Method[] methods = testClass.getDeclaredMethods();
594 <        ArrayList<String> names = new ArrayList<String>(methods.length);
594 >        ArrayList<String> names = new ArrayList<>(methods.length);
595          for (Method method : methods) {
596              if (method.getName().startsWith("test")
597                  && Modifier.isPublic(method.getModifiers())
# Line 569 | Line 618 | public class JSR166TestCase extends Test
618              for (String methodName : testMethodNames(testClass))
619                  suite.addTest((Test) c.newInstance(data, methodName));
620              return suite;
621 <        } catch (Exception e) {
622 <            throw new Error(e);
621 >        } catch (ReflectiveOperationException e) {
622 >            throw new AssertionError(e);
623          }
624      }
625  
# Line 586 | Line 635 | public class JSR166TestCase extends Test
635          if (atLeastJava8()) {
636              String name = testClass.getName();
637              String name8 = name.replaceAll("Test$", "8Test");
638 <            if (name.equals(name8)) throw new Error(name);
638 >            if (name.equals(name8)) throw new AssertionError(name);
639              try {
640                  return (Test)
641                      Class.forName(name8)
642 <                    .getMethod("testSuite", new Class[] { dataClass })
642 >                    .getMethod("testSuite", dataClass)
643                      .invoke(null, data);
644 <            } catch (Exception e) {
645 <                throw new Error(e);
644 >            } catch (ReflectiveOperationException e) {
645 >                throw new AssertionError(e);
646              }
647          } else {
648              return new TestSuite();
# Line 607 | Line 656 | public class JSR166TestCase extends Test
656      public static long MEDIUM_DELAY_MS;
657      public static long LONG_DELAY_MS;
658  
659 +    private static final long RANDOM_TIMEOUT;
660 +    private static final long RANDOM_EXPIRED_TIMEOUT;
661 +    private static final TimeUnit RANDOM_TIMEUNIT;
662 +    static {
663 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
664 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
665 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
666 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
667 +        TimeUnit[] timeUnits = TimeUnit.values();
668 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
669 +    }
670 +
671 +    /**
672 +     * Returns a timeout for use when any value at all will do.
673 +     */
674 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
675 +
676 +    /**
677 +     * Returns a timeout that means "no waiting", i.e. not positive.
678 +     */
679 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
680 +
681 +    /**
682 +     * Returns a random non-null TimeUnit.
683 +     */
684 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
685 +
686      /**
687       * Returns the shortest timed delay. This can be scaled up for
688       * slow machines using the jsr166.delay.factor system property,
# Line 627 | Line 703 | public class JSR166TestCase extends Test
703          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
704      }
705  
706 +    private static final long TIMEOUT_DELAY_MS
707 +        = (long) (12.0 * Math.cbrt(delayFactor));
708 +
709      /**
710 <     * Returns a timeout in milliseconds to be used in tests that
711 <     * verify that operations block or time out.
710 >     * Returns a timeout in milliseconds to be used in tests that verify
711 >     * that operations block or time out.  We want this to be longer
712 >     * than the OS scheduling quantum, but not too long, so don't scale
713 >     * linearly with delayFactor; we use "crazy" cube root instead.
714       */
715 <    long timeoutMillis() {
716 <        return SHORT_DELAY_MS / 4;
715 >    static long timeoutMillis() {
716 >        return TIMEOUT_DELAY_MS;
717      }
718  
719      /**
# Line 648 | Line 729 | public class JSR166TestCase extends Test
729       * The first exception encountered if any threadAssertXXX method fails.
730       */
731      private final AtomicReference<Throwable> threadFailure
732 <        = new AtomicReference<Throwable>(null);
732 >        = new AtomicReference<>(null);
733  
734      /**
735       * Records an exception so that it can be rethrown later in the test
# Line 670 | Line 751 | public class JSR166TestCase extends Test
751          String msg = toString() + ": " + String.format(format, args);
752          System.err.println(msg);
753          dumpTestThreads();
754 <        throw new AssertionFailedError(msg);
754 >        throw new AssertionError(msg);
755      }
756  
757      /**
# Line 691 | Line 772 | public class JSR166TestCase extends Test
772                  throw (RuntimeException) t;
773              else if (t instanceof Exception)
774                  throw (Exception) t;
775 <            else {
776 <                AssertionFailedError afe =
696 <                    new AssertionFailedError(t.toString());
697 <                afe.initCause(t);
698 <                throw afe;
699 <            }
775 >            else
776 >                throw new AssertionError(t.toString(), t);
777          }
778  
779          if (Thread.interrupted())
# Line 730 | Line 807 | public class JSR166TestCase extends Test
807  
808      /**
809       * Just like fail(reason), but additionally recording (using
810 <     * threadRecordFailure) any AssertionFailedError thrown, so that
811 <     * the current testcase will fail.
810 >     * threadRecordFailure) any AssertionError thrown, so that the
811 >     * current testcase will fail.
812       */
813      public void threadFail(String reason) {
814          try {
815              fail(reason);
816 <        } catch (AssertionFailedError t) {
817 <            threadRecordFailure(t);
818 <            throw t;
816 >        } catch (AssertionError fail) {
817 >            threadRecordFailure(fail);
818 >            throw fail;
819          }
820      }
821  
822      /**
823       * Just like assertTrue(b), but additionally recording (using
824 <     * threadRecordFailure) any AssertionFailedError thrown, so that
825 <     * the current testcase will fail.
824 >     * threadRecordFailure) any AssertionError thrown, so that the
825 >     * current testcase will fail.
826       */
827      public void threadAssertTrue(boolean b) {
828          try {
829              assertTrue(b);
830 <        } catch (AssertionFailedError t) {
831 <            threadRecordFailure(t);
832 <            throw t;
830 >        } catch (AssertionError fail) {
831 >            threadRecordFailure(fail);
832 >            throw fail;
833          }
834      }
835  
836      /**
837       * Just like assertFalse(b), but additionally recording (using
838 <     * threadRecordFailure) any AssertionFailedError thrown, so that
839 <     * the current testcase will fail.
838 >     * threadRecordFailure) any AssertionError thrown, so that the
839 >     * current testcase will fail.
840       */
841      public void threadAssertFalse(boolean b) {
842          try {
843              assertFalse(b);
844 <        } catch (AssertionFailedError t) {
845 <            threadRecordFailure(t);
846 <            throw t;
844 >        } catch (AssertionError fail) {
845 >            threadRecordFailure(fail);
846 >            throw fail;
847          }
848      }
849  
850      /**
851       * Just like assertNull(x), but additionally recording (using
852 <     * threadRecordFailure) any AssertionFailedError thrown, so that
853 <     * the current testcase will fail.
852 >     * threadRecordFailure) any AssertionError thrown, so that the
853 >     * current testcase will fail.
854       */
855      public void threadAssertNull(Object x) {
856          try {
857              assertNull(x);
858 <        } catch (AssertionFailedError t) {
859 <            threadRecordFailure(t);
860 <            throw t;
858 >        } catch (AssertionError fail) {
859 >            threadRecordFailure(fail);
860 >            throw fail;
861          }
862      }
863  
864      /**
865       * Just like assertEquals(x, y), but additionally recording (using
866 <     * threadRecordFailure) any AssertionFailedError thrown, so that
867 <     * the current testcase will fail.
866 >     * threadRecordFailure) any AssertionError thrown, so that the
867 >     * current testcase will fail.
868       */
869      public void threadAssertEquals(long x, long y) {
870          try {
871              assertEquals(x, y);
872 <        } catch (AssertionFailedError t) {
873 <            threadRecordFailure(t);
874 <            throw t;
872 >        } catch (AssertionError fail) {
873 >            threadRecordFailure(fail);
874 >            throw fail;
875          }
876      }
877  
878      /**
879       * Just like assertEquals(x, y), but additionally recording (using
880 <     * threadRecordFailure) any AssertionFailedError thrown, so that
881 <     * the current testcase will fail.
880 >     * threadRecordFailure) any AssertionError thrown, so that the
881 >     * current testcase will fail.
882       */
883      public void threadAssertEquals(Object x, Object y) {
884          try {
885              assertEquals(x, y);
886 <        } catch (AssertionFailedError fail) {
886 >        } catch (AssertionError fail) {
887              threadRecordFailure(fail);
888              throw fail;
889          } catch (Throwable fail) {
# Line 816 | Line 893 | public class JSR166TestCase extends Test
893  
894      /**
895       * Just like assertSame(x, y), but additionally recording (using
896 <     * threadRecordFailure) any AssertionFailedError thrown, so that
897 <     * the current testcase will fail.
896 >     * threadRecordFailure) any AssertionError thrown, so that the
897 >     * current testcase will fail.
898       */
899      public void threadAssertSame(Object x, Object y) {
900          try {
901              assertSame(x, y);
902 <        } catch (AssertionFailedError fail) {
902 >        } catch (AssertionError fail) {
903              threadRecordFailure(fail);
904              throw fail;
905          }
# Line 844 | Line 921 | public class JSR166TestCase extends Test
921  
922      /**
923       * Records the given exception using {@link #threadRecordFailure},
924 <     * then rethrows the exception, wrapping it in an
925 <     * AssertionFailedError if necessary.
924 >     * then rethrows the exception, wrapping it in an AssertionError
925 >     * if necessary.
926       */
927      public void threadUnexpectedException(Throwable t) {
928          threadRecordFailure(t);
# Line 854 | Line 931 | public class JSR166TestCase extends Test
931              throw (RuntimeException) t;
932          else if (t instanceof Error)
933              throw (Error) t;
934 <        else {
935 <            AssertionFailedError afe =
859 <                new AssertionFailedError("unexpected exception: " + t);
860 <            afe.initCause(t);
861 <            throw afe;
862 <        }
934 >        else
935 >            throw new AssertionError("unexpected exception: " + t, t);
936      }
937  
938      /**
# Line 1005 | Line 1078 | public class JSR166TestCase extends Test
1078          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1079          System.err.println("------ stacktrace dump start ------");
1080          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1081 <            String name = info.getThreadName();
1081 >            final String name = info.getThreadName();
1082 >            String lockName;
1083              if ("Signal Dispatcher".equals(name))
1084                  continue;
1085              if ("Reference Handler".equals(name)
1086 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1086 >                && (lockName = info.getLockName()) != null
1087 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1088                  continue;
1089              if ("Finalizer".equals(name)
1090 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1090 >                && (lockName = info.getLockName()) != null
1091 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1092                  continue;
1093              if ("checkForWedgedTest".equals(name))
1094                  continue;
# Line 1024 | Line 1100 | public class JSR166TestCase extends Test
1100      }
1101  
1102      /**
1103 <     * Checks that thread does not terminate within the default
1028 <     * millisecond delay of {@code timeoutMillis()}.
1103 >     * Checks that thread eventually enters the expected blocked thread state.
1104       */
1105 <    void assertThreadStaysAlive(Thread thread) {
1106 <        assertThreadStaysAlive(thread, timeoutMillis());
1107 <    }
1108 <
1109 <    /**
1110 <     * Checks that thread does not terminate within the given millisecond delay.
1111 <     */
1112 <    void assertThreadStaysAlive(Thread thread, long millis) {
1113 <        try {
1114 <            // No need to optimize the failing case via Thread.join.
1115 <            delay(millis);
1116 <            assertTrue(thread.isAlive());
1117 <        } 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");
1105 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1106 >        // always sleep at least 1 ms, with high probability avoiding
1107 >        // transitory states
1108 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1109 >            try { delay(1); }
1110 >            catch (InterruptedException fail) {
1111 >                throw new AssertionError("Unexpected InterruptedException", fail);
1112 >            }
1113 >            Thread.State s = thread.getState();
1114 >            if (s == expected)
1115 >                return;
1116 >            else if (s == Thread.State.TERMINATED)
1117 >                fail("Unexpected thread termination");
1118          }
1119 +        fail("timed out waiting for thread to enter thread state " + expected);
1120      }
1121  
1122      /**
# Line 1104 | Line 1157 | public class JSR166TestCase extends Test
1157      }
1158  
1159      /**
1160 +     * The maximum number of consecutive spurious wakeups we should
1161 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1162 +     */
1163 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1164 +
1165 +    /**
1166       * The number of elements to place in collections, arrays, etc.
1167       */
1168      public static final int SIZE = 20;
# Line 1207 | Line 1266 | public class JSR166TestCase extends Test
1266          }
1267          public void refresh() {}
1268          public String toString() {
1269 <            List<Permission> ps = new ArrayList<Permission>();
1269 >            List<Permission> ps = new ArrayList<>();
1270              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1271                  ps.add(e.nextElement());
1272              return "AdjustablePolicy with permissions " + ps;
# Line 1235 | Line 1294 | public class JSR166TestCase extends Test
1294  
1295      /**
1296       * Sleeps until the given time has elapsed.
1297 <     * Throws AssertionFailedError if interrupted.
1297 >     * Throws AssertionError if interrupted.
1298       */
1299      static void sleep(long millis) {
1300          try {
1301              delay(millis);
1302          } catch (InterruptedException fail) {
1303 <            AssertionFailedError afe =
1245 <                new AssertionFailedError("Unexpected InterruptedException");
1246 <            afe.initCause(fail);
1247 <            throw afe;
1303 >            throw new AssertionError("Unexpected InterruptedException", fail);
1304          }
1305      }
1306  
1307      /**
1308       * Spin-waits up to the specified number of milliseconds for the given
1309       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1310 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1311       */
1312 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1313 <        long startTime = 0L;
1314 <        for (;;) {
1315 <            Thread.State s = thread.getState();
1316 <            if (s == Thread.State.BLOCKED ||
1317 <                s == Thread.State.WAITING ||
1318 <                s == Thread.State.TIMED_WAITING)
1319 <                return;
1320 <            else if (s == Thread.State.TERMINATED)
1312 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1313 >                                       Callable<Boolean> waitingForGodot) {
1314 >        for (long startTime = 0L;;) {
1315 >            switch (thread.getState()) {
1316 >            default: break;
1317 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1318 >                try {
1319 >                    if (waitingForGodot == null || waitingForGodot.call())
1320 >                        return;
1321 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1322 >                break;
1323 >            case TERMINATED:
1324                  fail("Unexpected thread termination");
1325 <            else if (startTime == 0L)
1325 >            }
1326 >
1327 >            if (startTime == 0L)
1328                  startTime = System.nanoTime();
1329              else if (millisElapsedSince(startTime) > timeoutMillis) {
1330 <                threadAssertTrue(thread.isAlive());
1331 <                return;
1330 >                assertTrue(thread.isAlive());
1331 >                if (waitingForGodot == null
1332 >                    || thread.getState() == Thread.State.RUNNABLE)
1333 >                    fail("timed out waiting for thread to enter wait state");
1334 >                else
1335 >                    fail("timed out waiting for condition, thread state="
1336 >                         + thread.getState());
1337              }
1338              Thread.yield();
1339          }
1340      }
1341  
1342      /**
1343 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1344 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1343 >     * Spin-waits up to the specified number of milliseconds for the given
1344 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1345 >     */
1346 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1347 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1348 >    }
1349 >
1350 >    /**
1351 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1352 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1353       */
1354      void waitForThreadToEnterWaitState(Thread thread) {
1355 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1355 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1356 >    }
1357 >
1358 >    /**
1359 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1360 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1361 >     * and additionally satisfy the given condition.
1362 >     */
1363 >    void waitForThreadToEnterWaitState(Thread thread,
1364 >                                       Callable<Boolean> waitingForGodot) {
1365 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1366      }
1367  
1368      /**
# Line 1295 | Line 1380 | public class JSR166TestCase extends Test
1380   //             r.run();
1381   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1382   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1383 < //             throw new AssertionFailedError("did not return promptly");
1383 > //             throw new AssertionError("did not return promptly");
1384   //     }
1385  
1386   //     void assertTerminatesPromptly(Runnable r) {
# Line 1308 | Line 1393 | public class JSR166TestCase extends Test
1393       */
1394      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1395          long startTime = System.nanoTime();
1396 +        T actual = null;
1397          try {
1398 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1398 >            actual = f.get(timeoutMillis, MILLISECONDS);
1399          } catch (Throwable fail) { threadUnexpectedException(fail); }
1400 +        assertEquals(expectedValue, actual);
1401          if (millisElapsedSince(startTime) > timeoutMillis/2)
1402 <            throw new AssertionFailedError("timed get did not return promptly");
1402 >            throw new AssertionError("timed get did not return promptly");
1403      }
1404  
1405      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1370 | Line 1457 | public class JSR166TestCase extends Test
1457          }
1458      }
1459  
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
1460      public abstract class ThreadShouldThrow extends Thread {
1461          protected abstract void realRun() throws Throwable;
1462  
# Line 1402 | Line 1469 | public class JSR166TestCase extends Test
1469          public final void run() {
1470              try {
1471                  realRun();
1405                threadShouldThrow(exceptionClass.getSimpleName());
1472              } catch (Throwable t) {
1473                  if (! exceptionClass.isInstance(t))
1474                      threadUnexpectedException(t);
1475 +                return;
1476              }
1477 +            threadShouldThrow(exceptionClass.getSimpleName());
1478          }
1479      }
1480  
# Line 1416 | Line 1484 | public class JSR166TestCase extends Test
1484          public final void run() {
1485              try {
1486                  realRun();
1419                threadShouldThrow("InterruptedException");
1487              } catch (InterruptedException success) {
1488                  threadAssertFalse(Thread.interrupted());
1489 +                return;
1490              } catch (Throwable fail) {
1491                  threadUnexpectedException(fail);
1492              }
1493 +            threadShouldThrow("InterruptedException");
1494          }
1495      }
1496  
# Line 1433 | Line 1502 | public class JSR166TestCase extends Test
1502                  return realCall();
1503              } catch (Throwable fail) {
1504                  threadUnexpectedException(fail);
1436                return null;
1505              }
1506 <        }
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;
1506 >            throw new AssertionError("unreached");
1507          }
1508      }
1509  
# Line 1509 | Line 1560 | public class JSR166TestCase extends Test
1560      }
1561  
1562      public void await(CountDownLatch latch, long timeoutMillis) {
1563 +        boolean timedOut = false;
1564          try {
1565 <            if (!latch.await(timeoutMillis, MILLISECONDS))
1514 <                fail("timed out waiting for CountDownLatch for "
1515 <                     + (timeoutMillis/1000) + " sec");
1565 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1566          } catch (Throwable fail) {
1567              threadUnexpectedException(fail);
1568          }
1569 +        if (timedOut)
1570 +            fail("timed out waiting for CountDownLatch for "
1571 +                 + (timeoutMillis/1000) + " sec");
1572      }
1573  
1574      public void await(CountDownLatch latch) {
# Line 1523 | Line 1576 | public class JSR166TestCase extends Test
1576      }
1577  
1578      public void await(Semaphore semaphore) {
1579 +        boolean timedOut = false;
1580 +        try {
1581 +            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1582 +        } catch (Throwable fail) {
1583 +            threadUnexpectedException(fail);
1584 +        }
1585 +        if (timedOut)
1586 +            fail("timed out waiting for Semaphore for "
1587 +                 + (LONG_DELAY_MS/1000) + " sec");
1588 +    }
1589 +
1590 +    public void await(CyclicBarrier barrier) {
1591          try {
1592 <            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1528 <                fail("timed out waiting for Semaphore for "
1529 <                     + (LONG_DELAY_MS/1000) + " sec");
1592 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1593          } catch (Throwable fail) {
1594              threadUnexpectedException(fail);
1595          }
# Line 1546 | Line 1609 | public class JSR166TestCase extends Test
1609   //         long startTime = System.nanoTime();
1610   //         while (!flag.get()) {
1611   //             if (millisElapsedSince(startTime) > timeoutMillis)
1612 < //                 throw new AssertionFailedError("timed out");
1612 > //                 throw new AssertionError("timed out");
1613   //             Thread.yield();
1614   //         }
1615   //     }
# Line 1555 | Line 1618 | public class JSR166TestCase extends Test
1618          public String call() { throw new NullPointerException(); }
1619      }
1620  
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
1621      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1622          return new CheckedRunnable() {
1623              protected void realRun() {
# Line 1613 | Line 1627 | public class JSR166TestCase extends Test
1627              }};
1628      }
1629  
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
1630      /**
1631       * For use as ThreadFactory in constructors
1632       */
# Line 1642 | Line 1640 | public class JSR166TestCase extends Test
1640          boolean isDone();
1641      }
1642  
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
1643      public static class TrackedNoOpRunnable implements Runnable {
1644          public volatile boolean done = false;
1645          public void run() {
# Line 1702 | Line 1647 | public class JSR166TestCase extends Test
1647          }
1648      }
1649  
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
1650      /**
1651       * Analog of CheckedRunnable for RecursiveAction
1652       */
# Line 1739 | Line 1673 | public class JSR166TestCase extends Test
1673                  return realCompute();
1674              } catch (Throwable fail) {
1675                  threadUnexpectedException(fail);
1742                return null;
1676              }
1677 +            throw new AssertionError("unreached");
1678          }
1679      }
1680  
# Line 1754 | Line 1688 | public class JSR166TestCase extends Test
1688  
1689      /**
1690       * A CyclicBarrier that uses timed await and fails with
1691 <     * AssertionFailedErrors instead of throwing checked exceptions.
1691 >     * AssertionErrors instead of throwing checked exceptions.
1692       */
1693      public static class CheckedBarrier extends CyclicBarrier {
1694          public CheckedBarrier(int parties) { super(parties); }
# Line 1763 | Line 1697 | public class JSR166TestCase extends Test
1697              try {
1698                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1699              } catch (TimeoutException timedOut) {
1700 <                throw new AssertionFailedError("timed out");
1700 >                throw new AssertionError("timed out");
1701              } catch (Exception fail) {
1702 <                AssertionFailedError afe =
1769 <                    new AssertionFailedError("Unexpected exception: " + fail);
1770 <                afe.initCause(fail);
1771 <                throw afe;
1702 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1703              }
1704          }
1705      }
# Line 1779 | Line 1710 | public class JSR166TestCase extends Test
1710              assertEquals(0, q.size());
1711              assertNull(q.peek());
1712              assertNull(q.poll());
1713 <            assertNull(q.poll(0, MILLISECONDS));
1713 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1714              assertEquals(q.toString(), "[]");
1715              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1716              assertFalse(q.iterator().hasNext());
# Line 1820 | Line 1751 | public class JSR166TestCase extends Test
1751          }
1752      }
1753  
1754 +    void assertImmutable(Object o) {
1755 +        if (o instanceof Collection) {
1756 +            assertThrows(
1757 +                UnsupportedOperationException.class,
1758 +                () -> ((Collection) o).add(null));
1759 +        }
1760 +    }
1761 +
1762      @SuppressWarnings("unchecked")
1763      <T> T serialClone(T o) {
1764 +        T clone = null;
1765          try {
1766              ObjectInputStream ois = new ObjectInputStream
1767                  (new ByteArrayInputStream(serialBytes(o)));
1768 <            T clone = (T) ois.readObject();
1829 <            assertSame(o.getClass(), clone.getClass());
1830 <            return clone;
1768 >            clone = (T) ois.readObject();
1769          } catch (Throwable fail) {
1770              threadUnexpectedException(fail);
1771 +        }
1772 +        if (o == clone) assertImmutable(o);
1773 +        else assertSame(o.getClass(), clone.getClass());
1774 +        return clone;
1775 +    }
1776 +
1777 +    /**
1778 +     * A version of serialClone that leaves error handling (for
1779 +     * e.g. NotSerializableException) up to the caller.
1780 +     */
1781 +    @SuppressWarnings("unchecked")
1782 +    <T> T serialClonePossiblyFailing(T o)
1783 +        throws ReflectiveOperationException, java.io.IOException {
1784 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1785 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1786 +        oos.writeObject(o);
1787 +        oos.flush();
1788 +        oos.close();
1789 +        ObjectInputStream ois = new ObjectInputStream
1790 +            (new ByteArrayInputStream(bos.toByteArray()));
1791 +        T clone = (T) ois.readObject();
1792 +        if (o == clone) assertImmutable(o);
1793 +        else assertSame(o.getClass(), clone.getClass());
1794 +        return clone;
1795 +    }
1796 +
1797 +    /**
1798 +     * If o implements Cloneable and has a public clone method,
1799 +     * returns a clone of o, else null.
1800 +     */
1801 +    @SuppressWarnings("unchecked")
1802 +    <T> T cloneableClone(T o) {
1803 +        if (!(o instanceof Cloneable)) return null;
1804 +        final T clone;
1805 +        try {
1806 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1807 +        } catch (NoSuchMethodException ok) {
1808              return null;
1809 +        } catch (ReflectiveOperationException unexpected) {
1810 +            throw new Error(unexpected);
1811          }
1812 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1813 +        assertSame(o.getClass(), clone.getClass());
1814 +        return clone;
1815      }
1816  
1817      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1818 <                             Runnable... throwingActions) {
1819 <        for (Runnable throwingAction : throwingActions) {
1818 >                             Action... throwingActions) {
1819 >        for (Action throwingAction : throwingActions) {
1820              boolean threw = false;
1821              try { throwingAction.run(); }
1822              catch (Throwable t) {
1823                  threw = true;
1824 <                if (!expectedExceptionClass.isInstance(t)) {
1825 <                    AssertionFailedError afe =
1826 <                        new AssertionFailedError
1827 <                        ("Expected " + expectedExceptionClass.getName() +
1828 <                         ", got " + t.getClass().getName());
1849 <                    afe.initCause(t);
1850 <                    threadUnexpectedException(afe);
1851 <                }
1824 >                if (!expectedExceptionClass.isInstance(t))
1825 >                    throw new AssertionError(
1826 >                            "Expected " + expectedExceptionClass.getName() +
1827 >                            ", got " + t.getClass().getName(),
1828 >                            t);
1829              }
1830              if (!threw)
1831                  shouldThrow(expectedExceptionClass.getName());
# Line 1880 | Line 1857 | public class JSR166TestCase extends Test
1857      static <T> void shuffle(T[] array) {
1858          Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1859      }
1860 +
1861 +    /**
1862 +     * Returns the same String as would be returned by {@link
1863 +     * Object#toString}, whether or not the given object's class
1864 +     * overrides toString().
1865 +     *
1866 +     * @see System#identityHashCode
1867 +     */
1868 +    static String identityString(Object x) {
1869 +        return x.getClass().getName()
1870 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1871 +    }
1872 +
1873 +    // --- Shared assertions for Executor tests ---
1874 +
1875 +    /**
1876 +     * Returns maximum number of tasks that can be submitted to given
1877 +     * pool (with bounded queue) before saturation (when submission
1878 +     * throws RejectedExecutionException).
1879 +     */
1880 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1881 +        BlockingQueue<Runnable> q = pool.getQueue();
1882 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1883 +    }
1884 +
1885 +    @SuppressWarnings("FutureReturnValueIgnored")
1886 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1887 +        try {
1888 +            e.execute((Runnable) null);
1889 +            shouldThrow();
1890 +        } catch (NullPointerException success) {}
1891 +
1892 +        if (! (e instanceof ExecutorService)) return;
1893 +        ExecutorService es = (ExecutorService) e;
1894 +        try {
1895 +            es.submit((Runnable) null);
1896 +            shouldThrow();
1897 +        } catch (NullPointerException success) {}
1898 +        try {
1899 +            es.submit((Runnable) null, Boolean.TRUE);
1900 +            shouldThrow();
1901 +        } catch (NullPointerException success) {}
1902 +        try {
1903 +            es.submit((Callable) null);
1904 +            shouldThrow();
1905 +        } catch (NullPointerException success) {}
1906 +
1907 +        if (! (e instanceof ScheduledExecutorService)) return;
1908 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1909 +        try {
1910 +            ses.schedule((Runnable) null,
1911 +                         randomTimeout(), randomTimeUnit());
1912 +            shouldThrow();
1913 +        } catch (NullPointerException success) {}
1914 +        try {
1915 +            ses.schedule((Callable) null,
1916 +                         randomTimeout(), randomTimeUnit());
1917 +            shouldThrow();
1918 +        } catch (NullPointerException success) {}
1919 +        try {
1920 +            ses.scheduleAtFixedRate((Runnable) null,
1921 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1922 +            shouldThrow();
1923 +        } catch (NullPointerException success) {}
1924 +        try {
1925 +            ses.scheduleWithFixedDelay((Runnable) null,
1926 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1927 +            shouldThrow();
1928 +        } catch (NullPointerException success) {}
1929 +    }
1930 +
1931 +    void setRejectedExecutionHandler(
1932 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1933 +        p.setRejectedExecutionHandler(handler);
1934 +        assertSame(handler, p.getRejectedExecutionHandler());
1935 +    }
1936 +
1937 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1938 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1939 +        final long savedTaskCount = p.getTaskCount();
1940 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1941 +        final int savedQueueSize = p.getQueue().size();
1942 +        final boolean stock = (p.getClass().getClassLoader() == null);
1943 +
1944 +        Runnable r = () -> {};
1945 +        Callable<Boolean> c = () -> Boolean.TRUE;
1946 +
1947 +        class Recorder implements RejectedExecutionHandler {
1948 +            public volatile Runnable r = null;
1949 +            public volatile ThreadPoolExecutor p = null;
1950 +            public void reset() { r = null; p = null; }
1951 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1952 +                assertNull(this.r);
1953 +                assertNull(this.p);
1954 +                this.r = r;
1955 +                this.p = p;
1956 +            }
1957 +        }
1958 +
1959 +        // check custom handler is invoked exactly once per task
1960 +        Recorder recorder = new Recorder();
1961 +        setRejectedExecutionHandler(p, recorder);
1962 +        for (int i = 2; i--> 0; ) {
1963 +            recorder.reset();
1964 +            p.execute(r);
1965 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1966 +                assertSame(r, recorder.r);
1967 +            assertSame(p, recorder.p);
1968 +
1969 +            recorder.reset();
1970 +            assertFalse(p.submit(r).isDone());
1971 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1972 +            assertSame(p, recorder.p);
1973 +
1974 +            recorder.reset();
1975 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
1976 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1977 +            assertSame(p, recorder.p);
1978 +
1979 +            recorder.reset();
1980 +            assertFalse(p.submit(c).isDone());
1981 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1982 +            assertSame(p, recorder.p);
1983 +
1984 +            if (p instanceof ScheduledExecutorService) {
1985 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
1986 +                ScheduledFuture<?> future;
1987 +
1988 +                recorder.reset();
1989 +                future = s.schedule(r, 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.schedule(c, randomTimeout(), randomTimeUnit());
1996 +                assertFalse(future.isDone());
1997 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1998 +                assertSame(p, recorder.p);
1999 +
2000 +                recorder.reset();
2001 +                future = s.scheduleAtFixedRate(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 +                recorder.reset();
2007 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2008 +                assertFalse(future.isDone());
2009 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2010 +                assertSame(p, recorder.p);
2011 +            }
2012 +        }
2013 +
2014 +        // Checking our custom handler above should be sufficient, but
2015 +        // we add some integration tests of standard handlers.
2016 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2017 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2018 +
2019 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2020 +        try {
2021 +            p.execute(setThread);
2022 +            shouldThrow();
2023 +        } catch (RejectedExecutionException success) {}
2024 +        assertNull(thread.get());
2025 +
2026 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2027 +        p.execute(setThread);
2028 +        assertNull(thread.get());
2029 +
2030 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2031 +        p.execute(setThread);
2032 +        if (p.isShutdown())
2033 +            assertNull(thread.get());
2034 +        else
2035 +            assertSame(Thread.currentThread(), thread.get());
2036 +
2037 +        setRejectedExecutionHandler(p, savedHandler);
2038 +
2039 +        // check that pool was not perturbed by handlers
2040 +        assertEquals(savedTaskCount, p.getTaskCount());
2041 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2042 +        assertEquals(savedQueueSize, p.getQueue().size());
2043 +    }
2044 +
2045 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2046 +        assertEquals(x, y);
2047 +        assertEquals(y, x);
2048 +        assertEquals(x.isEmpty(), y.isEmpty());
2049 +        assertEquals(x.size(), y.size());
2050 +        if (x instanceof List) {
2051 +            assertEquals(x.toString(), y.toString());
2052 +        }
2053 +        if (x instanceof List || x instanceof Set) {
2054 +            assertEquals(x.hashCode(), y.hashCode());
2055 +        }
2056 +        if (x instanceof List || x instanceof Deque) {
2057 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2058 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2059 +                                     y.toArray(new Object[0])));
2060 +        }
2061 +    }
2062 +
2063 +    /**
2064 +     * A weaker form of assertCollectionsEquals which does not insist
2065 +     * that the two collections satisfy Object#equals(Object), since
2066 +     * they may use identity semantics as Deques do.
2067 +     */
2068 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2069 +        if (x instanceof List || x instanceof Set)
2070 +            assertCollectionsEquals(x, y);
2071 +        else {
2072 +            assertEquals(x.isEmpty(), y.isEmpty());
2073 +            assertEquals(x.size(), y.size());
2074 +            assertEquals(new HashSet(x), new HashSet(y));
2075 +            if (x instanceof Deque) {
2076 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2077 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2078 +                                         y.toArray(new Object[0])));
2079 +            }
2080 +        }
2081 +    }
2082   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines