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.97 by jsr166, Fri Feb 1 19:07:36 2013 UTC vs.
Revision 1.104 by dl, Thu Mar 21 00:26:43 2013 UTC

# Line 182 | Line 182 | public class JSR166TestCase extends Test
182          return suite;
183      }
184  
185 <    static void addTestReflectively(TestSuite suite, String testClassName) {
186 <        try {
187 <            Class klazz = Class.forName(testClassName);
188 <            Method m = klazz.getDeclaredMethod("suite", new Class<?>[0]);
189 <            suite.addTest(newTestSuite((Test)m.invoke(null)));
190 <        } catch (Exception e) {
191 <            throw new Error(e);
185 >    public static void addNamedTestClasses(TestSuite suite,
186 >                                           String... testClassNames) {
187 >        for (String testClassName : testClassNames) {
188 >            try {
189 >                Class<?> testClass = Class.forName(testClassName);
190 >                Method m = testClass.getDeclaredMethod("suite",
191 >                                                       new Class<?>[0]);
192 >                suite.addTest(newTestSuite((Test)m.invoke(null)));
193 >            } catch (Exception e) {
194 >                throw new Error("Missing test class", e);
195 >            }
196          }
197      }
198  
# Line 204 | Line 208 | public class JSR166TestCase extends Test
208          }
209      }
210  
211 <    public static boolean isAtLeastJdk6() { return JAVA_CLASS_VERSION >= 50.0; }
212 <    public static boolean isAtLeastJdk7() { return JAVA_CLASS_VERSION >= 51.0; }
213 <    public static boolean isAtLeastJdk8() { return JAVA_CLASS_VERSION >= 52.0; }
211 >    public static boolean atLeastJava6() { return JAVA_CLASS_VERSION >= 50.0; }
212 >    public static boolean atLeastJava7() { return JAVA_CLASS_VERSION >= 51.0; }
213 >    public static boolean atLeastJava8() { return JAVA_CLASS_VERSION >= 52.0; }
214  
215      /**
216       * Collects all JSR166 unit tests as one suite.
217       */
218      public static Test suite() {
219 +        // Java7+ test classes
220          TestSuite suite = newTestSuite(
221              ForkJoinPoolTest.suite(),
222              ForkJoinTaskTest.suite(),
# Line 277 | Line 282 | public class JSR166TestCase extends Test
282              TreeSetTest.suite(),
283              TreeSubMapTest.suite(),
284              TreeSubSetTest.suite());
285 <        if (isAtLeastJdk8()) {
286 <            addTestReflectively(suite, "StampedLockTest");
285 >
286 >        // Java8+ test classes
287 >        if (atLeastJava8()) {
288 >            String[] java8TestClassNames = {
289 >                "CompletableFutureTest",
290 >                "CountedCompleterTest",
291 >                "DoubleAccumulatorTest",
292 >                "DoubleAdderTest",
293 >                "ForkJoinPool8Test",
294 >                "LongAccumulatorTest",
295 >                "LongAdderTest",
296 >                "StampedLockTest",
297 >            };
298 >            addNamedTestClasses(suite, java8TestClassNames);
299          }
300 +
301          return suite;
302      }
303  
# Line 372 | Line 390 | public class JSR166TestCase extends Test
390  
391          if (Thread.interrupted())
392              throw new AssertionFailedError("interrupt status set in main thread");
393 +
394 +        checkForkJoinPoolThreadLeaks();
395 +    }
396 +
397 +    /**
398 +     * Find missing try { ... } finally { joinPool(e); }
399 +     */
400 +    void checkForkJoinPoolThreadLeaks() throws InterruptedException {
401 +        Thread[] survivors = new Thread[5];
402 +        int count = Thread.enumerate(survivors);
403 +        for (int i = 0; i < count; i++) {
404 +            Thread thread = survivors[i];
405 +            String name = thread.getName();
406 +            if (name.startsWith("ForkJoinPool-")) {
407 +                // give thread some time to terminate
408 +                thread.join(LONG_DELAY_MS);
409 +                if (!thread.isAlive()) continue;
410 +                thread.stop();
411 +                throw new AssertionFailedError
412 +                    (String.format("Found leaked ForkJoinPool thread test=%s thread=%s%n",
413 +                                   toString(), name));
414 +            }
415 +        }
416      }
417  
418      /**

Diff Legend

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