From e364814a25edc613439eb63b490ac88c4eeca1c7 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 6 Apr 2015 19:59:37 +0200
Subject: [PATCH] sm runner: ensure process started with correct classpath/vm
 params

---
 .../execution/JavaTestFrameworkRunnableState.java    | 12 ++++++++++--
 .../src/com/intellij/execution/junit/TestObject.java |  7 ++++---
 .../com/intellij/execution/junit/TestPackage.java    |  2 ++
 .../testng/configuration/TestNGRunnableState.java    | 12 +++++++++---
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index 619812ed593a..067edb8af524 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -39,6 +39,7 @@ 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;
+import com.intellij.openapi.util.registry.Registry;
 import com.intellij.util.PathUtil;
 import jetbrains.buildServer.messages.serviceMessages.ServiceMessageTypes;
 import org.jetbrains.annotations.NotNull;
@@ -67,6 +68,8 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
 
   @NotNull protected abstract T getConfiguration();
 
+  @NotNull protected abstract OSProcessHandler createHandler(Executor executor) throws ExecutionException;
+
   public SearchForTestsTask createSearchingForTestsTask() {
     return null;
   }
@@ -75,8 +78,11 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
     return module != null;
   }
 
-  protected ExecutionResult startSMRunner(Executor executor, OSProcessHandler handler) throws ExecutionException {
-    getJavaParameters().getVMParametersList().add("-Didea." + getFrameworkId()+ ".sm_runner");
+  protected ExecutionResult startSMRunner(Executor executor) throws ExecutionException {
+    if (!Registry.is(getFrameworkId() + "_sm_runner")) {
+      return null;
+    }
+    getJavaParameters().getVMParametersList().addProperty("idea." + getFrameworkId() + ".sm_runner");
     getJavaParameters().getClassPath().add(PathUtil.getJarPathForClass(ServiceMessageTypes.class));
 
     final RunnerSettings runnerSettings = getRunnerSettings();
@@ -86,6 +92,8 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
 
     final ConsoleView consoleView = SMTestRunnerConnectionUtil.createConsoleWithCustomLocator(getFrameworkName(), testConsoleProperties, getEnvironment(), null);
     Disposer.register(getConfiguration().getProject(), consoleView);
+
+    final OSProcessHandler handler = createHandler(executor);
     consoleView.attachToProcess(handler);
 
     AbstractRerunFailedTestsAction rerunFailedTestsAction = createRerunFailedTestsAction(testConsoleProperties, consoleView);
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index 369b6c771196..51dad2db57b1 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -180,9 +180,9 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
   @NotNull
   @Override
   public ExecutionResult execute(@NotNull final Executor executor, @NotNull final ProgramRunner runner) throws ExecutionException {
-    final boolean smRunner = Registry.is("junit_sm_runner");
-    if (smRunner) {
-      return startSMRunner(executor, createHandler(executor));
+    final ExecutionResult executionResult = startSMRunner(executor);
+    if (executionResult != null) {
+      return executionResult;
     }
     final JUnitProcessHandler handler = createHandler(executor);
     final RunnerSettings runnerSettings = getRunnerSettings();
@@ -299,6 +299,7 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
     TestsUIUtil.notifyByBalloon(consoleProperties.getProject(), started, model != null ? model.getRoot() : null, consoleProperties, comment);
   }
 
+  @NotNull
   protected JUnitProcessHandler createHandler(Executor executor) throws ExecutionException {
     appendForkInfo(executor);
     final String repeatMode = getConfiguration().getRepeatMode();
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
index 3d0c68465293..daec919ebdf9 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestPackage.java
@@ -33,6 +33,7 @@ import com.intellij.psi.search.PackageScope;
 import com.intellij.refactoring.listeners.RefactoringElementListener;
 import com.intellij.util.Function;
 import gnu.trove.THashSet;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public class TestPackage extends TestObject {
@@ -48,6 +49,7 @@ public class TestPackage extends TestObject {
     return data.getScope().getSourceScope(getConfiguration());
   }
 
+  @NotNull
   @Override
   protected JUnitProcessHandler createHandler(Executor executor) throws ExecutionException {
     final JUnitProcessHandler handler = super.createHandler(executor);
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
index 0264f097e091..4624c204247f 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
@@ -80,12 +80,18 @@ public class TestNGRunnableState extends JavaTestFrameworkRunnableState<TestNGCo
     return handler;
   }
 
+  @NotNull
+  @Override
+  protected OSProcessHandler createHandler(Executor executor) throws ExecutionException {
+    return startProcess();
+  }
+
   @NotNull
   @Override
   public ExecutionResult execute(@NotNull final Executor executor, @NotNull final ProgramRunner runner) throws ExecutionException {
-    final boolean smRunner = Registry.is("testng_sm_runner");
-    if (smRunner) {
-      return startSMRunner(executor, startProcess());
+    final ExecutionResult executionResult = startSMRunner(executor);
+    if (executionResult != null) {
+      return executionResult;
     }
     OSProcessHandler processHandler = startProcess();
     final TreeRootNode unboundOutputRoot = new TreeRootNode();