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.169 by jsr166, Thu Oct 8 21:50:26 2015 UTC vs.
Revision 1.267 by jsr166, Sun Sep 8 16:08:56 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);
287 >        Runnable wedgedTestDetector = new Runnable() { public void run() {
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 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; }
297                  if (lastTestCase == currentTestCase) {
298 <                    System.err.println
299 <                        ("Looks like we're stuck running test: "
300 <                         + lastTestCase);
301 <                    System.err.println("availableProcessors=" +
302 <                        Runtime.getRuntime().availableProcessors());
298 >                    System.err.printf(
299 >                        "Looks like we're stuck running test: %s%n",
300 >                        lastTestCase);
301 > //                     System.err.printf(
302 > //                         "Looks like we're stuck running test: %s (%d/%d)%n",
303 > //                         lastTestCase, currentRun, runsPerTest);
304 > //                     System.err.println("availableProcessors=" +
305 > //                         Runtime.getRuntime().availableProcessors());
306 > //                     System.err.printf("cpu model = %s%n", cpuModel());
307                      dumpTestThreads();
308                      // one stack dump is probably enough; more would be spam
309                      break;
310                  }
311                  lastTestCase = currentTestCase;
312              }}};
313 <        Thread thread = new Thread(checkForWedgedTest, "checkForWedgedTest");
313 >        Thread thread = new Thread(wedgedTestDetector, "WedgedTestDetector");
314          thread.setDaemon(true);
315          thread.start();
316      }
317  
318 + //     public static String cpuModel() {
319 + //         try {
320 + //             java.util.regex.Matcher matcher
321 + //               = Pattern.compile("model name\\s*: (.*)")
322 + //                 .matcher(new String(
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; }
328 + //     }
329 +
330      public void runBare() throws Throwable {
331          currentTestCase = this;
332          if (methodFilter == null
# Line 222 | Line 336 | public class JSR166TestCase extends Test
336  
337      protected void runTest() throws Throwable {
338          for (int i = 0; i < runsPerTest; i++) {
339 +            // currentRun = i;
340              if (profileTests)
341                  runTestProfiled();
342              else
# Line 239 | Line 354 | public class JSR166TestCase extends Test
354              // Never report first run of any test; treat it as a
355              // warmup run, notably to trigger all needed classloading,
356              if (i > 0)
357 <                System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
357 >                System.out.printf("%s: %d%n", toString(), elapsedMillis);
358          }
359      }
360  
# Line 250 | Line 365 | public class JSR166TestCase extends Test
365          main(suite(), args);
366      }
367  
368 +    static class PithyResultPrinter extends junit.textui.ResultPrinter {
369 +        PithyResultPrinter(java.io.PrintStream writer) { super(writer); }
370 +        long runTime;
371 +        public void startTest(Test test) {}
372 +        protected void printHeader(long runTime) {
373 +            this.runTime = runTime; // defer printing for later
374 +        }
375 +        protected void printFooter(TestResult result) {
376 +            if (result.wasSuccessful()) {
377 +                getWriter().println("OK (" + result.runCount() + " tests)"
378 +                    + "  Time: " + elapsedTimeAsString(runTime));
379 +            } else {
380 +                getWriter().println("Time: " + elapsedTimeAsString(runTime));
381 +                super.printFooter(result);
382 +            }
383 +        }
384 +    }
385 +
386 +    /**
387 +     * Returns a TestRunner that doesn't bother with unnecessary
388 +     * fluff, like printing a "." for each test case.
389 +     */
390 +    static junit.textui.TestRunner newPithyTestRunner() {
391 +        junit.textui.TestRunner runner = new junit.textui.TestRunner();
392 +        runner.setPrinter(new PithyResultPrinter(System.out));
393 +        return runner;
394 +    }
395 +
396      /**
397       * Runs all unit tests in the given test suite.
398       * Actual behavior influenced by jsr166.* system properties.
# Line 261 | Line 404 | public class JSR166TestCase extends Test
404              System.setSecurityManager(new SecurityManager());
405          }
406          for (int i = 0; i < suiteRuns; i++) {
407 <            TestResult result = junit.textui.TestRunner.run(suite);
407 >            TestResult result = newPithyTestRunner().doRun(suite);
408              if (!result.wasSuccessful())
409                  System.exit(1);
410              System.gc();
# Line 287 | 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",
291 <                                                       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 313 | 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 345 | 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 367 | 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 374 | 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 395 | 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 421 | 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 432 | 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 459 | 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 476 | 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 498 | Line 658 | public class JSR166TestCase extends Test
658      public static long LONG_DELAY_MS;
659  
660      /**
661 <     * Returns the shortest timed delay. This could
662 <     * be reimplemented to use for example a Property.
661 >     * A delay significantly longer than LONG_DELAY_MS.
662 >     * Use this in a thread that is waited for via awaitTermination(Thread).
663 >     */
664 >    public static long LONGER_DELAY_MS;
665 >
666 >    private static final long RANDOM_TIMEOUT;
667 >    private static final long RANDOM_EXPIRED_TIMEOUT;
668 >    private static final TimeUnit RANDOM_TIMEUNIT;
669 >    static {
670 >        ThreadLocalRandom rnd = ThreadLocalRandom.current();
671 >        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
672 >        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
673 >        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
674 >        TimeUnit[] timeUnits = TimeUnit.values();
675 >        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
676 >    }
677 >
678 >    /**
679 >     * Returns a timeout for use when any value at all will do.
680 >     */
681 >    static long randomTimeout() { return RANDOM_TIMEOUT; }
682 >
683 >    /**
684 >     * Returns a timeout that means "no waiting", i.e. not positive.
685 >     */
686 >    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
687 >
688 >    /**
689 >     * Returns a random non-null TimeUnit.
690 >     */
691 >    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
692 >
693 >    /**
694 >     * Returns a random boolean; a "coin flip".
695 >     */
696 >    static boolean randomBoolean() {
697 >        return ThreadLocalRandom.current().nextBoolean();
698 >    }
699 >
700 >    /**
701 >     * Returns a random element from given choices.
702 >     */
703 >    <T> T chooseRandomly(T... choices) {
704 >        return choices[ThreadLocalRandom.current().nextInt(choices.length)];
705 >    }
706 >
707 >    /**
708 >     * Returns the shortest timed delay. This can be scaled up for
709 >     * slow machines using the jsr166.delay.factor system property,
710 >     * or via jtreg's -timeoutFactor: flag.
711 >     * http://openjdk.java.net/jtreg/command-help.html
712       */
713      protected long getShortDelay() {
714 <        return 50;
714 >        return (long) (50 * delayFactor);
715      }
716  
717      /**
# Line 513 | Line 722 | public class JSR166TestCase extends Test
722          SMALL_DELAY_MS  = SHORT_DELAY_MS * 5;
723          MEDIUM_DELAY_MS = SHORT_DELAY_MS * 10;
724          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
725 +        LONGER_DELAY_MS = 2 * LONG_DELAY_MS;
726      }
727  
728 +    private static final long TIMEOUT_DELAY_MS
729 +        = (long) (12.0 * Math.cbrt(delayFactor));
730 +
731      /**
732 <     * Returns a timeout in milliseconds to be used in tests that
733 <     * verify that operations block or time out.
732 >     * Returns a timeout in milliseconds to be used in tests that verify
733 >     * that operations block or time out.  We want this to be longer
734 >     * than the OS scheduling quantum, but not too long, so don't scale
735 >     * linearly with delayFactor; we use "crazy" cube root instead.
736       */
737 <    long timeoutMillis() {
738 <        return SHORT_DELAY_MS / 4;
737 >    static long timeoutMillis() {
738 >        return TIMEOUT_DELAY_MS;
739      }
740  
741      /**
# Line 536 | Line 751 | public class JSR166TestCase extends Test
751       * The first exception encountered if any threadAssertXXX method fails.
752       */
753      private final AtomicReference<Throwable> threadFailure
754 <        = new AtomicReference<Throwable>(null);
754 >        = new AtomicReference<>(null);
755  
756      /**
757       * Records an exception so that it can be rethrown later in the test
# Line 546 | Line 761 | public class JSR166TestCase extends Test
761       */
762      public void threadRecordFailure(Throwable t) {
763          System.err.println(t);
764 <        dumpTestThreads();
765 <        threadFailure.compareAndSet(null, t);
764 >        if (threadFailure.compareAndSet(null, t))
765 >            dumpTestThreads();
766      }
767  
768      public void setUp() {
# Line 558 | Line 773 | public class JSR166TestCase extends Test
773          String msg = toString() + ": " + String.format(format, args);
774          System.err.println(msg);
775          dumpTestThreads();
776 <        throw new AssertionFailedError(msg);
776 >        throw new AssertionError(msg);
777      }
778  
779      /**
# Line 579 | Line 794 | public class JSR166TestCase extends Test
794                  throw (RuntimeException) t;
795              else if (t instanceof Exception)
796                  throw (Exception) t;
797 <            else {
798 <                AssertionFailedError afe =
584 <                    new AssertionFailedError(t.toString());
585 <                afe.initCause(t);
586 <                throw afe;
587 <            }
797 >            else
798 >                throw new AssertionError(t.toString(), t);
799          }
800  
801          if (Thread.interrupted())
# Line 618 | Line 829 | public class JSR166TestCase extends Test
829  
830      /**
831       * Just like fail(reason), but additionally recording (using
832 <     * threadRecordFailure) any AssertionFailedError thrown, so that
833 <     * the current testcase will fail.
832 >     * threadRecordFailure) any AssertionError thrown, so that the
833 >     * current testcase will fail.
834       */
835      public void threadFail(String reason) {
836          try {
837              fail(reason);
838 <        } catch (AssertionFailedError t) {
839 <            threadRecordFailure(t);
840 <            throw t;
838 >        } catch (AssertionError fail) {
839 >            threadRecordFailure(fail);
840 >            throw fail;
841          }
842      }
843  
844      /**
845       * Just like assertTrue(b), but additionally recording (using
846 <     * threadRecordFailure) any AssertionFailedError thrown, so that
847 <     * the current testcase will fail.
846 >     * threadRecordFailure) any AssertionError thrown, so that the
847 >     * current testcase will fail.
848       */
849      public void threadAssertTrue(boolean b) {
850          try {
851              assertTrue(b);
852 <        } catch (AssertionFailedError t) {
853 <            threadRecordFailure(t);
854 <            throw t;
852 >        } catch (AssertionError fail) {
853 >            threadRecordFailure(fail);
854 >            throw fail;
855          }
856      }
857  
858      /**
859       * Just like assertFalse(b), but additionally recording (using
860 <     * threadRecordFailure) any AssertionFailedError thrown, so that
861 <     * the current testcase will fail.
860 >     * threadRecordFailure) any AssertionError thrown, so that the
861 >     * current testcase will fail.
862       */
863      public void threadAssertFalse(boolean b) {
864          try {
865              assertFalse(b);
866 <        } catch (AssertionFailedError t) {
867 <            threadRecordFailure(t);
868 <            throw t;
866 >        } catch (AssertionError fail) {
867 >            threadRecordFailure(fail);
868 >            throw fail;
869          }
870      }
871  
872      /**
873       * Just like assertNull(x), but additionally recording (using
874 <     * threadRecordFailure) any AssertionFailedError thrown, so that
875 <     * the current testcase will fail.
874 >     * threadRecordFailure) any AssertionError thrown, so that the
875 >     * current testcase will fail.
876       */
877      public void threadAssertNull(Object x) {
878          try {
879              assertNull(x);
880 <        } catch (AssertionFailedError t) {
881 <            threadRecordFailure(t);
882 <            throw t;
880 >        } catch (AssertionError fail) {
881 >            threadRecordFailure(fail);
882 >            throw fail;
883          }
884      }
885  
886      /**
887       * Just like assertEquals(x, y), but additionally recording (using
888 <     * threadRecordFailure) any AssertionFailedError thrown, so that
889 <     * the current testcase will fail.
888 >     * threadRecordFailure) any AssertionError thrown, so that the
889 >     * current testcase will fail.
890       */
891      public void threadAssertEquals(long x, long y) {
892          try {
893              assertEquals(x, y);
894 <        } catch (AssertionFailedError t) {
895 <            threadRecordFailure(t);
896 <            throw t;
894 >        } catch (AssertionError fail) {
895 >            threadRecordFailure(fail);
896 >            throw fail;
897          }
898      }
899  
900      /**
901       * Just like assertEquals(x, y), but additionally recording (using
902 <     * threadRecordFailure) any AssertionFailedError thrown, so that
903 <     * the current testcase will fail.
902 >     * threadRecordFailure) any AssertionError thrown, so that the
903 >     * current testcase will fail.
904       */
905      public void threadAssertEquals(Object x, Object y) {
906          try {
907              assertEquals(x, y);
908 <        } catch (AssertionFailedError fail) {
908 >        } catch (AssertionError fail) {
909              threadRecordFailure(fail);
910              throw fail;
911          } catch (Throwable fail) {
# Line 704 | Line 915 | public class JSR166TestCase extends Test
915  
916      /**
917       * Just like assertSame(x, y), but additionally recording (using
918 <     * threadRecordFailure) any AssertionFailedError thrown, so that
919 <     * the current testcase will fail.
918 >     * threadRecordFailure) any AssertionError thrown, so that the
919 >     * current testcase will fail.
920       */
921      public void threadAssertSame(Object x, Object y) {
922          try {
923              assertSame(x, y);
924 <        } catch (AssertionFailedError fail) {
924 >        } catch (AssertionError fail) {
925              threadRecordFailure(fail);
926              throw fail;
927          }
# Line 732 | Line 943 | public class JSR166TestCase extends Test
943  
944      /**
945       * Records the given exception using {@link #threadRecordFailure},
946 <     * then rethrows the exception, wrapping it in an
947 <     * AssertionFailedError if necessary.
946 >     * then rethrows the exception, wrapping it in an AssertionError
947 >     * if necessary.
948       */
949      public void threadUnexpectedException(Throwable t) {
950          threadRecordFailure(t);
# Line 742 | Line 953 | public class JSR166TestCase extends Test
953              throw (RuntimeException) t;
954          else if (t instanceof Error)
955              throw (Error) t;
956 <        else {
957 <            AssertionFailedError afe =
747 <                new AssertionFailedError("unexpected exception: " + t);
748 <            afe.initCause(t);
749 <            throw afe;
750 <        }
956 >        else
957 >            throw new AssertionError("unexpected exception: " + t, t);
958      }
959  
960      /**
# Line 815 | Line 1022 | public class JSR166TestCase extends Test
1022          }};
1023      }
1024  
1025 +    PoolCleaner cleaner(ExecutorService pool, AtomicBoolean flag) {
1026 +        return new PoolCleanerWithReleaser(pool, releaser(flag));
1027 +    }
1028 +
1029 +    Runnable releaser(final AtomicBoolean flag) {
1030 +        return new Runnable() { public void run() { flag.set(true); }};
1031 +    }
1032 +
1033      /**
1034       * Waits out termination of a thread pool or fails doing so.
1035       */
# Line 838 | Line 1053 | public class JSR166TestCase extends Test
1053          }
1054      }
1055  
1056 <    /** Like Runnable, but with the freedom to throw anything */
1056 >    /**
1057 >     * Like Runnable, but with the freedom to throw anything.
1058 >     * junit folks had the same idea:
1059 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1060 >     */
1061      interface Action { public void run() throws Throwable; }
1062  
1063      /**
# Line 864 | Line 1083 | public class JSR166TestCase extends Test
1083          }
1084      }
1085  
1086 +    /** Returns true if thread info might be useful in a thread dump. */
1087 +    static boolean threadOfInterest(ThreadInfo info) {
1088 +        final String name = info.getThreadName();
1089 +        String lockName;
1090 +        if (name == null)
1091 +            return true;
1092 +        if (name.equals("Signal Dispatcher")
1093 +            || name.equals("WedgedTestDetector"))
1094 +            return false;
1095 +        if (name.equals("Reference Handler")) {
1096 +            // Reference Handler stacktrace changed in JDK-8156500
1097 +            StackTraceElement[] stackTrace; String methodName;
1098 +            if ((stackTrace = info.getStackTrace()) != null
1099 +                && stackTrace.length > 0
1100 +                && (methodName = stackTrace[0].getMethodName()) != null
1101 +                && methodName.equals("waitForReferencePendingList"))
1102 +                return false;
1103 +            // jdk8 Reference Handler stacktrace
1104 +            if ((lockName = info.getLockName()) != null
1105 +                && lockName.startsWith("java.lang.ref"))
1106 +                return false;
1107 +        }
1108 +        if ((name.equals("Finalizer") || name.equals("Common-Cleaner"))
1109 +            && (lockName = info.getLockName()) != null
1110 +            && lockName.startsWith("java.lang.ref"))
1111 +            return false;
1112 +        if (name.startsWith("ForkJoinPool.commonPool-worker")
1113 +            && (lockName = info.getLockName()) != null
1114 +            && lockName.startsWith("java.util.concurrent.ForkJoinPool"))
1115 +            return false;
1116 +        return true;
1117 +    }
1118 +
1119      /**
1120       * A debugging tool to print stack traces of most threads, as jstack does.
1121       * Uninteresting threads are filtered out.
1122       */
1123      static void dumpTestThreads() {
1124 +        SecurityManager sm = System.getSecurityManager();
1125 +        if (sm != null) {
1126 +            try {
1127 +                System.setSecurityManager(null);
1128 +            } catch (SecurityException giveUp) {
1129 +                return;
1130 +            }
1131 +        }
1132 +
1133          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1134          System.err.println("------ stacktrace dump start ------");
1135 <        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1136 <            String name = info.getThreadName();
1137 <            if ("Signal Dispatcher".equals(name))
877 <                continue;
878 <            if ("Reference Handler".equals(name)
879 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
880 <                continue;
881 <            if ("Finalizer".equals(name)
882 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
883 <                continue;
884 <            if ("checkForWedgedTest".equals(name))
885 <                continue;
886 <            System.err.print(info);
887 <        }
1135 >        for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true))
1136 >            if (threadOfInterest(info))
1137 >                System.err.print(info);
1138          System.err.println("------ stacktrace dump end ------");
889    }
1139  
1140 <    /**
892 <     * Checks that thread does not terminate within the default
893 <     * millisecond delay of {@code timeoutMillis()}.
894 <     */
895 <    void assertThreadStaysAlive(Thread thread) {
896 <        assertThreadStaysAlive(thread, timeoutMillis());
1140 >        if (sm != null) System.setSecurityManager(sm);
1141      }
1142  
1143      /**
1144 <     * Checks that thread does not terminate within the given millisecond delay.
1144 >     * Checks that thread eventually enters the expected blocked thread state.
1145       */
1146 <    void assertThreadStaysAlive(Thread thread, long millis) {
1147 <        try {
1148 <            // No need to optimize the failing case via Thread.join.
1149 <            delay(millis);
1150 <            assertTrue(thread.isAlive());
1151 <        } catch (InterruptedException fail) {
1152 <            threadFail("Unexpected InterruptedException");
1153 <        }
1154 <    }
1155 <
1156 <    /**
1157 <     * Checks that the threads do not terminate within the default
1158 <     * millisecond delay of {@code timeoutMillis()}.
915 <     */
916 <    void assertThreadsStayAlive(Thread... threads) {
917 <        assertThreadsStayAlive(timeoutMillis(), threads);
918 <    }
919 <
920 <    /**
921 <     * Checks that the threads do not terminate within the given millisecond delay.
922 <     */
923 <    void assertThreadsStayAlive(long millis, Thread... threads) {
924 <        try {
925 <            // No need to optimize the failing case via Thread.join.
926 <            delay(millis);
927 <            for (Thread thread : threads)
928 <                assertTrue(thread.isAlive());
929 <        } catch (InterruptedException fail) {
930 <            threadFail("Unexpected InterruptedException");
1146 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1147 >        // always sleep at least 1 ms, with high probability avoiding
1148 >        // transitory states
1149 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1150 >            try { delay(1); }
1151 >            catch (InterruptedException fail) {
1152 >                throw new AssertionError("Unexpected InterruptedException", fail);
1153 >            }
1154 >            Thread.State s = thread.getState();
1155 >            if (s == expected)
1156 >                return;
1157 >            else if (s == Thread.State.TERMINATED)
1158 >                fail("Unexpected thread termination");
1159          }
1160 +        fail("timed out waiting for thread to enter thread state " + expected);
1161      }
1162  
1163      /**
# Line 969 | Line 1198 | public class JSR166TestCase extends Test
1198      }
1199  
1200      /**
1201 +     * The maximum number of consecutive spurious wakeups we should
1202 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1203 +     */
1204 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1205 +
1206 +    /**
1207       * The number of elements to place in collections, arrays, etc.
1208       */
1209      public static final int SIZE = 20;
# Line 1072 | Line 1307 | public class JSR166TestCase extends Test
1307          }
1308          public void refresh() {}
1309          public String toString() {
1310 <            List<Permission> ps = new ArrayList<Permission>();
1310 >            List<Permission> ps = new ArrayList<>();
1311              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1312                  ps.add(e.nextElement());
1313              return "AdjustablePolicy with permissions " + ps;
# Line 1100 | Line 1335 | public class JSR166TestCase extends Test
1335  
1336      /**
1337       * Sleeps until the given time has elapsed.
1338 <     * Throws AssertionFailedError if interrupted.
1338 >     * Throws AssertionError if interrupted.
1339       */
1340 <    void sleep(long millis) {
1340 >    static void sleep(long millis) {
1341          try {
1342              delay(millis);
1343          } catch (InterruptedException fail) {
1344 <            AssertionFailedError afe =
1110 <                new AssertionFailedError("Unexpected InterruptedException");
1111 <            afe.initCause(fail);
1112 <            throw afe;
1344 >            throw new AssertionError("Unexpected InterruptedException", fail);
1345          }
1346      }
1347  
1348      /**
1349       * Spin-waits up to the specified number of milliseconds for the given
1350       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1351 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1352       */
1353 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1354 <        long startTime = System.nanoTime();
1355 <        for (;;) {
1356 <            Thread.State s = thread.getState();
1357 <            if (s == Thread.State.BLOCKED ||
1358 <                s == Thread.State.WAITING ||
1359 <                s == Thread.State.TIMED_WAITING)
1360 <                return;
1361 <            else if (s == Thread.State.TERMINATED)
1353 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1354 >                                       Callable<Boolean> waitingForGodot) {
1355 >        for (long startTime = 0L;;) {
1356 >            switch (thread.getState()) {
1357 >            default: break;
1358 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1359 >                try {
1360 >                    if (waitingForGodot == null || waitingForGodot.call())
1361 >                        return;
1362 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1363 >                break;
1364 >            case TERMINATED:
1365                  fail("Unexpected thread termination");
1366 +            }
1367 +
1368 +            if (startTime == 0L)
1369 +                startTime = System.nanoTime();
1370              else if (millisElapsedSince(startTime) > timeoutMillis) {
1371 <                threadAssertTrue(thread.isAlive());
1372 <                return;
1371 >                assertTrue(thread.isAlive());
1372 >                if (waitingForGodot == null
1373 >                    || thread.getState() == Thread.State.RUNNABLE)
1374 >                    fail("timed out waiting for thread to enter wait state");
1375 >                else
1376 >                    fail("timed out waiting for condition, thread state="
1377 >                         + thread.getState());
1378              }
1379              Thread.yield();
1380          }
1381      }
1382  
1383      /**
1384 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1385 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1384 >     * Spin-waits up to the specified number of milliseconds for the given
1385 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1386 >     */
1387 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1388 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1389 >    }
1390 >
1391 >    /**
1392 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1393 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1394       */
1395      void waitForThreadToEnterWaitState(Thread thread) {
1396 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1396 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1397 >    }
1398 >
1399 >    /**
1400 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1401 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1402 >     * and additionally satisfy the given condition.
1403 >     */
1404 >    void waitForThreadToEnterWaitState(Thread thread,
1405 >                                       Callable<Boolean> waitingForGodot) {
1406 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1407 >    }
1408 >
1409 >    /**
1410 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1411 >     * be interrupted.  Clears the interrupt status before returning.
1412 >     */
1413 >    void awaitInterrupted() {
1414 >        for (long startTime = 0L; !Thread.interrupted(); ) {
1415 >            if (startTime == 0L)
1416 >                startTime = System.nanoTime();
1417 >            else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1418 >                fail("timed out waiting for thread interrupt");
1419 >            Thread.yield();
1420 >        }
1421      }
1422  
1423      /**
# Line 1152 | Line 1429 | public class JSR166TestCase extends Test
1429          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1430      }
1431  
1155 //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1156 //         long startTime = System.nanoTime();
1157 //         try {
1158 //             r.run();
1159 //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1160 //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1161 //             throw new AssertionFailedError("did not return promptly");
1162 //     }
1163
1164 //     void assertTerminatesPromptly(Runnable r) {
1165 //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1166 //     }
1167
1432      /**
1433       * Checks that timed f.get() returns the expected value, and does not
1434       * wait for the timeout to elapse before returning.
1435       */
1436      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1437          long startTime = System.nanoTime();
1438 +        T actual = null;
1439          try {
1440 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1440 >            actual = f.get(timeoutMillis, MILLISECONDS);
1441          } catch (Throwable fail) { threadUnexpectedException(fail); }
1442 +        assertEquals(expectedValue, actual);
1443          if (millisElapsedSince(startTime) > timeoutMillis/2)
1444 <            throw new AssertionFailedError("timed get did not return promptly");
1444 >            throw new AssertionError("timed get did not return promptly");
1445      }
1446  
1447      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1197 | Line 1463 | public class JSR166TestCase extends Test
1463       * to terminate (using {@link Thread#join(long)}), else interrupts
1464       * the thread (in the hope that it may terminate later) and fails.
1465       */
1466 <    void awaitTermination(Thread t, long timeoutMillis) {
1466 >    void awaitTermination(Thread thread, long timeoutMillis) {
1467          try {
1468 <            t.join(timeoutMillis);
1468 >            thread.join(timeoutMillis);
1469          } catch (InterruptedException fail) {
1470              threadUnexpectedException(fail);
1471 <        } finally {
1472 <            if (t.getState() != Thread.State.TERMINATED) {
1473 <                t.interrupt();
1474 <                threadFail("Test timed out");
1471 >        }
1472 >        if (thread.getState() != Thread.State.TERMINATED) {
1473 >            String detail = String.format(
1474 >                    "timed out waiting for thread to terminate, thread=%s, state=%s" ,
1475 >                    thread, thread.getState());
1476 >            try {
1477 >                threadFail(detail);
1478 >            } finally {
1479 >                // Interrupt thread __after__ having reported its stack trace
1480 >                thread.interrupt();
1481              }
1482          }
1483      }
# Line 1233 | Line 1505 | public class JSR166TestCase extends Test
1505          }
1506      }
1507  
1236    public abstract class RunnableShouldThrow implements Runnable {
1237        protected abstract void realRun() throws Throwable;
1238
1239        final Class<?> exceptionClass;
1240
1241        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1242            this.exceptionClass = exceptionClass;
1243        }
1244
1245        public final void run() {
1246            try {
1247                realRun();
1248                threadShouldThrow(exceptionClass.getSimpleName());
1249            } catch (Throwable t) {
1250                if (! exceptionClass.isInstance(t))
1251                    threadUnexpectedException(t);
1252            }
1253        }
1254    }
1255
1508      public abstract class ThreadShouldThrow extends Thread {
1509          protected abstract void realRun() throws Throwable;
1510  
# Line 1265 | Line 1517 | public class JSR166TestCase extends Test
1517          public final void run() {
1518              try {
1519                  realRun();
1268                threadShouldThrow(exceptionClass.getSimpleName());
1520              } catch (Throwable t) {
1521                  if (! exceptionClass.isInstance(t))
1522                      threadUnexpectedException(t);
1523 +                return;
1524              }
1525 +            threadShouldThrow(exceptionClass.getSimpleName());
1526          }
1527      }
1528  
# Line 1279 | Line 1532 | public class JSR166TestCase extends Test
1532          public final void run() {
1533              try {
1534                  realRun();
1282                threadShouldThrow("InterruptedException");
1535              } catch (InterruptedException success) {
1536                  threadAssertFalse(Thread.interrupted());
1537 +                return;
1538              } catch (Throwable fail) {
1539                  threadUnexpectedException(fail);
1540              }
1541 +            threadShouldThrow("InterruptedException");
1542          }
1543      }
1544  
# Line 1296 | Line 1550 | public class JSR166TestCase extends Test
1550                  return realCall();
1551              } catch (Throwable fail) {
1552                  threadUnexpectedException(fail);
1299                return null;
1553              }
1554 <        }
1302 <    }
1303 <
1304 <    public abstract class CheckedInterruptedCallable<T>
1305 <        implements Callable<T> {
1306 <        protected abstract T realCall() throws Throwable;
1307 <
1308 <        public final T call() {
1309 <            try {
1310 <                T result = realCall();
1311 <                threadShouldThrow("InterruptedException");
1312 <                return result;
1313 <            } catch (InterruptedException success) {
1314 <                threadAssertFalse(Thread.interrupted());
1315 <            } catch (Throwable fail) {
1316 <                threadUnexpectedException(fail);
1317 <            }
1318 <            return null;
1554 >            throw new AssertionError("unreached");
1555          }
1556      }
1557  
# Line 1371 | Line 1607 | public class JSR166TestCase extends Test
1607          return new LatchAwaiter(latch);
1608      }
1609  
1610 <    public void await(CountDownLatch latch) {
1610 >    public void await(CountDownLatch latch, long timeoutMillis) {
1611 >        boolean timedOut = false;
1612          try {
1613 <            assertTrue(latch.await(LONG_DELAY_MS, MILLISECONDS));
1613 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1614          } catch (Throwable fail) {
1615              threadUnexpectedException(fail);
1616          }
1617 +        if (timedOut)
1618 +            fail("timed out waiting for CountDownLatch for "
1619 +                 + (timeoutMillis/1000) + " sec");
1620 +    }
1621 +
1622 +    public void await(CountDownLatch latch) {
1623 +        await(latch, LONG_DELAY_MS);
1624      }
1625  
1626      public void await(Semaphore semaphore) {
1627 +        boolean timedOut = false;
1628          try {
1629 <            assertTrue(semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS));
1629 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1630 >        } catch (Throwable fail) {
1631 >            threadUnexpectedException(fail);
1632 >        }
1633 >        if (timedOut)
1634 >            fail("timed out waiting for Semaphore for "
1635 >                 + (LONG_DELAY_MS/1000) + " sec");
1636 >    }
1637 >
1638 >    public void await(CyclicBarrier barrier) {
1639 >        try {
1640 >            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1641          } catch (Throwable fail) {
1642              threadUnexpectedException(fail);
1643          }
# Line 1401 | Line 1657 | public class JSR166TestCase extends Test
1657   //         long startTime = System.nanoTime();
1658   //         while (!flag.get()) {
1659   //             if (millisElapsedSince(startTime) > timeoutMillis)
1660 < //                 throw new AssertionFailedError("timed out");
1660 > //                 throw new AssertionError("timed out");
1661   //             Thread.yield();
1662   //         }
1663   //     }
# Line 1410 | Line 1666 | public class JSR166TestCase extends Test
1666          public String call() { throw new NullPointerException(); }
1667      }
1668  
1413    public static class CallableOne implements Callable<Integer> {
1414        public Integer call() { return one; }
1415    }
1416
1417    public class ShortRunnable extends CheckedRunnable {
1418        protected void realRun() throws Throwable {
1419            delay(SHORT_DELAY_MS);
1420        }
1421    }
1422
1423    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1424        protected void realRun() throws InterruptedException {
1425            delay(SHORT_DELAY_MS);
1426        }
1427    }
1428
1429    public class SmallRunnable extends CheckedRunnable {
1430        protected void realRun() throws Throwable {
1431            delay(SMALL_DELAY_MS);
1432        }
1433    }
1434
1435    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1436        protected void realRun() {
1437            try {
1438                delay(SMALL_DELAY_MS);
1439            } catch (InterruptedException ok) {}
1440        }
1441    }
1442
1443    public class SmallCallable extends CheckedCallable {
1444        protected Object realCall() throws InterruptedException {
1445            delay(SMALL_DELAY_MS);
1446            return Boolean.TRUE;
1447        }
1448    }
1449
1450    public class MediumRunnable extends CheckedRunnable {
1451        protected void realRun() throws Throwable {
1452            delay(MEDIUM_DELAY_MS);
1453        }
1454    }
1455
1456    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1457        protected void realRun() throws InterruptedException {
1458            delay(MEDIUM_DELAY_MS);
1459        }
1460    }
1461
1669      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1670          return new CheckedRunnable() {
1671              protected void realRun() {
# Line 1468 | Line 1675 | public class JSR166TestCase extends Test
1675              }};
1676      }
1677  
1471    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1472        protected void realRun() {
1473            try {
1474                delay(MEDIUM_DELAY_MS);
1475            } catch (InterruptedException ok) {}
1476        }
1477    }
1478
1479    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1480        protected void realRun() {
1481            try {
1482                delay(LONG_DELAY_MS);
1483            } catch (InterruptedException ok) {}
1484        }
1485    }
1486
1678      /**
1679       * For use as ThreadFactory in constructors
1680       */
# Line 1497 | Line 1688 | public class JSR166TestCase extends Test
1688          boolean isDone();
1689      }
1690  
1500    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1501        return new TrackedRunnable() {
1502                private volatile boolean done = false;
1503                public boolean isDone() { return done; }
1504                public void run() {
1505                    try {
1506                        delay(timeoutMillis);
1507                        done = true;
1508                    } catch (InterruptedException ok) {}
1509                }
1510            };
1511    }
1512
1513    public static class TrackedShortRunnable implements Runnable {
1514        public volatile boolean done = false;
1515        public void run() {
1516            try {
1517                delay(SHORT_DELAY_MS);
1518                done = true;
1519            } catch (InterruptedException ok) {}
1520        }
1521    }
1522
1523    public static class TrackedSmallRunnable implements Runnable {
1524        public volatile boolean done = false;
1525        public void run() {
1526            try {
1527                delay(SMALL_DELAY_MS);
1528                done = true;
1529            } catch (InterruptedException ok) {}
1530        }
1531    }
1532
1533    public static class TrackedMediumRunnable implements Runnable {
1534        public volatile boolean done = false;
1535        public void run() {
1536            try {
1537                delay(MEDIUM_DELAY_MS);
1538                done = true;
1539            } catch (InterruptedException ok) {}
1540        }
1541    }
1542
1543    public static class TrackedLongRunnable implements Runnable {
1544        public volatile boolean done = false;
1545        public void run() {
1546            try {
1547                delay(LONG_DELAY_MS);
1548                done = true;
1549            } catch (InterruptedException ok) {}
1550        }
1551    }
1552
1691      public static class TrackedNoOpRunnable implements Runnable {
1692          public volatile boolean done = false;
1693          public void run() {
# Line 1557 | Line 1695 | public class JSR166TestCase extends Test
1695          }
1696      }
1697  
1560    public static class TrackedCallable implements Callable {
1561        public volatile boolean done = false;
1562        public Object call() {
1563            try {
1564                delay(SMALL_DELAY_MS);
1565                done = true;
1566            } catch (InterruptedException ok) {}
1567            return Boolean.TRUE;
1568        }
1569    }
1570
1698      /**
1699       * Analog of CheckedRunnable for RecursiveAction
1700       */
# Line 1594 | Line 1721 | public class JSR166TestCase extends Test
1721                  return realCompute();
1722              } catch (Throwable fail) {
1723                  threadUnexpectedException(fail);
1597                return null;
1724              }
1725 +            throw new AssertionError("unreached");
1726          }
1727      }
1728  
# Line 1609 | Line 1736 | public class JSR166TestCase extends Test
1736  
1737      /**
1738       * A CyclicBarrier that uses timed await and fails with
1739 <     * AssertionFailedErrors instead of throwing checked exceptions.
1739 >     * AssertionErrors instead of throwing checked exceptions.
1740       */
1741 <    public class CheckedBarrier extends CyclicBarrier {
1741 >    public static class CheckedBarrier extends CyclicBarrier {
1742          public CheckedBarrier(int parties) { super(parties); }
1743  
1744          public int await() {
1745              try {
1746                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1747              } catch (TimeoutException timedOut) {
1748 <                throw new AssertionFailedError("timed out");
1748 >                throw new AssertionError("timed out");
1749              } catch (Exception fail) {
1750 <                AssertionFailedError afe =
1624 <                    new AssertionFailedError("Unexpected exception: " + fail);
1625 <                afe.initCause(fail);
1626 <                throw afe;
1750 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1751              }
1752          }
1753      }
# Line 1634 | Line 1758 | public class JSR166TestCase extends Test
1758              assertEquals(0, q.size());
1759              assertNull(q.peek());
1760              assertNull(q.poll());
1761 <            assertNull(q.poll(0, MILLISECONDS));
1761 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1762              assertEquals(q.toString(), "[]");
1763              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1764              assertFalse(q.iterator().hasNext());
# Line 1675 | Line 1799 | public class JSR166TestCase extends Test
1799          }
1800      }
1801  
1802 +    void assertImmutable(Object o) {
1803 +        if (o instanceof Collection) {
1804 +            assertThrows(
1805 +                UnsupportedOperationException.class,
1806 +                () -> ((Collection) o).add(null));
1807 +        }
1808 +    }
1809 +
1810      @SuppressWarnings("unchecked")
1811      <T> T serialClone(T o) {
1812 +        T clone = null;
1813          try {
1814              ObjectInputStream ois = new ObjectInputStream
1815                  (new ByteArrayInputStream(serialBytes(o)));
1816 <            T clone = (T) ois.readObject();
1684 <            assertSame(o.getClass(), clone.getClass());
1685 <            return clone;
1816 >            clone = (T) ois.readObject();
1817          } catch (Throwable fail) {
1818              threadUnexpectedException(fail);
1819 +        }
1820 +        if (o == clone) assertImmutable(o);
1821 +        else assertSame(o.getClass(), clone.getClass());
1822 +        return clone;
1823 +    }
1824 +
1825 +    /**
1826 +     * A version of serialClone that leaves error handling (for
1827 +     * e.g. NotSerializableException) up to the caller.
1828 +     */
1829 +    @SuppressWarnings("unchecked")
1830 +    <T> T serialClonePossiblyFailing(T o)
1831 +        throws ReflectiveOperationException, java.io.IOException {
1832 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1833 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1834 +        oos.writeObject(o);
1835 +        oos.flush();
1836 +        oos.close();
1837 +        ObjectInputStream ois = new ObjectInputStream
1838 +            (new ByteArrayInputStream(bos.toByteArray()));
1839 +        T clone = (T) ois.readObject();
1840 +        if (o == clone) assertImmutable(o);
1841 +        else assertSame(o.getClass(), clone.getClass());
1842 +        return clone;
1843 +    }
1844 +
1845 +    /**
1846 +     * If o implements Cloneable and has a public clone method,
1847 +     * returns a clone of o, else null.
1848 +     */
1849 +    @SuppressWarnings("unchecked")
1850 +    <T> T cloneableClone(T o) {
1851 +        if (!(o instanceof Cloneable)) return null;
1852 +        final T clone;
1853 +        try {
1854 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1855 +        } catch (NoSuchMethodException ok) {
1856              return null;
1857 +        } catch (ReflectiveOperationException unexpected) {
1858 +            throw new Error(unexpected);
1859          }
1860 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1861 +        assertSame(o.getClass(), clone.getClass());
1862 +        return clone;
1863      }
1864  
1865      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1866 <                             Runnable... throwingActions) {
1867 <        for (Runnable throwingAction : throwingActions) {
1866 >                             Action... throwingActions) {
1867 >        for (Action throwingAction : throwingActions) {
1868              boolean threw = false;
1869              try { throwingAction.run(); }
1870              catch (Throwable t) {
1871                  threw = true;
1872 <                if (!expectedExceptionClass.isInstance(t)) {
1873 <                    AssertionFailedError afe =
1874 <                        new AssertionFailedError
1875 <                        ("Expected " + expectedExceptionClass.getName() +
1876 <                         ", got " + t.getClass().getName());
1704 <                    afe.initCause(t);
1705 <                    threadUnexpectedException(afe);
1706 <                }
1872 >                if (!expectedExceptionClass.isInstance(t))
1873 >                    throw new AssertionError(
1874 >                            "Expected " + expectedExceptionClass.getName() +
1875 >                            ", got " + t.getClass().getName(),
1876 >                            t);
1877              }
1878              if (!threw)
1879                  shouldThrow(expectedExceptionClass.getName());
# Line 1717 | Line 1887 | public class JSR166TestCase extends Test
1887          } catch (NoSuchElementException success) {}
1888          assertFalse(it.hasNext());
1889      }
1890 +
1891 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1892 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1893 +    }
1894 +
1895 +    public Runnable runnableThrowing(final RuntimeException ex) {
1896 +        return new Runnable() { public void run() { throw ex; }};
1897 +    }
1898 +
1899 +    /** A reusable thread pool to be shared by tests. */
1900 +    static final ExecutorService cachedThreadPool =
1901 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
1902 +                               1000L, MILLISECONDS,
1903 +                               new SynchronousQueue<Runnable>());
1904 +
1905 +    static <T> void shuffle(T[] array) {
1906 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1907 +    }
1908 +
1909 +    /**
1910 +     * Returns the same String as would be returned by {@link
1911 +     * Object#toString}, whether or not the given object's class
1912 +     * overrides toString().
1913 +     *
1914 +     * @see System#identityHashCode
1915 +     */
1916 +    static String identityString(Object x) {
1917 +        return x.getClass().getName()
1918 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1919 +    }
1920 +
1921 +    // --- Shared assertions for Executor tests ---
1922 +
1923 +    /**
1924 +     * Returns maximum number of tasks that can be submitted to given
1925 +     * pool (with bounded queue) before saturation (when submission
1926 +     * throws RejectedExecutionException).
1927 +     */
1928 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1929 +        BlockingQueue<Runnable> q = pool.getQueue();
1930 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1931 +    }
1932 +
1933 +    @SuppressWarnings("FutureReturnValueIgnored")
1934 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1935 +        try {
1936 +            e.execute((Runnable) null);
1937 +            shouldThrow();
1938 +        } catch (NullPointerException success) {}
1939 +
1940 +        if (! (e instanceof ExecutorService)) return;
1941 +        ExecutorService es = (ExecutorService) e;
1942 +        try {
1943 +            es.submit((Runnable) null);
1944 +            shouldThrow();
1945 +        } catch (NullPointerException success) {}
1946 +        try {
1947 +            es.submit((Runnable) null, Boolean.TRUE);
1948 +            shouldThrow();
1949 +        } catch (NullPointerException success) {}
1950 +        try {
1951 +            es.submit((Callable) null);
1952 +            shouldThrow();
1953 +        } catch (NullPointerException success) {}
1954 +
1955 +        if (! (e instanceof ScheduledExecutorService)) return;
1956 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1957 +        try {
1958 +            ses.schedule((Runnable) null,
1959 +                         randomTimeout(), randomTimeUnit());
1960 +            shouldThrow();
1961 +        } catch (NullPointerException success) {}
1962 +        try {
1963 +            ses.schedule((Callable) null,
1964 +                         randomTimeout(), randomTimeUnit());
1965 +            shouldThrow();
1966 +        } catch (NullPointerException success) {}
1967 +        try {
1968 +            ses.scheduleAtFixedRate((Runnable) null,
1969 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1970 +            shouldThrow();
1971 +        } catch (NullPointerException success) {}
1972 +        try {
1973 +            ses.scheduleWithFixedDelay((Runnable) null,
1974 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1975 +            shouldThrow();
1976 +        } catch (NullPointerException success) {}
1977 +    }
1978 +
1979 +    void setRejectedExecutionHandler(
1980 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1981 +        p.setRejectedExecutionHandler(handler);
1982 +        assertSame(handler, p.getRejectedExecutionHandler());
1983 +    }
1984 +
1985 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1986 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1987 +        final long savedTaskCount = p.getTaskCount();
1988 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1989 +        final int savedQueueSize = p.getQueue().size();
1990 +        final boolean stock = (p.getClass().getClassLoader() == null);
1991 +
1992 +        Runnable r = () -> {};
1993 +        Callable<Boolean> c = () -> Boolean.TRUE;
1994 +
1995 +        class Recorder implements RejectedExecutionHandler {
1996 +            public volatile Runnable r = null;
1997 +            public volatile ThreadPoolExecutor p = null;
1998 +            public void reset() { r = null; p = null; }
1999 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
2000 +                assertNull(this.r);
2001 +                assertNull(this.p);
2002 +                this.r = r;
2003 +                this.p = p;
2004 +            }
2005 +        }
2006 +
2007 +        // check custom handler is invoked exactly once per task
2008 +        Recorder recorder = new Recorder();
2009 +        setRejectedExecutionHandler(p, recorder);
2010 +        for (int i = 2; i--> 0; ) {
2011 +            recorder.reset();
2012 +            p.execute(r);
2013 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
2014 +                assertSame(r, recorder.r);
2015 +            assertSame(p, recorder.p);
2016 +
2017 +            recorder.reset();
2018 +            assertFalse(p.submit(r).isDone());
2019 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2020 +            assertSame(p, recorder.p);
2021 +
2022 +            recorder.reset();
2023 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2024 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2025 +            assertSame(p, recorder.p);
2026 +
2027 +            recorder.reset();
2028 +            assertFalse(p.submit(c).isDone());
2029 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2030 +            assertSame(p, recorder.p);
2031 +
2032 +            if (p instanceof ScheduledExecutorService) {
2033 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2034 +                ScheduledFuture<?> future;
2035 +
2036 +                recorder.reset();
2037 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2038 +                assertFalse(future.isDone());
2039 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2040 +                assertSame(p, recorder.p);
2041 +
2042 +                recorder.reset();
2043 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2044 +                assertFalse(future.isDone());
2045 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2046 +                assertSame(p, recorder.p);
2047 +
2048 +                recorder.reset();
2049 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2050 +                assertFalse(future.isDone());
2051 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2052 +                assertSame(p, recorder.p);
2053 +
2054 +                recorder.reset();
2055 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2056 +                assertFalse(future.isDone());
2057 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2058 +                assertSame(p, recorder.p);
2059 +            }
2060 +        }
2061 +
2062 +        // Checking our custom handler above should be sufficient, but
2063 +        // we add some integration tests of standard handlers.
2064 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2065 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2066 +
2067 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2068 +        try {
2069 +            p.execute(setThread);
2070 +            shouldThrow();
2071 +        } catch (RejectedExecutionException success) {}
2072 +        assertNull(thread.get());
2073 +
2074 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2075 +        p.execute(setThread);
2076 +        assertNull(thread.get());
2077 +
2078 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2079 +        p.execute(setThread);
2080 +        if (p.isShutdown())
2081 +            assertNull(thread.get());
2082 +        else
2083 +            assertSame(Thread.currentThread(), thread.get());
2084 +
2085 +        setRejectedExecutionHandler(p, savedHandler);
2086 +
2087 +        // check that pool was not perturbed by handlers
2088 +        assertEquals(savedTaskCount, p.getTaskCount());
2089 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2090 +        assertEquals(savedQueueSize, p.getQueue().size());
2091 +    }
2092 +
2093 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2094 +        assertEquals(x, y);
2095 +        assertEquals(y, x);
2096 +        assertEquals(x.isEmpty(), y.isEmpty());
2097 +        assertEquals(x.size(), y.size());
2098 +        if (x instanceof List) {
2099 +            assertEquals(x.toString(), y.toString());
2100 +        }
2101 +        if (x instanceof List || x instanceof Set) {
2102 +            assertEquals(x.hashCode(), y.hashCode());
2103 +        }
2104 +        if (x instanceof List || x instanceof Deque) {
2105 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2106 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2107 +                                     y.toArray(new Object[0])));
2108 +        }
2109 +    }
2110 +
2111 +    /**
2112 +     * A weaker form of assertCollectionsEquals which does not insist
2113 +     * that the two collections satisfy Object#equals(Object), since
2114 +     * they may use identity semantics as Deques do.
2115 +     */
2116 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2117 +        if (x instanceof List || x instanceof Set)
2118 +            assertCollectionsEquals(x, y);
2119 +        else {
2120 +            assertEquals(x.isEmpty(), y.isEmpty());
2121 +            assertEquals(x.size(), y.size());
2122 +            assertEquals(new HashSet(x), new HashSet(y));
2123 +            if (x instanceof Deque) {
2124 +                assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2125 +                assertTrue(Arrays.equals(x.toArray(new Object[0]),
2126 +                                         y.toArray(new Object[0])));
2127 +            }
2128 +        }
2129 +    }
2130   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines