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

pattern configurations: distinguish set parameters (IDEA-176937)

Browse Source
This commit is contained in:
Anna Kozlova
2017-08-07 06:37:45 +02:00
parent b20523616e
commit cb0dff0799
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/execution/impl/src/com/intellij/execution/testframework/AbstractJavaTestConfigurationProducer.java
+8 -3
View File
@@ -105,9 +105,7 @@ public abstract class AbstractJavaTestConfigurationProducer<T extends JavaTestCo
? ((CommonJavaRunConfigurationParameters)predefinedConfiguration).getVMParameters()
: null;
if (vmParameters != null && !Comparing.strEqual(vmParameters, configuration.getVMParameters())) return false;
String paramSetName = contextLocation instanceof PsiMemberParameterizedLocation
? configuration.prepareParameterizedParameter(((PsiMemberParameterizedLocation)contextLocation).getParamSetName()) : null;
if (paramSetName != null && !Comparing.strEqual(paramSetName, configuration.getProgramParameters())) return false;
if (differentParamSet(configuration, contextLocation)) return false;
if (configuration.isConfiguredByElement(element)) {
final Module configurationModule = configuration.getConfigurationModule().getModule();
@@ -118,6 +116,13 @@ public abstract class AbstractJavaTestConfigurationProducer<T extends JavaTestCo
return false;
}
protected boolean differentParamSet(T configuration, Location contextLocation) {
String paramSetName = contextLocation instanceof PsiMemberParameterizedLocation
? configuration.prepareParameterizedParameter(((PsiMemberParameterizedLocation)contextLocation).getParamSetName()) : null;
if (paramSetName != null && !Comparing.strEqual(paramSetName, configuration.getProgramParameters())) return true;
return false;
}
public Module findModule(ModuleBasedConfiguration configuration, Module contextModule, Set<String> patterns) {
return JavaExecutionUtil.findModule(contextModule, patterns, configuration.getProject(), psiClass -> isTestClass(psiClass));
plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java
+1
View File
@@ -75,6 +75,7 @@ public class PatternConfigurationProducer extends AbstractPatternBasedConfigurat
public boolean isConfigurationFromContext(JUnitConfiguration unitConfiguration, ConfigurationContext context) {
final TestObject testobject = unitConfiguration.getTestObject();
if (testobject instanceof TestsPattern) {
if (differentParamSet(unitConfiguration, context.getLocation())) return false;
final Set<String> patterns = unitConfiguration.getPersistentData().getPatterns();
if (isConfiguredFromContext(context, patterns)) return true;
}
plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGPatternConfigurationProducer.java
+1
View File
@@ -63,6 +63,7 @@ public abstract class AbstractTestNGPatternConfigurationProducer extends Abstrac
public boolean isConfigurationFromContext(TestNGConfiguration testNGConfiguration, ConfigurationContext context) {
final String type = testNGConfiguration.getPersistantData().TEST_OBJECT;
if (Comparing.equal(type, TestType.PATTERN.getType())) {
if (differentParamSet(testNGConfiguration, context.getLocation())) return false;
return isConfiguredFromContext(context, testNGConfiguration.getPersistantData().getPatterns());
}
return false;