From 954e287343d25b3af24d2e4b395a509a5d70bf2c Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 6 Apr 2015 14:59:43 +0200
Subject: [PATCH] junit/testng: simplify signatures

---
 .../JavaTestFrameworkRunnableState.java       | 116 +++++++++---------
 .../intellij/execution/junit/TestObject.java  |   5 +-
 .../configuration/TestNGRunnableState.java    |   2 +-
 3 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index 04b7478249c4..619812ed593a 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -22,7 +22,6 @@ import com.intellij.execution.runners.ExecutionEnvironment;
 import com.intellij.execution.testframework.SearchForTestsTask;
 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;
@@ -68,38 +67,6 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
 
   @NotNull protected abstract T getConfiguration();
 
-  protected void collectListeners(JavaParameters javaParameters, StringBuilder buf, String epName, String delimiter) {
-    final T configuration = getConfiguration();
-    final Object[] listeners = Extensions.getExtensions(epName);
-    for (final Object listener : listeners) {
-      boolean enabled = true;
-      for (RunConfigurationExtension ext : Extensions.getExtensions(RunConfigurationExtension.EP_NAME)) {
-        if (ext.isListenerDisabled(configuration, listener, getRunnerSettings())) {
-          enabled = false;
-          break;
-        }
-      }
-      if (enabled) {
-        if (buf.length() > 0) buf.append(delimiter);
-        final Class classListener = listener.getClass();
-        buf.append(classListener.getName());
-        javaParameters.getClassPath().add(PathUtil.getJarPathForClass(classListener));
-      }
-    }
-  }
-
-  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);
-    }
-  }
-
   public SearchForTestsTask createSearchingForTestsTask() {
     return null;
   }
@@ -108,6 +75,34 @@ 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");
+    getJavaParameters().getClassPath().add(PathUtil.getJarPathForClass(ServiceMessageTypes.class));
+
+    final RunnerSettings runnerSettings = getRunnerSettings();
+
+    TestConsoleProperties testConsoleProperties = new SMTRunnerConsoleProperties(getConfiguration(), getFrameworkName(), executor);
+    testConsoleProperties.setIfUndefined(TestConsoleProperties.HIDE_PASSED_TESTS, false);
+
+    final ConsoleView consoleView = SMTestRunnerConnectionUtil.createConsoleWithCustomLocator(getFrameworkName(), testConsoleProperties, getEnvironment(), null);
+    Disposer.register(getConfiguration().getProject(), consoleView);
+    consoleView.attachToProcess(handler);
+
+    AbstractRerunFailedTestsAction rerunFailedTestsAction = createRerunFailedTestsAction(testConsoleProperties, consoleView);
+    rerunFailedTestsAction.setModelProvider(new Getter<TestFrameworkRunningModel>() {
+      @Override
+      public TestFrameworkRunningModel get() {
+        return ((SMTRunnerConsoleView)consoleView).getResultsViewer();
+      }
+    });
+
+    final DefaultExecutionResult result = new DefaultExecutionResult(consoleView, handler);
+    result.setRestartActions(rerunFailedTestsAction);
+
+    JavaRunConfigurationExtensionManager.getInstance().attachExtensionsToProcess(getConfiguration(), handler, runnerSettings);
+    return result;
+  }
+
   @Override
   protected JavaParameters createJavaParameters() throws ExecutionException {
     final JavaParameters javaParameters = new JavaParameters();
@@ -135,35 +130,36 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
     return javaParameters;
   }
 
-  protected ExecutionResult startSMRunner(Executor executor,
-                                          OSProcessHandler handler,
-                                          RunConfigurationBase configuration,
-                                          ExecutionEnvironment environment) throws ExecutionException {
-    getJavaParameters().getVMParametersList().add("-Didea." + getFrameworkId()+ ".sm_runner");
-    getJavaParameters().getClassPath().add(PathUtil.getJarPathForClass(ServiceMessageTypes.class));
-
-    final RunnerSettings runnerSettings = getRunnerSettings();
-
-    TestConsoleProperties testConsoleProperties = new SMTRunnerConsoleProperties(configuration, getFrameworkName(), executor);
-    testConsoleProperties.setIfUndefined(TestConsoleProperties.HIDE_PASSED_TESTS, false);
-
-    final ConsoleView consoleView = SMTestRunnerConnectionUtil.createConsoleWithCustomLocator(getFrameworkName(), testConsoleProperties, environment, null);
-    Disposer.register(configuration.getProject(), consoleView);
-    consoleView.attachToProcess(handler);
-
-    AbstractRerunFailedTestsAction rerunFailedTestsAction = createRerunFailedTestsAction(testConsoleProperties, consoleView);
-    rerunFailedTestsAction.setModelProvider(new Getter<TestFrameworkRunningModel>() {
-      @Override
-      public TestFrameworkRunningModel get() {
-        return ((SMTRunnerConsoleView)consoleView).getResultsViewer();
+  protected void collectListeners(JavaParameters javaParameters, StringBuilder buf, String epName, String delimiter) {
+    final T configuration = getConfiguration();
+    final Object[] listeners = Extensions.getExtensions(epName);
+    for (final Object listener : listeners) {
+      boolean enabled = true;
+      for (RunConfigurationExtension ext : Extensions.getExtensions(RunConfigurationExtension.EP_NAME)) {
+        if (ext.isListenerDisabled(configuration, listener, getRunnerSettings())) {
+          enabled = false;
+          break;
+        }
       }
-    });
+      if (enabled) {
+        if (buf.length() > 0) buf.append(delimiter);
+        final Class classListener = listener.getClass();
+        buf.append(classListener.getName());
+        javaParameters.getClassPath().add(PathUtil.getJarPathForClass(classListener));
+      }
+    }
+  }
 
-    final DefaultExecutionResult result = new DefaultExecutionResult(consoleView, handler);
-    result.setRestartActions(rerunFailedTestsAction);
-
-    JavaRunConfigurationExtensionManager.getInstance().attachExtensionsToProcess(configuration, handler, runnerSettings);
-    return result;
+  protected 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 void createServerSocket(JavaParameters javaParameters) {
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index d78cc9593024..369b6c771196 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -42,7 +42,6 @@ import com.intellij.execution.util.JavaParametersUtil;
 import com.intellij.execution.util.ProgramParametersUtil;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
 import com.intellij.openapi.project.Project;
@@ -50,8 +49,6 @@ import com.intellij.openapi.projectRoots.JavaSdkType;
 import com.intellij.openapi.projectRoots.JdkUtil;
 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.Comparing;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Getter;
@@ -185,7 +182,7 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
   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), getConfiguration(), getEnvironment());
+      return startSMRunner(executor, createHandler(executor));
     }
     final JUnitProcessHandler handler = createHandler(executor);
     final RunnerSettings runnerSettings = getRunnerSettings();
diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
index f6f783455645..0264f097e091 100644
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGRunnableState.java
@@ -85,7 +85,7 @@ public class TestNGRunnableState extends JavaTestFrameworkRunnableState<TestNGCo
   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(), getConfiguration(), getEnvironment());
+      return startSMRunner(executor, startProcess());
     }
     OSProcessHandler processHandler = startProcess();
     final TreeRootNode unboundOutputRoot = new TreeRootNode();