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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines