junit: do not exclude self suite if it inherits TestCase the same time

This commit is contained in:
anna
2010-07-16 13:28:30 +04:00
parent f78643b4b1
commit 83b1df153e
@@ -46,10 +46,12 @@ public class TestAllInPackage2 extends TestSuite {
private static boolean skipSuite(Set allNames, Test suite) {
if (suite instanceof TestRunnerUtil.SuiteMethodWrapper) {
final Test test = ((TestRunnerUtil.SuiteMethodWrapper)suite).getSuite();
final String currentSuiteName = ((TestRunnerUtil.SuiteMethodWrapper)suite).getClassName();
if (test instanceof TestSuite) {
boolean hasAllComponents = true;
for (int idx = 0; idx < ((TestSuite)test).testCount(); idx++) {
if (!allNames.contains(((TestSuite)test).testAt(idx).toString())) {
final String testName = ((TestSuite)test).testAt(idx).toString();
if (!allNames.contains(testName) || currentSuiteName.equals(testName)) {
hasAllComponents = false;
break;
}