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.198 by jsr166, Wed Jul 27 17:16:23 2016 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
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
18 < * @run junit/othervm/timeout=1000 -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 -Djava.util.secureRandomSeed=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 30 | 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;
33 import java.nio.file.Files;
34 import java.nio.file.Paths;
57   import java.security.CodeSource;
58   import java.security.Permission;
59   import java.security.PermissionCollection;
# Line 41 | 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 52 | 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;
69 import java.util.regex.Matcher;
100   import java.util.regex.Pattern;
101  
72 import junit.framework.AssertionFailedError;
102   import junit.framework.Test;
103   import junit.framework.TestCase;
104   import junit.framework.TestResult;
# Line 276 | 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 413 | 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
421 <            // As of 2015-09, java9 still uses 52.0 class file version
422 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?(9|[0-9][0-9])$");
423 <    }
424 <    public static boolean atLeastJava10() {
425 <        return JAVA_CLASS_VERSION >= 54.0
426 <            || JAVA_SPECIFICATION_VERSION.matches("^(1\\.)?[0-9][0-9]$");
427 <    }
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 445 | Line 469 | public class JSR166TestCase extends Test
469              AbstractQueuedLongSynchronizerTest.suite(),
470              ArrayBlockingQueueTest.suite(),
471              ArrayDequeTest.suite(),
472 +            ArrayListTest.suite(),
473              AtomicBooleanTest.suite(),
474              AtomicIntegerArrayTest.suite(),
475              AtomicIntegerFieldUpdaterTest.suite(),
# Line 467 | Line 492 | public class JSR166TestCase extends Test
492              CopyOnWriteArrayListTest.suite(),
493              CopyOnWriteArraySetTest.suite(),
494              CountDownLatchTest.suite(),
495 +            CountedCompleterTest.suite(),
496              CyclicBarrierTest.suite(),
497              DelayQueueTest.suite(),
498              EntryTest.suite(),
# Line 495 | Line 521 | public class JSR166TestCase extends Test
521              TreeMapTest.suite(),
522              TreeSetTest.suite(),
523              TreeSubMapTest.suite(),
524 <            TreeSubSetTest.suite());
524 >            TreeSubSetTest.suite(),
525 >            VectorTest.suite());
526  
527          // Java8+ test classes
528          if (atLeastJava8()) {
529              String[] java8TestClassNames = {
530 +                "ArrayDeque8Test",
531                  "Atomic8Test",
532                  "CompletableFutureTest",
533                  "ConcurrentHashMap8Test",
534 <                "CountedCompleterTest",
534 >                "CountedCompleter8Test",
535                  "DoubleAccumulatorTest",
536                  "DoubleAdderTest",
537                  "ForkJoinPool8Test",
538                  "ForkJoinTask8Test",
539 +                "HashMapTest",
540 +                "LinkedBlockingDeque8Test",
541 +                "LinkedBlockingQueue8Test",
542                  "LongAccumulatorTest",
543                  "LongAdderTest",
544                  "SplittableRandomTest",
# Line 530 | Line 561 | public class JSR166TestCase extends Test
561                  "AtomicReference9Test",
562                  "AtomicReferenceArray9Test",
563                  "ExecutorCompletionService9Test",
564 +                "ForkJoinPool9Test",
565              };
566              addNamedTestClasses(suite, java9TestClassNames);
567          }
# Line 540 | Line 572 | public class JSR166TestCase extends Test
572      /** Returns list of junit-style test method names in given class. */
573      public static ArrayList<String> testMethodNames(Class<?> testClass) {
574          Method[] methods = testClass.getDeclaredMethods();
575 <        ArrayList<String> names = new ArrayList<String>(methods.length);
575 >        ArrayList<String> names = new ArrayList<>(methods.length);
576          for (Method method : methods) {
577              if (method.getName().startsWith("test")
578                  && Modifier.isPublic(method.getModifiers())
# Line 605 | 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 625 | 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 646 | Line 710 | public class JSR166TestCase extends Test
710       * The first exception encountered if any threadAssertXXX method fails.
711       */
712      private final AtomicReference<Throwable> threadFailure
713 <        = new AtomicReference<Throwable>(null);
713 >        = new AtomicReference<>(null);
714  
715      /**
716       * Records an exception so that it can be rethrown later in the test
# Line 668 | 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 689 | 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 =
694 <                    new AssertionFailedError(t.toString());
695 <                afe.initCause(t);
696 <                throw afe;
697 <            }
756 >            else
757 >                throw new AssertionError(t.toString(), t);
758          }
759  
760          if (Thread.interrupted())
# Line 728 | 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 814 | 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 842 | 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 852 | 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 =
857 <                new AssertionFailedError("unexpected exception: " + t);
858 <            afe.initCause(t);
859 <            throw afe;
860 <        }
915 >        else
916 >            throw new AssertionError("unexpected exception: " + t, t);
917      }
918  
919      /**
# Line 1003 | Line 1059 | public class JSR166TestCase extends Test
1059          ThreadMXBean threadMXBean = ManagementFactory.getThreadMXBean();
1060          System.err.println("------ stacktrace dump start ------");
1061          for (ThreadInfo info : threadMXBean.dumpAllThreads(true, true)) {
1062 <            String name = info.getThreadName();
1062 >            final String name = info.getThreadName();
1063 >            String lockName;
1064              if ("Signal Dispatcher".equals(name))
1065                  continue;
1066              if ("Reference Handler".equals(name)
1067 <                && info.getLockName().startsWith("java.lang.ref.Reference$Lock"))
1067 >                && (lockName = info.getLockName()) != null
1068 >                && lockName.startsWith("java.lang.ref.Reference$Lock"))
1069                  continue;
1070              if ("Finalizer".equals(name)
1071 <                && info.getLockName().startsWith("java.lang.ref.ReferenceQueue$Lock"))
1071 >                && (lockName = info.getLockName()) != null
1072 >                && lockName.startsWith("java.lang.ref.ReferenceQueue$Lock"))
1073                  continue;
1074              if ("checkForWedgedTest".equals(name))
1075                  continue;
# Line 1022 | Line 1081 | public class JSR166TestCase extends Test
1081      }
1082  
1083      /**
1084 <     * Checks that thread does not terminate within the default
1026 <     * millisecond delay of {@code timeoutMillis()}.
1084 >     * Checks that thread eventually enters the expected blocked thread state.
1085       */
1086 <    void assertThreadStaysAlive(Thread thread) {
1087 <        assertThreadStaysAlive(thread, timeoutMillis());
1088 <    }
1089 <
1090 <    /**
1091 <     * Checks that thread does not terminate within the given millisecond delay.
1092 <     */
1093 <    void assertThreadStaysAlive(Thread thread, long millis) {
1094 <        try {
1095 <            // No need to optimize the failing case via Thread.join.
1096 <            delay(millis);
1097 <            assertTrue(thread.isAlive());
1098 <        } catch (InterruptedException fail) {
1041 <            threadFail("Unexpected InterruptedException");
1042 <        }
1043 <    }
1044 <
1045 <    /**
1046 <     * Checks that the threads do not terminate within the default
1047 <     * millisecond delay of {@code timeoutMillis()}.
1048 <     */
1049 <    void assertThreadsStayAlive(Thread... threads) {
1050 <        assertThreadsStayAlive(timeoutMillis(), threads);
1051 <    }
1052 <
1053 <    /**
1054 <     * Checks that the threads do not terminate within the given millisecond delay.
1055 <     */
1056 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1057 <        try {
1058 <            // No need to optimize the failing case via Thread.join.
1059 <            delay(millis);
1060 <            for (Thread thread : threads)
1061 <                assertTrue(thread.isAlive());
1062 <        } catch (InterruptedException fail) {
1063 <            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 1102 | 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 1205 | Line 1247 | public class JSR166TestCase extends Test
1247          }
1248          public void refresh() {}
1249          public String toString() {
1250 <            List<Permission> ps = new ArrayList<Permission>();
1250 >            List<Permission> ps = new ArrayList<>();
1251              for (Enumeration<Permission> e = perms.elements(); e.hasMoreElements();)
1252                  ps.add(e.nextElement());
1253              return "AdjustablePolicy with permissions " + ps;
# Line 1233 | 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 <    void sleep(long millis) {
1280 >    static void sleep(long millis) {
1281          try {
1282              delay(millis);
1283          } catch (InterruptedException fail) {
1284 <            AssertionFailedError afe =
1243 <                new AssertionFailedError("Unexpected InterruptedException");
1244 <            afe.initCause(fail);
1245 <            throw afe;
1284 >            throw new AssertionError("Unexpected InterruptedException", fail);
1285          }
1286      }
1287  
# Line 1251 | Line 1290 | public class JSR166TestCase extends Test
1290       * thread to enter a wait state: BLOCKED, WAITING, or TIMED_WAITING.
1291       */
1292      void waitForThreadToEnterWaitState(Thread thread, long timeoutMillis) {
1293 <        long startTime = System.nanoTime();
1293 >        long startTime = 0L;
1294          for (;;) {
1295              Thread.State s = thread.getState();
1296              if (s == Thread.State.BLOCKED ||
# Line 1260 | Line 1299 | public class JSR166TestCase extends Test
1299                  return;
1300              else if (s == Thread.State.TERMINATED)
1301                  fail("Unexpected thread termination");
1302 +            else if (startTime == 0L)
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 1291 | 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 1308 | 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 1528 | 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 1542 | 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 1551 | Line 1640 | public class JSR166TestCase extends Test
1640          public String call() { throw new NullPointerException(); }
1641      }
1642  
1554    public static class CallableOne implements Callable<Integer> {
1555        public Integer call() { return one; }
1556    }
1557
1558    public class ShortRunnable extends CheckedRunnable {
1559        protected void realRun() throws Throwable {
1560            delay(SHORT_DELAY_MS);
1561        }
1562    }
1563
1564    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1565        protected void realRun() throws InterruptedException {
1566            delay(SHORT_DELAY_MS);
1567        }
1568    }
1569
1570    public class SmallRunnable extends CheckedRunnable {
1571        protected void realRun() throws Throwable {
1572            delay(SMALL_DELAY_MS);
1573        }
1574    }
1575
1643      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1644          protected void realRun() {
1645              try {
# Line 1581 | Line 1648 | public class JSR166TestCase extends Test
1648          }
1649      }
1650  
1584    public class SmallCallable extends CheckedCallable {
1585        protected Object realCall() throws InterruptedException {
1586            delay(SMALL_DELAY_MS);
1587            return Boolean.TRUE;
1588        }
1589    }
1590
1591    public class MediumRunnable extends CheckedRunnable {
1592        protected void realRun() throws Throwable {
1593            delay(MEDIUM_DELAY_MS);
1594        }
1595    }
1596
1597    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1598        protected void realRun() throws InterruptedException {
1599            delay(MEDIUM_DELAY_MS);
1600        }
1601    }
1602
1651      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1652          return new CheckedRunnable() {
1653              protected void realRun() {
# Line 1609 | Line 1657 | public class JSR166TestCase extends Test
1657              }};
1658      }
1659  
1612    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1613        protected void realRun() {
1614            try {
1615                delay(MEDIUM_DELAY_MS);
1616            } catch (InterruptedException ok) {}
1617        }
1618    }
1619
1620    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1621        protected void realRun() {
1622            try {
1623                delay(LONG_DELAY_MS);
1624            } catch (InterruptedException ok) {}
1625        }
1626    }
1627
1660      /**
1661       * For use as ThreadFactory in constructors
1662       */
# Line 1638 | Line 1670 | public class JSR166TestCase extends Test
1670          boolean isDone();
1671      }
1672  
1641    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1642        return new TrackedRunnable() {
1643                private volatile boolean done = false;
1644                public boolean isDone() { return done; }
1645                public void run() {
1646                    try {
1647                        delay(timeoutMillis);
1648                        done = true;
1649                    } catch (InterruptedException ok) {}
1650                }
1651            };
1652    }
1653
1654    public static class TrackedShortRunnable implements Runnable {
1655        public volatile boolean done = false;
1656        public void run() {
1657            try {
1658                delay(SHORT_DELAY_MS);
1659                done = true;
1660            } catch (InterruptedException ok) {}
1661        }
1662    }
1663
1664    public static class TrackedSmallRunnable implements Runnable {
1665        public volatile boolean done = false;
1666        public void run() {
1667            try {
1668                delay(SMALL_DELAY_MS);
1669                done = true;
1670            } catch (InterruptedException ok) {}
1671        }
1672    }
1673
1674    public static class TrackedMediumRunnable implements Runnable {
1675        public volatile boolean done = false;
1676        public void run() {
1677            try {
1678                delay(MEDIUM_DELAY_MS);
1679                done = true;
1680            } catch (InterruptedException ok) {}
1681        }
1682    }
1683
1684    public static class TrackedLongRunnable implements Runnable {
1685        public volatile boolean done = false;
1686        public void run() {
1687            try {
1688                delay(LONG_DELAY_MS);
1689                done = true;
1690            } catch (InterruptedException ok) {}
1691        }
1692    }
1693
1673      public static class TrackedNoOpRunnable implements Runnable {
1674          public volatile boolean done = false;
1675          public void run() {
# Line 1698 | Line 1677 | public class JSR166TestCase extends Test
1677          }
1678      }
1679  
1701    public static class TrackedCallable implements Callable {
1702        public volatile boolean done = false;
1703        public Object call() {
1704            try {
1705                delay(SMALL_DELAY_MS);
1706                done = true;
1707            } catch (InterruptedException ok) {}
1708            return Boolean.TRUE;
1709        }
1710    }
1711
1680      /**
1681       * Analog of CheckedRunnable for RecursiveAction
1682       */
# Line 1750 | 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 class CheckedBarrier extends CyclicBarrier {
1723 >    public static class CheckedBarrier extends CyclicBarrier {
1724          public CheckedBarrier(int parties) { super(parties); }
1725  
1726          public int await() {
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 =
1765 <                    new AssertionFailedError("Unexpected exception: " + fail);
1766 <                afe.initCause(fail);
1767 <                throw afe;
1732 >                throw new AssertionError("Unexpected exception: " + fail, fail);
1733              }
1734          }
1735      }
# Line 1775 | 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 1816 | Line 1781 | public class JSR166TestCase extends Test
1781          }
1782      }
1783  
1784 +    void assertImmutable(final Object o) {
1785 +        if (o instanceof Collection) {
1786 +            assertThrows(
1787 +                UnsupportedOperationException.class,
1788 +                new Runnable() { public void run() {
1789 +                        ((Collection) o).add(null);}});
1790 +        }
1791 +    }
1792 +
1793      @SuppressWarnings("unchecked")
1794      <T> T serialClone(T o) {
1795          try {
1796              ObjectInputStream ois = new ObjectInputStream
1797                  (new ByteArrayInputStream(serialBytes(o)));
1798              T clone = (T) ois.readObject();
1799 +            if (o == clone) assertImmutable(o);
1800              assertSame(o.getClass(), clone.getClass());
1801              return clone;
1802          } catch (Throwable fail) {
# Line 1830 | Line 1805 | public class JSR166TestCase extends Test
1805          }
1806      }
1807  
1808 +    /**
1809 +     * A version of serialClone that leaves error handling (for
1810 +     * e.g. NotSerializableException) up to the caller.
1811 +     */
1812 +    @SuppressWarnings("unchecked")
1813 +    <T> T serialClonePossiblyFailing(T o)
1814 +        throws ReflectiveOperationException, java.io.IOException {
1815 +        ByteArrayOutputStream bos = new ByteArrayOutputStream();
1816 +        ObjectOutputStream oos = new ObjectOutputStream(bos);
1817 +        oos.writeObject(o);
1818 +        oos.flush();
1819 +        oos.close();
1820 +        ObjectInputStream ois = new ObjectInputStream
1821 +            (new ByteArrayInputStream(bos.toByteArray()));
1822 +        T clone = (T) ois.readObject();
1823 +        if (o == clone) assertImmutable(o);
1824 +        assertSame(o.getClass(), clone.getClass());
1825 +        return clone;
1826 +    }
1827 +
1828 +    /**
1829 +     * If o implements Cloneable and has a public clone method,
1830 +     * returns a clone of o, else null.
1831 +     */
1832 +    @SuppressWarnings("unchecked")
1833 +    <T> T cloneableClone(T o) {
1834 +        if (!(o instanceof Cloneable)) return null;
1835 +        final T clone;
1836 +        try {
1837 +            clone = (T) o.getClass().getMethod("clone").invoke(o);
1838 +        } catch (NoSuchMethodException ok) {
1839 +            return null;
1840 +        } catch (ReflectiveOperationException unexpected) {
1841 +            throw new Error(unexpected);
1842 +        }
1843 +        assertNotSame(o, clone); // not 100% guaranteed by spec
1844 +        assertSame(o.getClass(), clone.getClass());
1845 +        return clone;
1846 +    }
1847 +
1848      public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1849                               Runnable... throwingActions) {
1850          for (Runnable throwingAction : throwingActions) {
# Line 1837 | 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());
1845 <                    afe.initCause(t);
1846 <                    threadUnexpectedException(afe);
1847 <                }
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 1873 | Line 1885 | public class JSR166TestCase extends Test
1885                                 1000L, MILLISECONDS,
1886                                 new SynchronousQueue<Runnable>());
1887  
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