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.241 by jsr166, Sun Jan 28 16:20:42 2018 UTC vs.
Revision 1.263 by jsr166, Thu Sep 5 22:05:30 2019 UTC

# Line 66 | Line 66 | 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;
# Line 114 | 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 277 | Line 288 | public class JSR166TestCase extends Test
288              // Avoid spurious reports with enormous runsPerTest.
289              // A single test case run should never take more than 1 second.
290              // But let's cap it at the high end too ...
291 <            final int timeoutMinutes =
292 <                Math.min(15, Math.max(runsPerTest / 60, 1));
291 >            final int timeoutMinutesMin = Math.max(runsPerTest / 60, 1)
292 >                * Math.max((int) delayFactor, 1);
293 >            final int timeoutMinutes = Math.min(15, timeoutMinutesMin);
294              for (TestCase lastTestCase = currentTestCase;;) {
295                  try { MINUTES.sleep(timeoutMinutes); }
296                  catch (InterruptedException unexpected) { break; }
# Line 448 | Line 460 | public class JSR166TestCase extends Test
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 499 | 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 538 | Line 558 | public class JSR166TestCase extends Test
558                  "HashMapTest",
559                  "LinkedBlockingDeque8Test",
560                  "LinkedBlockingQueue8Test",
561 +                "LinkedHashMapTest",
562                  "LongAccumulatorTest",
563                  "LongAdderTest",
564                  "SplittableRandomTest",
# Line 636 | Line 657 | public class JSR166TestCase extends Test
657      public static long MEDIUM_DELAY_MS;
658      public static long LONG_DELAY_MS;
659  
660 +    /**
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;
# Line 664 | Line 691 | public class JSR166TestCase extends Test
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.
# Line 681 | 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
# Line 719 | 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 1287 | Line 1329 | public class JSR166TestCase extends Test
1329      /**
1330       * Spin-waits up to the specified number of milliseconds for the given
1331       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1332 +     * @param waitingForGodot if non-null, an additional condition to satisfy
1333       */
1334 <    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1335 <        long startTime = 0L;
1336 <        for (;;) {
1337 <            Thread.State s = thread.getState();
1338 <            if (s == Thread.State.BLOCKED ||
1339 <                s == Thread.State.WAITING ||
1340 <                s == Thread.State.TIMED_WAITING)
1341 <                return;
1342 <            else if (s == Thread.State.TERMINATED)
1334 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis,
1335 >                                       Callable<Boolean> waitingForGodot) {
1336 >        for (long startTime = 0L;;) {
1337 >            switch (thread.getState()) {
1338 >            default: break;
1339 >            case BLOCKED: case WAITING: case TIMED_WAITING:
1340 >                try {
1341 >                    if (waitingForGodot == null || waitingForGodot.call())
1342 >                        return;
1343 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1344 >                break;
1345 >            case TERMINATED:
1346                  fail("Unexpected thread termination");
1347 <            else if (startTime == 0L)
1347 >            }
1348 >
1349 >            if (startTime == 0L)
1350                  startTime = System.nanoTime();
1351              else if (millisElapsedSince(startTime) > timeoutMillis) {
1352 <                threadAssertTrue(thread.isAlive());
1353 <                fail("timed out waiting for thread to enter wait state");
1352 >                assertTrue(thread.isAlive());
1353 >                if (waitingForGodot == null
1354 >                    || thread.getState() == Thread.State.RUNNABLE)
1355 >                    fail("timed out waiting for thread to enter wait state");
1356 >                else
1357 >                    fail("timed out waiting for condition, thread state="
1358 >                         + thread.getState());
1359              }
1360              Thread.yield();
1361          }
# Line 1310 | Line 1363 | public class JSR166TestCase extends Test
1363  
1364      /**
1365       * Spin-waits up to the specified number of milliseconds for the given
1366 <     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1314 <     * and additionally satisfy the given condition.
1366 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1367       */
1368 <    void waitForThreadToEnterWaitState(
1369 <        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1318 <        long startTime = 0L;
1319 <        for (;;) {
1320 <            Thread.State s = thread.getState();
1321 <            if (s == Thread.State.BLOCKED ||
1322 <                s == Thread.State.WAITING ||
1323 <                s == Thread.State.TIMED_WAITING) {
1324 <                try {
1325 <                    if (waitingForGodot.call())
1326 <                        return;
1327 <                } catch (Throwable fail) { threadUnexpectedException(fail); }
1328 <            }
1329 <            else if (s == Thread.State.TERMINATED)
1330 <                fail("Unexpected thread termination");
1331 <            else if (startTime == 0L)
1332 <                startTime = System.nanoTime();
1333 <            else if (millisElapsedSince(startTime) > timeoutMillis) {
1334 <                threadAssertTrue(thread.isAlive());
1335 <                fail("timed out waiting for thread to enter wait state");
1336 <            }
1337 <            Thread.yield();
1338 <        }
1368 >    void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1369 >        waitForThreadToEnterWaitState(thread, timeoutMillis, null);
1370      }
1371  
1372      /**
# Line 1343 | Line 1374 | public class JSR166TestCase extends Test
1374       * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1375       */
1376      void waitForThreadToEnterWaitState(Thread thread) {
1377 <        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1377 >        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, null);
1378      }
1379  
1380      /**
# Line 1351 | Line 1382 | public class JSR166TestCase extends Test
1382       * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1383       * and additionally satisfy the given condition.
1384       */
1385 <    void waitForThreadToEnterWaitState(
1386 <        Thread thread, Callable<Boolean> waitingForGodot) {
1385 >    void waitForThreadToEnterWaitState(Thread thread,
1386 >                                       Callable<Boolean> waitingForGodot) {
1387          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1388      }
1389  
1390      /**
1391 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the current thread to
1392 +     * be interrupted.  Clears the interrupt status before returning.
1393 +     */
1394 +    void awaitInterrupted() {
1395 +        for (long startTime = 0L; !Thread.interrupted(); ) {
1396 +            if (startTime == 0L)
1397 +                startTime = System.nanoTime();
1398 +            else if (millisElapsedSince(startTime) > LONG_DELAY_MS)
1399 +                fail("timed out waiting for thread interrupt");
1400 +            Thread.yield();
1401 +        }
1402 +    }
1403 +
1404 +    /**
1405       * Returns the number of milliseconds since time given by
1406       * startNanoTime, which must have been previously returned from a
1407       * call to {@link System#nanoTime()}.
# Line 1365 | Line 1410 | public class JSR166TestCase extends Test
1410          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
1411      }
1412  
1368 //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
1369 //         long startTime = System.nanoTime();
1370 //         try {
1371 //             r.run();
1372 //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1373 //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1374 //             throw new AssertionError("did not return promptly");
1375 //     }
1376
1377 //     void assertTerminatesPromptly(Runnable r) {
1378 //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
1379 //     }
1380
1413      /**
1414       * Checks that timed f.get() returns the expected value, and does not
1415       * wait for the timeout to elapse before returning.
1416       */
1417      <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
1418          long startTime = System.nanoTime();
1419 +        T actual = null;
1420          try {
1421 <            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1421 >            actual = f.get(timeoutMillis, MILLISECONDS);
1422          } catch (Throwable fail) { threadUnexpectedException(fail); }
1423 +        assertEquals(expectedValue, actual);
1424          if (millisElapsedSince(startTime) > timeoutMillis/2)
1425              throw new AssertionError("timed get did not return promptly");
1426      }
# Line 1410 | Line 1444 | public class JSR166TestCase extends Test
1444       * to terminate (using {@link Thread#join(long)}), else interrupts
1445       * the thread (in the hope that it may terminate later) and fails.
1446       */
1447 <    void awaitTermination(Thread t, long timeoutMillis) {
1447 >    void awaitTermination(Thread thread, long timeoutMillis) {
1448          try {
1449 <            t.join(timeoutMillis);
1449 >            thread.join(timeoutMillis);
1450          } catch (InterruptedException fail) {
1451              threadUnexpectedException(fail);
1452 <        } finally {
1453 <            if (t.getState() != Thread.State.TERMINATED) {
1454 <                t.interrupt();
1455 <                threadFail("timed out waiting for thread to terminate");
1452 >        }
1453 >        if (thread.getState() != Thread.State.TERMINATED) {
1454 >            String detail = String.format(
1455 >                    "timed out waiting for thread to terminate, thread=%s, state=%s" ,
1456 >                    thread, thread.getState());
1457 >            try {
1458 >                threadFail(detail);
1459 >            } finally {
1460 >                // Interrupt thread __after__ having reported its stack trace
1461 >                thread.interrupt();
1462              }
1463          }
1464      }
# Line 1446 | Line 1486 | public class JSR166TestCase extends Test
1486          }
1487      }
1488  
1449    public abstract class RunnableShouldThrow implements Runnable {
1450        protected abstract void realRun() throws Throwable;
1451
1452        final Class<?> exceptionClass;
1453
1454        <T extends Throwable> RunnableShouldThrow(Class<T> exceptionClass) {
1455            this.exceptionClass = exceptionClass;
1456        }
1457
1458        public final void run() {
1459            try {
1460                realRun();
1461                threadShouldThrow(exceptionClass.getSimpleName());
1462            } catch (Throwable t) {
1463                if (! exceptionClass.isInstance(t))
1464                    threadUnexpectedException(t);
1465            }
1466        }
1467    }
1468
1489      public abstract class ThreadShouldThrow extends Thread {
1490          protected abstract void realRun() throws Throwable;
1491  
# Line 1478 | Line 1498 | public class JSR166TestCase extends Test
1498          public final void run() {
1499              try {
1500                  realRun();
1481                threadShouldThrow(exceptionClass.getSimpleName());
1501              } catch (Throwable t) {
1502                  if (! exceptionClass.isInstance(t))
1503                      threadUnexpectedException(t);
1504 +                return;
1505              }
1506 +            threadShouldThrow(exceptionClass.getSimpleName());
1507          }
1508      }
1509  
# Line 1492 | Line 1513 | public class JSR166TestCase extends Test
1513          public final void run() {
1514              try {
1515                  realRun();
1495                threadShouldThrow("InterruptedException");
1516              } catch (InterruptedException success) {
1517                  threadAssertFalse(Thread.interrupted());
1518 +                return;
1519              } catch (Throwable fail) {
1520                  threadUnexpectedException(fail);
1521              }
1522 +            threadShouldThrow("InterruptedException");
1523          }
1524      }
1525  
# Line 1509 | Line 1531 | public class JSR166TestCase extends Test
1531                  return realCall();
1532              } catch (Throwable fail) {
1533                  threadUnexpectedException(fail);
1512                return null;
1513            }
1514        }
1515    }
1516
1517    public abstract class CheckedInterruptedCallable<T>
1518        implements Callable<T> {
1519        protected abstract T realCall() throws Throwable;
1520
1521        public final T call() {
1522            try {
1523                T result = realCall();
1524                threadShouldThrow("InterruptedException");
1525                return result;
1526            } catch (InterruptedException success) {
1527                threadAssertFalse(Thread.interrupted());
1528            } catch (Throwable fail) {
1529                threadUnexpectedException(fail);
1534              }
1535 <            return null;
1535 >            throw new AssertionError("unreached");
1536          }
1537      }
1538  
# Line 1585 | Line 1589 | public class JSR166TestCase extends Test
1589      }
1590  
1591      public void await(CountDownLatch latch, long timeoutMillis) {
1592 +        boolean timedOut = false;
1593          try {
1594 <            if (!latch.await(timeoutMillis, MILLISECONDS))
1590 <                fail("timed out waiting for CountDownLatch for "
1591 <                     + (timeoutMillis/1000) + " sec");
1594 >            timedOut = !latch.await(timeoutMillis, MILLISECONDS);
1595          } catch (Throwable fail) {
1596              threadUnexpectedException(fail);
1597          }
1598 +        if (timedOut)
1599 +            fail("timed out waiting for CountDownLatch for "
1600 +                 + (timeoutMillis/1000) + " sec");
1601      }
1602  
1603      public void await(CountDownLatch latch) {
# Line 1599 | Line 1605 | public class JSR166TestCase extends Test
1605      }
1606  
1607      public void await(Semaphore semaphore) {
1608 +        boolean timedOut = false;
1609          try {
1610 <            if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
1604 <                fail("timed out waiting for Semaphore for "
1605 <                     + (LONG_DELAY_MS/1000) + " sec");
1610 >            timedOut = !semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS);
1611          } catch (Throwable fail) {
1612              threadUnexpectedException(fail);
1613          }
1614 +        if (timedOut)
1615 +            fail("timed out waiting for Semaphore for "
1616 +                 + (LONG_DELAY_MS/1000) + " sec");
1617      }
1618  
1619      public void await(CyclicBarrier barrier) {
# Line 1639 | Line 1647 | public class JSR166TestCase extends Test
1647          public String call() { throw new NullPointerException(); }
1648      }
1649  
1642    public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1643        protected void realRun() {
1644            try {
1645                delay(SMALL_DELAY_MS);
1646            } catch (InterruptedException ok) {}
1647        }
1648    }
1649
1650      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1651          return new CheckedRunnable() {
1652              protected void realRun() {
# Line 1702 | Line 1702 | public class JSR166TestCase extends Test
1702                  return realCompute();
1703              } catch (Throwable fail) {
1704                  threadUnexpectedException(fail);
1705                return null;
1705              }
1706 +            throw new AssertionError("unreached");
1707          }
1708      }
1709  
# Line 1780 | Line 1780 | public class JSR166TestCase extends Test
1780          }
1781      }
1782  
1783 <    void assertImmutable(final Object o) {
1783 >    void assertImmutable(Object o) {
1784          if (o instanceof Collection) {
1785              assertThrows(
1786                  UnsupportedOperationException.class,
1787 <                new Runnable() { public void run() {
1788 <                        ((Collection) o).add(null);}});
1787 >                () -> ((Collection) o).add(null));
1788          }
1789      }
1790  
1791      @SuppressWarnings("unchecked")
1792      <T> T serialClone(T o) {
1793 +        T clone = null;
1794          try {
1795              ObjectInputStream ois = new ObjectInputStream
1796                  (new ByteArrayInputStream(serialBytes(o)));
1797 <            T clone = (T) ois.readObject();
1798 <            if (o == clone) assertImmutable(o);
1799 <            assertSame(o.getClass(), clone.getClass());
1800 <            return clone;
1797 >            clone = (T) ois.readObject();
1798          } catch (Throwable fail) {
1799              threadUnexpectedException(fail);
1803            return null;
1800          }
1801 +        if (o == clone) assertImmutable(o);
1802 +        else assertSame(o.getClass(), clone.getClass());
1803 +        return clone;
1804      }
1805  
1806      /**
# Line 1820 | Line 1819 | public class JSR166TestCase extends Test
1819              (new ByteArrayInputStream(bos.toByteArray()));
1820          T clone = (T) ois.readObject();
1821          if (o == clone) assertImmutable(o);
1822 <        assertSame(o.getClass(), clone.getClass());
1822 >        else assertSame(o.getClass(), clone.getClass());
1823          return clone;
1824      }
1825  
# Line 1845 | Line 1844 | public class JSR166TestCase extends Test
1844      }
1845  
1846      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1847 <                             Runnable... throwingActions) {
1848 <        for (Runnable throwingAction : throwingActions) {
1847 >                             Action... throwingActions) {
1848 >        for (Action throwingAction : throwingActions) {
1849              boolean threw = false;
1850              try { throwingAction.run(); }
1851              catch (Throwable t) {
# Line 2071 | Line 2070 | public class JSR166TestCase extends Test
2070          assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2071          assertEquals(savedQueueSize, p.getQueue().size());
2072      }
2073 +
2074 +    void assertCollectionsEquals(Collection<?> x, Collection<?> y) {
2075 +        assertEquals(x, y);
2076 +        assertEquals(y, x);
2077 +        assertEquals(x.isEmpty(), y.isEmpty());
2078 +        assertEquals(x.size(), y.size());
2079 +        if (x instanceof List) {
2080 +            assertEquals(x.toString(), y.toString());
2081 +        }
2082 +        if (x instanceof List || x instanceof Set) {
2083 +            assertEquals(x.hashCode(), y.hashCode());
2084 +        }
2085 +        if (x instanceof List || x instanceof Deque) {
2086 +            assertTrue(Arrays.equals(x.toArray(), y.toArray()));
2087 +            assertTrue(Arrays.equals(x.toArray(new Object[0]),
2088 +                                     y.toArray(new Object[0])));
2089 +        }
2090 +    }
2091 +
2092 +    /**
2093 +     * A weaker form of assertCollectionsEquals which does not insist
2094 +     * that the two collections satisfy Object#equals(Object), since
2095 +     * they may use identity semantics as Deques do.
2096 +     */
2097 +    void assertCollectionsEquivalent(Collection<?> x, Collection<?> y) {
2098 +        if (x instanceof List || x instanceof Set)
2099 +            assertCollectionsEquals(x, y);
2100 +        else {
2101 +            assertEquals(x.isEmpty(), y.isEmpty());
2102 +            assertEquals(x.size(), y.size());
2103 +            assertEquals(new HashSet(x), new HashSet(y));
2104 +            if (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   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines