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.168 by jsr166, Mon Oct 5 22:53:25 2015 UTC vs.
Revision 1.252 by jsr166, Thu Jan 10 04:35:16 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.
8   */
9  
10 + /*
11 + * @test
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 + * @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;
44   import static java.util.concurrent.TimeUnit.MINUTES;
45   import static java.util.concurrent.TimeUnit.NANOSECONDS;
# Line 29 | 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;
103   import java.util.regex.Pattern;
104  
57 import junit.framework.AssertionFailedError;
105   import junit.framework.Test;
106   import junit.framework.TestCase;
107   import junit.framework.TestResult;
# Line 70 | 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 109 | Line 164 | import junit.framework.TestSuite;
164   * methods as there are exceptions the method can throw. Sometimes
165   * there are multiple tests per JSR166 method when the different
166   * "normal" behaviors differ significantly. And sometimes testcases
167 < * cover multiple methods when they cannot be tested in
113 < * isolation.
167 > * cover multiple methods when they cannot be tested in isolation.
168   *
169   * <li>The documentation style for testcases is to provide as javadoc
170   * a simple sentence or two describing the property that the testcase
# Line 173 | Line 227 | public class JSR166TestCase extends Test
227      private static final int suiteRuns =
228          Integer.getInteger("jsr166.suiteRuns", 1);
229  
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 Float.NaN;
237 +        try {
238 +            return Float.parseFloat(floatString);
239 +        } catch (NumberFormatException ex) {
240 +            throw new IllegalArgumentException(
241 +                String.format("Bad float value in system property %s=%s",
242 +                              name, floatString));
243 +        }
244 +    }
245 +
246 +    /**
247 +     * The scaling factor to apply to standard delays used in tests.
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); }
270  
# Line 188 | Line 280 | public class JSR166TestCase extends Test
280          return (regex == null) ? null : Pattern.compile(regex);
281      }
282  
283 +    // Instrumentation to debug very rare, but very annoying hung test runs.
284      static volatile TestCase currentTestCase;
285 +    // static volatile int currentRun = 0;
286      static {
287          Runnable checkForWedgedTest = new Runnable() { public void run() {
288 <            // avoid spurious reports with enormous runsPerTest
289 <            final int timeoutMinutes = Math.max(runsPerTest / 10, 1);
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));
293              for (TestCase lastTestCase = currentTestCase;;) {
294                  try { MINUTES.sleep(timeoutMinutes); }
295                  catch (InterruptedException unexpected) { break; }
296                  if (lastTestCase == currentTestCase) {
297 <                    System.err.println
298 <                        ("Looks like we're stuck running test: "
299 <                         + lastTestCase);
297 >                    System.err.printf(
298 >                        "Looks like we're stuck running test: %s%n",
299 >                        lastTestCase);
300 > //                     System.err.printf(
301 > //                         "Looks like we're stuck running test: %s (%d/%d)%n",
302 > //                         lastTestCase, currentRun, runsPerTest);
303 > //                     System.err.println("availableProcessors=" +
304 > //                         Runtime.getRuntime().availableProcessors());
305 > //                     System.err.printf("cpu model = %s%n", cpuModel());
306                      dumpTestThreads();
307                      // one stack dump is probably enough; more would be spam
308                      break;
# Line 211 | Line 314 | public class JSR166TestCase extends Test
314          thread.start();
315      }
316  
317 + //     public static String cpuModel() {
318 + //         try {
319 + //             java.util.regex.Matcher matcher
320 + //               = Pattern.compile("model name\\s*: (.*)")
321 + //                 .matcher(new String(
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; }
327 + //     }
328 +
329      public void runBare() throws Throwable {
330          currentTestCase = this;
331          if (methodFilter == null
# Line 220 | Line 335 | public class JSR166TestCase extends Test
335  
336      protected void runTest() throws Throwable {
337          for (int i = 0; i < runsPerTest; i++) {
338 +            // currentRun = i;
339              if (profileTests)
340                  runTestProfiled();
341              else
# Line 248 | Line 364 | public class JSR166TestCase extends Test
364          main(suite(), args);
365      }
366  
367 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
368 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
369 +        long runTime;
370 +        public void startTest(Test test) {}
371 +        protected void printHeader(long runTime) {
372 +            this.runTime = runTime; // defer printing for later
373 +        }
374 +        protected void printFooter(TestResult result) {
375 +            if (result.wasSuccessful()) {
376 +                getWriter().println("OK (" + result.runCount() + " tests)"
377 +                    + "  Time: " + elapsedTimeAsString(runTime));
378 +            } else {
379 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
380 +                super.printFooter(result);
381 +            }
382 +        }
383 +    }
384 +
385 +    /**
386 +     * Returns a TestRunner that doesn't bother with unnecessary
387 +     * fluff, like printing a "." for each test case.
388 +     */
389 +    static junit.textui.TestRunner newPithyTestRunner() {
390 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
391 +        runner.setPrinter(new PithyResultPrinter(System.out));
392 +        return runner;
393 +    }
394 +
395      /**
396       * Runs all unit tests in the given test suite.
397       * Actual behavior influenced by jsr166.* system properties.
# Line 259 | Line 403 | public class JSR166TestCase extends Test
403              System.setSecurityManager(new SecurityManager());
404          }
405          for (int i = 0; i < suiteRuns; i++) {
406 <            TestResult result = junit.textui.TestRunner.run(suite);
406 >            TestResult result = newPithyTestRunner().doRun(suite);
407              if (!result.wasSuccessful())
408                  System.exit(1);
409              System.gc();
# Line 285 | 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",
289 <                                                       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 311 | 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 343 | 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 365 | 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 393 | 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",
563                  "StampedLockTest",
564                  "SubmissionPublisherTest",
565                  "ThreadLocalRandom8Test",
566 +                "TimeUnit8Test",
567              };
568              addNamedTestClasses(suite, java8TestClassNames);
569          }
# Line 419 | Line 571 | public class JSR166TestCase extends Test
571          // Java9+ test classes
572          if (atLeastJava9()) {
573              String[] java9TestClassNames = {
574 <                // Currently empty, but expecting varhandle tests
574 >                "AtomicBoolean9Test",
575 >                "AtomicInteger9Test",
576 >                "AtomicIntegerArray9Test",
577 >                "AtomicLong9Test",
578 >                "AtomicLongArray9Test",
579 >                "AtomicReference9Test",
580 >                "AtomicReferenceArray9Test",
581 >                "ExecutorCompletionService9Test",
582 >                "ForkJoinPool9Test",
583              };
584              addNamedTestClasses(suite, java9TestClassNames);
585          }
# Line 430 | 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 457 | 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 474 | 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 495 | 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 the shortest timed delay. This could
682 <     * be reimplemented to use for example a Property.
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,
688 >     * or via jtreg's -timeoutFactor: flag.
689 >     * http://openjdk.java.net/jtreg/command-help.html
690       */
691      protected long getShortDelay() {
692 <        return 50;
692 >        return (long) (50 * delayFactor);
693      }
694  
695      /**
# Line 513 | 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 534 | 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 556 | 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 577 | 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 =
582 <                    new AssertionFailedError(t.toString());
583 <                afe.initCause(t);
584 <                throw afe;
585 <            }
774 >            else
775 >                throw new AssertionError(t.toString(), t);
776          }
777  
778          if (Thread.interrupted())
# Line 616 | 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 702 | 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 730 | 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 740 | 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 =
745 <                new AssertionFailedError("unexpected exception: " + t);
746 <            afe.initCause(t);
747 <            throw afe;
748 <        }
933 >        else
934 >            throw new AssertionError("unexpected exception: " + t, t);
935      }
936  
937      /**
# Line 813 | Line 999 | public class JSR166TestCase extends Test
999          }};
1000      }
1001  
1002 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
1003 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
1004 +    }
1005 +
1006 +    Runnable releaser(final AtomicBoolean flag) {
1007 +        return new Runnable() { public void run() { flag.set(true); }};
1008 +    }
1009 +
1010      /**
1011       * Waits out termination of a thread pool or fails doing so.
1012       */
# Line 836 | Line 1030 | public class JSR166TestCase extends Test
1030          }
1031      }
1032  
1033 <    /** Like Runnable, but with the freedom to throw anything */
1033 >    /**
1034 >     * Like Runnable, but with the freedom to throw anything.
1035 >     * junit folks had the same idea:
1036 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1037 >     */
1038      interface Action { public void run() throws Throwable; }
1039  
1040      /**
# Line 867 | Line 1065 | public class JSR166TestCase extends Test
1065       * Uninteresting threads are filtered out.
1066       */
1067      static void dumpTestThreads() {
1068 +        SecurityManager sm = System.getSecurityManager();
1069 +        if (sm != null) {
1070 +            try {
1071 +                System.setSecurityManager(null);
1072 +            } catch (SecurityException giveUp) {
1073 +                return;
1074 +            }
1075 +        }
1076 +
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;
1094              System.err.print(info);
1095          }
1096          System.err.println("------ stacktrace dump end ------");
887    }
888
889    /**
890     * Checks that thread does not terminate within the default
891     * millisecond delay of {@code timeoutMillis()}.
892     */
893    void assertThreadStaysAlive(Thread thread) {
894        assertThreadStaysAlive(thread, timeoutMillis());
895    }
896
897    /**
898     * Checks that thread does not terminate within the given millisecond delay.
899     */
900    void assertThreadStaysAlive(Thread thread, long millis) {
901        try {
902            // No need to optimize the failing case via Thread.join.
903            delay(millis);
904            assertTrue(thread.isAlive());
905        } catch (InterruptedException fail) {
906            threadFail("Unexpected InterruptedException");
907        }
908    }
1097  
1098 <    /**
911 <     * Checks that the threads do not terminate within the default
912 <     * millisecond delay of {@code timeoutMillis()}.
913 <     */
914 <    void assertThreadsStayAlive(Thread... threads) {
915 <        assertThreadsStayAlive(timeoutMillis(), threads);
1098 >        if (sm != null) System.setSecurityManager(sm);
1099      }
1100  
1101      /**
1102 <     * Checks that the threads do not terminate within the given millisecond delay.
1102 >     * Checks that thread eventually enters the expected blocked thread state.
1103       */
1104 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1105 <        try {
1106 <            // No need to optimize the failing case via Thread.join.
1107 <            delay(millis);
1108 <            for (Thread thread : threads)
1109 <                assertTrue(thread.isAlive());
1110 <        } catch (InterruptedException fail) {
1111 <            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 967 | 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 1070 | 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 1098 | 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 <    void sleep(long millis) {
1298 >    static void sleep(long millis) {
1299          try {
1300              delay(millis);
1301          } catch (InterruptedException fail) {
1302 <            AssertionFailedError afe =
1108 <                new AssertionFailedError("Unexpected InterruptedException");
1109 <            afe.initCause(fail);
1110 <            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 = System.nanoTime();
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 +            }
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 1156 | 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 1169 | 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 1203 | Line 1428 | public class JSR166TestCase extends Test
1428          } finally {
1429              if (t.getState() != Thread.State.TERMINATED) {
1430                  t.interrupt();
1431 <                threadFail("Test timed out");
1431 >                threadFail("timed out waiting for thread to terminate");
1432              }
1433          }
1434      }
# Line 1231 | Line 1456 | public class JSR166TestCase extends Test
1456          }
1457      }
1458  
1234    public abstract class RunnableShouldThrow implements Runnable {
1235        protected abstract void realRun() throws Throwable;
1236
1237        final Class<?> exceptionClass;
1238
1239        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1240            this.exceptionClass = exceptionClass;
1241        }
1242
1243        public final void run() {
1244            try {
1245                realRun();
1246                threadShouldThrow(exceptionClass.getSimpleName());
1247            } catch (Throwable t) {
1248                if (! exceptionClass.isInstance(t))
1249                    threadUnexpectedException(t);
1250            }
1251        }
1252    }
1253
1459      public abstract class ThreadShouldThrow extends Thread {
1460          protected abstract void realRun() throws Throwable;
1461  
# Line 1263 | Line 1468 | public class JSR166TestCase extends Test
1468          public final void run() {
1469              try {
1470                  realRun();
1266                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 1277 | Line 1483 | public class JSR166TestCase extends Test
1483          public final void run() {
1484              try {
1485                  realRun();
1280                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 1294 | Line 1501 | public class JSR166TestCase extends Test
1501                  return realCall();
1502              } catch (Throwable fail) {
1503                  threadUnexpectedException(fail);
1297                return null;
1298            }
1299        }
1300    }
1301
1302    public abstract class CheckedInterruptedCallable<T>
1303        implements Callable<T> {
1304        protected abstract T realCall() throws Throwable;
1305
1306        public final T call() {
1307            try {
1308                T result = realCall();
1309                threadShouldThrow("InterruptedException");
1310                return result;
1311            } catch (InterruptedException success) {
1312                threadAssertFalse(Thread.interrupted());
1313            } catch (Throwable fail) {
1314                threadUnexpectedException(fail);
1504              }
1505 <            return null;
1505 >            throw new AssertionError("unreached");
1506          }
1507      }
1508  
# Line 1369 | Line 1558 | public class JSR166TestCase extends Test
1558          return new LatchAwaiter(latch);
1559      }
1560  
1561 <    public void await(CountDownLatch latch) {
1561 >    public void await(CountDownLatch latch, long timeoutMillis) {
1562 >        boolean timedOut = false;
1563          try {
1564 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
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) {
1574 +        await(latch, LONG_DELAY_MS);
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 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1591 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1592          } catch (Throwable fail) {
1593              threadUnexpectedException(fail);
1594          }
# Line 1399 | 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 1408 | Line 1617 | public class JSR166TestCase extends Test
1617          public String call() { throw new NullPointerException(); }
1618      }
1619  
1411    public static class CallableOne implements Callable<Integer> {
1412        public Integer call() { return one; }
1413    }
1414
1415    public class ShortRunnable extends CheckedRunnable {
1416        protected void realRun() throws Throwable {
1417            delay(SHORT_DELAY_MS);
1418        }
1419    }
1420
1421    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1422        protected void realRun() throws InterruptedException {
1423            delay(SHORT_DELAY_MS);
1424        }
1425    }
1426
1427    public class SmallRunnable extends CheckedRunnable {
1428        protected void realRun() throws Throwable {
1429            delay(SMALL_DELAY_MS);
1430        }
1431    }
1432
1433    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1434        protected void realRun() {
1435            try {
1436                delay(SMALL_DELAY_MS);
1437            } catch (InterruptedException ok) {}
1438        }
1439    }
1440
1441    public class SmallCallable extends CheckedCallable {
1442        protected Object realCall() throws InterruptedException {
1443            delay(SMALL_DELAY_MS);
1444            return Boolean.TRUE;
1445        }
1446    }
1447
1448    public class MediumRunnable extends CheckedRunnable {
1449        protected void realRun() throws Throwable {
1450            delay(MEDIUM_DELAY_MS);
1451        }
1452    }
1453
1454    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1455        protected void realRun() throws InterruptedException {
1456            delay(MEDIUM_DELAY_MS);
1457        }
1458    }
1459
1620      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1621          return new CheckedRunnable() {
1622              protected void realRun() {
# Line 1466 | Line 1626 | public class JSR166TestCase extends Test
1626              }};
1627      }
1628  
1469    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1470        protected void realRun() {
1471            try {
1472                delay(MEDIUM_DELAY_MS);
1473            } catch (InterruptedException ok) {}
1474        }
1475    }
1476
1477    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1478        protected void realRun() {
1479            try {
1480                delay(LONG_DELAY_MS);
1481            } catch (InterruptedException ok) {}
1482        }
1483    }
1484
1629      /**
1630       * For use as ThreadFactory in constructors
1631       */
# Line 1495 | Line 1639 | public class JSR166TestCase extends Test
1639          boolean isDone();
1640      }
1641  
1498    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1499        return new TrackedRunnable() {
1500                private volatile boolean done = false;
1501                public boolean isDone() { return done; }
1502                public void run() {
1503                    try {
1504                        delay(timeoutMillis);
1505                        done = true;
1506                    } catch (InterruptedException ok) {}
1507                }
1508            };
1509    }
1510
1511    public static class TrackedShortRunnable implements Runnable {
1512        public volatile boolean done = false;
1513        public void run() {
1514            try {
1515                delay(SHORT_DELAY_MS);
1516                done = true;
1517            } catch (InterruptedException ok) {}
1518        }
1519    }
1520
1521    public static class TrackedSmallRunnable implements Runnable {
1522        public volatile boolean done = false;
1523        public void run() {
1524            try {
1525                delay(SMALL_DELAY_MS);
1526                done = true;
1527            } catch (InterruptedException ok) {}
1528        }
1529    }
1530
1531    public static class TrackedMediumRunnable implements Runnable {
1532        public volatile boolean done = false;
1533        public void run() {
1534            try {
1535                delay(MEDIUM_DELAY_MS);
1536                done = true;
1537            } catch (InterruptedException ok) {}
1538        }
1539    }
1540
1541    public static class TrackedLongRunnable implements Runnable {
1542        public volatile boolean done = false;
1543        public void run() {
1544            try {
1545                delay(LONG_DELAY_MS);
1546                done = true;
1547            } catch (InterruptedException ok) {}
1548        }
1549    }
1550
1642      public static class TrackedNoOpRunnable implements Runnable {
1643          public volatile boolean done = false;
1644          public void run() {
# Line 1555 | Line 1646 | public class JSR166TestCase extends Test
1646          }
1647      }
1648  
1558    public static class TrackedCallable implements Callable {
1559        public volatile boolean done = false;
1560        public Object call() {
1561            try {
1562                delay(SMALL_DELAY_MS);
1563                done = true;
1564            } catch (InterruptedException ok) {}
1565            return Boolean.TRUE;
1566        }
1567    }
1568
1649      /**
1650       * Analog of CheckedRunnable for RecursiveAction
1651       */
# Line 1592 | Line 1672 | public class JSR166TestCase extends Test
1672                  return realCompute();
1673              } catch (Throwable fail) {
1674                  threadUnexpectedException(fail);
1595                return null;
1675              }
1676 +            throw new AssertionError("unreached");
1677          }
1678      }
1679  
# Line 1607 | 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 class CheckedBarrier extends CyclicBarrier {
1692 >    public static class CheckedBarrier extends CyclicBarrier {
1693          public CheckedBarrier(int parties) { super(parties); }
1694  
1695          public int await() {
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 =
1622 <                    new AssertionFailedError("Unexpected exception: " + fail);
1623 <                afe.initCause(fail);
1624 <                throw afe;
1701 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1702              }
1703          }
1704      }
# Line 1632 | 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 1673 | Line 1750 | public class JSR166TestCase extends Test
1750          }
1751      }
1752  
1753 +    void assertImmutable(final Object o) {
1754 +        if (o instanceof Collection) {
1755 +            assertThrows(
1756 +                UnsupportedOperationException.class,
1757 +                new Runnable() { public void run() {
1758 +                        ((Collection) o).add(null);}});
1759 +        }
1760 +    }
1761 +
1762      @SuppressWarnings("unchecked")
1763      <T> T serialClone(T o) {
1764 +        T clone = null;
1765          try {
1766              ObjectInputStream ois = new ObjectInputStream
1767                  (new ByteArrayInputStream(serialBytes(o)));
1768 <            T clone = (T) ois.readObject();
1682 <            assertSame(o.getClass(), clone.getClass());
1683 <            return clone;
1768 >            clone = (T) ois.readObject();
1769          } catch (Throwable fail) {
1770              threadUnexpectedException(fail);
1771 +        }
1772 +        if (o == clone) assertImmutable(o);
1773 +        else assertSame(o.getClass(), clone.getClass());
1774 +        return clone;
1775 +    }
1776 +
1777 +    /**
1778 +     * A version of serialClone that leaves error handling (for
1779 +     * e.g. NotSerializableException) up to the caller.
1780 +     */
1781 +    @SuppressWarnings("unchecked")
1782 +    <T> T serialClonePossiblyFailing(T o)
1783 +        throws ReflectiveOperationException, java.io.IOException {
1784 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1785 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1786 +        oos.writeObject(o);
1787 +        oos.flush();
1788 +        oos.close();
1789 +        ObjectInputStream ois = new ObjectInputStream
1790 +            (new ByteArrayInputStream(bos.toByteArray()));
1791 +        T clone = (T) ois.readObject();
1792 +        if (o == clone) assertImmutable(o);
1793 +        else assertSame(o.getClass(), clone.getClass());
1794 +        return clone;
1795 +    }
1796 +
1797 +    /**
1798 +     * If o implements Cloneable and has a public clone method,
1799 +     * returns a clone of o, else null.
1800 +     */
1801 +    @SuppressWarnings("unchecked")
1802 +    <T> T cloneableClone(T o) {
1803 +        if (!(o instanceof Cloneable)) return null;
1804 +        final T clone;
1805 +        try {
1806 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1807 +        } catch (NoSuchMethodException ok) {
1808              return null;
1809 +        } catch (ReflectiveOperationException unexpected) {
1810 +            throw new Error(unexpected);
1811          }
1812 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1813 +        assertSame(o.getClass(), clone.getClass());
1814 +        return clone;
1815      }
1816  
1817      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
# Line 1694 | Line 1821 | public class JSR166TestCase extends Test
1821              try { throwingAction.run(); }
1822              catch (Throwable t) {
1823                  threw = true;
1824 <                if (!expectedExceptionClass.isInstance(t)) {
1825 <                    AssertionFailedError afe =
1826 <                        new AssertionFailedError
1827 <                        ("Expected " + expectedExceptionClass.getName() +
1828 <                         ", got " + t.getClass().getName());
1702 <                    afe.initCause(t);
1703 <                    threadUnexpectedException(afe);
1704 <                }
1824 >                if (!expectedExceptionClass.isInstance(t))
1825 >                    throw new AssertionError(
1826 >                            "Expected " + expectedExceptionClass.getName() +
1827 >                            ", got " + t.getClass().getName(),
1828 >                            t);
1829              }
1830              if (!threw)
1831                  shouldThrow(expectedExceptionClass.getName());
# Line 1715 | Line 1839 | public class JSR166TestCase extends Test
1839          } catch (NoSuchElementException success) {}
1840          assertFalse(it.hasNext());
1841      }
1842 +
1843 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1844 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1845 +    }
1846 +
1847 +    public Runnable runnableThrowing(final RuntimeException ex) {
1848 +        return new Runnable() { public void run() { throw ex; }};
1849 +    }
1850 +
1851 +    /** A reusable thread pool to be shared by tests. */
1852 +    static final ExecutorService cachedThreadPool =
1853 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1854 +                               1000L, MILLISECONDS,
1855 +                               new SynchronousQueue<Runnable>());
1856 +
1857 +    static <T> void shuffle(T[] array) {
1858 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1859 +    }
1860 +
1861 +    /**
1862 +     * Returns the same String as would be returned by {@link
1863 +     * Object#toString}, whether or not the given object's class
1864 +     * overrides toString().
1865 +     *
1866 +     * @see System#identityHashCode
1867 +     */
1868 +    static String identityString(Object x) {
1869 +        return x.getClass().getName()
1870 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1871 +    }
1872 +
1873 +    // --- Shared assertions for Executor tests ---
1874 +
1875 +    /**
1876 +     * Returns maximum number of tasks that can be submitted to given
1877 +     * pool (with bounded queue) before saturation (when submission
1878 +     * throws RejectedExecutionException).
1879 +     */
1880 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1881 +        BlockingQueue<Runnable> q = pool.getQueue();
1882 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1883 +    }
1884 +
1885 +    @SuppressWarnings("FutureReturnValueIgnored")
1886 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1887 +        try {
1888 +            e.execute((Runnable) null);
1889 +            shouldThrow();
1890 +        } catch (NullPointerException success) {}
1891 +
1892 +        if (! (e instanceof ExecutorService)) return;
1893 +        ExecutorService es = (ExecutorService) e;
1894 +        try {
1895 +            es.submit((Runnable) null);
1896 +            shouldThrow();
1897 +        } catch (NullPointerException success) {}
1898 +        try {
1899 +            es.submit((Runnable) null, Boolean.TRUE);
1900 +            shouldThrow();
1901 +        } catch (NullPointerException success) {}
1902 +        try {
1903 +            es.submit((Callable) null);
1904 +            shouldThrow();
1905 +        } catch (NullPointerException success) {}
1906 +
1907 +        if (! (e instanceof ScheduledExecutorService)) return;
1908 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1909 +        try {
1910 +            ses.schedule((Runnable) null,
1911 +                         randomTimeout(), randomTimeUnit());
1912 +            shouldThrow();
1913 +        } catch (NullPointerException success) {}
1914 +        try {
1915 +            ses.schedule((Callable) null,
1916 +                         randomTimeout(), randomTimeUnit());
1917 +            shouldThrow();
1918 +        } catch (NullPointerException success) {}
1919 +        try {
1920 +            ses.scheduleAtFixedRate((Runnable) null,
1921 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1922 +            shouldThrow();
1923 +        } catch (NullPointerException success) {}
1924 +        try {
1925 +            ses.scheduleWithFixedDelay((Runnable) null,
1926 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1927 +            shouldThrow();
1928 +        } catch (NullPointerException success) {}
1929 +    }
1930 +
1931 +    void setRejectedExecutionHandler(
1932 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1933 +        p.setRejectedExecutionHandler(handler);
1934 +        assertSame(handler, p.getRejectedExecutionHandler());
1935 +    }
1936 +
1937 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1938 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1939 +        final long savedTaskCount = p.getTaskCount();
1940 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1941 +        final int savedQueueSize = p.getQueue().size();
1942 +        final boolean stock = (p.getClass().getClassLoader() == null);
1943 +
1944 +        Runnable r = () -> {};
1945 +        Callable<Boolean> c = () -> Boolean.TRUE;
1946 +
1947 +        class Recorder implements RejectedExecutionHandler {
1948 +            public volatile Runnable r = null;
1949 +            public volatile ThreadPoolExecutor p = null;
1950 +            public void reset() { r = null; p = null; }
1951 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1952 +                assertNull(this.r);
1953 +                assertNull(this.p);
1954 +                this.r = r;
1955 +                this.p = p;
1956 +            }
1957 +        }
1958 +
1959 +        // check custom handler is invoked exactly once per task
1960 +        Recorder recorder = new Recorder();
1961 +        setRejectedExecutionHandler(p, recorder);
1962 +        for (int i = 2; i--> 0; ) {
1963 +            recorder.reset();
1964 +            p.execute(r);
1965 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1966 +                assertSame(r, recorder.r);
1967 +            assertSame(p, recorder.p);
1968 +
1969 +            recorder.reset();
1970 +            assertFalse(p.submit(r).isDone());
1971 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1972 +            assertSame(p, recorder.p);
1973 +
1974 +            recorder.reset();
1975 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
1976 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1977 +            assertSame(p, recorder.p);
1978 +
1979 +            recorder.reset();
1980 +            assertFalse(p.submit(c).isDone());
1981 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1982 +            assertSame(p, recorder.p);
1983 +
1984 +            if (p instanceof ScheduledExecutorService) {
1985 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
1986 +                ScheduledFuture<?> future;
1987 +
1988 +                recorder.reset();
1989 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
1990 +                assertFalse(future.isDone());
1991 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1992 +                assertSame(p, recorder.p);
1993 +
1994 +                recorder.reset();
1995 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
1996 +                assertFalse(future.isDone());
1997 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
1998 +                assertSame(p, recorder.p);
1999 +
2000 +                recorder.reset();
2001 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2002 +                assertFalse(future.isDone());
2003 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2004 +                assertSame(p, recorder.p);
2005 +
2006 +                recorder.reset();
2007 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2008 +                assertFalse(future.isDone());
2009 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2010 +                assertSame(p, recorder.p);
2011 +            }
2012 +        }
2013 +
2014 +        // Checking our custom handler above should be sufficient, but
2015 +        // we add some integration tests of standard handlers.
2016 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2017 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2018 +
2019 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2020 +        try {
2021 +            p.execute(setThread);
2022 +            shouldThrow();
2023 +        } catch (RejectedExecutionException success) {}
2024 +        assertNull(thread.get());
2025 +
2026 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2027 +        p.execute(setThread);
2028 +        assertNull(thread.get());
2029 +
2030 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2031 +        p.execute(setThread);
2032 +        if (p.isShutdown())
2033 +            assertNull(thread.get());
2034 +        else
2035 +            assertSame(Thread.currentThread(), thread.get());
2036 +
2037 +        setRejectedExecutionHandler(p, savedHandler);
2038 +
2039 +        // check that pool was not perturbed by handlers
2040 +        assertEquals(savedTaskCount, p.getTaskCount());
2041 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2042 +        assertEquals(savedQueueSize, p.getQueue().size());
2043 +    }
2044 +
2045 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2046 +        assertEquals(x, y);
2047 +        assertEquals(y, x);
2048 +        assertEquals(x.isEmpty(), y.isEmpty());
2049 +        assertEquals(x.size(), y.size());
2050 +        if (x instanceof List) {
2051 +            assertEquals(x.toString(), y.toString());
2052 +        }
2053 +        if (x instanceof List || x instanceof Set) {
2054 +            assertEquals(x.hashCode(), y.hashCode());
2055 +        }
2056 +        if (x instanceof List || x instanceof Deque) {
2057 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2058 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2059 +                                     y.toArray(new Object[0])));
2060 +        }
2061 +    }
2062 +
2063 +    /**
2064 +     * A weaker form of assertCollectionsEquals which does not insist
2065 +     * that the two collections satisfy Object#equals(Object), since
2066 +     * they may use identity semantics as Deques do.
2067 +     */
2068 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2069 +        if (x instanceof List || x instanceof Set)
2070 +            assertCollectionsEquals(x, y);
2071 +        else {
2072 +            assertEquals(x.isEmpty(), y.isEmpty());
2073 +            assertEquals(x.size(), y.size());
2074 +            assertEquals(new HashSet(x), new HashSet(y));
2075 +            if (x instanceof Deque) {
2076 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2077 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2078 +                                         y.toArray(new Object[0])));
2079 +            }
2080 +        }
2081 +    }
2082   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines