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.216 by jsr166, Wed Jan 4 06:09:58 2017 UTC vs.
Revision 1.240 by jsr166, Tue Jan 23 22:56:37 2018 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 72 | Line 76 | import java.util.concurrent.Callable;
76   import java.util.concurrent.CountDownLatch;
77   import java.util.concurrent.CyclicBarrier;
78   import java.util.concurrent.ExecutionException;
79 + import java.util.concurrent.Executor;
80   import java.util.concurrent.Executors;
81   import java.util.concurrent.ExecutorService;
82   import java.util.concurrent.ForkJoinPool;
83   import java.util.concurrent.Future;
84 + import java.util.concurrent.FutureTask;
85   import java.util.concurrent.RecursiveAction;
86   import java.util.concurrent.RecursiveTask;
87 + import java.util.concurrent.RejectedExecutionException;
88   import java.util.concurrent.RejectedExecutionHandler;
89   import java.util.concurrent.Semaphore;
90 + import java.util.concurrent.ScheduledExecutorService;
91 + import java.util.concurrent.ScheduledFuture;
92   import java.util.concurrent.SynchronousQueue;
93   import java.util.concurrent.ThreadFactory;
94   import java.util.concurrent.ThreadLocalRandom;
95   import java.util.concurrent.ThreadPoolExecutor;
96 + import java.util.concurrent.TimeUnit;
97   import java.util.concurrent.TimeoutException;
98   import java.util.concurrent.atomic.AtomicBoolean;
99   import java.util.concurrent.atomic.AtomicReference;
90 import java.util.regex.Matcher;
100   import java.util.regex.Pattern;
101  
93 import junit.framework.AssertionFailedError;
102   import junit.framework.Test;
103   import junit.framework.TestCase;
104   import junit.framework.TestResult;
# Line 297 | Line 305 | public class JSR166TestCase extends Test
305  
306   //     public static String cpuModel() {
307   //         try {
308 < //             Matcher matcher = Pattern.compile("model name\\s*: (.*)")
308 > //             java.util.regex.Matcher matcher
309 > //               = Pattern.compile("model name\\s*: (.*)")
310   //                 .matcher(new String(
311 < //                      Files.readAllBytes(Paths.get("/proc/cpuinfo")), "UTF-8"));
311 > //                     java.nio.file.Files.readAllBytes(
312 > //                         java.nio.file.Paths.get("/proc/cpuinfo")), "UTF-8"));
313   //             matcher.find();
314   //             return matcher.group(1);
315   //         } catch (Exception ex) { return null; }
# Line 434 | Line 444 | public class JSR166TestCase extends Test
444          }
445      }
446  
447 <    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
448 <    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
449 <    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
450 <    public static boolean atLeastJava9() {
451 <        return JAVA_CLASS_VERSION >= 53.0
442 <            // As of 2015-09, java9 still uses 52.0 class file version
443 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
444 <    }
445 <    public static boolean atLeastJava10() {
446 <        return JAVA_CLASS_VERSION >= 54.0
447 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
448 <    }
447 >    public static boolean atLeastJava6()  { return JAVA_CLASS_VERSION >= 50.0; }
448 >    public static boolean atLeastJava7()  { return JAVA_CLASS_VERSION >= 51.0; }
449 >    public static boolean atLeastJava8()  { return JAVA_CLASS_VERSION >= 52.0; }
450 >    public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
451 >    public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
452  
453      /**
454       * Collects all JSR166 unit tests as one suite.
# Line 533 | Line 536 | public class JSR166TestCase extends Test
536                  "DoubleAdderTest",
537                  "ForkJoinPool8Test",
538                  "ForkJoinTask8Test",
539 +                "HashMapTest",
540                  "LinkedBlockingDeque8Test",
541                  "LinkedBlockingQueue8Test",
542                  "LongAccumulatorTest",
# Line 557 | Line 561 | public class JSR166TestCase extends Test
561                  "AtomicReference9Test",
562                  "AtomicReferenceArray9Test",
563                  "ExecutorCompletionService9Test",
564 +                "ForkJoinPool9Test",
565              };
566              addNamedTestClasses(suite, java9TestClassNames);
567          }
# Line 632 | Line 637 | public class JSR166TestCase extends Test
637      public static long MEDIUM_DELAY_MS;
638      public static long LONG_DELAY_MS;
639  
640 +    private static final long RANDOM_TIMEOUT;
641 +    private static final long RANDOM_EXPIRED_TIMEOUT;
642 +    private static final TimeUnit RANDOM_TIMEUNIT;
643 +    static {
644 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
645 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
646 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
647 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
648 +        TimeUnit[] timeUnits = TimeUnit.values();
649 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
650 +    }
651 +
652 +    /**
653 +     * Returns a timeout for use when any value at all will do.
654 +     */
655 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
656 +
657 +    /**
658 +     * Returns a timeout that means "no waiting", i.e. not positive.
659 +     */
660 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
661 +
662 +    /**
663 +     * Returns a random non-null TimeUnit.
664 +     */
665 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
666 +
667      /**
668       * Returns the shortest timed delay. This can be scaled up for
669       * slow machines using the jsr166.delay.factor system property,
# Line 652 | Line 684 | public class JSR166TestCase extends Test
684          LONG_DELAY_MS   = SHORT_DELAY_MS * 200;
685      }
686  
687 +    private static final long TIMEOUT_DELAY_MS
688 +        = (long) (12.0 * Math.cbrt(delayFactor));
689 +
690      /**
691 <     * Returns a timeout in milliseconds to be used in tests that
692 <     * verify that operations block or time out.
691 >     * Returns a timeout in milliseconds to be used in tests that verify
692 >     * that operations block or time out.  We want this to be longer
693 >     * than the OS scheduling quantum, but not too long, so don't scale
694 >     * linearly with delayFactor; we use "crazy" cube root instead.
695       */
696 <    long timeoutMillis() {
697 <        return SHORT_DELAY_MS / 4;
696 >    static long timeoutMillis() {
697 >        return TIMEOUT_DELAY_MS;
698      }
699  
700      /**
# Line 695 | Line 732 | public class JSR166TestCase extends Test
732          String msg = toString() + ": " + String.format(format, args);
733          System.err.println(msg);
734          dumpTestThreads();
735 <        throw new AssertionFailedError(msg);
735 >        throw new AssertionError(msg);
736      }
737  
738      /**
# Line 716 | Line 753 | public class JSR166TestCase extends Test
753                  throw (RuntimeException) t;
754              else if (t instanceof Exception)
755                  throw (Exception) t;
756 <            else {
757 <                AssertionFailedError afe =
721 <                    new AssertionFailedError(t.toString());
722 <                afe.initCause(t);
723 <                throw afe;
724 <            }
756 >            else
757 >                throw new AssertionError(t.toString(), t);
758          }
759  
760          if (Thread.interrupted())
# Line 755 | Line 788 | public class JSR166TestCase extends Test
788  
789      /**
790       * Just like fail(reason), but additionally recording (using
791 <     * threadRecordFailure) any AssertionFailedError thrown, so that
792 <     * the current testcase will fail.
791 >     * threadRecordFailure) any AssertionError thrown, so that the
792 >     * current testcase will fail.
793       */
794      public void threadFail(String reason) {
795          try {
796              fail(reason);
797 <        } catch (AssertionFailedError t) {
798 <            threadRecordFailure(t);
799 <            throw t;
797 >        } catch (AssertionError fail) {
798 >            threadRecordFailure(fail);
799 >            throw fail;
800          }
801      }
802  
803      /**
804       * Just like assertTrue(b), but additionally recording (using
805 <     * threadRecordFailure) any AssertionFailedError thrown, so that
806 <     * the current testcase will fail.
805 >     * threadRecordFailure) any AssertionError thrown, so that the
806 >     * current testcase will fail.
807       */
808      public void threadAssertTrue(boolean b) {
809          try {
810              assertTrue(b);
811 <        } catch (AssertionFailedError t) {
812 <            threadRecordFailure(t);
813 <            throw t;
811 >        } catch (AssertionError fail) {
812 >            threadRecordFailure(fail);
813 >            throw fail;
814          }
815      }
816  
817      /**
818       * Just like assertFalse(b), but additionally recording (using
819 <     * threadRecordFailure) any AssertionFailedError thrown, so that
820 <     * the current testcase will fail.
819 >     * threadRecordFailure) any AssertionError thrown, so that the
820 >     * current testcase will fail.
821       */
822      public void threadAssertFalse(boolean b) {
823          try {
824              assertFalse(b);
825 <        } catch (AssertionFailedError t) {
826 <            threadRecordFailure(t);
827 <            throw t;
825 >        } catch (AssertionError fail) {
826 >            threadRecordFailure(fail);
827 >            throw fail;
828          }
829      }
830  
831      /**
832       * Just like assertNull(x), but additionally recording (using
833 <     * threadRecordFailure) any AssertionFailedError thrown, so that
834 <     * the current testcase will fail.
833 >     * threadRecordFailure) any AssertionError thrown, so that the
834 >     * current testcase will fail.
835       */
836      public void threadAssertNull(Object x) {
837          try {
838              assertNull(x);
839 <        } catch (AssertionFailedError t) {
840 <            threadRecordFailure(t);
841 <            throw t;
839 >        } catch (AssertionError fail) {
840 >            threadRecordFailure(fail);
841 >            throw fail;
842          }
843      }
844  
845      /**
846       * Just like assertEquals(x, y), but additionally recording (using
847 <     * threadRecordFailure) any AssertionFailedError thrown, so that
848 <     * the current testcase will fail.
847 >     * threadRecordFailure) any AssertionError thrown, so that the
848 >     * current testcase will fail.
849       */
850      public void threadAssertEquals(long x, long y) {
851          try {
852              assertEquals(x, y);
853 <        } catch (AssertionFailedError t) {
854 <            threadRecordFailure(t);
855 <            throw t;
853 >        } catch (AssertionError fail) {
854 >            threadRecordFailure(fail);
855 >            throw fail;
856          }
857      }
858  
859      /**
860       * Just like assertEquals(x, y), but additionally recording (using
861 <     * threadRecordFailure) any AssertionFailedError thrown, so that
862 <     * the current testcase will fail.
861 >     * threadRecordFailure) any AssertionError thrown, so that the
862 >     * current testcase will fail.
863       */
864      public void threadAssertEquals(Object x, Object y) {
865          try {
866              assertEquals(x, y);
867 <        } catch (AssertionFailedError fail) {
867 >        } catch (AssertionError fail) {
868              threadRecordFailure(fail);
869              throw fail;
870          } catch (Throwable fail) {
# Line 841 | Line 874 | public class JSR166TestCase extends Test
874  
875      /**
876       * Just like assertSame(x, y), but additionally recording (using
877 <     * threadRecordFailure) any AssertionFailedError thrown, so that
878 <     * the current testcase will fail.
877 >     * threadRecordFailure) any AssertionError thrown, so that the
878 >     * current testcase will fail.
879       */
880      public void threadAssertSame(Object x, Object y) {
881          try {
882              assertSame(x, y);
883 <        } catch (AssertionFailedError fail) {
883 >        } catch (AssertionError fail) {
884              threadRecordFailure(fail);
885              throw fail;
886          }
# Line 869 | Line 902 | public class JSR166TestCase extends Test
902  
903      /**
904       * Records the given exception using {@link #threadRecordFailure},
905 <     * then rethrows the exception, wrapping it in an
906 <     * AssertionFailedError if necessary.
905 >     * then rethrows the exception, wrapping it in an AssertionError
906 >     * if necessary.
907       */
908      public void threadUnexpectedException(Throwable t) {
909          threadRecordFailure(t);
# Line 879 | Line 912 | public class JSR166TestCase extends Test
912              throw (RuntimeException) t;
913          else if (t instanceof Error)
914              throw (Error) t;
915 <        else {
916 <            AssertionFailedError afe =
884 <                new AssertionFailedError("unexpected exception: " + t);
885 <            afe.initCause(t);
886 <            throw afe;
887 <        }
915 >        else
916 >            throw new AssertionError("unexpected exception: " + t, t);
917      }
918  
919      /**
# Line 1052 | Line 1081 | public class JSR166TestCase extends Test
1081      }
1082  
1083      /**
1084 <     * Checks that thread does not terminate within the default
1056 <     * millisecond delay of {@code timeoutMillis()}.
1057 <     */
1058 <    void assertThreadStaysAlive(Thread thread) {
1059 <        assertThreadStaysAlive(thread, timeoutMillis());
1060 <    }
1061 <
1062 <    /**
1063 <     * Checks that thread does not terminate within the given millisecond delay.
1064 <     */
1065 <    void assertThreadStaysAlive(Thread thread, long millis) {
1066 <        try {
1067 <            // No need to optimize the failing case via Thread.join.
1068 <            delay(millis);
1069 <            assertTrue(thread.isAlive());
1070 <        } catch (InterruptedException fail) {
1071 <            threadFail("Unexpected InterruptedException");
1072 <        }
1073 <    }
1074 <
1075 <    /**
1076 <     * Checks that the threads do not terminate within the default
1077 <     * millisecond delay of {@code timeoutMillis()}.
1078 <     */
1079 <    void assertThreadsStayAlive(Thread... threads) {
1080 <        assertThreadsStayAlive(timeoutMillis(), threads);
1081 <    }
1082 <
1083 <    /**
1084 <     * Checks that the threads do not terminate within the given millisecond delay.
1084 >     * Checks that thread eventually enters the expected blocked thread state.
1085       */
1086 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1087 <        try {
1088 <            // No need to optimize the failing case via Thread.join.
1089 <            delay(millis);
1090 <            for (Thread thread : threads)
1091 <                assertTrue(thread.isAlive());
1092 <        } catch (InterruptedException fail) {
1093 <            threadFail("Unexpected InterruptedException");
1086 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1087 >        // always sleep at least 1 ms, with high probability avoiding
1088 >        // transitory states
1089 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1090 >            try { delay(1); }
1091 >            catch (InterruptedException fail) {
1092 >                throw new AssertionError("Unexpected InterruptedException", fail);
1093 >            }
1094 >            Thread.State s = thread.getState();
1095 >            if (s == expected)
1096 >                return;
1097 >            else if (s == Thread.State.TERMINATED)
1098 >                fail("Unexpected thread termination");
1099          }
1100 +        fail("timed out waiting for thread to enter thread state " + expected);
1101      }
1102  
1103      /**
# Line 1132 | Line 1138 | public class JSR166TestCase extends Test
1138      }
1139  
1140      /**
1141 +     * The maximum number of consecutive spurious wakeups we should
1142 +     * tolerate (from APIs like LockSupport.park) before failing a test.
1143 +     */
1144 +    static final int MAX_SPURIOUS_WAKEUPS = 10;
1145 +
1146 +    /**
1147       * The number of elements to place in collections, arrays, etc.
1148       */
1149      public static final int SIZE = 20;
# Line 1263 | Line 1275 | public class JSR166TestCase extends Test
1275  
1276      /**
1277       * Sleeps until the given time has elapsed.
1278 <     * Throws AssertionFailedError if interrupted.
1278 >     * Throws AssertionError if interrupted.
1279       */
1280      static void sleep(long millis) {
1281          try {
1282              delay(millis);
1283          } catch (InterruptedException fail) {
1284 <            AssertionFailedError afe =
1273 <                new AssertionFailedError("Unexpected InterruptedException");
1274 <            afe.initCause(fail);
1275 <            throw afe;
1284 >            throw new AssertionError("Unexpected InterruptedException", fail);
1285          }
1286      }
1287  
# Line 1294 | Line 1303 | public class JSR166TestCase extends Test
1303                  startTime = System.nanoTime();
1304              else if (millisElapsedSince(startTime) > timeoutMillis) {
1305                  threadAssertTrue(thread.isAlive());
1306 <                return;
1306 >                fail("timed out waiting for thread to enter wait state");
1307              }
1308              Thread.yield();
1309          }
1310      }
1311  
1312      /**
1313 <     * Waits up to LONG_DELAY_MS for the given thread to enter a wait
1314 <     * state: BLOCKED, WAITING, or TIMED_WAITING.
1313 >     * Spin-waits up to the specified number of milliseconds for the given
1314 >     * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING,
1315 >     * and additionally satisfy the given condition.
1316 >     */
1317 >    void waitForThreadToEnterWaitState(
1318 >        Thread thread, long timeoutMillis, Callable<Boolean> waitingForGodot) {
1319 >        long startTime = 0L;
1320 >        for (;;) {
1321 >            Thread.State s = thread.getState();
1322 >            if (s == Thread.State.BLOCKED ||
1323 >                s == Thread.State.WAITING ||
1324 >                s == Thread.State.TIMED_WAITING) {
1325 >                try {
1326 >                    if (waitingForGodot.call())
1327 >                        return;
1328 >                } catch (Throwable fail) { threadUnexpectedException(fail); }
1329 >            }
1330 >            else if (s == Thread.State.TERMINATED)
1331 >                fail("Unexpected thread termination");
1332 >            else if (startTime == 0L)
1333 >                startTime = System.nanoTime();
1334 >            else if (millisElapsedSince(startTime) > timeoutMillis) {
1335 >                threadAssertTrue(thread.isAlive());
1336 >                fail("timed out waiting for thread to enter wait state");
1337 >            }
1338 >            Thread.yield();
1339 >        }
1340 >    }
1341 >
1342 >    /**
1343 >     * Spin-waits up to LONG_DELAY_MS milliseconds for the given thread to
1344 >     * enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1345       */
1346      void waitForThreadToEnterWaitState(Thread thread) {
1347          waitForThreadToEnterWaitState(thread, LONG_DELAY_MS);
1348      }
1349  
1350      /**
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 +     * and additionally satisfy the given condition.
1354 +     */
1355 +    void waitForThreadToEnterWaitState(
1356 +        Thread thread, Callable<Boolean> waitingForGodot) {
1357 +        waitForThreadToEnterWaitState(thread, LONG_DELAY_MS, waitingForGodot);
1358 +    }
1359 +
1360 +    /**
1361       * Returns the number of milliseconds since time given by
1362       * startNanoTime, which must have been previously returned from a
1363       * call to {@link System#nanoTime()}.
# Line 1323 | Line 1372 | public class JSR166TestCase extends Test
1372   //             r.run();
1373   //         } catch (Throwable fail) { threadUnexpectedException(fail); }
1374   //         if (millisElapsedSince(startTime) > timeoutMillis/2)
1375 < //             throw new AssertionFailedError("did not return promptly");
1375 > //             throw new AssertionError("did not return promptly");
1376   //     }
1377  
1378   //     void assertTerminatesPromptly(Runnable r) {
# Line 1340 | Line 1389 | public class JSR166TestCase extends Test
1389              assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
1390          } catch (Throwable fail) { threadUnexpectedException(fail); }
1391          if (millisElapsedSince(startTime) > timeoutMillis/2)
1392 <            throw new AssertionFailedError("timed get did not return promptly");
1392 >            throw new AssertionError("timed get did not return promptly");
1393      }
1394  
1395      <T> void checkTimedGet(Future<T> f, T expectedValue) {
# Line 1560 | Line 1609 | public class JSR166TestCase extends Test
1609          }
1610      }
1611  
1612 +    public void await(CyclicBarrier barrier) {
1613 +        try {
1614 +            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1615 +        } catch (Throwable fail) {
1616 +            threadUnexpectedException(fail);
1617 +        }
1618 +    }
1619 +
1620   //     /**
1621   //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1622   //      */
# Line 1574 | Line 1631 | public class JSR166TestCase extends Test
1631   //         long startTime = System.nanoTime();
1632   //         while (!flag.get()) {
1633   //             if (millisElapsedSince(startTime) > timeoutMillis)
1634 < //                 throw new AssertionFailedError("timed out");
1634 > //                 throw new AssertionError("timed out");
1635   //             Thread.yield();
1636   //         }
1637   //     }
# Line 1583 | Line 1640 | public class JSR166TestCase extends Test
1640          public String call() { throw new NullPointerException(); }
1641      }
1642  
1586    public static class CallableOne implements Callable<Integer> {
1587        public Integer call() { return one; }
1588    }
1589
1590    public class ShortRunnable extends CheckedRunnable {
1591        protected void realRun() throws Throwable {
1592            delay(SHORT_DELAY_MS);
1593        }
1594    }
1595
1596    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1597        protected void realRun() throws InterruptedException {
1598            delay(SHORT_DELAY_MS);
1599        }
1600    }
1601
1602    public class SmallRunnable extends CheckedRunnable {
1603        protected void realRun() throws Throwable {
1604            delay(SMALL_DELAY_MS);
1605        }
1606    }
1607
1643      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1644          protected void realRun() {
1645              try {
# Line 1613 | Line 1648 | public class JSR166TestCase extends Test
1648          }
1649      }
1650  
1616    public class SmallCallable extends CheckedCallable {
1617        protected Object realCall() throws InterruptedException {
1618            delay(SMALL_DELAY_MS);
1619            return Boolean.TRUE;
1620        }
1621    }
1622
1623    public class MediumRunnable extends CheckedRunnable {
1624        protected void realRun() throws Throwable {
1625            delay(MEDIUM_DELAY_MS);
1626        }
1627    }
1628
1629    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1630        protected void realRun() throws InterruptedException {
1631            delay(MEDIUM_DELAY_MS);
1632        }
1633    }
1634
1651      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1652          return new CheckedRunnable() {
1653              protected void realRun() {
# Line 1641 | Line 1657 | public class JSR166TestCase extends Test
1657              }};
1658      }
1659  
1644    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1645        protected void realRun() {
1646            try {
1647                delay(MEDIUM_DELAY_MS);
1648            } catch (InterruptedException ok) {}
1649        }
1650    }
1651
1652    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1653        protected void realRun() {
1654            try {
1655                delay(LONG_DELAY_MS);
1656            } catch (InterruptedException ok) {}
1657        }
1658    }
1659
1660      /**
1661       * For use as ThreadFactory in constructors
1662       */
# Line 1670 | Line 1670 | public class JSR166TestCase extends Test
1670          boolean isDone();
1671      }
1672  
1673    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1674        return new TrackedRunnable() {
1675                private volatile boolean done = false;
1676                public boolean isDone() { return done; }
1677                public void run() {
1678                    try {
1679                        delay(timeoutMillis);
1680                        done = true;
1681                    } catch (InterruptedException ok) {}
1682                }
1683            };
1684    }
1685
1686    public static class TrackedShortRunnable implements Runnable {
1687        public volatile boolean done = false;
1688        public void run() {
1689            try {
1690                delay(SHORT_DELAY_MS);
1691                done = true;
1692            } catch (InterruptedException ok) {}
1693        }
1694    }
1695
1696    public static class TrackedSmallRunnable implements Runnable {
1697        public volatile boolean done = false;
1698        public void run() {
1699            try {
1700                delay(SMALL_DELAY_MS);
1701                done = true;
1702            } catch (InterruptedException ok) {}
1703        }
1704    }
1705
1706    public static class TrackedMediumRunnable implements Runnable {
1707        public volatile boolean done = false;
1708        public void run() {
1709            try {
1710                delay(MEDIUM_DELAY_MS);
1711                done = true;
1712            } catch (InterruptedException ok) {}
1713        }
1714    }
1715
1716    public static class TrackedLongRunnable implements Runnable {
1717        public volatile boolean done = false;
1718        public void run() {
1719            try {
1720                delay(LONG_DELAY_MS);
1721                done = true;
1722            } catch (InterruptedException ok) {}
1723        }
1724    }
1725
1673      public static class TrackedNoOpRunnable implements Runnable {
1674          public volatile boolean done = false;
1675          public void run() {
# Line 1730 | Line 1677 | public class JSR166TestCase extends Test
1677          }
1678      }
1679  
1733    public static class TrackedCallable implements Callable {
1734        public volatile boolean done = false;
1735        public Object call() {
1736            try {
1737                delay(SMALL_DELAY_MS);
1738                done = true;
1739            } catch (InterruptedException ok) {}
1740            return Boolean.TRUE;
1741        }
1742    }
1743
1680      /**
1681       * Analog of CheckedRunnable for RecursiveAction
1682       */
# Line 1782 | Line 1718 | public class JSR166TestCase extends Test
1718  
1719      /**
1720       * A CyclicBarrier that uses timed await and fails with
1721 <     * AssertionFailedErrors instead of throwing checked exceptions.
1721 >     * AssertionErrors instead of throwing checked exceptions.
1722       */
1723      public static class CheckedBarrier extends CyclicBarrier {
1724          public CheckedBarrier(int parties) { super(parties); }
# Line 1791 | Line 1727 | public class JSR166TestCase extends Test
1727              try {
1728                  return super.await(2 * LONG_DELAY_MS, MILLISECONDS);
1729              } catch (TimeoutException timedOut) {
1730 <                throw new AssertionFailedError("timed out");
1730 >                throw new AssertionError("timed out");
1731              } catch (Exception fail) {
1732 <                AssertionFailedError afe =
1797 <                    new AssertionFailedError("Unexpected exception: " + fail);
1798 <                afe.initCause(fail);
1799 <                throw afe;
1732 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1733              }
1734          }
1735      }
# Line 1807 | Line 1740 | public class JSR166TestCase extends Test
1740              assertEquals(0, q.size());
1741              assertNull(q.peek());
1742              assertNull(q.poll());
1743 <            assertNull(q.poll(0, MILLISECONDS));
1743 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1744              assertEquals(q.toString(), "[]");
1745              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1746              assertFalse(q.iterator().hasNext());
# Line 1919 | Line 1852 | public class JSR166TestCase extends Test
1852              try { throwingAction.run(); }
1853              catch (Throwable t) {
1854                  threw = true;
1855 <                if (!expectedExceptionClass.isInstance(t)) {
1856 <                    AssertionFailedError afe =
1857 <                        new AssertionFailedError
1858 <                        ("Expected " + expectedExceptionClass.getName() +
1859 <                         ", got " + t.getClass().getName());
1927 <                    afe.initCause(t);
1928 <                    threadUnexpectedException(afe);
1929 <                }
1855 >                if (!expectedExceptionClass.isInstance(t))
1856 >                    throw new AssertionError(
1857 >                            "Expected " + expectedExceptionClass.getName() +
1858 >                            ", got " + t.getClass().getName(),
1859 >                            t);
1860              }
1861              if (!threw)
1862                  shouldThrow(expectedExceptionClass.getName());
# Line 1958 | Line 1888 | public class JSR166TestCase extends Test
1888      static <T> void shuffle(T[] array) {
1889          Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1890      }
1891 +
1892 +    /**
1893 +     * Returns the same String as would be returned by {@link
1894 +     * Object#toString}, whether or not the given object's class
1895 +     * overrides toString().
1896 +     *
1897 +     * @see System#identityHashCode
1898 +     */
1899 +    static String identityString(Object x) {
1900 +        return x.getClass().getName()
1901 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1902 +    }
1903 +
1904 +    // --- Shared assertions for Executor tests ---
1905 +
1906 +    /**
1907 +     * Returns maximum number of tasks that can be submitted to given
1908 +     * pool (with bounded queue) before saturation (when submission
1909 +     * throws RejectedExecutionException).
1910 +     */
1911 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1912 +        BlockingQueue<Runnable> q = pool.getQueue();
1913 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1914 +    }
1915 +
1916 +    @SuppressWarnings("FutureReturnValueIgnored")
1917 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1918 +        try {
1919 +            e.execute((Runnable) null);
1920 +            shouldThrow();
1921 +        } catch (NullPointerException success) {}
1922 +
1923 +        if (! (e instanceof ExecutorService)) return;
1924 +        ExecutorService es = (ExecutorService) e;
1925 +        try {
1926 +            es.submit((Runnable) null);
1927 +            shouldThrow();
1928 +        } catch (NullPointerException success) {}
1929 +        try {
1930 +            es.submit((Runnable) null, Boolean.TRUE);
1931 +            shouldThrow();
1932 +        } catch (NullPointerException success) {}
1933 +        try {
1934 +            es.submit((Callable) null);
1935 +            shouldThrow();
1936 +        } catch (NullPointerException success) {}
1937 +
1938 +        if (! (e instanceof ScheduledExecutorService)) return;
1939 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1940 +        try {
1941 +            ses.schedule((Runnable) null,
1942 +                         randomTimeout(), randomTimeUnit());
1943 +            shouldThrow();
1944 +        } catch (NullPointerException success) {}
1945 +        try {
1946 +            ses.schedule((Callable) null,
1947 +                         randomTimeout(), randomTimeUnit());
1948 +            shouldThrow();
1949 +        } catch (NullPointerException success) {}
1950 +        try {
1951 +            ses.scheduleAtFixedRate((Runnable) null,
1952 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1953 +            shouldThrow();
1954 +        } catch (NullPointerException success) {}
1955 +        try {
1956 +            ses.scheduleWithFixedDelay((Runnable) null,
1957 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1958 +            shouldThrow();
1959 +        } catch (NullPointerException success) {}
1960 +    }
1961 +
1962 +    void setRejectedExecutionHandler(
1963 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1964 +        p.setRejectedExecutionHandler(handler);
1965 +        assertSame(handler, p.getRejectedExecutionHandler());
1966 +    }
1967 +
1968 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1969 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1970 +        final long savedTaskCount = p.getTaskCount();
1971 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1972 +        final int savedQueueSize = p.getQueue().size();
1973 +        final boolean stock = (p.getClass().getClassLoader() == null);
1974 +
1975 +        Runnable r = () -> {};
1976 +        Callable<Boolean> c = () -> Boolean.TRUE;
1977 +
1978 +        class Recorder implements RejectedExecutionHandler {
1979 +            public volatile Runnable r = null;
1980 +            public volatile ThreadPoolExecutor p = null;
1981 +            public void reset() { r = null; p = null; }
1982 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
1983 +                assertNull(this.r);
1984 +                assertNull(this.p);
1985 +                this.r = r;
1986 +                this.p = p;
1987 +            }
1988 +        }
1989 +
1990 +        // check custom handler is invoked exactly once per task
1991 +        Recorder recorder = new Recorder();
1992 +        setRejectedExecutionHandler(p, recorder);
1993 +        for (int i = 2; i--> 0; ) {
1994 +            recorder.reset();
1995 +            p.execute(r);
1996 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
1997 +                assertSame(r, recorder.r);
1998 +            assertSame(p, recorder.p);
1999 +
2000 +            recorder.reset();
2001 +            assertFalse(p.submit(r).isDone());
2002 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2003 +            assertSame(p, recorder.p);
2004 +
2005 +            recorder.reset();
2006 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2007 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2008 +            assertSame(p, recorder.p);
2009 +
2010 +            recorder.reset();
2011 +            assertFalse(p.submit(c).isDone());
2012 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2013 +            assertSame(p, recorder.p);
2014 +
2015 +            if (p instanceof ScheduledExecutorService) {
2016 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2017 +                ScheduledFuture<?> future;
2018 +
2019 +                recorder.reset();
2020 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2021 +                assertFalse(future.isDone());
2022 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2023 +                assertSame(p, recorder.p);
2024 +
2025 +                recorder.reset();
2026 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2027 +                assertFalse(future.isDone());
2028 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2029 +                assertSame(p, recorder.p);
2030 +
2031 +                recorder.reset();
2032 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2033 +                assertFalse(future.isDone());
2034 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2035 +                assertSame(p, recorder.p);
2036 +
2037 +                recorder.reset();
2038 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2039 +                assertFalse(future.isDone());
2040 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2041 +                assertSame(p, recorder.p);
2042 +            }
2043 +        }
2044 +
2045 +        // Checking our custom handler above should be sufficient, but
2046 +        // we add some integration tests of standard handlers.
2047 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2048 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2049 +
2050 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2051 +        try {
2052 +            p.execute(setThread);
2053 +            shouldThrow();
2054 +        } catch (RejectedExecutionException success) {}
2055 +        assertNull(thread.get());
2056 +
2057 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2058 +        p.execute(setThread);
2059 +        assertNull(thread.get());
2060 +
2061 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2062 +        p.execute(setThread);
2063 +        if (p.isShutdown())
2064 +            assertNull(thread.get());
2065 +        else
2066 +            assertSame(Thread.currentThread(), thread.get());
2067 +
2068 +        setRejectedExecutionHandler(p, savedHandler);
2069 +
2070 +        // check that pool was not perturbed by handlers
2071 +        assertEquals(savedTaskCount, p.getTaskCount());
2072 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2073 +        assertEquals(savedQueueSize, p.getQueue().size());
2074 +    }
2075   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines