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.101 by jsr166, Wed Feb 6 16:57:21 2013 UTC vs.
Revision 1.120 by jsr166, Wed Jun 25 15:32:10 2014 UTC

# Line 26 | Line 26 | import java.util.concurrent.atomic.Atomi
26   import java.util.concurrent.atomic.AtomicReference;
27   import static java.util.concurrent.TimeUnit.MILLISECONDS;
28   import static java.util.concurrent.TimeUnit.NANOSECONDS;
29 + import java.util.regex.Pattern;
30   import java.security.CodeSource;
31   import java.security.Permission;
32   import java.security.PermissionCollection;
# Line 115 | Line 116 | public class JSR166TestCase extends Test
116          Boolean.getBoolean("jsr166.expensiveTests");
117  
118      /**
119 +     * If true, also run tests that are not part of the official tck
120 +     * because they test unspecified implementation details.
121 +     */
122 +    protected static final boolean testImplementationDetails =
123 +        Boolean.getBoolean("jsr166.testImplementationDetails");
124 +
125 +    /**
126       * If true, report on stdout all "slow" tests, that is, ones that
127       * take more than profileThreshold milliseconds to execute.
128       */
# Line 128 | Line 136 | public class JSR166TestCase extends Test
136      private static final long profileThreshold =
137          Long.getLong("jsr166.profileThreshold", 100);
138  
139 +    /**
140 +     * The number of repetitions per test (for tickling rare bugs).
141 +     */
142 +    private static final int runsPerTest =
143 +        Integer.getInteger("jsr166.runsPerTest", 1);
144 +
145 +    /**
146 +     * A filter for tests to run, matching strings of the form
147 +     * methodName(className), e.g. "testInvokeAll5(ForkJoinPoolTest)"
148 +     * Usefully combined with jsr166.runsPerTest.
149 +     */
150 +    private static final Pattern methodFilter = methodFilter();
151 +
152 +    private static Pattern methodFilter() {
153 +        String regex = System.getProperty("jsr166.methodFilter");
154 +        return (regex == null) ? null : Pattern.compile(regex);
155 +    }
156 +
157      protected void runTest() throws Throwable {
158 <        if (profileTests)
159 <            runTestProfiled();
160 <        else
161 <            super.runTest();
158 >        if (methodFilter == null
159 >            || methodFilter.matcher(toString()).find()) {
160 >            for (int i = 0; i < runsPerTest; i++) {
161 >                if (profileTests)
162 >                    runTestProfiled();
163 >                else
164 >                    super.runTest();
165 >            }
166 >        }
167      }
168  
169      protected void runTestProfiled() throws Throwable {
170 +        // Warmup run, notably to trigger all needed classloading.
171 +        super.runTest();
172          long t0 = System.nanoTime();
173          try {
174              super.runTest();
175          } finally {
176 <            long elapsedMillis =
144 <                (System.nanoTime() - t0) / (1000L * 1000L);
176 >            long elapsedMillis = millisElapsedSince(t0);
177              if (elapsedMillis >= profileThreshold)
178                  System.out.printf("%n%s: %d%n", toString(), elapsedMillis);
179          }
# Line 197 | Line 229 | public class JSR166TestCase extends Test
229      }
230  
231      public static final double JAVA_CLASS_VERSION;
232 +    public static final String JAVA_SPECIFICATION_VERSION;
233      static {
234          try {
235              JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
236                  new java.security.PrivilegedAction<Double>() {
237                  public Double run() {
238                      return Double.valueOf(System.getProperty("java.class.version"));}});
239 +            JAVA_SPECIFICATION_VERSION = java.security.AccessController.doPrivileged(
240 +                new java.security.PrivilegedAction<String>() {
241 +                public String run() {
242 +                    return System.getProperty("java.specification.version");}});
243          } catch (Throwable t) {
244              throw new Error(t);
245          }
# Line 211 | Line 248 | public class JSR166TestCase extends Test
248      public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
249      public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
250      public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
251 +    public static boolean atLeastJava9() {
252 +        // As of 2014-05, java9 still uses 52.0 class file version
253 +        return JAVA_SPECIFICATION_VERSION.startsWith("1.9");
254 +    }
255  
256      /**
257       * Collects all JSR166 unit tests as one suite.
# Line 286 | Line 327 | public class JSR166TestCase extends Test
327          // Java8+ test classes
328          if (atLeastJava8()) {
329              String[] java8TestClassNames = {
330 <                "StampedLockTest",
330 >                "Atomic8Test",
331 >                "CompletableFutureTest",
332 >                "ConcurrentHashMap8Test",
333 >                "CountedCompleterTest",
334 >                "DoubleAccumulatorTest",
335 >                "DoubleAdderTest",
336                  "ForkJoinPool8Test",
337 +                "ForkJoinTask8Test",
338 +                "LongAccumulatorTest",
339 +                "LongAdderTest",
340 +                "SplittableRandomTest",
341 +                "StampedLockTest",
342 +                "ThreadLocalRandom8Test",
343              };
344              addNamedTestClasses(suite, java8TestClassNames);
345          }
346  
347 +        // Java9+ test classes
348 +        if (atLeastJava9()) {
349 +            String[] java9TestClassNames = {
350 +                "ThreadPoolExecutor9Test",
351 +            };
352 +            addNamedTestClasses(suite, java9TestClassNames);
353 +        }
354 +
355          return suite;
356      }
357  
358 +    // Delays for timing-dependent tests, in milliseconds.
359  
360      public static long SHORT_DELAY_MS;
361      public static long SMALL_DELAY_MS;
362      public static long MEDIUM_DELAY_MS;
363      public static long LONG_DELAY_MS;
364  
304 –
365      /**
366       * Returns the shortest timed delay. This could
367       * be reimplemented to use for example a Property.
# Line 694 | Line 754 | public class JSR166TestCase extends Test
754      public static final Integer m6  = new Integer(-6);
755      public static final Integer m10 = new Integer(-10);
756  
697 –
757      /**
758       * Runs Runnable r with a security policy that permits precisely
759       * the specified permissions.  If there is no current security
# Line 850 | Line 909 | public class JSR166TestCase extends Test
909       * startNanoTime, which must have been previously returned from a
910       * call to {@link System.nanoTime()}.
911       */
912 <    long millisElapsedSince(long startNanoTime) {
912 >    static long millisElapsedSince(long startNanoTime) {
913          return NANOSECONDS.toMillis(System.nanoTime() - startNanoTime);
914      }
915  
916 + //     void assertTerminatesPromptly(long timeoutMillis, Runnable r) {
917 + //         long startTime = System.nanoTime();
918 + //         try {
919 + //             r.run();
920 + //         } catch (Throwable fail) { threadUnexpectedException(fail); }
921 + //         if (millisElapsedSince(startTime) > timeoutMillis/2)
922 + //             throw new AssertionFailedError("did not return promptly");
923 + //     }
924 +
925 + //     void assertTerminatesPromptly(Runnable r) {
926 + //         assertTerminatesPromptly(LONG_DELAY_MS/2, r);
927 + //     }
928 +
929 +    /**
930 +     * Checks that timed f.get() returns the expected value, and does not
931 +     * wait for the timeout to elapse before returning.
932 +     */
933 +    <T> void checkTimedGet(Future<T> f, T expectedValue, long timeoutMillis) {
934 +        long startTime = System.nanoTime();
935 +        try {
936 +            assertEquals(expectedValue, f.get(timeoutMillis, MILLISECONDS));
937 +        } catch (Throwable fail) { threadUnexpectedException(fail); }
938 +        if (millisElapsedSince(startTime) > timeoutMillis/2)
939 +            throw new AssertionFailedError("timed get did not return promptly");
940 +    }
941 +
942 +    <T> void checkTimedGet(Future<T> f, T expectedValue) {
943 +        checkTimedGet(f, expectedValue, LONG_DELAY_MS);
944 +    }
945 +
946      /**
947       * Returns a new started daemon Thread running the given runnable.
948       */
# Line 1225 | Line 1314 | public class JSR166TestCase extends Test
1314      public abstract class CheckedRecursiveAction extends RecursiveAction {
1315          protected abstract void realCompute() throws Throwable;
1316  
1317 <        public final void compute() {
1317 >        @Override protected final void compute() {
1318              try {
1319                  realCompute();
1320              } catch (Throwable t) {
# Line 1240 | Line 1329 | public class JSR166TestCase extends Test
1329      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1330          protected abstract T realCompute() throws Throwable;
1331  
1332 <        public final T compute() {
1332 >        @Override protected final T compute() {
1333              try {
1334                  return realCompute();
1335              } catch (Throwable t) {
# Line 1341 | Line 1430 | public class JSR166TestCase extends Test
1430              return null;
1431          }
1432      }
1433 +
1434 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1435 +                             Runnable... throwingActions) {
1436 +        for (Runnable throwingAction : throwingActions) {
1437 +            boolean threw = false;
1438 +            try { throwingAction.run(); }
1439 +            catch (Throwable t) {
1440 +                threw = true;
1441 +                if (!expectedExceptionClass.isInstance(t)) {
1442 +                    AssertionFailedError afe =
1443 +                        new AssertionFailedError
1444 +                        ("Expected " + expectedExceptionClass.getName() +
1445 +                         ", got " + t.getClass().getName());
1446 +                    afe.initCause(t);
1447 +                    threadUnexpectedException(afe);
1448 +                }
1449 +            }
1450 +            if (!threw)
1451 +                shouldThrow(expectedExceptionClass.getName());
1452 +        }
1453 +    }
1454   }

Diff Legend

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