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.187 by jsr166, Mon Feb 22 20:41:59 2016 UTC vs.
Revision 1.231 by jsr166, Mon May 15 17:02:46 2017 UTC

# Line 1 | Line 1
1   /*
2 < * Written by Doug Lea with assistance from members of JCP JSR-166
3 < * Expert Group and released to the public domain, as explained at
2 > * Written by Doug Lea and Martin Buchholz with assistance from
3 > * members of JCP JSR-166 Expert Group and released to the public
4 > * domain, as explained at
5   * http://creativecommons.org/publicdomain/zero/1.0/
6   * Other contributors include Andrew Wright, Jeffrey Hayes,
7   * Pat Fisher, Mike Judd.
# Line 8 | Line 9
9  
10   /*
11   * @test
12 < * @summary JSR-166 tck tests
13 < * @modules java.management
12 > * @summary JSR-166 tck tests, in a number of variations.
13 > *          The first is the conformance testing variant,
14 > *          while others also test implementation details.
15   * @build *
16 < * @run junit/othervm/timeout=1000 -Djsr166.testImplementationDetails=true JSR166TestCase
16 > * @modules java.management
17 > * @run junit/othervm/timeout=1000 JSR166TestCase
18 > * @run junit/othervm/timeout=1000
19 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
20 > *      --add-opens java.base/java.lang=ALL-UNNAMED
21 > *      -Djsr166.testImplementationDetails=true
22 > *      JSR166TestCase
23 > * @run junit/othervm/timeout=1000
24 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
25 > *      --add-opens java.base/java.lang=ALL-UNNAMED
26 > *      -Djsr166.testImplementationDetails=true
27 > *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=0
28 > *      JSR166TestCase
29 > * @run junit/othervm/timeout=1000
30 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
31 > *      --add-opens java.base/java.lang=ALL-UNNAMED
32 > *      -Djsr166.testImplementationDetails=true
33 > *      -Djava.util.concurrent.ForkJoinPool.common.parallelism=1
34 > *      -Djava.util.secureRandomSeed=true
35 > *      JSR166TestCase
36 > * @run junit/othervm/timeout=1000/policy=tck.policy
37 > *      --add-opens java.base/java.util.concurrent=ALL-UNNAMED
38 > *      --add-opens java.base/java.lang=ALL-UNNAMED
39 > *      -Djsr166.testImplementationDetails=true
40 > *      JSR166TestCase
41   */
42  
43   import static java.util.concurrent.TimeUnit.MILLISECONDS;
# Line 28 | Line 54 | import java.lang.management.ThreadMXBean
54   import java.lang.reflect.Constructor;
55   import java.lang.reflect.Method;
56   import java.lang.reflect.Modifier;
31 import java.nio.file.Files;
32 import java.nio.file.Paths;
57   import java.security.CodeSource;
58   import java.security.Permission;
59   import java.security.PermissionCollection;
# Line 39 | Line 63 | import java.security.ProtectionDomain;
63   import java.security.SecurityPermission;
64   import java.util.ArrayList;
65   import java.util.Arrays;
66 + import java.util.Collection;
67 + import java.util.Collections;
68   import java.util.Date;
69   import java.util.Enumeration;
70   import java.util.Iterator;
# Line 58 | Line 84 | import java.util.concurrent.RecursiveAct
84   import java.util.concurrent.RecursiveTask;
85   import java.util.concurrent.RejectedExecutionHandler;
86   import java.util.concurrent.Semaphore;
87 + import java.util.concurrent.SynchronousQueue;
88   import java.util.concurrent.ThreadFactory;
89 + import java.util.concurrent.ThreadLocalRandom;
90   import java.util.concurrent.ThreadPoolExecutor;
91   import java.util.concurrent.TimeoutException;
92   import java.util.concurrent.atomic.AtomicBoolean;
93   import java.util.concurrent.atomic.AtomicReference;
66 import java.util.regex.Matcher;
94   import java.util.regex.Pattern;
95  
96   import junit.framework.AssertionFailedError;
# Line 184 | Line 211 | public class JSR166TestCase extends Test
211      private static final int suiteRuns =
212          Integer.getInteger("jsr166.suiteRuns", 1);
213  
214 <    private static float systemPropertyValue(String name, float defaultValue) {
214 >    /**
215 >     * Returns the value of the system property, or NaN if not defined.
216 >     */
217 >    private static float systemPropertyValue(String name) {
218          String floatString = System.getProperty(name);
219          if (floatString == null)
220 <            return defaultValue;
220 >            return Float.NaN;
221          try {
222              return Float.parseFloat(floatString);
223          } catch (NumberFormatException ex) {
# Line 199 | Line 229 | public class JSR166TestCase extends Test
229  
230      /**
231       * The scaling factor to apply to standard delays used in tests.
232 <     */
233 <    private static final float delayFactor =
234 <        systemPropertyValue("jsr166.delay.factor", 1.0f);
235 <
236 <    /**
237 <     * The timeout factor as used in the jtreg test harness.
238 <     * See: http://openjdk.java.net/jtreg/tag-spec.html
239 <     */
240 <    private static final float jtregTestTimeoutFactor
241 <        = systemPropertyValue("test.timeout.factor", 1.0f);
232 >     * May be initialized from any of:
233 >     * - the "jsr166.delay.factor" system property
234 >     * - the "test.timeout.factor" system property (as used by jtreg)
235 >     *   See: http://openjdk.java.net/jtreg/tag-spec.html
236 >     * - hard-coded fuzz factor when using a known slowpoke VM
237 >     */
238 >    private static final float delayFactor = delayFactor();
239 >
240 >    private static float delayFactor() {
241 >        float x;
242 >        if (!Float.isNaN(x = systemPropertyValue("jsr166.delay.factor")))
243 >            return x;
244 >        if (!Float.isNaN(x = systemPropertyValue("test.timeout.factor")))
245 >            return x;
246 >        String prop = System.getProperty("java.vm.version");
247 >        if (prop != null && prop.matches(".*debug.*"))
248 >            return 4.0f; // How much slower is fastdebug than product?!
249 >        return 1.0f;
250 >    }
251  
252      public JSR166TestCase() { super(); }
253      public JSR166TestCase(String name) { super(name); }
# Line 261 | Line 300 | public class JSR166TestCase extends Test
300  
301   //     public static String cpuModel() {
302   //         try {
303 < //             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
303 > //             java.util.regex.Matcher matcher
304 > //               = Pattern.compile("model name\\s*: (.*)")
305   //                 .matcher(new String(
306 < //                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
306 > //                     java.nio.file.Files.readAllBytes(
307 > //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
308   //             matcher.find();
309   //             return matcher.group(1);
310   //         } catch (Exception ex) { return null; }
# Line 430 | Line 471 | public class JSR166TestCase extends Test
471              AbstractQueuedLongSynchronizerTest.suite(),
472              ArrayBlockingQueueTest.suite(),
473              ArrayDequeTest.suite(),
474 +            ArrayListTest.suite(),
475              AtomicBooleanTest.suite(),
476              AtomicIntegerArrayTest.suite(),
477              AtomicIntegerFieldUpdaterTest.suite(),
# Line 452 | Line 494 | public class JSR166TestCase extends Test
494              CopyOnWriteArrayListTest.suite(),
495              CopyOnWriteArraySetTest.suite(),
496              CountDownLatchTest.suite(),
497 +            CountedCompleterTest.suite(),
498              CyclicBarrierTest.suite(),
499              DelayQueueTest.suite(),
500              EntryTest.suite(),
# Line 480 | Line 523 | public class JSR166TestCase extends Test
523              TreeMapTest.suite(),
524              TreeSetTest.suite(),
525              TreeSubMapTest.suite(),
526 <            TreeSubSetTest.suite());
526 >            TreeSubSetTest.suite(),
527 >            VectorTest.suite());
528  
529          // Java8+ test classes
530          if (atLeastJava8()) {
531              String[] java8TestClassNames = {
532 +                "ArrayDeque8Test",
533                  "Atomic8Test",
534                  "CompletableFutureTest",
535                  "ConcurrentHashMap8Test",
536 <                "CountedCompleterTest",
536 >                "CountedCompleter8Test",
537                  "DoubleAccumulatorTest",
538                  "DoubleAdderTest",
539                  "ForkJoinPool8Test",
540                  "ForkJoinTask8Test",
541 +                "LinkedBlockingDeque8Test",
542 +                "LinkedBlockingQueue8Test",
543                  "LongAccumulatorTest",
544                  "LongAdderTest",
545                  "SplittableRandomTest",
546                  "StampedLockTest",
547                  "SubmissionPublisherTest",
548                  "ThreadLocalRandom8Test",
549 +                "TimeUnit8Test",
550              };
551              addNamedTestClasses(suite, java8TestClassNames);
552          }
# Line 506 | Line 554 | public class JSR166TestCase extends Test
554          // Java9+ test classes
555          if (atLeastJava9()) {
556              String[] java9TestClassNames = {
557 <                // Currently empty, but expecting varhandle tests
557 >                "AtomicBoolean9Test",
558 >                "AtomicInteger9Test",
559 >                "AtomicIntegerArray9Test",
560 >                "AtomicLong9Test",
561 >                "AtomicLongArray9Test",
562 >                "AtomicReference9Test",
563 >                "AtomicReferenceArray9Test",
564 >                "ExecutorCompletionService9Test",
565 >                "ForkJoinPool9Test",
566              };
567              addNamedTestClasses(suite, java9TestClassNames);
568          }
# Line 517 | Line 573 | public class JSR166TestCase extends Test
573      /** Returns list of junit-style test method names in given class. */
574      public static ArrayList<String> testMethodNames(Class<?> testClass) {
575          Method[] methods = testClass.getDeclaredMethods();
576 <        ArrayList<String> names = new ArrayList<String>(methods.length);
576 >        ArrayList<String> names = new ArrayList<>(methods.length);
577          for (Method method : methods) {
578              if (method.getName().startsWith("test")
579                  && Modifier.isPublic(method.getModifiers())
# Line 589 | Line 645 | public class JSR166TestCase extends Test
645       * http://openjdk.java.net/jtreg/command-help.html
646       */
647      protected long getShortDelay() {
648 <        return (long) (50 * delayFactor * jtregTestTimeoutFactor);
648 >        return (long) (50 * delayFactor);
649      }
650  
651      /**
# Line 602 | Line 658 | public class JSR166TestCase extends Test
658          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
659      }
660  
661 +    private static final long TIMEOUT_DELAY_MS
662 +        = (long) (12.0 * Math.cbrt(delayFactor));
663 +
664      /**
665 <     * Returns a timeout in milliseconds to be used in tests that
666 <     * verify that operations block or time out.
665 >     * Returns a timeout in milliseconds to be used in tests that verify
666 >     * that operations block or time out.  We want this to be longer
667 >     * than the OS scheduling quantum, but not too long, so don't scale
668 >     * linearly with delayFactor; we use "crazy" cube root instead.
669       */
670 <    long timeoutMillis() {
671 <        return SHORT_DELAY_MS / 4;
670 >    static long timeoutMillis() {
671 >        return TIMEOUT_DELAY_MS;
672      }
673  
674      /**
# Line 623 | Line 684 | public class JSR166TestCase extends Test
684       * The first exception encountered if any threadAssertXXX method fails.
685       */
686      private final AtomicReference<Throwable> threadFailure
687 <        = new AtomicReference<Throwable>(null);
687 >        = new AtomicReference<>(null);
688  
689      /**
690       * Records an exception so that it can be rethrown later in the test
# Line 933 | Line 994 | public class JSR166TestCase extends Test
994          }
995      }
996  
997 <    /** Like Runnable, but with the freedom to throw anything */
997 >    /**
998 >     * Like Runnable, but with the freedom to throw anything.
999 >     * junit folks had the same idea:
1000 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
1001 >     */
1002      interface Action { public void run() throws Throwable; }
1003  
1004      /**
# Line 964 | Line 1029 | public class JSR166TestCase extends Test
1029       * Uninteresting threads are filtered out.
1030       */
1031      static void dumpTestThreads() {
1032 +        SecurityManager sm = System.getSecurityManager();
1033 +        if (sm != null) {
1034 +            try {
1035 +                System.setSecurityManager(null);
1036 +            } catch (SecurityException giveUp) {
1037 +                return;
1038 +            }
1039 +        }
1040 +
1041          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1042          System.err.println("------ stacktrace dump start ------");
1043          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1044 <            String name = info.getThreadName();
1044 >            final String name = info.getThreadName();
1045 >            String lockName;
1046              if ("Signal Dispatcher".equals(name))
1047                  continue;
1048              if ("Reference Handler".equals(name)
1049 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1049 >                && (lockName = info.getLockName()) != null
1050 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1051                  continue;
1052              if ("Finalizer".equals(name)
1053 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1053 >                && (lockName = info.getLockName()) != null
1054 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1055                  continue;
1056              if ("checkForWedgedTest".equals(name))
1057                  continue;
1058              System.err.print(info);
1059          }
1060          System.err.println("------ stacktrace dump end ------");
1061 +
1062 +        if (sm != null) System.setSecurityManager(sm);
1063 +    }
1064 +
1065 +    /**
1066 +     * Checks that thread eventually enters the expected blocked thread state.
1067 +     */
1068 +    void assertThreadBlocks(Thread thread, Thread.State expected) {
1069 +        // always sleep at least 1 ms, with high probability avoiding
1070 +        // transitory states
1071 +        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1072 +            try { delay(1); }
1073 +            catch (InterruptedException fail) {
1074 +                fail("Unexpected InterruptedException");
1075 +            }
1076 +            Thread.State s = thread.getState();
1077 +            if (s == expected)
1078 +                return;
1079 +            else if (s == Thread.State.TERMINATED)
1080 +                fail("Unexpected thread termination");
1081 +        }
1082 +        fail("timed out waiting for thread to enter thread state " + expected);
1083      }
1084  
1085      /**
1086       * Checks that thread does not terminate within the default
1087       * millisecond delay of {@code timeoutMillis()}.
1088 +     * TODO: REMOVEME
1089       */
1090      void assertThreadStaysAlive(Thread thread) {
1091          assertThreadStaysAlive(thread, timeoutMillis());
# Line 993 | Line 1093 | public class JSR166TestCase extends Test
1093  
1094      /**
1095       * Checks that thread does not terminate within the given millisecond delay.
1096 +     * TODO: REMOVEME
1097       */
1098      void assertThreadStaysAlive(Thread thread, long millis) {
1099          try {
# Line 1007 | Line 1108 | public class JSR166TestCase extends Test
1108      /**
1109       * Checks that the threads do not terminate within the default
1110       * millisecond delay of {@code timeoutMillis()}.
1111 +     * TODO: REMOVEME
1112       */
1113      void assertThreadsStayAlive(Thread... threads) {
1114          assertThreadsStayAlive(timeoutMillis(), threads);
# Line 1014 | Line 1116 | public class JSR166TestCase extends Test
1116  
1117      /**
1118       * Checks that the threads do not terminate within the given millisecond delay.
1119 +     * TODO: REMOVEME
1120       */
1121      void assertThreadsStayAlive(long millis, Thread... threads) {
1122          try {
# Line 1064 | Line 1167 | public class JSR166TestCase extends Test
1167      }
1168  
1169      /**
1170 +     * The maximum number of consecutive spurious wakeups we should
1171 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1172 +     */
1173 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1174 +
1175 +    /**
1176       * The number of elements to place in collections, arrays, etc.
1177       */
1178      public static final int SIZE = 20;
# Line 1167 | Line 1276 | public class JSR166TestCase extends Test
1276          }
1277          public void refresh() {}
1278          public String toString() {
1279 <            List<Permission> ps = new ArrayList<Permission>();
1279 >            List<Permission> ps = new ArrayList<>();
1280              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1281                  ps.add(e.nextElement());
1282              return "AdjustablePolicy with permissions " + ps;
# Line 1197 | Line 1306 | public class JSR166TestCase extends Test
1306       * Sleeps until the given time has elapsed.
1307       * Throws AssertionFailedError if interrupted.
1308       */
1309 <    void sleep(long millis) {
1309 >    static void sleep(long millis) {
1310          try {
1311              delay(millis);
1312          } catch (InterruptedException fail) {
# Line 1213 | Line 1322 | public class JSR166TestCase extends Test
1322       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1323       */
1324      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1325 <        long startTime = System.nanoTime();
1325 >        long startTime = 0L;
1326          for (;;) {
1327              Thread.State s = thread.getState();
1328              if (s == Thread.State.BLOCKED ||
# Line 1222 | Line 1331 | public class JSR166TestCase extends Test
1331                  return;
1332              else if (s == Thread.State.TERMINATED)
1333                  fail("Unexpected thread termination");
1334 +            else if (startTime == 0L)
1335 +                startTime = System.nanoTime();
1336              else if (millisElapsedSince(startTime) > timeoutMillis) {
1337                  threadAssertTrue(thread.isAlive());
1338 <                return;
1338 >                fail("timed out waiting for thread to enter wait state");
1339 >            }
1340 >            Thread.yield();
1341 >        }
1342 >    }
1343 >
1344 >    /**
1345 >     * Spin-waits up to the specified number of milliseconds for the given
1346 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1347 >     * and additionally satisfy the given condition.
1348 >     */
1349 >    void waitForThreadToEnterWaitState(
1350 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1351 >        long startTime = 0L;
1352 >        for (;;) {
1353 >            Thread.State s = thread.getState();
1354 >            if (s == Thread.State.BLOCKED ||
1355 >                s == Thread.State.WAITING ||
1356 >                s == Thread.State.TIMED_WAITING) {
1357 >                try {
1358 >                    if (waitingForGodot.call())
1359 >                        return;
1360 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1361 >            }
1362 >            else if (s == Thread.State.TERMINATED)
1363 >                fail("Unexpected thread termination");
1364 >            else if (startTime == 0L)
1365 >                startTime = System.nanoTime();
1366 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1367 >                threadAssertTrue(thread.isAlive());
1368 >                fail("timed out waiting for thread to enter wait state");
1369              }
1370              Thread.yield();
1371          }
1372      }
1373  
1374      /**
1375 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1376 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1375 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1376 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1377       */
1378      void waitForThreadToEnterWaitState(Thread thread) {
1379          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1380      }
1381  
1382      /**
1383 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1384 +     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1385 +     * and additionally satisfy the given condition.
1386 +     */
1387 +    void waitForThreadToEnterWaitState(
1388 +        Thread thread, Callable<Boolean> waitingForGodot) {
1389 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1390 +    }
1391 +
1392 +    /**
1393       * Returns the number of milliseconds since time given by
1394       * startNanoTime, which must have been previously returned from a
1395       * call to {@link System#nanoTime()}.
# Line 1466 | Line 1617 | public class JSR166TestCase extends Test
1617          return new LatchAwaiter(latch);
1618      }
1619  
1620 <    public void await(CountDownLatch latch) {
1620 >    public void await(CountDownLatch latch, long timeoutMillis) {
1621          try {
1622 <            if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
1622 >            if (!latch.await(timeoutMillis, MILLISECONDS))
1623                  fail("timed out waiting for CountDownLatch for "
1624 <                     + (LONG_DELAY_MS/1000) + " sec");
1624 >                     + (timeoutMillis/1000) + " sec");
1625          } catch (Throwable fail) {
1626              threadUnexpectedException(fail);
1627          }
1628      }
1629  
1630 +    public void await(CountDownLatch latch) {
1631 +        await(latch, LONG_DELAY_MS);
1632 +    }
1633 +
1634      public void await(Semaphore semaphore) {
1635          try {
1636              if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
# Line 1486 | Line 1641 | public class JSR166TestCase extends Test
1641          }
1642      }
1643  
1644 +    public void await(CyclicBarrier barrier) {
1645 +        try {
1646 +            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1647 +        } catch (Throwable fail) {
1648 +            threadUnexpectedException(fail);
1649 +        }
1650 +    }
1651 +
1652   //     /**
1653   //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1654   //      */
# Line 1710 | Line 1873 | public class JSR166TestCase extends Test
1873       * A CyclicBarrier that uses timed await and fails with
1874       * AssertionFailedErrors instead of throwing checked exceptions.
1875       */
1876 <    public class CheckedBarrier extends CyclicBarrier {
1876 >    public static class CheckedBarrier extends CyclicBarrier {
1877          public CheckedBarrier(int parties) { super(parties); }
1878  
1879          public int await() {
# Line 1774 | Line 1937 | public class JSR166TestCase extends Test
1937          }
1938      }
1939  
1940 +    void assertImmutable(final Object o) {
1941 +        if (o instanceof Collection) {
1942 +            assertThrows(
1943 +                UnsupportedOperationException.class,
1944 +                new Runnable() { public void run() {
1945 +                        ((Collection) o).add(null);}});
1946 +        }
1947 +    }
1948 +
1949      @SuppressWarnings("unchecked")
1950      <T> T serialClone(T o) {
1951          try {
1952              ObjectInputStream ois = new ObjectInputStream
1953                  (new ByteArrayInputStream(serialBytes(o)));
1954              T clone = (T) ois.readObject();
1955 +            if (o == clone) assertImmutable(o);
1956              assertSame(o.getClass(), clone.getClass());
1957              return clone;
1958          } catch (Throwable fail) {
# Line 1788 | Line 1961 | public class JSR166TestCase extends Test
1961          }
1962      }
1963  
1964 +    /**
1965 +     * A version of serialClone that leaves error handling (for
1966 +     * e.g. NotSerializableException) up to the caller.
1967 +     */
1968 +    @SuppressWarnings("unchecked")
1969 +    <T> T serialClonePossiblyFailing(T o)
1970 +        throws ReflectiveOperationException, java.io.IOException {
1971 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1972 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1973 +        oos.writeObject(o);
1974 +        oos.flush();
1975 +        oos.close();
1976 +        ObjectInputStream ois = new ObjectInputStream
1977 +            (new ByteArrayInputStream(bos.toByteArray()));
1978 +        T clone = (T) ois.readObject();
1979 +        if (o == clone) assertImmutable(o);
1980 +        assertSame(o.getClass(), clone.getClass());
1981 +        return clone;
1982 +    }
1983 +
1984 +    /**
1985 +     * If o implements Cloneable and has a public clone method,
1986 +     * returns a clone of o, else null.
1987 +     */
1988 +    @SuppressWarnings("unchecked")
1989 +    <T> T cloneableClone(T o) {
1990 +        if (!(o instanceof Cloneable)) return null;
1991 +        final T clone;
1992 +        try {
1993 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1994 +        } catch (NoSuchMethodException ok) {
1995 +            return null;
1996 +        } catch (ReflectiveOperationException unexpected) {
1997 +            throw new Error(unexpected);
1998 +        }
1999 +        assertNotSame(o, clone); // not 100% guaranteed by spec
2000 +        assertSame(o.getClass(), clone.getClass());
2001 +        return clone;
2002 +    }
2003 +
2004      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
2005                               Runnable... throwingActions) {
2006          for (Runnable throwingAction : throwingActions) {
# Line 1816 | Line 2029 | public class JSR166TestCase extends Test
2029          } catch (NoSuchElementException success) {}
2030          assertFalse(it.hasNext());
2031      }
2032 +
2033 +    public <T> Callable<T> callableThrowing(final Exception ex) {
2034 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
2035 +    }
2036 +
2037 +    public Runnable runnableThrowing(final RuntimeException ex) {
2038 +        return new Runnable() { public void run() { throw ex; }};
2039 +    }
2040 +
2041 +    /** A reusable thread pool to be shared by tests. */
2042 +    static final ExecutorService cachedThreadPool =
2043 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2044 +                               1000L, MILLISECONDS,
2045 +                               new SynchronousQueue<Runnable>());
2046 +
2047 +    static <T> void shuffle(T[] array) {
2048 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2049 +    }
2050   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines