From bfa4e6ccabb98d9d0364025d94d77d80e0e148e6 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 9 Sep 2016 15:12:34 +0300
Subject: [PATCH] java tests: restore compatibility with jtreg plugin

---
 .../execution/JavaTestFrameworkRunnableState.java  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index 60995ac06ec8..5e766ddcc5cc 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -125,6 +125,14 @@ public abstract class JavaTestFrameworkRunnableState<T extends
   @NotNull
   @Override
   public ExecutionResult execute(@NotNull Executor executor, @NotNull ProgramRunner runner) throws ExecutionException {
+    return startSMRunner(executor);
+  }
+
+  /**
+   * to be removed in 2017.1, compatibility with jtreg plugin
+   */
+  @Deprecated
+  protected ExecutionResult startSMRunner(Executor executor) throws ExecutionException {
     final RunnerSettings runnerSettings = getRunnerSettings();
 
     final SMTRunnerConsoleProperties testConsoleProperties = getConfiguration().createTestConsoleProperties(executor);
@@ -369,12 +377,10 @@ public abstract class JavaTestFrameworkRunnableState<T extends
 
   protected void createTempFiles(JavaParameters javaParameters) {
     try {
-      myWorkingDirsFile = FileUtil.createTempFile("idea_working_dirs_" + getFrameworkId(), ".tmp");
-      myWorkingDirsFile.deleteOnExit();
+      myWorkingDirsFile = FileUtil.createTempFile("idea_working_dirs_" + getFrameworkId(), ".tmp", true);
       javaParameters.getProgramParametersList().add("@w@" + myWorkingDirsFile.getAbsolutePath());
       
-      myTempFile = FileUtil.createTempFile("idea_" + getFrameworkId(), ".tmp");
-      myTempFile.deleteOnExit();
+      myTempFile = FileUtil.createTempFile("idea_" + getFrameworkId(), ".tmp", true);
       passTempFile(javaParameters.getProgramParametersList(), myTempFile.getAbsolutePath());
     }
     catch (Exception e) {