MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

junit: skip subsuites ("suite.addTest(Tests.suite())")

Browse Source
This commit is contained in:
anna
2012-07-11 16:01:26 +02:00
parent 7eeeec4ba5
commit 1f75c9ebd1
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit_rt/src/com/intellij/junit3/TestAllInPackage2.java
+23 -9
View File
@@ -38,9 +38,17 @@ public class TestAllInPackage2 extends TestSuite {
String classMethodName = classMethodNames[i];
Test suite = TestRunnerUtil.createClassOrMethodSuite(runner, classMethodName);
if (suite != null) {
final boolean isTestSuite = suite instanceof TestSuite;
if (!isTestSuite || allNames.contains(((TestSuite)suite).getName())) {
if (isTestSuite && ((TestSuite)suite).getName() == null) {
boolean skip;
if (suite instanceof TestSuite) {
skip = !allNames.contains(((TestSuite)suite).getName());
} else if (suite instanceof TestRunnerUtil.SuiteMethodWrapper) {
skip = !allNames.contains(((TestRunnerUtil.SuiteMethodWrapper)suite).getClassName());
} else {
skip = false;
}
if (!skip) {
if (suite instanceof TestSuite && ((TestSuite)suite).getName() == null) {
attachSuiteInfo(suite, classMethodName);
}
addTest(suite);
@@ -56,13 +64,19 @@ public class TestAllInPackage2 extends TestSuite {
if (suite instanceof TestRunnerUtil.SuiteMethodWrapper) {
final Test test = ((TestRunnerUtil.SuiteMethodWrapper)suite).getSuite();
final String currentSuiteName = ((TestRunnerUtil.SuiteMethodWrapper)suite).getClassName();
if (test instanceof TestSuite) {
for (int idx = 0; idx < ((TestSuite)test).testCount(); idx++) {
final String testName = ((TestSuite)test).testAt(idx).toString();
if (!currentSuiteName.equals(testName)) {
allNames.remove(testName);
}
skipSubtests(allNames, test, currentSuiteName);
}
}
private static void skipSubtests(Set allNames, Test test, String currentSuiteName) {
if (test instanceof TestSuite) {
for (int idx = 0; idx < ((TestSuite)test).testCount(); idx++) {
Test childTest = ((TestSuite)test).testAt(idx);
final String testName = childTest.toString();
if (!currentSuiteName.equals(testName)) {
allNames.remove(testName);
}
skipSubtests(allNames, childTest, currentSuiteName);
}
}
}