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 |
|
|
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(), |
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 |
> |
"StampedLockTest", |
290 |
> |
}; |
291 |
> |
addNamedTestClasses(suite, java8TestClassNames); |
292 |
|
} |
293 |
+ |
|
294 |
|
return suite; |
295 |
|
} |
296 |
|
|