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.185 by jsr166, Mon Feb 22 19:36:59 2016 UTC vs.
Revision 1.255 by jsr166, Sun Jul 28 18:09:25 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
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 28 | 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;
31 import java.nio.file.Files;
32 import java.nio.file.Paths;
57   import java.security.CodeSource;
58   import java.security.Permission;
59   import java.security.PermissionCollection;
# Line 39 | 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;
66 import java.util.regex.Matcher;
103   import java.util.regex.Pattern;
104  
69 import junit.framework.AssertionFailedError;
105   import junit.framework.Test;
106   import junit.framework.TestCase;
107   import junit.framework.TestResult;
# Line 82 | 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 184 | Line 227 | public class JSR166TestCase extends Test
227      private static final int suiteRuns =
228          Integer.getInteger("jsr166.suiteRuns", 1);
229  
230 <    private static float systemPropertyValue(String name, float defaultValue) {
230 >    /**
231 >     * Returns the value of the system property, or NaN if not defined.
232 >     */
233 >    private static float systemPropertyValue(String name) {
234          String floatString = System.getProperty(name);
235          if (floatString == null)
236 <            return defaultValue;
236 >            return Float.NaN;
237          try {
238              return Float.parseFloat(floatString);
239          } catch (NumberFormatException ex) {
# Line 199 | Line 245 | public class JSR166TestCase extends Test
245  
246      /**
247       * The scaling factor to apply to standard delays used in tests.
248 <     */
249 <    private static final float delayFactor =
250 <        systemPropertyValue("jsr166.delay.factor", 1.0f);
251 <    
252 <    /**
253 <     * The timeout factor as used in the jtreg test harness.
254 <     * See: http://openjdk.java.net/jtreg/tag-spec.html
255 <     */
256 <    private static final float jtregTestTimeoutFactor
257 <        = systemPropertyValue("test.timeout.factor", 1.0f);
248 >     * May be initialized from any of:
249 >     * - the "jsr166.delay.factor" system property
250 >     * - the "test.timeout.factor" system property (as used by jtreg)
251 >     *   See: http://openjdk.java.net/jtreg/tag-spec.html
252 >     * - hard-coded fuzz factor when using a known slowpoke VM
253 >     */
254 >    private static final float delayFactor = delayFactor();
255 >
256 >    private static float delayFactor() {
257 >        float x;
258 >        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
259 >            return x;
260 >        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
261 >            return x;
262 >        String prop = System.getProperty("java.vm.version");
263 >        if (prop != null && prop.matches(".*debug.*"))
264 >            return 4.0f; // How much slower is fastdebug than product?!
265 >        return 1.0f;
266 >    }
267  
268      public JSR166TestCase() { super(); }
269      public JSR166TestCase(String name) { super(name); }
# Line 233 | Line 288 | public class JSR166TestCase extends Test
288              // Avoid spurious reports with enormous runsPerTest.
289              // A single test case run should never take more than 1 second.
290              // But let's cap it at the high end too ...
291 <            final int timeoutMinutes =
292 <                Math.min(15, Math.max(runsPerTest / 60, 1));
291 >            final int timeoutMinutesMin = Math.max(runsPerTest / 60, 1)
292 >                * Math.max((int) delayFactor, 1);
293 >            final int timeoutMinutes = Math.min(15, timeoutMinutesMin);
294              for (TestCase lastTestCase = currentTestCase;;) {
295                  try { MINUTES.sleep(timeoutMinutes); }
296                  catch (InterruptedException unexpected) { break; }
# Line 261 | Line 317 | public class JSR166TestCase extends Test
317  
318   //     public static String cpuModel() {
319   //         try {
320 < //             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
320 > //             java.util.regex.Matcher matcher
321 > //               = Pattern.compile("model name\\s*: (.*)")
322   //                 .matcher(new String(
323 < //                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
323 > //                     java.nio.file.Files.readAllBytes(
324 > //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
325   //             matcher.find();
326   //             return matcher.group(1);
327   //         } catch (Exception ex) { return null; }
# Line 372 | Line 430 | public class JSR166TestCase extends Test
430          for (String testClassName : testClassNames) {
431              try {
432                  Class<?> testClass = Class.forName(testClassName);
433 <                Method m = testClass.getDeclaredMethod("suite",
376 <                                                       new Class<?>[0]);
433 >                Method m = testClass.getDeclaredMethod("suite");
434                  suite.addTest(newTestSuite((Test)m.invoke(null)));
435 <            } catch (Exception e) {
436 <                throw new Error("Missing test class", e);
435 >            } catch (ReflectiveOperationException e) {
436 >                throw new AssertionError("Missing test class", e);
437              }
438          }
439      }
# Line 398 | Line 455 | public class JSR166TestCase extends Test
455          }
456      }
457  
458 <    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
459 <    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
460 <    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
461 <    public static boolean atLeastJava9() {
462 <        return JAVA_CLASS_VERSION >= 53.0
463 <            // As of 2015-09, java9 still uses 52.0 class file version
464 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
465 <    }
466 <    public static boolean atLeastJava10() {
467 <        return JAVA_CLASS_VERSION >= 54.0
468 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
469 <    }
458 >    public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
459 >    public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
460 >    public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
461 >    public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
462 >    public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
463 >    public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
464 >    public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
465 >    public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
466 >    public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
467 >    public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
468 >    public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
469 >    public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
470  
471      /**
472       * Collects all JSR166 unit tests as one suite.
# Line 430 | Line 487 | public class JSR166TestCase extends Test
487              AbstractQueuedLongSynchronizerTest.suite(),
488              ArrayBlockingQueueTest.suite(),
489              ArrayDequeTest.suite(),
490 +            ArrayListTest.suite(),
491              AtomicBooleanTest.suite(),
492              AtomicIntegerArrayTest.suite(),
493              AtomicIntegerFieldUpdaterTest.suite(),
# Line 452 | Line 510 | public class JSR166TestCase extends Test
510              CopyOnWriteArrayListTest.suite(),
511              CopyOnWriteArraySetTest.suite(),
512              CountDownLatchTest.suite(),
513 +            CountedCompleterTest.suite(),
514              CyclicBarrierTest.suite(),
515              DelayQueueTest.suite(),
516              EntryTest.suite(),
# Line 459 | Line 518 | public class JSR166TestCase extends Test
518              ExecutorsTest.suite(),
519              ExecutorCompletionServiceTest.suite(),
520              FutureTaskTest.suite(),
521 +            HashtableTest.suite(),
522              LinkedBlockingDequeTest.suite(),
523              LinkedBlockingQueueTest.suite(),
524              LinkedListTest.suite(),
# Line 480 | Line 540 | public class JSR166TestCase extends Test
540              TreeMapTest.suite(),
541              TreeSetTest.suite(),
542              TreeSubMapTest.suite(),
543 <            TreeSubSetTest.suite());
543 >            TreeSubSetTest.suite(),
544 >            VectorTest.suite());
545  
546          // Java8+ test classes
547          if (atLeastJava8()) {
548              String[] java8TestClassNames = {
549 +                "ArrayDeque8Test",
550                  "Atomic8Test",
551                  "CompletableFutureTest",
552                  "ConcurrentHashMap8Test",
553 <                "CountedCompleterTest",
553 >                "CountedCompleter8Test",
554                  "DoubleAccumulatorTest",
555                  "DoubleAdderTest",
556                  "ForkJoinPool8Test",
557                  "ForkJoinTask8Test",
558 +                "HashMapTest",
559 +                "LinkedBlockingDeque8Test",
560 +                "LinkedBlockingQueue8Test",
561 +                "LinkedHashMapTest",
562                  "LongAccumulatorTest",
563                  "LongAdderTest",
564                  "SplittableRandomTest",
565                  "StampedLockTest",
566                  "SubmissionPublisherTest",
567                  "ThreadLocalRandom8Test",
568 +                "TimeUnit8Test",
569              };
570              addNamedTestClasses(suite, java8TestClassNames);
571          }
# Line 506 | Line 573 | public class JSR166TestCase extends Test
573          // Java9+ test classes
574          if (atLeastJava9()) {
575              String[] java9TestClassNames = {
576 <                // Currently empty, but expecting varhandle tests
576 >                "AtomicBoolean9Test",
577 >                "AtomicInteger9Test",
578 >                "AtomicIntegerArray9Test",
579 >                "AtomicLong9Test",
580 >                "AtomicLongArray9Test",
581 >                "AtomicReference9Test",
582 >                "AtomicReferenceArray9Test",
583 >                "ExecutorCompletionService9Test",
584 >                "ForkJoinPool9Test",
585              };
586              addNamedTestClasses(suite, java9TestClassNames);
587          }
# Line 517 | Line 592 | public class JSR166TestCase extends Test
592      /** Returns list of junit-style test method names in given class. */
593      public static ArrayList<String> testMethodNames(Class<?> testClass) {
594          Method[] methods = testClass.getDeclaredMethods();
595 <        ArrayList<String> names = new ArrayList<String>(methods.length);
595 >        ArrayList<String> names = new ArrayList<>(methods.length);
596          for (Method method : methods) {
597              if (method.getName().startsWith("test")
598                  && Modifier.isPublic(method.getModifiers())
# Line 544 | Line 619 | public class JSR166TestCase extends Test
619              for (String methodName : testMethodNames(testClass))
620                  suite.addTest((Test) c.newInstance(data, methodName));
621              return suite;
622 <        } catch (Exception e) {
623 <            throw new Error(e);
622 >        } catch (ReflectiveOperationException e) {
623 >            throw new AssertionError(e);
624          }
625      }
626  
# Line 561 | Line 636 | public class JSR166TestCase extends Test
636          if (atLeastJava8()) {
637              String name = testClass.getName();
638              String name8 = name.replaceAll("Test$", "8Test");
639 <            if (name.equals(name8)) throw new Error(name);
639 >            if (name.equals(name8)) throw new AssertionError(name);
640              try {
641                  return (Test)
642                      Class.forName(name8)
643 <                    .getMethod("testSuite", new Class[] { dataClass })
643 >                    .getMethod("testSuite", dataClass)
644                      .invoke(null, data);
645 <            } catch (Exception e) {
646 <                throw new Error(e);
645 >            } catch (ReflectiveOperationException e) {
646 >                throw new AssertionError(e);
647              }
648          } else {
649              return new TestSuite();
# Line 582 | Line 657 | public class JSR166TestCase extends Test
657      public static long MEDIUM_DELAY_MS;
658      public static long LONG_DELAY_MS;
659  
660 +    private static final long RANDOM_TIMEOUT;
661 +    private static final long RANDOM_EXPIRED_TIMEOUT;
662 +    private static final TimeUnit RANDOM_TIMEUNIT;
663 +    static {
664 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
665 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
666 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
667 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
668 +        TimeUnit[] timeUnits = TimeUnit.values();
669 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
670 +    }
671 +
672 +    /**
673 +     * Returns a timeout for use when any value at all will do.
674 +     */
675 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
676 +
677 +    /**
678 +     * Returns a timeout that means "no waiting", i.e. not positive.
679 +     */
680 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
681 +
682 +    /**
683 +     * Returns a random non-null TimeUnit.
684 +     */
685 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
686 +
687      /**
688       * Returns the shortest timed delay. This can be scaled up for
689       * slow machines using the jsr166.delay.factor system property,
690 <     * or via jtreg's -timeoutFactor:<val> flag.
690 >     * or via jtreg's -timeoutFactor: flag.
691       * http://openjdk.java.net/jtreg/command-help.html
692       */
693      protected long getShortDelay() {
694 <        return (long) (50 * delayFactor * jtregTestTimeoutFactor);
694 >        return (long) (50 * delayFactor);
695      }
696  
697      /**
# Line 602 | Line 704 | public class JSR166TestCase extends Test
704          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
705      }
706  
707 +    private static final long TIMEOUT_DELAY_MS
708 +        = (long) (12.0 * Math.cbrt(delayFactor));
709 +
710      /**
711 <     * Returns a timeout in milliseconds to be used in tests that
712 <     * verify that operations block or time out.
711 >     * Returns a timeout in milliseconds to be used in tests that verify
712 >     * that operations block or time out.  We want this to be longer
713 >     * than the OS scheduling quantum, but not too long, so don't scale
714 >     * linearly with delayFactor; we use "crazy" cube root instead.
715       */
716 <    long timeoutMillis() {
717 <        return SHORT_DELAY_MS / 4;
716 >    static long timeoutMillis() {
717 >        return TIMEOUT_DELAY_MS;
718      }
719  
720      /**
# Line 623 | Line 730 | public class JSR166TestCase extends Test
730       * The first exception encountered if any threadAssertXXX method fails.
731       */
732      private final AtomicReference<Throwable> threadFailure
733 <        = new AtomicReference<Throwable>(null);
733 >        = new AtomicReference<>(null);
734  
735      /**
736       * Records an exception so that it can be rethrown later in the test
# Line 645 | Line 752 | public class JSR166TestCase extends Test
752          String msg = toString() + ": " + String.format(format, args);
753          System.err.println(msg);
754          dumpTestThreads();
755 <        throw new AssertionFailedError(msg);
755 >        throw new AssertionError(msg);
756      }
757  
758      /**
# Line 666 | Line 773 | public class JSR166TestCase extends Test
773                  throw (RuntimeException) t;
774              else if (t instanceof Exception)
775                  throw (Exception) t;
776 <            else {
777 <                AssertionFailedError afe =
671 <                    new AssertionFailedError(t.toString());
672 <                afe.initCause(t);
673 <                throw afe;
674 <            }
776 >            else
777 >                throw new AssertionError(t.toString(), t);
778          }
779  
780          if (Thread.interrupted())
# Line 705 | Line 808 | public class JSR166TestCase extends Test
808  
809      /**
810       * Just like fail(reason), but additionally recording (using
811 <     * threadRecordFailure) any AssertionFailedError thrown, so that
812 <     * the current testcase will fail.
811 >     * threadRecordFailure) any AssertionError thrown, so that the
812 >     * current testcase will fail.
813       */
814      public void threadFail(String reason) {
815          try {
816              fail(reason);
817 <        } catch (AssertionFailedError t) {
818 <            threadRecordFailure(t);
819 <            throw t;
817 >        } catch (AssertionError fail) {
818 >            threadRecordFailure(fail);
819 >            throw fail;
820          }
821      }
822  
823      /**
824       * Just like assertTrue(b), but additionally recording (using
825 <     * threadRecordFailure) any AssertionFailedError thrown, so that
826 <     * the current testcase will fail.
825 >     * threadRecordFailure) any AssertionError thrown, so that the
826 >     * current testcase will fail.
827       */
828      public void threadAssertTrue(boolean b) {
829          try {
830              assertTrue(b);
831 <        } catch (AssertionFailedError t) {
832 <            threadRecordFailure(t);
833 <            throw t;
831 >        } catch (AssertionError fail) {
832 >            threadRecordFailure(fail);
833 >            throw fail;
834          }
835      }
836  
837      /**
838       * Just like assertFalse(b), but additionally recording (using
839 <     * threadRecordFailure) any AssertionFailedError thrown, so that
840 <     * the current testcase will fail.
839 >     * threadRecordFailure) any AssertionError thrown, so that the
840 >     * current testcase will fail.
841       */
842      public void threadAssertFalse(boolean b) {
843          try {
844              assertFalse(b);
845 <        } catch (AssertionFailedError t) {
846 <            threadRecordFailure(t);
847 <            throw t;
845 >        } catch (AssertionError fail) {
846 >            threadRecordFailure(fail);
847 >            throw fail;
848          }
849      }
850  
851      /**
852       * Just like assertNull(x), but additionally recording (using
853 <     * threadRecordFailure) any AssertionFailedError thrown, so that
854 <     * the current testcase will fail.
853 >     * threadRecordFailure) any AssertionError thrown, so that the
854 >     * current testcase will fail.
855       */
856      public void threadAssertNull(Object x) {
857          try {
858              assertNull(x);
859 <        } catch (AssertionFailedError t) {
860 <            threadRecordFailure(t);
861 <            throw t;
859 >        } catch (AssertionError fail) {
860 >            threadRecordFailure(fail);
861 >            throw fail;
862          }
863      }
864  
865      /**
866       * Just like assertEquals(x, y), but additionally recording (using
867 <     * threadRecordFailure) any AssertionFailedError thrown, so that
868 <     * the current testcase will fail.
867 >     * threadRecordFailure) any AssertionError thrown, so that the
868 >     * current testcase will fail.
869       */
870      public void threadAssertEquals(long x, long y) {
871          try {
872              assertEquals(x, y);
873 <        } catch (AssertionFailedError t) {
874 <            threadRecordFailure(t);
875 <            throw t;
873 >        } catch (AssertionError fail) {
874 >            threadRecordFailure(fail);
875 >            throw fail;
876          }
877      }
878  
879      /**
880       * Just like assertEquals(x, y), but additionally recording (using
881 <     * threadRecordFailure) any AssertionFailedError thrown, so that
882 <     * the current testcase will fail.
881 >     * threadRecordFailure) any AssertionError thrown, so that the
882 >     * current testcase will fail.
883       */
884      public void threadAssertEquals(Object x, Object y) {
885          try {
886              assertEquals(x, y);
887 <        } catch (AssertionFailedError fail) {
887 >        } catch (AssertionError fail) {
888              threadRecordFailure(fail);
889              throw fail;
890          } catch (Throwable fail) {
# Line 791 | Line 894 | public class JSR166TestCase extends Test
894  
895      /**
896       * Just like assertSame(x, y), but additionally recording (using
897 <     * threadRecordFailure) any AssertionFailedError thrown, so that
898 <     * the current testcase will fail.
897 >     * threadRecordFailure) any AssertionError thrown, so that the
898 >     * current testcase will fail.
899       */
900      public void threadAssertSame(Object x, Object y) {
901          try {
902              assertSame(x, y);
903 <        } catch (AssertionFailedError fail) {
903 >        } catch (AssertionError fail) {
904              threadRecordFailure(fail);
905              throw fail;
906          }
# Line 819 | Line 922 | public class JSR166TestCase extends Test
922  
923      /**
924       * Records the given exception using {@link #threadRecordFailure},
925 <     * then rethrows the exception, wrapping it in an
926 <     * AssertionFailedError if necessary.
925 >     * then rethrows the exception, wrapping it in an AssertionError
926 >     * if necessary.
927       */
928      public void threadUnexpectedException(Throwable t) {
929          threadRecordFailure(t);
# Line 829 | Line 932 | public class JSR166TestCase extends Test
932              throw (RuntimeException) t;
933          else if (t instanceof Error)
934              throw (Error) t;
935 <        else {
936 <            AssertionFailedError afe =
834 <                new AssertionFailedError("unexpected exception: " + t);
835 <            afe.initCause(t);
836 <            throw afe;
837 <        }
935 >        else
936 >            throw new AssertionError("unexpected exception: " + t, t);
937      }
938  
939      /**
# Line 933 | Line 1032 | public class JSR166TestCase extends Test
1032          }
1033      }
1034  
1035 <    /** Like Runnable, but with the freedom to throw anything */
1035 >    /**
1036 >     * Like Runnable, but with the freedom to throw anything.
1037 >     * junit folks had the same idea:
1038 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1039 >     */
1040      interface Action { public void run() throws Throwable; }
1041  
1042      /**
# Line 964 | Line 1067 | public class JSR166TestCase extends Test
1067       * Uninteresting threads are filtered out.
1068       */
1069      static void dumpTestThreads() {
1070 +        SecurityManager sm = System.getSecurityManager();
1071 +        if (sm != null) {
1072 +            try {
1073 +                System.setSecurityManager(null);
1074 +            } catch (SecurityException giveUp) {
1075 +                return;
1076 +            }
1077 +        }
1078 +
1079          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1080          System.err.println("------ stacktrace dump start ------");
1081          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1082 <            String name = info.getThreadName();
1082 >            final String name = info.getThreadName();
1083 >            String lockName;
1084              if ("Signal Dispatcher".equals(name))
1085                  continue;
1086              if ("Reference Handler".equals(name)
1087 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1087 >                && (lockName = info.getLockName()) != null
1088 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1089                  continue;
1090              if ("Finalizer".equals(name)
1091 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1091 >                && (lockName = info.getLockName()) != null
1092 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1093                  continue;
1094              if ("checkForWedgedTest".equals(name))
1095                  continue;
1096              System.err.print(info);
1097          }
1098          System.err.println("------ stacktrace dump end ------");
984    }
1099  
1100 <    /**
987 <     * Checks that thread does not terminate within the default
988 <     * millisecond delay of {@code timeoutMillis()}.
989 <     */
990 <    void assertThreadStaysAlive(Thread thread) {
991 <        assertThreadStaysAlive(thread, timeoutMillis());
1100 >        if (sm != null) System.setSecurityManager(sm);
1101      }
1102  
1103      /**
1104 <     * Checks that thread does not terminate within the given millisecond delay.
1104 >     * Checks that thread eventually enters the expected blocked thread state.
1105       */
1106 <    void assertThreadStaysAlive(Thread thread, long millis) {
1107 <        try {
1108 <            // No need to optimize the failing case via Thread.join.
1109 <            delay(millis);
1110 <            assertTrue(thread.isAlive());
1111 <        } catch (InterruptedException fail) {
1112 <            threadFail("Unexpected InterruptedException");
1113 <        }
1114 <    }
1115 <
1116 <    /**
1117 <     * Checks that the threads do not terminate within the default
1118 <     * millisecond delay of {@code timeoutMillis()}.
1010 <     */
1011 <    void assertThreadsStayAlive(Thread... threads) {
1012 <        assertThreadsStayAlive(timeoutMillis(), threads);
1013 <    }
1014 <
1015 <    /**
1016 <     * Checks that the threads do not terminate within the given millisecond delay.
1017 <     */
1018 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1019 <        try {
1020 <            // No need to optimize the failing case via Thread.join.
1021 <            delay(millis);
1022 <            for (Thread thread : threads)
1023 <                assertTrue(thread.isAlive());
1024 <        } catch (InterruptedException fail) {
1025 <            threadFail("Unexpected InterruptedException");
1106 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1107 >        // always sleep at least 1 ms, with high probability avoiding
1108 >        // transitory states
1109 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1110 >            try { delay(1); }
1111 >            catch (InterruptedException fail) {
1112 >                throw new AssertionError("Unexpected InterruptedException", fail);
1113 >            }
1114 >            Thread.State s = thread.getState();
1115 >            if (s == expected)
1116 >                return;
1117 >            else if (s == Thread.State.TERMINATED)
1118 >                fail("Unexpected thread termination");
1119          }
1120 +        fail("timed out waiting for thread to enter thread state " + expected);
1121      }
1122  
1123      /**
# Line 1064 | Line 1158 | public class JSR166TestCase extends Test
1158      }
1159  
1160      /**
1161 +     * The maximum number of consecutive spurious wakeups we should
1162 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1163 +     */
1164 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1165 +
1166 +    /**
1167       * The number of elements to place in collections, arrays, etc.
1168       */
1169      public static final int SIZE = 20;
# Line 1167 | Line 1267 | public class JSR166TestCase extends Test
1267          }
1268          public void refresh() {}
1269          public String toString() {
1270 <            List<Permission> ps = new ArrayList<Permission>();
1270 >            List<Permission> ps = new ArrayList<>();
1271              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1272                  ps.add(e.nextElement());
1273              return "AdjustablePolicy with permissions " + ps;
# Line 1195 | Line 1295 | public class JSR166TestCase extends Test
1295  
1296      /**
1297       * Sleeps until the given time has elapsed.
1298 <     * Throws AssertionFailedError if interrupted.
1298 >     * Throws AssertionError if interrupted.
1299       */
1300 <    void sleep(long millis) {
1300 >    static void sleep(long millis) {
1301          try {
1302              delay(millis);
1303          } catch (InterruptedException fail) {
1304 <            AssertionFailedError afe =
1205 <                new AssertionFailedError("Unexpected InterruptedException");
1206 <            afe.initCause(fail);
1207 <            throw afe;
1304 >            throw new AssertionError("Unexpected InterruptedException", fail);
1305          }
1306      }
1307  
1308      /**
1309       * Spin-waits up to the specified number of milliseconds for the given
1310       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1311 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1312       */
1313 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1314 <        long startTime = System.nanoTime();
1315 <        for (;;) {
1316 <            Thread.State s = thread.getState();
1317 <            if (s == Thread.State.BLOCKED ||
1318 <                s == Thread.State.WAITING ||
1319 <                s == Thread.State.TIMED_WAITING)
1320 <                return;
1321 <            else if (s == Thread.State.TERMINATED)
1313 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1314 >                                       Callable<Boolean> waitingForGodot) {
1315 >        for (long startTime = 0L;;) {
1316 >            switch (thread.getState()) {
1317 >            default: break;
1318 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1319 >                try {
1320 >                    if (waitingForGodot == null || waitingForGodot.call())
1321 >                        return;
1322 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1323 >                break;
1324 >            case TERMINATED:
1325                  fail("Unexpected thread termination");
1326 +            }
1327 +
1328 +            if (startTime == 0L)
1329 +                startTime = System.nanoTime();
1330              else if (millisElapsedSince(startTime) > timeoutMillis) {
1331 <                threadAssertTrue(thread.isAlive());
1332 <                return;
1331 >                assertTrue(thread.isAlive());
1332 >                if (waitingForGodot == null
1333 >                    || thread.getState() == Thread.State.RUNNABLE)
1334 >                    fail("timed out waiting for thread to enter wait state");
1335 >                else
1336 >                    fail("timed out waiting for condition, thread state="
1337 >                         + thread.getState());
1338              }
1339              Thread.yield();
1340          }
1341      }
1342  
1343      /**
1344 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1345 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1344 >     * Spin-waits up to the specified number of milliseconds for the given
1345 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1346 >     */
1347 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1348 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1349 >    }
1350 >
1351 >    /**
1352 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1353 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1354       */
1355      void waitForThreadToEnterWaitState(Thread thread) {
1356 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1356 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1357 >    }
1358 >
1359 >    /**
1360 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1361 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1362 >     * and additionally satisfy the given condition.
1363 >     */
1364 >    void waitForThreadToEnterWaitState(Thread thread,
1365 >                                       Callable<Boolean> waitingForGodot) {
1366 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1367      }
1368  
1369      /**
# Line 1253 | Line 1381 | public class JSR166TestCase extends Test
1381   //             r.run();
1382   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1383   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1384 < //             throw new AssertionFailedError("did not return promptly");
1384 > //             throw new AssertionError("did not return promptly");
1385   //     }
1386  
1387   //     void assertTerminatesPromptly(Runnable r) {
# Line 1266 | Line 1394 | public class JSR166TestCase extends Test
1394       */
1395      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1396          long startTime = System.nanoTime();
1397 +        T actual = null;
1398          try {
1399 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1399 >            actual = f.get(timeoutMillis, MILLISECONDS);
1400          } catch (Throwable fail) { threadUnexpectedException(fail); }
1401 +        assertEquals(expectedValue, actual);
1402          if (millisElapsedSince(startTime) > timeoutMillis/2)
1403 <            throw new AssertionFailedError("timed get did not return promptly");
1403 >            throw new AssertionError("timed get did not return promptly");
1404      }
1405  
1406      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1328 | Line 1458 | public class JSR166TestCase extends Test
1458          }
1459      }
1460  
1331    public abstract class RunnableShouldThrow implements Runnable {
1332        protected abstract void realRun() throws Throwable;
1333
1334        final Class<?> exceptionClass;
1335
1336        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1337            this.exceptionClass = exceptionClass;
1338        }
1339
1340        public final void run() {
1341            try {
1342                realRun();
1343                threadShouldThrow(exceptionClass.getSimpleName());
1344            } catch (Throwable t) {
1345                if (! exceptionClass.isInstance(t))
1346                    threadUnexpectedException(t);
1347            }
1348        }
1349    }
1350
1461      public abstract class ThreadShouldThrow extends Thread {
1462          protected abstract void realRun() throws Throwable;
1463  
# Line 1360 | Line 1470 | public class JSR166TestCase extends Test
1470          public final void run() {
1471              try {
1472                  realRun();
1363                threadShouldThrow(exceptionClass.getSimpleName());
1473              } catch (Throwable t) {
1474                  if (! exceptionClass.isInstance(t))
1475                      threadUnexpectedException(t);
1476 +                return;
1477              }
1478 +            threadShouldThrow(exceptionClass.getSimpleName());
1479          }
1480      }
1481  
# Line 1374 | Line 1485 | public class JSR166TestCase extends Test
1485          public final void run() {
1486              try {
1487                  realRun();
1377                threadShouldThrow("InterruptedException");
1488              } catch (InterruptedException success) {
1489                  threadAssertFalse(Thread.interrupted());
1490 +                return;
1491              } catch (Throwable fail) {
1492                  threadUnexpectedException(fail);
1493              }
1494 +            threadShouldThrow("InterruptedException");
1495          }
1496      }
1497  
# Line 1391 | Line 1503 | public class JSR166TestCase extends Test
1503                  return realCall();
1504              } catch (Throwable fail) {
1505                  threadUnexpectedException(fail);
1394                return null;
1395            }
1396        }
1397    }
1398
1399    public abstract class CheckedInterruptedCallable<T>
1400        implements Callable<T> {
1401        protected abstract T realCall() throws Throwable;
1402
1403        public final T call() {
1404            try {
1405                T result = realCall();
1406                threadShouldThrow("InterruptedException");
1407                return result;
1408            } catch (InterruptedException success) {
1409                threadAssertFalse(Thread.interrupted());
1410            } catch (Throwable fail) {
1411                threadUnexpectedException(fail);
1506              }
1507 <            return null;
1507 >            throw new AssertionError("unreached");
1508          }
1509      }
1510  
# Line 1466 | Line 1560 | public class JSR166TestCase extends Test
1560          return new LatchAwaiter(latch);
1561      }
1562  
1563 <    public void await(CountDownLatch latch) {
1563 >    public void await(CountDownLatch latch, long timeoutMillis) {
1564 >        boolean timedOut = false;
1565          try {
1566 <            if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
1472 <                fail("timed out waiting for CountDownLatch for "
1473 <                     + (LONG_DELAY_MS/1000) + " sec");
1566 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1567          } catch (Throwable fail) {
1568              threadUnexpectedException(fail);
1569          }
1570 +        if (timedOut)
1571 +            fail("timed out waiting for CountDownLatch for "
1572 +                 + (timeoutMillis/1000) + " sec");
1573 +    }
1574 +
1575 +    public void await(CountDownLatch latch) {
1576 +        await(latch, LONG_DELAY_MS);
1577      }
1578  
1579      public void await(Semaphore semaphore) {
1580 +        boolean timedOut = false;
1581 +        try {
1582 +            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1583 +        } catch (Throwable fail) {
1584 +            threadUnexpectedException(fail);
1585 +        }
1586 +        if (timedOut)
1587 +            fail("timed out waiting for Semaphore for "
1588 +                 + (LONG_DELAY_MS/1000) + " sec");
1589 +    }
1590 +
1591 +    public void await(CyclicBarrier barrier) {
1592          try {
1593 <            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1482 <                fail("timed out waiting for Semaphore for "
1483 <                     + (LONG_DELAY_MS/1000) + " sec");
1593 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1594          } catch (Throwable fail) {
1595              threadUnexpectedException(fail);
1596          }
# Line 1500 | Line 1610 | public class JSR166TestCase extends Test
1610   //         long startTime = System.nanoTime();
1611   //         while (!flag.get()) {
1612   //             if (millisElapsedSince(startTime) > timeoutMillis)
1613 < //                 throw new AssertionFailedError("timed out");
1613 > //                 throw new AssertionError("timed out");
1614   //             Thread.yield();
1615   //         }
1616   //     }
# Line 1509 | Line 1619 | public class JSR166TestCase extends Test
1619          public String call() { throw new NullPointerException(); }
1620      }
1621  
1512    public static class CallableOne implements Callable<Integer> {
1513        public Integer call() { return one; }
1514    }
1515
1516    public class ShortRunnable extends CheckedRunnable {
1517        protected void realRun() throws Throwable {
1518            delay(SHORT_DELAY_MS);
1519        }
1520    }
1521
1522    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1523        protected void realRun() throws InterruptedException {
1524            delay(SHORT_DELAY_MS);
1525        }
1526    }
1527
1528    public class SmallRunnable extends CheckedRunnable {
1529        protected void realRun() throws Throwable {
1530            delay(SMALL_DELAY_MS);
1531        }
1532    }
1533
1534    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1535        protected void realRun() {
1536            try {
1537                delay(SMALL_DELAY_MS);
1538            } catch (InterruptedException ok) {}
1539        }
1540    }
1541
1542    public class SmallCallable extends CheckedCallable {
1543        protected Object realCall() throws InterruptedException {
1544            delay(SMALL_DELAY_MS);
1545            return Boolean.TRUE;
1546        }
1547    }
1548
1549    public class MediumRunnable extends CheckedRunnable {
1550        protected void realRun() throws Throwable {
1551            delay(MEDIUM_DELAY_MS);
1552        }
1553    }
1554
1555    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1556        protected void realRun() throws InterruptedException {
1557            delay(MEDIUM_DELAY_MS);
1558        }
1559    }
1560
1622      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1623          return new CheckedRunnable() {
1624              protected void realRun() {
# Line 1567 | Line 1628 | public class JSR166TestCase extends Test
1628              }};
1629      }
1630  
1570    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1571        protected void realRun() {
1572            try {
1573                delay(MEDIUM_DELAY_MS);
1574            } catch (InterruptedException ok) {}
1575        }
1576    }
1577
1578    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1579        protected void realRun() {
1580            try {
1581                delay(LONG_DELAY_MS);
1582            } catch (InterruptedException ok) {}
1583        }
1584    }
1585
1631      /**
1632       * For use as ThreadFactory in constructors
1633       */
# Line 1596 | Line 1641 | public class JSR166TestCase extends Test
1641          boolean isDone();
1642      }
1643  
1599    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1600        return new TrackedRunnable() {
1601                private volatile boolean done = false;
1602                public boolean isDone() { return done; }
1603                public void run() {
1604                    try {
1605                        delay(timeoutMillis);
1606                        done = true;
1607                    } catch (InterruptedException ok) {}
1608                }
1609            };
1610    }
1611
1612    public static class TrackedShortRunnable implements Runnable {
1613        public volatile boolean done = false;
1614        public void run() {
1615            try {
1616                delay(SHORT_DELAY_MS);
1617                done = true;
1618            } catch (InterruptedException ok) {}
1619        }
1620    }
1621
1622    public static class TrackedSmallRunnable implements Runnable {
1623        public volatile boolean done = false;
1624        public void run() {
1625            try {
1626                delay(SMALL_DELAY_MS);
1627                done = true;
1628            } catch (InterruptedException ok) {}
1629        }
1630    }
1631
1632    public static class TrackedMediumRunnable implements Runnable {
1633        public volatile boolean done = false;
1634        public void run() {
1635            try {
1636                delay(MEDIUM_DELAY_MS);
1637                done = true;
1638            } catch (InterruptedException ok) {}
1639        }
1640    }
1641
1642    public static class TrackedLongRunnable implements Runnable {
1643        public volatile boolean done = false;
1644        public void run() {
1645            try {
1646                delay(LONG_DELAY_MS);
1647                done = true;
1648            } catch (InterruptedException ok) {}
1649        }
1650    }
1651
1644      public static class TrackedNoOpRunnable implements Runnable {
1645          public volatile boolean done = false;
1646          public void run() {
# Line 1656 | Line 1648 | public class JSR166TestCase extends Test
1648          }
1649      }
1650  
1659    public static class TrackedCallable implements Callable {
1660        public volatile boolean done = false;
1661        public Object call() {
1662            try {
1663                delay(SMALL_DELAY_MS);
1664                done = true;
1665            } catch (InterruptedException ok) {}
1666            return Boolean.TRUE;
1667        }
1668    }
1669
1651      /**
1652       * Analog of CheckedRunnable for RecursiveAction
1653       */
# Line 1693 | Line 1674 | public class JSR166TestCase extends Test
1674                  return realCompute();
1675              } catch (Throwable fail) {
1676                  threadUnexpectedException(fail);
1696                return null;
1677              }
1678 +            throw new AssertionError("unreached");
1679          }
1680      }
1681  
# Line 1708 | Line 1689 | public class JSR166TestCase extends Test
1689  
1690      /**
1691       * A CyclicBarrier that uses timed await and fails with
1692 <     * AssertionFailedErrors instead of throwing checked exceptions.
1692 >     * AssertionErrors instead of throwing checked exceptions.
1693       */
1694 <    public class CheckedBarrier extends CyclicBarrier {
1694 >    public static class CheckedBarrier extends CyclicBarrier {
1695          public CheckedBarrier(int parties) { super(parties); }
1696  
1697          public int await() {
1698              try {
1699                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1700              } catch (TimeoutException timedOut) {
1701 <                throw new AssertionFailedError("timed out");
1701 >                throw new AssertionError("timed out");
1702              } catch (Exception fail) {
1703 <                AssertionFailedError afe =
1723 <                    new AssertionFailedError("Unexpected exception: " + fail);
1724 <                afe.initCause(fail);
1725 <                throw afe;
1703 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1704              }
1705          }
1706      }
# Line 1733 | Line 1711 | public class JSR166TestCase extends Test
1711              assertEquals(0, q.size());
1712              assertNull(q.peek());
1713              assertNull(q.poll());
1714 <            assertNull(q.poll(0, MILLISECONDS));
1714 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1715              assertEquals(q.toString(), "[]");
1716              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1717              assertFalse(q.iterator().hasNext());
# Line 1774 | Line 1752 | public class JSR166TestCase extends Test
1752          }
1753      }
1754  
1755 +    void assertImmutable(Object o) {
1756 +        if (o instanceof Collection) {
1757 +            assertThrows(
1758 +                UnsupportedOperationException.class,
1759 +                () -> ((Collection) o).add(null));
1760 +        }
1761 +    }
1762 +
1763      @SuppressWarnings("unchecked")
1764      <T> T serialClone(T o) {
1765 +        T clone = null;
1766          try {
1767              ObjectInputStream ois = new ObjectInputStream
1768                  (new ByteArrayInputStream(serialBytes(o)));
1769 <            T clone = (T) ois.readObject();
1783 <            assertSame(o.getClass(), clone.getClass());
1784 <            return clone;
1769 >            clone = (T) ois.readObject();
1770          } catch (Throwable fail) {
1771              threadUnexpectedException(fail);
1772 +        }
1773 +        if (o == clone) assertImmutable(o);
1774 +        else assertSame(o.getClass(), clone.getClass());
1775 +        return clone;
1776 +    }
1777 +
1778 +    /**
1779 +     * A version of serialClone that leaves error handling (for
1780 +     * e.g. NotSerializableException) up to the caller.
1781 +     */
1782 +    @SuppressWarnings("unchecked")
1783 +    <T> T serialClonePossiblyFailing(T o)
1784 +        throws ReflectiveOperationException, java.io.IOException {
1785 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1786 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1787 +        oos.writeObject(o);
1788 +        oos.flush();
1789 +        oos.close();
1790 +        ObjectInputStream ois = new ObjectInputStream
1791 +            (new ByteArrayInputStream(bos.toByteArray()));
1792 +        T clone = (T) ois.readObject();
1793 +        if (o == clone) assertImmutable(o);
1794 +        else assertSame(o.getClass(), clone.getClass());
1795 +        return clone;
1796 +    }
1797 +
1798 +    /**
1799 +     * If o implements Cloneable and has a public clone method,
1800 +     * returns a clone of o, else null.
1801 +     */
1802 +    @SuppressWarnings("unchecked")
1803 +    <T> T cloneableClone(T o) {
1804 +        if (!(o instanceof Cloneable)) return null;
1805 +        final T clone;
1806 +        try {
1807 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1808 +        } catch (NoSuchMethodException ok) {
1809              return null;
1810 +        } catch (ReflectiveOperationException unexpected) {
1811 +            throw new Error(unexpected);
1812          }
1813 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1814 +        assertSame(o.getClass(), clone.getClass());
1815 +        return clone;
1816      }
1817  
1818      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1819 <                             Runnable... throwingActions) {
1820 <        for (Runnable throwingAction : throwingActions) {
1819 >                             Action... throwingActions) {
1820 >        for (Action throwingAction : throwingActions) {
1821              boolean threw = false;
1822              try { throwingAction.run(); }
1823              catch (Throwable t) {
1824                  threw = true;
1825 <                if (!expectedExceptionClass.isInstance(t)) {
1826 <                    AssertionFailedError afe =
1827 <                        new AssertionFailedError
1828 <                        ("Expected " + expectedExceptionClass.getName() +
1829 <                         ", got " + t.getClass().getName());
1803 <                    afe.initCause(t);
1804 <                    threadUnexpectedException(afe);
1805 <                }
1825 >                if (!expectedExceptionClass.isInstance(t))
1826 >                    throw new AssertionError(
1827 >                            "Expected " + expectedExceptionClass.getName() +
1828 >                            ", got " + t.getClass().getName(),
1829 >                            t);
1830              }
1831              if (!threw)
1832                  shouldThrow(expectedExceptionClass.getName());
# Line 1816 | Line 1840 | public class JSR166TestCase extends Test
1840          } catch (NoSuchElementException success) {}
1841          assertFalse(it.hasNext());
1842      }
1843 +
1844 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1845 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1846 +    }
1847 +
1848 +    public Runnable runnableThrowing(final RuntimeException ex) {
1849 +        return new Runnable() { public void run() { throw ex; }};
1850 +    }
1851 +
1852 +    /** A reusable thread pool to be shared by tests. */
1853 +    static final ExecutorService cachedThreadPool =
1854 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1855 +                               1000L, MILLISECONDS,
1856 +                               new SynchronousQueue<Runnable>());
1857 +
1858 +    static <T> void shuffle(T[] array) {
1859 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1860 +    }
1861 +
1862 +    /**
1863 +     * Returns the same String as would be returned by {@link
1864 +     * Object#toString}, whether or not the given object's class
1865 +     * overrides toString().
1866 +     *
1867 +     * @see System#identityHashCode
1868 +     */
1869 +    static String identityString(Object x) {
1870 +        return x.getClass().getName()
1871 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1872 +    }
1873 +
1874 +    // --- Shared assertions for Executor tests ---
1875 +
1876 +    /**
1877 +     * Returns maximum number of tasks that can be submitted to given
1878 +     * pool (with bounded queue) before saturation (when submission
1879 +     * throws RejectedExecutionException).
1880 +     */
1881 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1882 +        BlockingQueue<Runnable> q = pool.getQueue();
1883 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1884 +    }
1885 +
1886 +    @SuppressWarnings("FutureReturnValueIgnored")
1887 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1888 +        try {
1889 +            e.execute((Runnable) null);
1890 +            shouldThrow();
1891 +        } catch (NullPointerException success) {}
1892 +
1893 +        if (! (e instanceof ExecutorService)) return;
1894 +        ExecutorService es = (ExecutorService) e;
1895 +        try {
1896 +            es.submit((Runnable) null);
1897 +            shouldThrow();
1898 +        } catch (NullPointerException success) {}
1899 +        try {
1900 +            es.submit((Runnable) null, Boolean.TRUE);
1901 +            shouldThrow();
1902 +        } catch (NullPointerException success) {}
1903 +        try {
1904 +            es.submit((Callable) null);
1905 +            shouldThrow();
1906 +        } catch (NullPointerException success) {}
1907 +
1908 +        if (! (e instanceof ScheduledExecutorService)) return;
1909 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1910 +        try {
1911 +            ses.schedule((Runnable) null,
1912 +                         randomTimeout(), randomTimeUnit());
1913 +            shouldThrow();
1914 +        } catch (NullPointerException success) {}
1915 +        try {
1916 +            ses.schedule((Callable) null,
1917 +                         randomTimeout(), randomTimeUnit());
1918 +            shouldThrow();
1919 +        } catch (NullPointerException success) {}
1920 +        try {
1921 +            ses.scheduleAtFixedRate((Runnable) null,
1922 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1923 +            shouldThrow();
1924 +        } catch (NullPointerException success) {}
1925 +        try {
1926 +            ses.scheduleWithFixedDelay((Runnable) null,
1927 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1928 +            shouldThrow();
1929 +        } catch (NullPointerException success) {}
1930 +    }
1931 +
1932 +    void setRejectedExecutionHandler(
1933 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1934 +        p.setRejectedExecutionHandler(handler);
1935 +        assertSame(handler, p.getRejectedExecutionHandler());
1936 +    }
1937 +
1938 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1939 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1940 +        final long savedTaskCount = p.getTaskCount();
1941 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1942 +        final int savedQueueSize = p.getQueue().size();
1943 +        final boolean stock = (p.getClass().getClassLoader() == null);
1944 +
1945 +        Runnable r = () -> {};
1946 +        Callable<Boolean> c = () -> Boolean.TRUE;
1947 +
1948 +        class Recorder implements RejectedExecutionHandler {
1949 +            public volatile Runnable r = null;
1950 +            public volatile ThreadPoolExecutor p = null;
1951 +            public void reset() { r = null; p = null; }
1952 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1953 +                assertNull(this.r);
1954 +                assertNull(this.p);
1955 +                this.r = r;
1956 +                this.p = p;
1957 +            }
1958 +        }
1959 +
1960 +        // check custom handler is invoked exactly once per task
1961 +        Recorder recorder = new Recorder();
1962 +        setRejectedExecutionHandler(p, recorder);
1963 +        for (int i = 2; i--> 0; ) {
1964 +            recorder.reset();
1965 +            p.execute(r);
1966 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1967 +                assertSame(r, recorder.r);
1968 +            assertSame(p, recorder.p);
1969 +
1970 +            recorder.reset();
1971 +            assertFalse(p.submit(r).isDone());
1972 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1973 +            assertSame(p, recorder.p);
1974 +
1975 +            recorder.reset();
1976 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
1977 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1978 +            assertSame(p, recorder.p);
1979 +
1980 +            recorder.reset();
1981 +            assertFalse(p.submit(c).isDone());
1982 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1983 +            assertSame(p, recorder.p);
1984 +
1985 +            if (p instanceof ScheduledExecutorService) {
1986 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
1987 +                ScheduledFuture<?> future;
1988 +
1989 +                recorder.reset();
1990 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
1991 +                assertFalse(future.isDone());
1992 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1993 +                assertSame(p, recorder.p);
1994 +
1995 +                recorder.reset();
1996 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
1997 +                assertFalse(future.isDone());
1998 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1999 +                assertSame(p, recorder.p);
2000 +
2001 +                recorder.reset();
2002 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2003 +                assertFalse(future.isDone());
2004 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2005 +                assertSame(p, recorder.p);
2006 +
2007 +                recorder.reset();
2008 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2009 +                assertFalse(future.isDone());
2010 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2011 +                assertSame(p, recorder.p);
2012 +            }
2013 +        }
2014 +
2015 +        // Checking our custom handler above should be sufficient, but
2016 +        // we add some integration tests of standard handlers.
2017 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2018 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2019 +
2020 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2021 +        try {
2022 +            p.execute(setThread);
2023 +            shouldThrow();
2024 +        } catch (RejectedExecutionException success) {}
2025 +        assertNull(thread.get());
2026 +
2027 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2028 +        p.execute(setThread);
2029 +        assertNull(thread.get());
2030 +
2031 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2032 +        p.execute(setThread);
2033 +        if (p.isShutdown())
2034 +            assertNull(thread.get());
2035 +        else
2036 +            assertSame(Thread.currentThread(), thread.get());
2037 +
2038 +        setRejectedExecutionHandler(p, savedHandler);
2039 +
2040 +        // check that pool was not perturbed by handlers
2041 +        assertEquals(savedTaskCount, p.getTaskCount());
2042 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2043 +        assertEquals(savedQueueSize, p.getQueue().size());
2044 +    }
2045 +
2046 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2047 +        assertEquals(x, y);
2048 +        assertEquals(y, x);
2049 +        assertEquals(x.isEmpty(), y.isEmpty());
2050 +        assertEquals(x.size(), y.size());
2051 +        if (x instanceof List) {
2052 +            assertEquals(x.toString(), y.toString());
2053 +        }
2054 +        if (x instanceof List || x instanceof Set) {
2055 +            assertEquals(x.hashCode(), y.hashCode());
2056 +        }
2057 +        if (x instanceof List || x instanceof Deque) {
2058 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2059 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2060 +                                     y.toArray(new Object[0])));
2061 +        }
2062 +    }
2063 +
2064 +    /**
2065 +     * A weaker form of assertCollectionsEquals which does not insist
2066 +     * that the two collections satisfy Object#equals(Object), since
2067 +     * they may use identity semantics as Deques do.
2068 +     */
2069 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2070 +        if (x instanceof List || x instanceof Set)
2071 +            assertCollectionsEquals(x, y);
2072 +        else {
2073 +            assertEquals(x.isEmpty(), y.isEmpty());
2074 +            assertEquals(x.size(), y.size());
2075 +            assertEquals(new HashSet(x), new HashSet(y));
2076 +            if (x instanceof Deque) {
2077 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2078 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2079 +                                         y.toArray(new Object[0])));
2080 +            }
2081 +        }
2082 +    }
2083   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines