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.223 by jsr166, Sat May 13 19:13:09 2017 UTC vs.
Revision 1.237 by jsr166, Wed Aug 23 05:33:00 2017 UTC

# Line 76 | 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;
# Line 538 | Line 544 | public class JSR166TestCase extends Test
544                  "DoubleAdderTest",
545                  "ForkJoinPool8Test",
546                  "ForkJoinTask8Test",
547 +                "HashMapTest",
548                  "LinkedBlockingDeque8Test",
549                  "LinkedBlockingQueue8Test",
550                  "LongAccumulatorTest",
# Line 638 | Line 645 | public class JSR166TestCase extends Test
645      public static long MEDIUM_DELAY_MS;
646      public static long LONG_DELAY_MS;
647  
648 +    private static final long RANDOM_TIMEOUT;
649 +    private static final long RANDOM_EXPIRED_TIMEOUT;
650 +    private static final TimeUnit RANDOM_TIMEUNIT;
651 +    static {
652 +        ThreadLocalRandom rnd = ThreadLocalRandom.current();
653 +        long[] timeouts = { Long.MIN_VALUE, -1, 0, 1, Long.MAX_VALUE };
654 +        RANDOM_TIMEOUT = timeouts[rnd.nextInt(timeouts.length)];
655 +        RANDOM_EXPIRED_TIMEOUT = timeouts[rnd.nextInt(3)];
656 +        TimeUnit[] timeUnits = TimeUnit.values();
657 +        RANDOM_TIMEUNIT = timeUnits[rnd.nextInt(timeUnits.length)];
658 +    }
659 +
660 +    /**
661 +     * Returns a timeout for use when any value at all will do.
662 +     */
663 +    static long randomTimeout() { return RANDOM_TIMEOUT; }
664 +
665 +    /**
666 +     * Returns a timeout that means "no waiting", i.e. not positive.
667 +     */
668 +    static long randomExpiredTimeout() { return RANDOM_EXPIRED_TIMEOUT; }
669 +
670 +    /**
671 +     * Returns a random non-null TimeUnit.
672 +     */
673 +    static TimeUnit randomTimeUnit() { return RANDOM_TIMEUNIT; }
674 +
675      /**
676       * Returns the shortest timed delay. This can be scaled up for
677       * slow machines using the jsr166.delay.factor system property,
# Line 1063 | Line 1097 | public class JSR166TestCase extends Test
1097      }
1098  
1099      /**
1100 <     * Checks that thread does not terminate within the default
1067 <     * millisecond delay of {@code timeoutMillis()}.
1068 <     */
1069 <    void assertThreadStaysAlive(Thread thread) {
1070 <        assertThreadStaysAlive(thread, timeoutMillis());
1071 <    }
1072 <
1073 <    /**
1074 <     * Checks that thread does not terminate within the given millisecond delay.
1075 <     */
1076 <    void assertThreadStaysAlive(Thread thread, long millis) {
1077 <        try {
1078 <            // No need to optimize the failing case via Thread.join.
1079 <            delay(millis);
1080 <            assertTrue(thread.isAlive());
1081 <        } catch (InterruptedException fail) {
1082 <            threadFail("Unexpected InterruptedException");
1083 <        }
1084 <    }
1085 <
1086 <    /**
1087 <     * Checks that the threads do not terminate within the default
1088 <     * millisecond delay of {@code timeoutMillis()}.
1089 <     */
1090 <    void assertThreadsStayAlive(Thread... threads) {
1091 <        assertThreadsStayAlive(timeoutMillis(), threads);
1092 <    }
1093 <
1094 <    /**
1095 <     * Checks that the threads do not terminate within the given millisecond delay.
1100 >     * Checks that thread eventually enters the expected blocked thread state.
1101       */
1102 <    void assertThreadsStayAlive(long millis, Thread... threads) {
1103 <        try {
1104 <            // No need to optimize the failing case via Thread.join.
1105 <            delay(millis);
1106 <            for (Thread thread : threads)
1107 <                assertTrue(thread.isAlive());
1108 <        } catch (InterruptedException fail) {
1109 <            threadFail("Unexpected InterruptedException");
1102 >    void assertThreadBlocks(Thread thread, Thread.State expected) {
1103 >        // always sleep at least 1 ms, with high probability avoiding
1104 >        // transitory states
1105 >        for (long retries = LONG_DELAY_MS * 3 / 4; retries-->0; ) {
1106 >            try { delay(1); }
1107 >            catch (InterruptedException fail) {
1108 >                fail("Unexpected InterruptedException");
1109 >            }
1110 >            Thread.State s = thread.getState();
1111 >            if (s == expected)
1112 >                return;
1113 >            else if (s == Thread.State.TERMINATED)
1114 >                fail("Unexpected thread termination");
1115          }
1116 +        fail("timed out waiting for thread to enter thread state " + expected);
1117      }
1118  
1119      /**
# Line 1617 | Line 1628 | public class JSR166TestCase extends Test
1628          }
1629      }
1630  
1631 +    public void await(CyclicBarrier barrier) {
1632 +        try {
1633 +            barrier.await(LONG_DELAY_MS, MILLISECONDS);
1634 +        } catch (Throwable fail) {
1635 +            threadUnexpectedException(fail);
1636 +        }
1637 +    }
1638 +
1639   //     /**
1640   //      * Spin-waits up to LONG_DELAY_MS until flag becomes true.
1641   //      */
# Line 1640 | Line 1659 | public class JSR166TestCase extends Test
1659          public String call() { throw new NullPointerException(); }
1660      }
1661  
1643    public static class CallableOne implements Callable<Integer> {
1644        public Integer call() { return one; }
1645    }
1646
1647    public class ShortRunnable extends CheckedRunnable {
1648        protected void realRun() throws Throwable {
1649            delay(SHORT_DELAY_MS);
1650        }
1651    }
1652
1653    public class ShortInterruptedRunnable extends CheckedInterruptedRunnable {
1654        protected void realRun() throws InterruptedException {
1655            delay(SHORT_DELAY_MS);
1656        }
1657    }
1658
1659    public class SmallRunnable extends CheckedRunnable {
1660        protected void realRun() throws Throwable {
1661            delay(SMALL_DELAY_MS);
1662        }
1663    }
1664
1662      public class SmallPossiblyInterruptedRunnable extends CheckedRunnable {
1663          protected void realRun() {
1664              try {
# Line 1670 | Line 1667 | public class JSR166TestCase extends Test
1667          }
1668      }
1669  
1673    public class SmallCallable extends CheckedCallable {
1674        protected Object realCall() throws InterruptedException {
1675            delay(SMALL_DELAY_MS);
1676            return Boolean.TRUE;
1677        }
1678    }
1679
1680    public class MediumRunnable extends CheckedRunnable {
1681        protected void realRun() throws Throwable {
1682            delay(MEDIUM_DELAY_MS);
1683        }
1684    }
1685
1686    public class MediumInterruptedRunnable extends CheckedInterruptedRunnable {
1687        protected void realRun() throws InterruptedException {
1688            delay(MEDIUM_DELAY_MS);
1689        }
1690    }
1691
1670      public Runnable possiblyInterruptedRunnable(final long timeoutMillis) {
1671          return new CheckedRunnable() {
1672              protected void realRun() {
# Line 1698 | Line 1676 | public class JSR166TestCase extends Test
1676              }};
1677      }
1678  
1701    public class MediumPossiblyInterruptedRunnable extends CheckedRunnable {
1702        protected void realRun() {
1703            try {
1704                delay(MEDIUM_DELAY_MS);
1705            } catch (InterruptedException ok) {}
1706        }
1707    }
1708
1709    public class LongPossiblyInterruptedRunnable extends CheckedRunnable {
1710        protected void realRun() {
1711            try {
1712                delay(LONG_DELAY_MS);
1713            } catch (InterruptedException ok) {}
1714        }
1715    }
1716
1679      /**
1680       * For use as ThreadFactory in constructors
1681       */
# Line 1727 | Line 1689 | public class JSR166TestCase extends Test
1689          boolean isDone();
1690      }
1691  
1730    public static TrackedRunnable trackedRunnable(final long timeoutMillis) {
1731        return new TrackedRunnable() {
1732                private volatile boolean done = false;
1733                public boolean isDone() { return done; }
1734                public void run() {
1735                    try {
1736                        delay(timeoutMillis);
1737                        done = true;
1738                    } catch (InterruptedException ok) {}
1739                }
1740            };
1741    }
1742
1743    public static class TrackedShortRunnable implements Runnable {
1744        public volatile boolean done = false;
1745        public void run() {
1746            try {
1747                delay(SHORT_DELAY_MS);
1748                done = true;
1749            } catch (InterruptedException ok) {}
1750        }
1751    }
1752
1753    public static class TrackedSmallRunnable implements Runnable {
1754        public volatile boolean done = false;
1755        public void run() {
1756            try {
1757                delay(SMALL_DELAY_MS);
1758                done = true;
1759            } catch (InterruptedException ok) {}
1760        }
1761    }
1762
1763    public static class TrackedMediumRunnable implements Runnable {
1764        public volatile boolean done = false;
1765        public void run() {
1766            try {
1767                delay(MEDIUM_DELAY_MS);
1768                done = true;
1769            } catch (InterruptedException ok) {}
1770        }
1771    }
1772
1773    public static class TrackedLongRunnable implements Runnable {
1774        public volatile boolean done = false;
1775        public void run() {
1776            try {
1777                delay(LONG_DELAY_MS);
1778                done = true;
1779            } catch (InterruptedException ok) {}
1780        }
1781    }
1782
1692      public static class TrackedNoOpRunnable implements Runnable {
1693          public volatile boolean done = false;
1694          public void run() {
# Line 1787 | Line 1696 | public class JSR166TestCase extends Test
1696          }
1697      }
1698  
1790    public static class TrackedCallable implements Callable {
1791        public volatile boolean done = false;
1792        public Object call() {
1793            try {
1794                delay(SMALL_DELAY_MS);
1795                done = true;
1796            } catch (InterruptedException ok) {}
1797            return Boolean.TRUE;
1798        }
1799    }
1800
1699      /**
1700       * Analog of CheckedRunnable for RecursiveAction
1701       */
# Line 1864 | Line 1762 | public class JSR166TestCase extends Test
1762              assertEquals(0, q.size());
1763              assertNull(q.peek());
1764              assertNull(q.poll());
1765 <            assertNull(q.poll(0, MILLISECONDS));
1765 >            assertNull(q.poll(randomExpiredTimeout(), randomTimeUnit()));
1766              assertEquals(q.toString(), "[]");
1767              assertTrue(Arrays.equals(q.toArray(), new Object[0]));
1768              assertFalse(q.iterator().hasNext());
# Line 2015 | Line 1913 | public class JSR166TestCase extends Test
1913      static <T> void shuffle(T[] array) {
1914          Collections.shuffle(Arrays.asList(array), ThreadLocalRandom.current());
1915      }
1916 +
1917 +    /**
1918 +     * Returns the same String as would be returned by {@link
1919 +     * Object#toString}, whether or not the given object's class
1920 +     * overrides toString().
1921 +     *
1922 +     * @see System#identityHashCode
1923 +     */
1924 +    static String identityString(Object x) {
1925 +        return x.getClass().getName()
1926 +            + "@" + Integer.toHexString(System.identityHashCode(x));
1927 +    }
1928 +
1929 +    // --- Shared assertions for Executor tests ---
1930 +
1931 +    /**
1932 +     * Returns maximum number of tasks that can be submitted to given
1933 +     * pool (with bounded queue) before saturation (when submission
1934 +     * throws RejectedExecutionException).
1935 +     */
1936 +    static final int saturatedSize(ThreadPoolExecutor pool) {
1937 +        BlockingQueue<Runnable> q = pool.getQueue();
1938 +        return pool.getMaximumPoolSize() + q.size() + q.remainingCapacity();
1939 +    }
1940 +
1941 +    @SuppressWarnings("FutureReturnValueIgnored")
1942 +    void assertNullTaskSubmissionThrowsNullPointerException(Executor e) {
1943 +        try {
1944 +            e.execute((Runnable) null);
1945 +            shouldThrow();
1946 +        } catch (NullPointerException success) {}
1947 +
1948 +        if (! (e instanceof ExecutorService)) return;
1949 +        ExecutorService es = (ExecutorService) e;
1950 +        try {
1951 +            es.submit((Runnable) null);
1952 +            shouldThrow();
1953 +        } catch (NullPointerException success) {}
1954 +        try {
1955 +            es.submit((Runnable) null, Boolean.TRUE);
1956 +            shouldThrow();
1957 +        } catch (NullPointerException success) {}
1958 +        try {
1959 +            es.submit((Callable) null);
1960 +            shouldThrow();
1961 +        } catch (NullPointerException success) {}
1962 +
1963 +        if (! (e instanceof ScheduledExecutorService)) return;
1964 +        ScheduledExecutorService ses = (ScheduledExecutorService) e;
1965 +        try {
1966 +            ses.schedule((Runnable) null,
1967 +                         randomTimeout(), randomTimeUnit());
1968 +            shouldThrow();
1969 +        } catch (NullPointerException success) {}
1970 +        try {
1971 +            ses.schedule((Callable) null,
1972 +                         randomTimeout(), randomTimeUnit());
1973 +            shouldThrow();
1974 +        } catch (NullPointerException success) {}
1975 +        try {
1976 +            ses.scheduleAtFixedRate((Runnable) null,
1977 +                                    randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1978 +            shouldThrow();
1979 +        } catch (NullPointerException success) {}
1980 +        try {
1981 +            ses.scheduleWithFixedDelay((Runnable) null,
1982 +                                       randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
1983 +            shouldThrow();
1984 +        } catch (NullPointerException success) {}
1985 +    }
1986 +
1987 +    void setRejectedExecutionHandler(
1988 +        ThreadPoolExecutor p, RejectedExecutionHandler handler) {
1989 +        p.setRejectedExecutionHandler(handler);
1990 +        assertSame(handler, p.getRejectedExecutionHandler());
1991 +    }
1992 +
1993 +    void assertTaskSubmissionsAreRejected(ThreadPoolExecutor p) {
1994 +        final RejectedExecutionHandler savedHandler = p.getRejectedExecutionHandler();
1995 +        final long savedTaskCount = p.getTaskCount();
1996 +        final long savedCompletedTaskCount = p.getCompletedTaskCount();
1997 +        final int savedQueueSize = p.getQueue().size();
1998 +        final boolean stock = (p.getClass().getClassLoader() == null);
1999 +
2000 +        Runnable r = () -> {};
2001 +        Callable<Boolean> c = () -> Boolean.TRUE;
2002 +
2003 +        class Recorder implements RejectedExecutionHandler {
2004 +            public volatile Runnable r = null;
2005 +            public volatile ThreadPoolExecutor p = null;
2006 +            public void reset() { r = null; p = null; }
2007 +            public void rejectedExecution(Runnable r, ThreadPoolExecutor p) {
2008 +                assertNull(this.r);
2009 +                assertNull(this.p);
2010 +                this.r = r;
2011 +                this.p = p;
2012 +            }
2013 +        }
2014 +
2015 +        // check custom handler is invoked exactly once per task
2016 +        Recorder recorder = new Recorder();
2017 +        setRejectedExecutionHandler(p, recorder);
2018 +        for (int i = 2; i--> 0; ) {
2019 +            recorder.reset();
2020 +            p.execute(r);
2021 +            if (stock && p.getClass() == ThreadPoolExecutor.class)
2022 +                assertSame(r, recorder.r);
2023 +            assertSame(p, recorder.p);
2024 +
2025 +            recorder.reset();
2026 +            assertFalse(p.submit(r).isDone());
2027 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2028 +            assertSame(p, recorder.p);
2029 +
2030 +            recorder.reset();
2031 +            assertFalse(p.submit(r, Boolean.TRUE).isDone());
2032 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2033 +            assertSame(p, recorder.p);
2034 +
2035 +            recorder.reset();
2036 +            assertFalse(p.submit(c).isDone());
2037 +            if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2038 +            assertSame(p, recorder.p);
2039 +
2040 +            if (p instanceof ScheduledExecutorService) {
2041 +                ScheduledExecutorService s = (ScheduledExecutorService) p;
2042 +                ScheduledFuture<?> future;
2043 +
2044 +                recorder.reset();
2045 +                future = s.schedule(r, randomTimeout(), randomTimeUnit());
2046 +                assertFalse(future.isDone());
2047 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2048 +                assertSame(p, recorder.p);
2049 +
2050 +                recorder.reset();
2051 +                future = s.schedule(c, randomTimeout(), randomTimeUnit());
2052 +                assertFalse(future.isDone());
2053 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2054 +                assertSame(p, recorder.p);
2055 +
2056 +                recorder.reset();
2057 +                future = s.scheduleAtFixedRate(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2058 +                assertFalse(future.isDone());
2059 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2060 +                assertSame(p, recorder.p);
2061 +
2062 +                recorder.reset();
2063 +                future = s.scheduleWithFixedDelay(r, randomTimeout(), LONG_DELAY_MS, MILLISECONDS);
2064 +                assertFalse(future.isDone());
2065 +                if (stock) assertTrue(!((FutureTask) recorder.r).isDone());
2066 +                assertSame(p, recorder.p);
2067 +            }
2068 +        }
2069 +
2070 +        // Checking our custom handler above should be sufficient, but
2071 +        // we add some integration tests of standard handlers.
2072 +        final AtomicReference<Thread> thread = new AtomicReference<>();
2073 +        final Runnable setThread = () -> thread.set(Thread.currentThread());
2074 +
2075 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.AbortPolicy());
2076 +        try {
2077 +            p.execute(setThread);
2078 +            shouldThrow();
2079 +        } catch (RejectedExecutionException success) {}
2080 +        assertNull(thread.get());
2081 +
2082 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.DiscardPolicy());
2083 +        p.execute(setThread);
2084 +        assertNull(thread.get());
2085 +
2086 +        setRejectedExecutionHandler(p, new ThreadPoolExecutor.CallerRunsPolicy());
2087 +        p.execute(setThread);
2088 +        if (p.isShutdown())
2089 +            assertNull(thread.get());
2090 +        else
2091 +            assertSame(Thread.currentThread(), thread.get());
2092 +
2093 +        setRejectedExecutionHandler(p, savedHandler);
2094 +
2095 +        // check that pool was not perturbed by handlers
2096 +        assertEquals(savedTaskCount, p.getTaskCount());
2097 +        assertEquals(savedCompletedTaskCount, p.getCompletedTaskCount());
2098 +        assertEquals(savedQueueSize, p.getQueue().size());
2099 +    }
2100   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines