junit: do not skip suite self when filtering its components

This commit is contained in:
anna
2012-02-29 10:38:29 +01:00
parent 509caedca8
commit dd29ef5a7d
@@ -86,14 +86,14 @@ class IdeaSuite extends Suite {
}
for (Iterator iterator = children.iterator(); iterator.hasNext();) {
final Object child = iterator.next();
if (child instanceof Suite || child instanceof SuiteMethod) {
if (isSuite(child)) {
skipSuiteComponents(allNames, child);
}
}
for (Iterator iterator = children.iterator(); iterator.hasNext(); ) {
Object child = iterator.next();
if (!allNames.contains(describeChild((Runner)child).getDisplayName())) {
if (!isSuite(child) && !allNames.contains(describeChild((Runner)child).getDisplayName())) {
iterator.remove();
}
}
@@ -101,6 +101,10 @@ class IdeaSuite extends Suite {
return children;
}
private static boolean isSuite(Object child) {
return child instanceof Suite || child instanceof SuiteMethod;
}
private void skipSuiteComponents(Set allNames, Object child) {
try {
if (child instanceof Suite) {