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.93 by jsr166, Sun Dec 16 17:22:42 2012 UTC vs.
Revision 1.108 by jsr166, Mon Jun 3 18:20:05 2013 UTC

# Line 11 | Line 11 | import java.io.ByteArrayInputStream;
11   import java.io.ByteArrayOutputStream;
12   import java.io.ObjectInputStream;
13   import java.io.ObjectOutputStream;
14 + import java.lang.management.ManagementFactory;
15 + import java.lang.management.ThreadInfo;
16 + import java.lang.reflect.Method;
17   import java.util.ArrayList;
18   import java.util.Arrays;
19   import java.util.Date;
# Line 125 | 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 145 | Line 156 | public class JSR166TestCase extends Test
156      }
157  
158      /**
159 <     * Runs all JSR166 unit tests using junit.textui.TestRunner
159 >     * Runs all JSR166 unit tests using junit.textui.TestRunner.
160 >     * Optional command line arg provides the number of iterations to
161 >     * repeat running the tests.
162       */
163      public static void main(String[] args) {
164          if (useSecurityManager) {
# Line 177 | Line 190 | public class JSR166TestCase extends Test
190          return suite;
191      }
192  
193 +    public static void addNamedTestClasses(TestSuite suite,
194 +                                           String... testClassNames) {
195 +        for (String testClassName : testClassNames) {
196 +            try {
197 +                Class<?> testClass = Class.forName(testClassName);
198 +                Method m = testClass.getDeclaredMethod("suite",
199 +                                                       new Class<?>[0]);
200 +                suite.addTest(newTestSuite((Test)m.invoke(null)));
201 +            } catch (Exception e) {
202 +                throw new Error("Missing test class", e);
203 +            }
204 +        }
205 +    }
206 +
207 +    public static final double JAVA_CLASS_VERSION;
208 +    static {
209 +        try {
210 +            JAVA_CLASS_VERSION = java.security.AccessController.doPrivileged(
211 +                new java.security.PrivilegedAction<Double>() {
212 +                public Double run() {
213 +                    return Double.valueOf(System.getProperty("java.class.version"));}});
214 +        } catch (Throwable t) {
215 +            throw new Error(t);
216 +        }
217 +    }
218 +
219 +    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
220 +    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
221 +    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
222 +
223      /**
224       * Collects all JSR166 unit tests as one suite.
225       */
226      public static Test suite() {
227 <        return newTestSuite(
227 >        // Java7+ test classes
228 >        TestSuite suite = newTestSuite(
229              ForkJoinPoolTest.suite(),
230              ForkJoinTaskTest.suite(),
231              RecursiveActionTest.suite(),
# Line 246 | Line 290 | public class JSR166TestCase extends Test
290              TreeSetTest.suite(),
291              TreeSubMapTest.suite(),
292              TreeSubSetTest.suite());
293 +
294 +        // Java8+ test classes
295 +        if (atLeastJava8()) {
296 +            String[] java8TestClassNames = {
297 +                "CompletableFutureTest",
298 +                "ConcurrentHashMap8Test",
299 +                "CountedCompleterTest",
300 +                "DoubleAccumulatorTest",
301 +                "DoubleAdderTest",
302 +                "ForkJoinPool8Test",
303 +                "LongAccumulatorTest",
304 +                "LongAdderTest",
305 +                "StampedLockTest",
306 +            };
307 +            addNamedTestClasses(suite, java8TestClassNames);
308 +        }
309 +
310 +        return suite;
311      }
312  
313  
# Line 337 | Line 399 | public class JSR166TestCase extends Test
399  
400          if (Thread.interrupted())
401              throw new AssertionFailedError("interrupt status set in main thread");
402 +
403 +        checkForkJoinPoolThreadLeaks();
404 +    }
405 +
406 +    /**
407 +     * Find missing try { ... } finally { joinPool(e); }
408 +     */
409 +    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
410 +        Thread[] survivors = new Thread[5];
411 +        int count = Thread.enumerate(survivors);
412 +        for (int i = 0; i < count; i++) {
413 +            Thread thread = survivors[i];
414 +            String name = thread.getName();
415 +            if (name.startsWith("ForkJoinPool-")) {
416 +                // give thread some time to terminate
417 +                thread.join(LONG_DELAY_MS);
418 +                if (!thread.isAlive()) continue;
419 +                thread.stop();
420 +                throw new AssertionFailedError
421 +                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
422 +                                   toString(), name));
423 +            }
424 +        }
425      }
426  
427      /**
# Line 510 | Line 595 | public class JSR166TestCase extends Test
595      }
596  
597      /**
598 +     * A debugging tool to print all stack traces, as jstack does.
599 +     */
600 +    static void printAllStackTraces() {
601 +        for (ThreadInfo info :
602 +                 ManagementFactory.getThreadMXBean()
603 +                 .dumpAllThreads(true, true))
604 +            System.err.print(info);
605 +    }
606 +
607 +    /**
608       * Checks that thread does not terminate within the default
609       * millisecond delay of {@code timeoutMillis()}.
610       */
# Line 1145 | Line 1240 | public class JSR166TestCase extends Test
1240      public abstract class CheckedRecursiveAction extends RecursiveAction {
1241          protected abstract void realCompute() throws Throwable;
1242  
1243 <        public final void compute() {
1243 >        @Override protected final void compute() {
1244              try {
1245                  realCompute();
1246              } catch (Throwable t) {
# Line 1160 | Line 1255 | public class JSR166TestCase extends Test
1255      public abstract class CheckedRecursiveTask<T> extends RecursiveTask<T> {
1256          protected abstract T realCompute() throws Throwable;
1257  
1258 <        public final T compute() {
1258 >        @Override protected final T compute() {
1259              try {
1260                  return realCompute();
1261              } catch (Throwable t) {
# Line 1261 | Line 1356 | public class JSR166TestCase extends Test
1356              return null;
1357          }
1358      }
1359 +
1360 +    public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
1361 +                             Runnable... throwingActions) {
1362 +        for (Runnable throwingAction : throwingActions) {
1363 +            boolean threw = false;
1364 +            try { throwingAction.run(); }
1365 +            catch (Throwable t) {
1366 +                threw = true;
1367 +                if (!expectedExceptionClass.isInstance(t)) {
1368 +                    AssertionFailedError afe =
1369 +                        new AssertionFailedError
1370 +                        ("Expected " + expectedExceptionClass.getName() +
1371 +                         ", got " + t.getClass().getName());
1372 +                    afe.initCause(t);
1373 +                    threadUnexpectedException(afe);
1374 +                }
1375 +            }
1376 +            if (!threw)
1377 +                shouldThrow(expectedExceptionClass.getName());
1378 +        }
1379 +    }
1380   }

Diff Legend

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