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.215 by jsr166, Sat Dec 10 18:11:05 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 (conformance testing mode)
12 > * @summary JSR-166 tck tests, in a number of variations.
13 > *          The first is the conformance testing variant,
14 > *          while others also test implementation details.
15   * @build *
16   * @modules java.management
17   * @run junit/othervm/timeout=1000 JSR166TestCase
15 */
16
17 /*
18 * @test
19 * @summary JSR-166 tck tests (whitebox tests allowed)
20 * @build *
21 * @modules java.base/java.util.concurrent:open
22 *          java.management
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 48 | 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;
51 import java.nio.file.Files;
52 import java.nio.file.Paths;
57   import java.security.CodeSource;
58   import java.security.Permission;
59   import java.security.PermissionCollection;
# Line 87 | Line 91 | import java.util.concurrent.ThreadPoolEx
91   import java.util.concurrent.TimeoutException;
92   import java.util.concurrent.atomic.AtomicBoolean;
93   import java.util.concurrent.atomic.AtomicReference;
90 import java.util.regex.Matcher;
94   import java.util.regex.Pattern;
95  
96   import junit.framework.AssertionFailedError;
# Line 297 | 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 557 | Line 562 | public class JSR166TestCase extends Test
562                  "AtomicReference9Test",
563                  "AtomicReferenceArray9Test",
564                  "ExecutorCompletionService9Test",
565 +                "ForkJoinPool9Test",
566              };
567              addNamedTestClasses(suite, java9TestClassNames);
568          }
# Line 567 | 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 652 | 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 673 | 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 1052 | Line 1063 | public class JSR166TestCase extends Test
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 1061 | 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 1075 | 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 1082 | 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 1132 | 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 1235 | 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 1294 | Line 1335 | public class JSR166TestCase extends Test
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 1558 | Line 1639 | public class JSR166TestCase extends Test
1639          } catch (Throwable fail) {
1640              threadUnexpectedException(fail);
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   //     /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines