From 97ca5a97befc2ff0eca7ff279f5dedebe4304a7a Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Mon, 10 Nov 2014 16:44:54 +0100 Subject: [PATCH] disable pattern configurations if another test framework is selected (IDEA-132654) --- .../execution/junit/PatternConfigurationProducer.java | 4 +++- .../configuration/TestNGPatternConfigurationProducer.java | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java index b0f8424316ce..e570f10177da 100644 --- a/plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java +++ b/plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java @@ -51,7 +51,9 @@ public class PatternConfigurationProducer extends JUnitConfigurationProducer { Ref sourceElement) { final LinkedHashSet classes = new LinkedHashSet(); PsiElement[] elements = collectPatternElements(context, classes); - if (classes.size() <= 1) return false; + if (elements == null || collectTestMembers(elements, false).size() <= 1) { + return false; + } sourceElement.set(elements[0]); final JUnitConfiguration.Data data = configuration.getPersistentData(); data.setPatterns(classes); diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPatternConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPatternConfigurationProducer.java index 67f3eb17db8f..8baed4adb889 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPatternConfigurationProducer.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPatternConfigurationProducer.java @@ -53,7 +53,9 @@ public class TestNGPatternConfigurationProducer extends TestNGConfigurationProdu Ref sourceElement) { final LinkedHashSet classes = new LinkedHashSet(); PsiElement[] elements = collectPatternElements(context, classes); - if (classes.size() <= 1) return false; + if (elements == null || collectTestMembers(elements).size() <= 1) { + return false; + } final TestData data = configuration.getPersistantData(); data.setPatterns(classes); data.TEST_OBJECT = TestType.PATTERN.getType(); @@ -69,7 +71,7 @@ public class TestNGPatternConfigurationProducer extends TestNGConfigurationProdu if (psiElement instanceof PsiClassOwner) { final PsiClass[] classes = ((PsiClassOwner)psiElement).getClasses(); for (PsiClass aClass : classes) { - if (JUnitUtil.isTestClass(aClass)) { + if (TestNGUtil.hasTest(aClass)) { foundMembers.add(aClass); } }