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.194 by jsr166, Mon May 23 18:42:17 2016 UTC vs.
Revision 1.223 by jsr166, Sat May 13 19:13:09 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
17 < * @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=0 -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 29 | 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;
32 import java.nio.file.Files;
33 import java.nio.file.Paths;
57   import java.security.CodeSource;
58   import java.security.Permission;
59   import java.security.PermissionCollection;
# Line 40 | 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 61 | Line 86 | import java.util.concurrent.RejectedExec
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;
68 import java.util.regex.Matcher;
94   import java.util.regex.Pattern;
95  
96   import junit.framework.AssertionFailedError;
# Line 275 | 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 444 | 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 466 | 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 494 | 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",
# Line 521 | Line 554 | public class JSR166TestCase extends Test
554          // Java9+ test classes
555          if (atLeastJava9()) {
556              String[] java9TestClassNames = {
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 532 | 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 617 | 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 638 | 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 948 | 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 979 | 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      /**
# Line 1079 | Line 1143 | public class JSR166TestCase extends Test
1143      }
1144  
1145      /**
1146 +     * The maximum number of consecutive spurious wakeups we should
1147 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1148 +     */
1149 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1150 +
1151 +    /**
1152       * The number of elements to place in collections, arrays, etc.
1153       */
1154      public static final int SIZE = 20;
# Line 1182 | Line 1252 | public class JSR166TestCase extends Test
1252          }
1253          public void refresh() {}
1254          public String toString() {
1255 <            List<Permission> ps = new ArrayList<Permission>();
1255 >            List<Permission> ps = new ArrayList<>();
1256              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1257                  ps.add(e.nextElement());
1258              return "AdjustablePolicy with permissions " + ps;
# Line 1212 | Line 1282 | public class JSR166TestCase extends Test
1282       * Sleeps until the given time has elapsed.
1283       * Throws AssertionFailedError if interrupted.
1284       */
1285 <    void sleep(long millis) {
1285 >    static void sleep(long millis) {
1286          try {
1287              delay(millis);
1288          } catch (InterruptedException fail) {
# Line 1228 | Line 1298 | public class JSR166TestCase extends Test
1298       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1299       */
1300      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1301 <        long startTime = System.nanoTime();
1301 >        long startTime = 0L;
1302          for (;;) {
1303              Thread.State s = thread.getState();
1304              if (s == Thread.State.BLOCKED ||
# Line 1237 | Line 1307 | public class JSR166TestCase extends Test
1307                  return;
1308              else if (s == Thread.State.TERMINATED)
1309                  fail("Unexpected thread termination");
1310 +            else if (startTime == 0L)
1311 +                startTime = System.nanoTime();
1312              else if (millisElapsedSince(startTime) > timeoutMillis) {
1313                  threadAssertTrue(thread.isAlive());
1314 <                return;
1314 >                fail("timed out waiting for thread to enter wait state");
1315 >            }
1316 >            Thread.yield();
1317 >        }
1318 >    }
1319 >
1320 >    /**
1321 >     * Spin-waits up to the specified number of milliseconds for the given
1322 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1323 >     * and additionally satisfy the given condition.
1324 >     */
1325 >    void waitForThreadToEnterWaitState(
1326 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1327 >        long startTime = 0L;
1328 >        for (;;) {
1329 >            Thread.State s = thread.getState();
1330 >            if (s == Thread.State.BLOCKED ||
1331 >                s == Thread.State.WAITING ||
1332 >                s == Thread.State.TIMED_WAITING) {
1333 >                try {
1334 >                    if (waitingForGodot.call())
1335 >                        return;
1336 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1337 >            }
1338 >            else if (s == Thread.State.TERMINATED)
1339 >                fail("Unexpected thread termination");
1340 >            else if (startTime == 0L)
1341 >                startTime = System.nanoTime();
1342 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1343 >                threadAssertTrue(thread.isAlive());
1344 >                fail("timed out waiting for thread to enter wait state");
1345              }
1346              Thread.yield();
1347          }
1348      }
1349  
1350      /**
1351 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1352 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1351 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1352 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1353       */
1354      void waitForThreadToEnterWaitState(Thread thread) {
1355          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1356      }
1357  
1358      /**
1359 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1360 +     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1361 +     * and additionally satisfy the given condition.
1362 +     */
1363 +    void waitForThreadToEnterWaitState(
1364 +        Thread thread, Callable<Boolean> waitingForGodot) {
1365 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1366 +    }
1367 +
1368 +    /**
1369       * Returns the number of milliseconds since time given by
1370       * startNanoTime, which must have been previously returned from a
1371       * call to {@link System#nanoTime()}.
# Line 1729 | Line 1841 | public class JSR166TestCase extends Test
1841       * A CyclicBarrier that uses timed await and fails with
1842       * AssertionFailedErrors instead of throwing checked exceptions.
1843       */
1844 <    public class CheckedBarrier extends CyclicBarrier {
1844 >    public static class CheckedBarrier extends CyclicBarrier {
1845          public CheckedBarrier(int parties) { super(parties); }
1846  
1847          public int await() {
# Line 1793 | Line 1905 | public class JSR166TestCase extends Test
1905          }
1906      }
1907  
1908 +    void assertImmutable(final Object o) {
1909 +        if (o instanceof Collection) {
1910 +            assertThrows(
1911 +                UnsupportedOperationException.class,
1912 +                new Runnable() { public void run() {
1913 +                        ((Collection) o).add(null);}});
1914 +        }
1915 +    }
1916 +
1917      @SuppressWarnings("unchecked")
1918      <T> T serialClone(T o) {
1919          try {
1920              ObjectInputStream ois = new ObjectInputStream
1921                  (new ByteArrayInputStream(serialBytes(o)));
1922              T clone = (T) ois.readObject();
1923 +            if (o == clone) assertImmutable(o);
1924              assertSame(o.getClass(), clone.getClass());
1925              return clone;
1926          } catch (Throwable fail) {
# Line 1807 | Line 1929 | public class JSR166TestCase extends Test
1929          }
1930      }
1931  
1932 +    /**
1933 +     * A version of serialClone that leaves error handling (for
1934 +     * e.g. NotSerializableException) up to the caller.
1935 +     */
1936 +    @SuppressWarnings("unchecked")
1937 +    <T> T serialClonePossiblyFailing(T o)
1938 +        throws ReflectiveOperationException, java.io.IOException {
1939 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1940 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1941 +        oos.writeObject(o);
1942 +        oos.flush();
1943 +        oos.close();
1944 +        ObjectInputStream ois = new ObjectInputStream
1945 +            (new ByteArrayInputStream(bos.toByteArray()));
1946 +        T clone = (T) ois.readObject();
1947 +        if (o == clone) assertImmutable(o);
1948 +        assertSame(o.getClass(), clone.getClass());
1949 +        return clone;
1950 +    }
1951 +
1952 +    /**
1953 +     * If o implements Cloneable and has a public clone method,
1954 +     * returns a clone of o, else null.
1955 +     */
1956 +    @SuppressWarnings("unchecked")
1957 +    <T> T cloneableClone(T o) {
1958 +        if (!(o instanceof Cloneable)) return null;
1959 +        final T clone;
1960 +        try {
1961 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1962 +        } catch (NoSuchMethodException ok) {
1963 +            return null;
1964 +        } catch (ReflectiveOperationException unexpected) {
1965 +            throw new Error(unexpected);
1966 +        }
1967 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1968 +        assertSame(o.getClass(), clone.getClass());
1969 +        return clone;
1970 +    }
1971 +
1972      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1973                               Runnable... throwingActions) {
1974          for (Runnable throwingAction : throwingActions) {
# Line 1850 | Line 2012 | public class JSR166TestCase extends Test
2012                                 1000L, MILLISECONDS,
2013                                 new SynchronousQueue<Runnable>());
2014  
2015 +    static <T> void shuffle(T[] array) {
2016 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2017 +    }
2018   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines