From c0e9e468efe0ee9a2d401d7946843869eda78d95 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 10 Apr 2015 16:53:50 +0200
Subject: [PATCH] java tests frameworks: ensure state is cleared on process
 termination

---
 .../intellij/execution/JavaTestFrameworkRunnableState.java  | 1 +
 .../execution/configurations/JavaCommandLineState.java      | 6 ++++--
 .../junit/src/com/intellij/execution/junit/TestObject.java  | 3 ---
 .../execution/junit2/ui/actions/RerunFailedTestsAction.java | 6 ------
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index 64d6caca0408..c36d9c52bf79 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -113,6 +113,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
             }
 
             deleteTempFiles();
+            clear();
           }
         };
         SwingUtilities.invokeLater(runnable);
diff --git a/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
index 7e477ba92818..5a4b3f49e931 100644
--- a/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
+++ b/java/execution/openapi/src/com/intellij/execution/configurations/JavaCommandLineState.java
@@ -18,8 +18,6 @@ package com.intellij.execution.configurations;
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.process.OSProcessHandler;
 import com.intellij.execution.runners.ExecutionEnvironment;
-import com.intellij.ide.DataManager;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
@@ -38,6 +36,10 @@ public abstract class JavaCommandLineState extends CommandLineState implements J
     return myParams;
   }
 
+  public void clear() {
+    myParams = null;
+  }
+  
   @Override
   @NotNull
   protected OSProcessHandler startProcess() throws ExecutionException {
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index 6fd9f56b952a..fe800b546ff9 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -515,9 +515,6 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
     }
   }
 
-  public void clear() {
-  }
-
   @NotNull
   protected String getFrameworkName() {
     return JUNIT_TEST_FRAMEWORK_NAME;
diff --git a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/RerunFailedTestsAction.java b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/RerunFailedTestsAction.java
index 332566b1b3f2..3fe9dbe1938f 100644
--- a/plugins/junit/src/com/intellij/execution/junit2/ui/actions/RerunFailedTestsAction.java
+++ b/plugins/junit/src/com/intellij/execution/junit2/ui/actions/RerunFailedTestsAction.java
@@ -48,12 +48,6 @@ public class RerunFailedTestsAction extends JavaRerunFailedTestsAction {
         testMethods.clear();
         return testMethods;
       }
-
-      @Override
-      public void clear() {
-        testMethods.clear();
-        super.clear();
-      }
     };
   }
 }