From cb0dff0799c355d0bc7faa938687949ae4cf163e Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Thu, 3 Aug 2017 20:03:50 -0700
Subject: [PATCH] pattern configurations: distinguish set parameters
 (IDEA-176937)

---
 .../AbstractJavaTestConfigurationProducer.java        | 11 ++++++++---
 .../execution/junit/PatternConfigurationProducer.java |  1 +
 .../AbstractTestNGPatternConfigurationProducer.java   |  1 +
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/testframework/AbstractJavaTestConfigurationProducer.java b/java/execution/impl/src/com/intellij/execution/testframework/AbstractJavaTestConfigurationProducer.java
index a3bb261ede5b..09bbfa35c5e7 100644
--- a/java/execution/impl/src/com/intellij/execution/testframework/AbstractJavaTestConfigurationProducer.java
+++ b/java/execution/impl/src/com/intellij/execution/testframework/AbstractJavaTestConfigurationProducer.java
@@ -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));
diff --git a/plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java b/plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java
index 418cfac6c127..48df71c1e780 100644
--- a/plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java
+++ b/plugins/junit/src/com/intellij/execution/junit/PatternConfigurationProducer.java
@@ -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;
     }
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGPatternConfigurationProducer.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGPatternConfigurationProducer.java
index 908858af1280..54c9ca00f07c 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGPatternConfigurationProducer.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/AbstractTestNGPatternConfigurationProducer.java
@@ -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;