From 227bdd8aa8c67c9dc9ebf08d3893ea64d0e60e5c Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 6 Apr 2015 14:05:28 +0200
Subject: [PATCH] junit/testng: common setup of classpath and jdk

---
 .../JavaTestFrameworkRunnableState.java       | 29 ++++++++++++++++++
 .../execution/junit/JUnitConfiguration.java   | 12 --------
 .../execution/junit/TestCategory.java         |  1 +
 .../intellij/execution/junit/TestClass.java   |  1 -
 .../execution/junit/TestDirectory.java        |  5 ++++
 .../intellij/execution/junit/TestMethod.java  |  1 -
 .../intellij/execution/junit/TestMethods.java | 13 --------
 .../intellij/execution/junit/TestObject.java  | 13 --------
 .../intellij/execution/junit/TestPackage.java | 21 ++-----------
 .../execution/junit/TestsPattern.java         | 17 ++---------
 .../configuration/TestNGRunnableState.java    | 30 ++++---------------
 11 files changed, 46 insertions(+), 97 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index d023c943a020..e63284579ac9 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -21,6 +21,7 @@ import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.TestConsoleProperties;
 import com.intellij.execution.testframework.TestFrameworkRunningModel;
+import com.intellij.execution.testframework.TestSearchScope;
 import com.intellij.execution.testframework.actions.AbstractRerunFailedTestsAction;
 import com.intellij.execution.testframework.sm.SMTestRunnerConnectionUtil;
 import com.intellij.execution.testframework.sm.runner.SMTRunnerConsoleProperties;
@@ -30,7 +31,11 @@ import com.intellij.execution.util.JavaParametersUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.ex.JavaSdkUtil;
+import com.intellij.openapi.roots.ModuleRootManager;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Getter;
 import com.intellij.openapi.util.io.FileUtil;
@@ -82,10 +87,32 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
     }
   }
 
+  public void configureClasspath(final JavaParameters javaParameters) throws CantRunException {
+    RunConfigurationModule module = getConfiguration().getConfigurationModule();
+    final String jreHome = getConfiguration().isAlternativeJrePathEnabled() ? getConfiguration().getAlternativeJrePath() : null;
+    final int pathType = JavaParameters.JDK_AND_CLASSES_AND_TESTS;
+    if (configureByModule(module.getModule())) {
+      JavaParametersUtil.configureModule(module, javaParameters, pathType, jreHome);
+    }
+    else {
+      JavaParametersUtil.configureProject(getConfiguration().getProject(), javaParameters, pathType, jreHome);
+    }
+  }
+
+  protected boolean configureByModule(Module module) {
+    return module != null;
+  }
+
   @Override
   protected JavaParameters createJavaParameters() throws ExecutionException {
     final JavaParameters javaParameters = new JavaParameters();
     final Module module = getConfiguration().getConfigurationModule().getModule();
+
+    Project project = getConfiguration().getProject();
+    Sdk jdk = module == null ? ProjectRootManager.getInstance(project).getProjectSdk() : ModuleRootManager.getInstance(module).getSdk();
+    javaParameters.setJdk(jdk);
+
+
     final Object[] patchers = Extensions.getExtensions(ExtensionPoints.JUNIT_PATCHER);
     for (Object patcher : patchers) {
       ((JUnitPatcher)patcher).patchJavaParameters(module, javaParameters);
@@ -98,6 +125,8 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
 
     JavaParametersUtil.configureConfiguration(javaParameters, getConfiguration());
     JavaSdkUtil.addRtJar(javaParameters.getClassPath());
+
+    configureClasspath(javaParameters);
     return javaParameters;
   }
 
diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
index 33eebfdd0a16..43ae36cf54cf 100644
--- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
+++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java
@@ -403,18 +403,6 @@ public class JUnitConfiguration extends ModuleBasedConfiguration<JavaRunConfigur
     element.addContent(patternsElement);
   }
 
-  public void configureClasspath(final JavaParameters javaParameters) throws CantRunException {
-    RunConfigurationModule module = getConfigurationModule();
-    final String jreHome = isAlternativeJrePathEnabled() ? getAlternativeJrePath() : null;
-    final int pathType = JavaParameters.JDK_AND_CLASSES_AND_TESTS;
-    if (myData.getScope() == TestSearchScope.WHOLE_PROJECT) {
-      JavaParametersUtil.configureProject(module.getProject(), javaParameters, pathType, jreHome);
-    }
-    else {
-      JavaParametersUtil.configureModule(module, javaParameters, pathType, jreHome);
-    }
-  }
-
   public void setForkMode(@NotNull String forkMode) {
     myData.FORK_MODE = forkMode;
   }
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestCategory.java b/plugins/junit/src/com/intellij/execution/junit/TestCategory.java
index c42b7e85431b..279bffb56ae1 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestCategory.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestCategory.java
@@ -22,6 +22,7 @@ import com.intellij.execution.configurations.RuntimeConfigurationException;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.util.JavaParametersUtil;
 import com.intellij.execution.util.ProgramParametersUtil;
+import com.intellij.openapi.module.Module;
 import com.intellij.psi.*;
 
 /**
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestClass.java b/plugins/junit/src/com/intellij/execution/junit/TestClass.java
index 2615b115c3e4..a84b3a699ae1 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestClass.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestClass.java
@@ -35,7 +35,6 @@ class TestClass extends TestObject {
     super.initialize(javaParameters);
     final JUnitConfiguration.Data data = getConfiguration().getPersistentData();
     RunConfigurationModule module = getConfiguration().getConfigurationModule();
-    configureModule(javaParameters, module, data.getMainClassName());
     javaParameters.getProgramParametersList().add(data.getMainClassName());
   }
 
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java b/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
index 4b83decc9e67..c26f06f0e71a 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestDirectory.java
@@ -76,6 +76,11 @@ class TestDirectory extends TestPackage {
     };
   }
 
+  @Override
+  protected boolean configureByModule(Module module) {
+    return module != null;
+  }
+
   @Override
   public void checkConfiguration() throws RuntimeConfigurationException {
     JavaParametersUtil.checkAlternativeJRE(getConfiguration());
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestMethod.java b/plugins/junit/src/com/intellij/execution/junit/TestMethod.java
index b9a44293742e..33622709fb28 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestMethod.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestMethod.java
@@ -40,7 +40,6 @@ class TestMethod extends TestObject {
     defaultInitialize(javaParameters);
     final JUnitConfiguration.Data data = getConfiguration().getPersistentData();
     RunConfigurationModule module = getConfiguration().getConfigurationModule();
-    configureModule(javaParameters, module, data.getMainClassName());
     addJUnit3Parameter(javaParameters, data, module.getProject());
     javaParameters.getProgramParametersList().add(data.getMainClassName() + "," + data.getMethodName());
   }
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestMethods.java b/plugins/junit/src/com/intellij/execution/junit/TestMethods.java
index 31e1f81ac4ca..e832c86345af 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestMethods.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestMethods.java
@@ -59,19 +59,6 @@ public class TestMethods extends TestMethod {
     final JUnitConfiguration.Data data = getConfiguration().getPersistentData();
     RunConfigurationModule module = getConfiguration().getConfigurationModule();
     final Project project = module.getProject();
-    final ExecutionException[] exception = new ExecutionException[1];
-    ApplicationManager.getApplication().runReadAction(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          getConfiguration().configureClasspath(javaParameters);
-        }
-        catch (ExecutionException e) {
-          exception[0] = e;
-        }
-      }
-    });
-    if (exception[0] != null) throw exception[0];
     final LinkedHashSet<TestInfo> methods = new LinkedHashSet<TestInfo>();
     final GlobalSearchScope searchScope = getConfiguration().getConfigurationModule().getSearchScope();
     for (AbstractTestProxy failedTest : myFailedTests) {
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index d0838ea3e15b..c242621e44f6 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -136,13 +136,6 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
                                                 PsiPackage testPackage,
                                                 PsiDirectory testDir);
 
-  protected void configureModule(final JavaParameters parameters, final RunConfigurationModule configurationModule, final String mainClassName)
-    throws CantRunException {
-    int classPathType = JavaParametersUtil.getClasspathType(configurationModule, mainClassName, true);
-    JavaParametersUtil.configureModule(configurationModule, parameters, classPathType,
-                                       getConfiguration().isAlternativeJrePathEnabled() ? getConfiguration().getAlternativeJrePath() : null);
-  }
-
   public void checkConfiguration() throws RuntimeConfigurationException{
     JavaParametersUtil.checkAlternativeJRE(getConfiguration());
     ProgramParametersUtil.checkWorkingDirectoryExist(getConfiguration(), getConfiguration().getProject(),
@@ -156,12 +149,6 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
   protected void initialize(JavaParameters javaParameters) throws ExecutionException {
     String parameters = getConfiguration().getProgramParameters();
     javaParameters.setMainClass(JUnitConfiguration.JUNIT_START_CLASS);
-    final Module module = getConfiguration().getConfigurationModule().getModule();
-    if (javaParameters.getJdk() == null){
-      javaParameters.setJdk(module != null
-                            ? ModuleRootManager.getInstance(module).getSdk()
-                            : ProjectRootManager.getInstance(getConfiguration().getProject()).getProjectSdk());
-    }
 
     javaParameters.getClassPath().add(PathUtil.getJarPathForClass(JUnitStarter.class));
     javaParameters.getProgramParametersList().add(JUnitStarter.IDE_VERSION + JUnitStarter.VERSION);
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
index f32f6700187c..0257056e9dfc 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
@@ -121,29 +121,14 @@ public class TestPackage extends TestObject {
     super.initialize(javaParameters);
     final JUnitConfiguration.Data data = getConfiguration().getPersistentData();
     getClassFilter(data);//check if junit found
-    configureClasspath(javaParameters);
-
     createTempFiles(javaParameters);
 
     createServerSocket(javaParameters);
   }
 
-  protected void configureClasspath(final JavaParameters javaParameters) throws ExecutionException {
-    final ExecutionException[] exception = new ExecutionException[1];
-    ApplicationManager.getApplication().runReadAction(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          getConfiguration().configureClasspath(javaParameters);
-        }
-        catch (CantRunException e) {
-          exception[0] = e;
-        }
-      }
-    });
-    if (exception[0] != null) {
-      throw exception[0];
-    }
+  @Override
+  protected boolean configureByModule(Module module) {
+    return super.configureByModule(module) && getConfiguration().getPersistentData().getScope() != TestSearchScope.WHOLE_PROJECT;
   }
 
   protected TestClassFilter getClassFilter(final JUnitConfiguration.Data data) throws CantRunException {
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestsPattern.java b/plugins/junit/src/com/intellij/execution/junit/TestsPattern.java
index 6d947f7686d7..62d35845bd5b 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestsPattern.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestsPattern.java
@@ -23,12 +23,10 @@ package com.intellij.execution.junit;
 import com.intellij.execution.CantRunException;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.JavaExecutionUtil;
-import com.intellij.execution.configurations.JavaParameters;
 import com.intellij.execution.configurations.RuntimeConfigurationException;
 import com.intellij.execution.configurations.RuntimeConfigurationWarning;
 import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.SearchForTestsTask;
-import com.intellij.execution.util.JavaParametersUtil;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
@@ -100,18 +98,9 @@ public class TestsPattern extends TestPackage {
                                            : className).trim(), GlobalSearchScope.allScope(project));
   }
 
-  protected void configureClasspath(JavaParameters javaParameters) throws CantRunException {
-    final String jreHome = getConfiguration().isAlternativeJrePathEnabled() ? getConfiguration().getAlternativeJrePath() : null;
-
-    final Module module = getConfiguration().getConfigurationModule().getModule();
-
-    if (module != null) {
-      JavaParametersUtil.configureModule(module, javaParameters, JavaParameters.JDK_AND_CLASSES_AND_TESTS, jreHome);
-    }
-    else {
-      JavaParametersUtil
-        .configureProject(getConfiguration().getProject(), javaParameters, JavaParameters.JDK_AND_CLASSES_AND_TESTS, jreHome);
-    }
+  @Override
+  protected boolean configureByModule(Module module) {
+    return module != null;
   }
 
   @Override
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
index 92d06dfe16a9..3a70179fc48f 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
@@ -193,41 +193,21 @@ public class TestNGRunnableState extends JavaTestFrameworkRunnableState<TestNGCo
     return new RerunFailedTestsAction(consoleView, testConsoleProperties);
   }
 
+  @Override
+  protected boolean configureByModule(Module module) {
+    return module != null && getConfiguration().getPersistantData().getScope() != TestSearchScope.WHOLE_PROJECT;
+  }
+
   @Override
   protected JavaParameters createJavaParameters() throws ExecutionException {
-    final Project project = getConfiguration().getProject();
     final JavaParameters javaParameters = super.createJavaParameters();
     javaParameters.setupEnvs(getConfiguration().getPersistantData().getEnvs(), getConfiguration().getPersistantData().PASS_PARENT_ENVS);
     javaParameters.setMainClass("org.testng.RemoteTestNGStarter");
     javaParameters.getClassPath().add(PathUtil.getJarPathForClass(RemoteTestNGStarter.class));
 
     //the next few lines are awkward for a reason, using compareTo for some reason causes a JVM class verification error!
-    Module module = getConfiguration().getConfigurationModule().getModule();
-    LanguageLevel effectiveLanguageLevel = module == null
-                                           ? LanguageLevelProjectExtension.getInstance(project).getLanguageLevel()
-                                           : EffectiveLanguageLevelUtil.getEffectiveLanguageLevel(module);
-    final boolean is15 = effectiveLanguageLevel != LanguageLevel.JDK_1_4 && effectiveLanguageLevel != LanguageLevel.JDK_1_3;
-
-    LOG.info("Language level is " + effectiveLanguageLevel.toString());
-    LOG.info("is15 is " + is15);
     final String pathToBundledJar = PathUtil.getJarPathForClass(AfterClass.class);
 
-    // Configure rest of jars
-    Sdk jdk = module == null ? ProjectRootManager.getInstance(project).getProjectSdk() : ModuleRootManager.getInstance(module).getSdk();
-    javaParameters.setJdk(jdk);
-
-    LOG.info("Test scope is: " + getConfiguration().getPersistantData().getScope());
-    if (getConfiguration().getPersistantData().getScope() == TestSearchScope.WHOLE_PROJECT) {
-      LOG.info("Configuring for whole project");
-      JavaParametersUtil.configureProject(getConfiguration().getProject(), javaParameters, JavaParameters.JDK_AND_CLASSES_AND_TESTS,
-                                          getConfiguration().ALTERNATIVE_JRE_PATH_ENABLED ? getConfiguration().ALTERNATIVE_JRE_PATH : null);
-    }
-    else {
-      LOG.info("Configuring for module:" + getConfiguration().getConfigurationModule().getModuleName());
-      JavaParametersUtil.configureModule(getConfiguration().getConfigurationModule(), javaParameters, JavaParameters.JDK_AND_CLASSES_AND_TESTS,
-                                         getConfiguration().ALTERNATIVE_JRE_PATH_ENABLED ? getConfiguration().ALTERNATIVE_JRE_PATH : null);
-    }
-
     javaParameters.getClassPath().add(pathToBundledJar);
 
     try {