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.217 by jsr166, Tue Jan 24 22:57:02 2017 UTC vs.
Revision 1.228 by jsr166, Sun May 14 03:14:25 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   */
# Line 51 | 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;
54 import java.nio.file.Files;
55 import java.nio.file.Paths;
57   import java.security.CodeSource;
58   import java.security.Permission;
59   import java.security.PermissionCollection;
# Line 90 | 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;
93 import java.util.regex.Matcher;
94   import java.util.regex.Pattern;
95  
96   import junit.framework.AssertionFailedError;
# Line 300 | 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 560 | Line 562 | public class JSR166TestCase extends Test
562                  "AtomicReference9Test",
563                  "AtomicReferenceArray9Test",
564                  "ExecutorCompletionService9Test",
565 +                "ForkJoinPool9Test",
566              };
567              addNamedTestClasses(suite, java9TestClassNames);
568          }
# Line 655 | 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 1055 | 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       */
# Line 1076 | Line 1104 | public class JSR166TestCase extends Test
1104      }
1105  
1106      /**
1079     * Checks that the threads do not terminate within the default
1080     * millisecond delay of {@code timeoutMillis()}.
1081     */
1082    void assertThreadsStayAlive(Thread... threads) {
1083        assertThreadsStayAlive(timeoutMillis(), threads);
1084    }
1085
1086    /**
1087     * Checks that the threads do not terminate within the given millisecond delay.
1088     */
1089    void assertThreadsStayAlive(long millis, Thread... threads) {
1090        try {
1091            // No need to optimize the failing case via Thread.join.
1092            delay(millis);
1093            for (Thread thread : threads)
1094                assertTrue(thread.isAlive());
1095        } catch (InterruptedException fail) {
1096            threadFail("Unexpected InterruptedException");
1097        }
1098    }
1099
1100    /**
1107       * Checks that future.get times out, with the default timeout of
1108       * {@code timeoutMillis()}.
1109       */
# Line 1135 | Line 1141 | public class JSR166TestCase extends Test
1141      }
1142  
1143      /**
1144 +     * The maximum number of consecutive spurious wakeups we should
1145 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1146 +     */
1147 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1148 +
1149 +    /**
1150       * The number of elements to place in collections, arrays, etc.
1151       */
1152      public static final int SIZE = 20;
# Line 1297 | Line 1309 | public class JSR166TestCase extends Test
1309                  startTime = System.nanoTime();
1310              else if (millisElapsedSince(startTime) > timeoutMillis) {
1311                  threadAssertTrue(thread.isAlive());
1312 <                return;
1312 >                fail("timed out waiting for thread to enter wait state");
1313 >            }
1314 >            Thread.yield();
1315 >        }
1316 >    }
1317 >
1318 >    /**
1319 >     * Spin-waits up to the specified number of milliseconds for the given
1320 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1321 >     * and additionally satisfy the given condition.
1322 >     */
1323 >    void waitForThreadToEnterWaitState(
1324 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1325 >        long startTime = 0L;
1326 >        for (;;) {
1327 >            Thread.State s = thread.getState();
1328 >            if (s == Thread.State.BLOCKED ||
1329 >                s == Thread.State.WAITING ||
1330 >                s == Thread.State.TIMED_WAITING) {
1331 >                try {
1332 >                    if (waitingForGodot.call())
1333 >                        return;
1334 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1335 >            }
1336 >            else if (s == Thread.State.TERMINATED)
1337 >                fail("Unexpected thread termination");
1338 >            else if (startTime == 0L)
1339 >                startTime = System.nanoTime();
1340 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1341 >                threadAssertTrue(thread.isAlive());
1342 >                fail("timed out waiting for thread to enter wait state");
1343              }
1344              Thread.yield();
1345          }
1346      }
1347  
1348      /**
1349 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1350 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1349 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1350 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1351       */
1352      void waitForThreadToEnterWaitState(Thread thread) {
1353          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1354      }
1355  
1356      /**
1357 +     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1358 +     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1359 +     * and additionally satisfy the given condition.
1360 +     */
1361 +    void waitForThreadToEnterWaitState(
1362 +        Thread thread, Callable<Boolean> waitingForGodot) {
1363 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1364 +    }
1365 +
1366 +    /**
1367       * Returns the number of milliseconds since time given by
1368       * startNanoTime, which must have been previously returned from a
1369       * call to {@link System#nanoTime()}.
# Line 1561 | Line 1613 | public class JSR166TestCase extends Test
1613          } catch (Throwable fail) {
1614              threadUnexpectedException(fail);
1615          }
1616 +    }
1617 +
1618 +    public void await(CyclicBarrier barrier) {
1619 +        try {
1620 +            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1621 +        } catch (Throwable fail) {
1622 +            threadUnexpectedException(fail);
1623 +        }
1624      }
1625  
1626   //     /**

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines