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.113 by dl, Sun Sep 8 23:00:36 2013 UTC vs.
Revision 1.123 by jsr166, Wed Dec 31 19:05:42 2014 UTC

# Line 6 | Line 6
6   * Pat Fisher, Mike Judd.
7   */
8  
9 < import junit.framework.*;
9 > import static java.util.concurrent.TimeUnit.MILLISECONDS;
10 > import static java.util.concurrent.TimeUnit.NANOSECONDS;
11 >
12   import java.io.ByteArrayInputStream;
13   import java.io.ByteArrayOutputStream;
14   import java.io.ObjectInputStream;
# Line 14 | Line 16 | import java.io.ObjectOutputStream;
16   import java.lang.management.ManagementFactory;
17   import java.lang.management.ThreadInfo;
18   import java.lang.reflect.Method;
19 + import java.security.CodeSource;
20 + import java.security.Permission;
21 + import java.security.PermissionCollection;
22 + import java.security.Permissions;
23 + import java.security.Policy;
24 + import java.security.ProtectionDomain;
25 + import java.security.SecurityPermission;
26   import java.util.ArrayList;
27   import java.util.Arrays;
28   import java.util.Date;
# Line 21 | Line 30 | import java.util.Enumeration;
30   import java.util.List;
31   import java.util.NoSuchElementException;
32   import java.util.PropertyPermission;
33 < import java.util.concurrent.*;
34 < import java.util.concurrent.atomic.AtomicBoolean;
33 > import java.util.concurrent.BlockingQueue;
34 > import java.util.concurrent.Callable;
35 > import java.util.concurrent.CountDownLatch;
36 > import java.util.concurrent.CyclicBarrier;
37 > import java.util.concurrent.ExecutorService;
38 > import java.util.concurrent.Future;
39 > import java.util.concurrent.RecursiveAction;
40 > import java.util.concurrent.RecursiveTask;
41 > import java.util.concurrent.RejectedExecutionHandler;
42 > import java.util.concurrent.Semaphore;
43 > import java.util.concurrent.ThreadFactory;
44 > import java.util.concurrent.ThreadPoolExecutor;
45 > import java.util.concurrent.TimeoutException;
46   import java.util.concurrent.atomic.AtomicReference;
47 < import static java.util.concurrent.TimeUnit.MILLISECONDS;
48 < import static java.util.concurrent.TimeUnit.NANOSECONDS;
49 < import java.security.CodeSource;
50 < import java.security.Permission;
51 < import java.security.PermissionCollection;
52 < import java.security.Permissions;
33 < import java.security.Policy;
34 < import java.security.ProtectionDomain;
35 < import java.security.SecurityPermission;
47 > import java.util.regex.Pattern;
48 >
49 > import junit.framework.AssertionFailedError;
50 > import junit.framework.Test;
51 > import junit.framework.TestCase;
52 > import junit.framework.TestSuite;
53  
54   /**
55   * Base class for JSR166 Junit TCK tests.  Defines some constants,
# Line 115 | Line 132 | public class JSR166TestCase extends Test
132          Boolean.getBoolean("jsr166.expensiveTests");
133  
134      /**
135 +     * If true, also run tests that are not part of the official tck
136 +     * because they test unspecified implementation details.
137 +     */
138 +    protected static final boolean testImplementationDetails =
139 +        Boolean.getBoolean("jsr166.testImplementationDetails");
140 +
141 +    /**
142       * If true, report on stdout all "slow" tests, that is, ones that
143       * take more than profileThreshold milliseconds to execute.
144       */
# Line 134 | Line 158 | public class JSR166TestCase extends Test
158      private static final int runsPerTest =
159          Integer.getInteger("jsr166.runsPerTest", 1);
160  
161 +    /**
162 +     * A filter for tests to run, matching strings of the form
163 +     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
164 +     * Usefully combined with jsr166.runsPerTest.
165 +     */
166 +    private static final Pattern methodFilter = methodFilter();
167 +
168 +    private static Pattern methodFilter() {
169 +        String regex = System.getProperty("jsr166.methodFilter");
170 +        return (regex == null) ? null : Pattern.compile(regex);
171 +    }
172 +
173      protected void runTest() throws Throwable {
174 <        for (int i = 0; i < runsPerTest; i++) {
175 <            if (profileTests)
176 <                runTestProfiled();
177 <            else
178 <                super.runTest();
174 >        if (methodFilter == null
175 >            || methodFilter.matcher(toString()).find()) {
176 >            for (int i = 0; i < runsPerTest; i++) {
177 >                if (profileTests)
178 >                    runTestProfiled();
179 >                else
180 >                    super.runTest();
181 >            }
182          }
183      }
184  
185      protected void runTestProfiled() throws Throwable {
186 +        // Warmup run, notably to trigger all needed classloading.
187 +        super.runTest();
188          long t0 = System.nanoTime();
189          try {
190              super.runTest();
191          } finally {
192 <            long elapsedMillis =
152 <                (System.nanoTime() - t0) / (1000L * 1000L);
192 >            long elapsedMillis = millisElapsedSince(t0);
193              if (elapsedMillis >= profileThreshold)
194                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
195          }
# Line 205 | Line 245 | public class JSR166TestCase extends Test
245      }
246  
247      public static final double JAVA_CLASS_VERSION;
248 +    public static final String JAVA_SPECIFICATION_VERSION;
249      static {
250          try {
251              JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
252                  new java.security.PrivilegedAction<Double>() {
253                  public Double run() {
254                      return Double.valueOf(System.getProperty("java.class.version"));}});
255 +            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
256 +                new java.security.PrivilegedAction<String>() {
257 +                public String run() {
258 +                    return System.getProperty("java.specification.version");}});
259          } catch (Throwable t) {
260              throw new Error(t);
261          }
# Line 219 | Line 264 | public class JSR166TestCase extends Test
264      public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
265      public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
266      public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
267 +    public static boolean atLeastJava9() {
268 +        // As of 2014-05, java9 still uses 52.0 class file version
269 +        return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
270 +    }
271  
272      /**
273       * Collects all JSR166 unit tests as one suite.
# Line 311 | Line 360 | public class JSR166TestCase extends Test
360              addNamedTestClasses(suite, java8TestClassNames);
361          }
362  
363 +        // Java9+ test classes
364 +        if (atLeastJava9()) {
365 +            String[] java9TestClassNames = {
366 +                "ThreadPoolExecutor9Test",
367 +            };
368 +            addNamedTestClasses(suite, java9TestClassNames);
369 +        }
370 +
371          return suite;
372      }
373  
# Line 589 | Line 646 | public class JSR166TestCase extends Test
646      void joinPool(ExecutorService exec) {
647          try {
648              exec.shutdown();
649 <            assertTrue("ExecutorService did not terminate in a timely manner",
650 <                       exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS));
649 >            if (!exec.awaitTermination(2 * LONG_DELAY_MS, MILLISECONDS))
650 >                fail("ExecutorService " + exec +
651 >                     " did not terminate in a timely manner");
652          } catch (SecurityException ok) {
653              // Allowed in case test doesn't have privs
654          } catch (InterruptedException ie) {
# Line 868 | Line 926 | public class JSR166TestCase extends Test
926       * startNanoTime, which must have been previously returned from a
927       * call to {@link System.nanoTime()}.
928       */
929 <    long millisElapsedSince(long startNanoTime) {
929 >    static long millisElapsedSince(long startNanoTime) {
930          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
931      }
932  
933 + //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
934 + //         long startTime = System.nanoTime();
935 + //         try {
936 + //             r.run();
937 + //         } catch (Throwable fail) { threadUnexpectedException(fail); }
938 + //         if (millisElapsedSince(startTime) > timeoutMillis/2)
939 + //             throw new AssertionFailedError("did not return promptly");
940 + //     }
941 +
942 + //     void assertTerminatesPromptly(Runnable r) {
943 + //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
944 + //     }
945 +
946 +    /**
947 +     * Checks that timed f.get() returns the expected value, and does not
948 +     * wait for the timeout to elapse before returning.
949 +     */
950 +    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
951 +        long startTime = System.nanoTime();
952 +        try {
953 +            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
954 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
955 +        if (millisElapsedSince(startTime) > timeoutMillis/2)
956 +            throw new AssertionFailedError("timed get did not return promptly");
957 +    }
958 +
959 +    <T> void checkTimedGet(Future<T> f, T expectedValue) {
960 +        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
961 +    }
962 +
963      /**
964       * Returns a new started daemon Thread running the given runnable.
965       */

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines