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.104 by dl, Thu Mar 21 00:26:43 2013 UTC vs.
Revision 1.112 by jsr166, Fri Aug 16 07:07:01 2013 UTC

# Line 128 | Line 128 | public class JSR166TestCase extends Test
128      private static final long profileThreshold =
129          Long.getLong("jsr166.profileThreshold", 100);
130  
131 +    /**
132 +     * The number of repetitions per test (for tickling rare bugs).
133 +     */
134 +    private static final int runsPerTest =
135 +        Integer.getInteger("jsr166.runsPerTest", 1);
136 +
137      protected void runTest() throws Throwable {
138 <        if (profileTests)
139 <            runTestProfiled();
140 <        else
141 <            super.runTest();
138 >        for (int i = 0; i < runsPerTest; i++) {
139 >            if (profileTests)
140 >                runTestProfiled();
141 >            else
142 >                super.runTest();
143 >        }
144      }
145  
146      protected void runTestProfiled() throws Throwable {
# Line 287 | Line 295 | public class JSR166TestCase extends Test
295          if (atLeastJava8()) {
296              String[] java8TestClassNames = {
297                  "CompletableFutureTest",
298 +                "ConcurrentHashMap8Test",
299                  "CountedCompleterTest",
300                  "DoubleAccumulatorTest",
301                  "DoubleAdderTest",
302                  "ForkJoinPool8Test",
303 +                "ForkJoinTask8Test",
304                  "LongAccumulatorTest",
305                  "LongAdderTest",
306 +                "SplittableRandomTest",
307                  "StampedLockTest",
308 +                "ThreadLocalRandom8Test",
309              };
310              addNamedTestClasses(suite, java8TestClassNames);
311          }
# Line 301 | Line 313 | public class JSR166TestCase extends Test
313          return suite;
314      }
315  
316 +    // Delays for timing-dependent tests, in milliseconds.
317  
318      public static long SHORT_DELAY_MS;
319      public static long SMALL_DELAY_MS;
320      public static long MEDIUM_DELAY_MS;
321      public static long LONG_DELAY_MS;
322  
310 –
323      /**
324       * Returns the shortest timed delay. This could
325       * be reimplemented to use for example a Property.
# Line 700 | Line 712 | public class JSR166TestCase extends Test
712      public static final Integer m6  = new Integer(-6);
713      public static final Integer m10 = new Integer(-10);
714  
703 –
715      /**
716       * Runs Runnable r with a security policy that permits precisely
717       * the specified permissions.  If there is no current security
# Line 1231 | Line 1242 | public class JSR166TestCase extends Test
1242      public abstract class CheckedRecursiveAction extends RecursiveAction {
1243          protected abstract void realCompute() throws Throwable;
1244  
1245 <        public final void compute() {
1245 >        @Override protected final void compute() {
1246              try {
1247                  realCompute();
1248              } catch (Throwable t) {
# Line 1246 | Line 1257 | public class JSR166TestCase extends Test
1257      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1258          protected abstract T realCompute() throws Throwable;
1259  
1260 <        public final T compute() {
1260 >        @Override protected final T compute() {
1261              try {
1262                  return realCompute();
1263              } catch (Throwable t) {
# Line 1347 | Line 1358 | public class JSR166TestCase extends Test
1358              return null;
1359          }
1360      }
1361 +
1362 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1363 +                             Runnable... throwingActions) {
1364 +        for (Runnable throwingAction : throwingActions) {
1365 +            boolean threw = false;
1366 +            try { throwingAction.run(); }
1367 +            catch (Throwable t) {
1368 +                threw = true;
1369 +                if (!expectedExceptionClass.isInstance(t)) {
1370 +                    AssertionFailedError afe =
1371 +                        new AssertionFailedError
1372 +                        ("Expected " + expectedExceptionClass.getName() +
1373 +                         ", got " + t.getClass().getName());
1374 +                    afe.initCause(t);
1375 +                    threadUnexpectedException(afe);
1376 +                }
1377 +            }
1378 +            if (!threw)
1379 +                shouldThrow(expectedExceptionClass.getName());
1380 +        }
1381 +    }
1382   }

Diff Legend

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