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.99 by jsr166, Tue Feb 5 03:39:34 2013 UTC vs.
Revision 1.111 by dl, Sun Jul 21 22:24:18 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 286 | Line 294 | public class JSR166TestCase extends Test
294          // Java8+ test classes
295          if (atLeastJava8()) {
296              String[] java8TestClassNames = {
297 <                "StampedLockTest",
297 >                "CompletableFutureTest",
298 >                "ConcurrentHashMap8Test",
299 >                "CountedCompleterTest",
300 >                "DoubleAccumulatorTest",
301 >                "DoubleAdderTest",
302                  "ForkJoinPool8Test",
303 +                "ForkJoinTask8Test",
304 +                "LongAccumulatorTest",
305 +                "LongAdderTest",
306 +                "SplittableRandomTest",
307 +                "StampedLockTest",
308              };
309              addNamedTestClasses(suite, java8TestClassNames);
310          }
# Line 295 | Line 312 | public class JSR166TestCase extends Test
312          return suite;
313      }
314  
315 +    // Delays for timing-dependent tests, in milliseconds.
316  
317      public static long SHORT_DELAY_MS;
318      public static long SMALL_DELAY_MS;
319      public static long MEDIUM_DELAY_MS;
320      public static long LONG_DELAY_MS;
321  
304 –
322      /**
323       * Returns the shortest timed delay. This could
324       * be reimplemented to use for example a Property.
# Line 384 | Line 401 | public class JSR166TestCase extends Test
401  
402          if (Thread.interrupted())
403              throw new AssertionFailedError("interrupt status set in main thread");
404 +
405 +        checkForkJoinPoolThreadLeaks();
406 +    }
407 +
408 +    /**
409 +     * Find missing try { ... } finally { joinPool(e); }
410 +     */
411 +    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
412 +        Thread[] survivors = new Thread[5];
413 +        int count = Thread.enumerate(survivors);
414 +        for (int i = 0; i < count; i++) {
415 +            Thread thread = survivors[i];
416 +            String name = thread.getName();
417 +            if (name.startsWith("ForkJoinPool-")) {
418 +                // give thread some time to terminate
419 +                thread.join(LONG_DELAY_MS);
420 +                if (!thread.isAlive()) continue;
421 +                thread.stop();
422 +                throw new AssertionFailedError
423 +                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
424 +                                   toString(), name));
425 +            }
426 +        }
427      }
428  
429      /**
# Line 671 | Line 711 | public class JSR166TestCase extends Test
711      public static final Integer m6  = new Integer(-6);
712      public static final Integer m10 = new Integer(-10);
713  
674 –
714      /**
715       * Runs Runnable r with a security policy that permits precisely
716       * the specified permissions.  If there is no current security
# Line 1202 | Line 1241 | public class JSR166TestCase extends Test
1241      public abstract class CheckedRecursiveAction extends RecursiveAction {
1242          protected abstract void realCompute() throws Throwable;
1243  
1244 <        public final void compute() {
1244 >        @Override protected final void compute() {
1245              try {
1246                  realCompute();
1247              } catch (Throwable t) {
# Line 1217 | Line 1256 | public class JSR166TestCase extends Test
1256      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1257          protected abstract T realCompute() throws Throwable;
1258  
1259 <        public final T compute() {
1259 >        @Override protected final T compute() {
1260              try {
1261                  return realCompute();
1262              } catch (Throwable t) {
# Line 1318 | Line 1357 | public class JSR166TestCase extends Test
1357              return null;
1358          }
1359      }
1360 +
1361 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1362 +                             Runnable... throwingActions) {
1363 +        for (Runnable throwingAction : throwingActions) {
1364 +            boolean threw = false;
1365 +            try { throwingAction.run(); }
1366 +            catch (Throwable t) {
1367 +                threw = true;
1368 +                if (!expectedExceptionClass.isInstance(t)) {
1369 +                    AssertionFailedError afe =
1370 +                        new AssertionFailedError
1371 +                        ("Expected " + expectedExceptionClass.getName() +
1372 +                         ", got " + t.getClass().getName());
1373 +                    afe.initCause(t);
1374 +                    threadUnexpectedException(afe);
1375 +                }
1376 +            }
1377 +            if (!threw)
1378 +                shouldThrow(expectedExceptionClass.getName());
1379 +        }
1380 +    }
1381   }

Diff Legend

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