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

disable pattern configurations if another test framework is selected (IDEA-132654)

Browse Source
This commit is contained in:
Anna Kozlova
2014-11-10 17:53:57 +01:00
parent 59fd186802
commit 97ca5a97be
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java
+3 -1
View File
@@ -51,7 +51,9 @@ public class PatternConfigurationProducer extends JUnitConfigurationProducer {
Ref<PsiElement> sourceElement) {
final LinkedHashSet<String> classes = new LinkedHashSet<String>();
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);
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGPatternConfigurationProducer.java
+4 -2
View File
@@ -53,7 +53,9 @@ public class TestNGPatternConfigurationProducer extends TestNGConfigurationProdu
Ref<PsiElement> sourceElement) {
final LinkedHashSet<String> classes = new LinkedHashSet<String>();
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);
}
}