From 83b1df153e9140d13b97006b37c20d310065b028 Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 16 Jul 2010 13:12:17 +0400 Subject: [PATCH] junit: do not exclude self suite if it inherits TestCase the same time --- .../junit_rt/src/com/intellij/junit3/TestAllInPackage2.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/junit_rt/src/com/intellij/junit3/TestAllInPackage2.java b/plugins/junit_rt/src/com/intellij/junit3/TestAllInPackage2.java index 8c83eb729a28..f044db433c58 100644 --- a/plugins/junit_rt/src/com/intellij/junit3/TestAllInPackage2.java +++ b/plugins/junit_rt/src/com/intellij/junit3/TestAllInPackage2.java @@ -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; }