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.185 by jsr166, Mon Feb 22 19:36:59 2016 UTC vs.
Revision 1.221 by jsr166, Tue Mar 14 00:54:27 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 585 | Line 641 | public class JSR166TestCase extends Test
641      /**
642       * Returns the shortest timed delay. This can be scaled up for
643       * slow machines using the jsr166.delay.factor system property,
644 <     * or via jtreg's -timeoutFactor:<val> flag.
644 >     * or via jtreg's -timeoutFactor: flag.
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 623 | Line 679 | public class JSR166TestCase extends Test
679       * The first exception encountered if any threadAssertXXX method fails.
680       */
681      private final AtomicReference<Throwable> threadFailure
682 <        = new AtomicReference<Throwable>(null);
682 >        = new AtomicReference<>(null);
683  
684      /**
685       * Records an exception so that it can be rethrown later in the test
# Line 933 | Line 989 | public class JSR166TestCase extends Test
989          }
990      }
991  
992 <    /** Like Runnable, but with the freedom to throw anything */
992 >    /**
993 >     * Like Runnable, but with the freedom to throw anything.
994 >     * junit folks had the same idea:
995 >     * http://junit.org/junit5/docs/snapshot/api/org/junit/gen5/api/Executable.html
996 >     */
997      interface Action { public void run() throws Throwable; }
998  
999      /**
# Line 964 | Line 1024 | public class JSR166TestCase extends Test
1024       * Uninteresting threads are filtered out.
1025       */
1026      static void dumpTestThreads() {
1027 +        SecurityManager sm = System.getSecurityManager();
1028 +        if (sm != null) {
1029 +            try {
1030 +                System.setSecurityManager(null);
1031 +            } catch (SecurityException giveUp) {
1032 +                return;
1033 +            }
1034 +        }
1035 +
1036          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1037          System.err.println("------ stacktrace dump start ------");
1038          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1039 <            String name = info.getThreadName();
1039 >            final String name = info.getThreadName();
1040 >            String lockName;
1041              if ("Signal Dispatcher".equals(name))
1042                  continue;
1043              if ("Reference Handler".equals(name)
1044 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1044 >                && (lockName = info.getLockName()) != null
1045 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1046                  continue;
1047              if ("Finalizer".equals(name)
1048 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1048 >                && (lockName = info.getLockName()) != null
1049 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1050                  continue;
1051              if ("checkForWedgedTest".equals(name))
1052                  continue;
1053              System.err.print(info);
1054          }
1055          System.err.println("------ stacktrace dump end ------");
1056 +
1057 +        if (sm != null) System.setSecurityManager(sm);
1058      }
1059  
1060      /**
# Line 1167 | Line 1241 | public class JSR166TestCase extends Test
1241          }
1242          public void refresh() {}
1243          public String toString() {
1244 <            List<Permission> ps = new ArrayList<Permission>();
1244 >            List<Permission> ps = new ArrayList<>();
1245              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1246                  ps.add(e.nextElement());
1247              return "AdjustablePolicy with permissions " + ps;
# Line 1197 | Line 1271 | public class JSR166TestCase extends Test
1271       * Sleeps until the given time has elapsed.
1272       * Throws AssertionFailedError if interrupted.
1273       */
1274 <    void sleep(long millis) {
1274 >    static void sleep(long millis) {
1275          try {
1276              delay(millis);
1277          } catch (InterruptedException fail) {
# Line 1213 | Line 1287 | public class JSR166TestCase extends Test
1287       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1288       */
1289      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1290 <        long startTime = System.nanoTime();
1290 >        long startTime = 0L;
1291          for (;;) {
1292              Thread.State s = thread.getState();
1293              if (s == Thread.State.BLOCKED ||
# Line 1222 | Line 1296 | public class JSR166TestCase extends Test
1296                  return;
1297              else if (s == Thread.State.TERMINATED)
1298                  fail("Unexpected thread termination");
1299 +            else if (startTime == 0L)
1300 +                startTime = System.nanoTime();
1301              else if (millisElapsedSince(startTime) > timeoutMillis) {
1302                  threadAssertTrue(thread.isAlive());
1303 <                return;
1303 >                fail("timed out waiting for thread to enter wait state");
1304              }
1305              Thread.yield();
1306          }
1307      }
1308  
1309      /**
1310 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1311 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1310 >     * Spin-waits up to the specified number of milliseconds for the given
1311 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1312 >     * and additionally satisfy the given condition.
1313 >     */
1314 >    void waitForThreadToEnterWaitState(
1315 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1316 >        long startTime = 0L;
1317 >        for (;;) {
1318 >            Thread.State s = thread.getState();
1319 >            if (s == Thread.State.BLOCKED ||
1320 >                s == Thread.State.WAITING ||
1321 >                s == Thread.State.TIMED_WAITING) {
1322 >                try {
1323 >                    if (waitingForGodot.call())
1324 >                        return;
1325 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1326 >            }
1327 >            else if (s == Thread.State.TERMINATED)
1328 >                fail("Unexpected thread termination");
1329 >            else if (startTime == 0L)
1330 >                startTime = System.nanoTime();
1331 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1332 >                threadAssertTrue(thread.isAlive());
1333 >                fail("timed out waiting for thread to enter wait state");
1334 >            }
1335 >            Thread.yield();
1336 >        }
1337 >    }
1338 >
1339 >    /**
1340 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1341 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1342       */
1343      void waitForThreadToEnterWaitState(Thread thread) {
1344          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1345      }
1346  
1347      /**
1348 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1349 +     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1350 +     * and additionally satisfy the given condition.
1351 +     */
1352 +    void waitForThreadToEnterWaitState(
1353 +        Thread thread, Callable<Boolean> waitingForGodot) {
1354 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1355 +    }
1356 +
1357 +    /**
1358       * Returns the number of milliseconds since time given by
1359       * startNanoTime, which must have been previously returned from a
1360       * call to {@link System#nanoTime()}.
# Line 1466 | Line 1582 | public class JSR166TestCase extends Test
1582          return new LatchAwaiter(latch);
1583      }
1584  
1585 <    public void await(CountDownLatch latch) {
1585 >    public void await(CountDownLatch latch, long timeoutMillis) {
1586          try {
1587 <            if (!latch.await(LONG_DELAY_MS, MILLISECONDS))
1587 >            if (!latch.await(timeoutMillis, MILLISECONDS))
1588                  fail("timed out waiting for CountDownLatch for "
1589 <                     + (LONG_DELAY_MS/1000) + " sec");
1589 >                     + (timeoutMillis/1000) + " sec");
1590          } catch (Throwable fail) {
1591              threadUnexpectedException(fail);
1592          }
1593      }
1594  
1595 +    public void await(CountDownLatch latch) {
1596 +        await(latch, LONG_DELAY_MS);
1597 +    }
1598 +
1599      public void await(Semaphore semaphore) {
1600          try {
1601              if (!semaphore.tryAcquire(LONG_DELAY_MS, MILLISECONDS))
# Line 1710 | Line 1830 | public class JSR166TestCase extends Test
1830       * A CyclicBarrier that uses timed await and fails with
1831       * AssertionFailedErrors instead of throwing checked exceptions.
1832       */
1833 <    public class CheckedBarrier extends CyclicBarrier {
1833 >    public static class CheckedBarrier extends CyclicBarrier {
1834          public CheckedBarrier(int parties) { super(parties); }
1835  
1836          public int await() {
# Line 1774 | Line 1894 | public class JSR166TestCase extends Test
1894          }
1895      }
1896  
1897 +    void assertImmutable(final Object o) {
1898 +        if (o instanceof Collection) {
1899 +            assertThrows(
1900 +                UnsupportedOperationException.class,
1901 +                new Runnable() { public void run() {
1902 +                        ((Collection) o).add(null);}});
1903 +        }
1904 +    }
1905 +
1906      @SuppressWarnings("unchecked")
1907      <T> T serialClone(T o) {
1908          try {
1909              ObjectInputStream ois = new ObjectInputStream
1910                  (new ByteArrayInputStream(serialBytes(o)));
1911              T clone = (T) ois.readObject();
1912 +            if (o == clone) assertImmutable(o);
1913              assertSame(o.getClass(), clone.getClass());
1914              return clone;
1915          } catch (Throwable fail) {
# Line 1788 | Line 1918 | public class JSR166TestCase extends Test
1918          }
1919      }
1920  
1921 +    /**
1922 +     * A version of serialClone that leaves error handling (for
1923 +     * e.g. NotSerializableException) up to the caller.
1924 +     */
1925 +    @SuppressWarnings("unchecked")
1926 +    <T> T serialClonePossiblyFailing(T o)
1927 +        throws ReflectiveOperationException, java.io.IOException {
1928 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1929 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1930 +        oos.writeObject(o);
1931 +        oos.flush();
1932 +        oos.close();
1933 +        ObjectInputStream ois = new ObjectInputStream
1934 +            (new ByteArrayInputStream(bos.toByteArray()));
1935 +        T clone = (T) ois.readObject();
1936 +        if (o == clone) assertImmutable(o);
1937 +        assertSame(o.getClass(), clone.getClass());
1938 +        return clone;
1939 +    }
1940 +
1941 +    /**
1942 +     * If o implements Cloneable and has a public clone method,
1943 +     * returns a clone of o, else null.
1944 +     */
1945 +    @SuppressWarnings("unchecked")
1946 +    <T> T cloneableClone(T o) {
1947 +        if (!(o instanceof Cloneable)) return null;
1948 +        final T clone;
1949 +        try {
1950 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1951 +        } catch (NoSuchMethodException ok) {
1952 +            return null;
1953 +        } catch (ReflectiveOperationException unexpected) {
1954 +            throw new Error(unexpected);
1955 +        }
1956 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1957 +        assertSame(o.getClass(), clone.getClass());
1958 +        return clone;
1959 +    }
1960 +
1961      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1962                               Runnable... throwingActions) {
1963          for (Runnable throwingAction : throwingActions) {
# Line 1816 | Line 1986 | public class JSR166TestCase extends Test
1986          } catch (NoSuchElementException success) {}
1987          assertFalse(it.hasNext());
1988      }
1989 +
1990 +    public <T> Callable<T> callableThrowing(final Exception ex) {
1991 +        return new Callable<T>() { public T call() throws Exception { throw ex; }};
1992 +    }
1993 +
1994 +    public Runnable runnableThrowing(final RuntimeException ex) {
1995 +        return new Runnable() { public void run() { throw ex; }};
1996 +    }
1997 +
1998 +    /** A reusable thread pool to be shared by tests. */
1999 +    static final ExecutorService cachedThreadPool =
2000 +        new ThreadPoolExecutor(0, Integer.MAX_VALUE,
2001 +                               1000L, MILLISECONDS,
2002 +                               new SynchronousQueue<Runnable>());
2003 +
2004 +    static <T> void shuffle(T[] array) {
2005 +        Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
2006 +    }
2007   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines