From b5b83f0273b929c59533b4fccf1b611be711a501 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 12 May 2015 21:36:35 +0200
Subject: [PATCH] junit compatibility with old IDEA SDKs: ensure current
 idea_rt.jar is used to run tests

---
 .../intellij/execution/JavaTestFrameworkRunnableState.java   | 5 ++---
 .../com/intellij/execution/junit/JUnitClasspathTest.java     | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
index 9fb6e4cf989b..147b85008ded 100644
--- a/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
+++ b/java/execution/impl/src/com/intellij/execution/JavaTestFrameworkRunnableState.java
@@ -109,7 +109,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
       return null;
     }
     getJavaParameters().getVMParametersList().addProperty("idea." + getFrameworkId() + ".sm_runner");
-    getJavaParameters().getClassPath().add(PathUtil.getJarPathForClass(ServiceMessageTypes.class));
+    getJavaParameters().getClassPath().addFirst(PathUtil.getJarPathForClass(ServiceMessageTypes.class));
 
     final RunnerSettings runnerSettings = getRunnerSettings();
 
@@ -191,8 +191,7 @@ public abstract class JavaTestFrameworkRunnableState<T extends ModuleBasedConfig
     finally {
       getConfiguration().setProgramParameters(parameters);
     }
-    JavaSdkUtil.addRtJar(javaParameters.getClassPath());
-
+    javaParameters.getClassPath().addFirst(JavaSdkUtil.getIdeaRtJarPath());
     configureClasspath(javaParameters);
 
     if (!StringUtil.isEmptyOrSpaces(parameters)) {
diff --git a/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java b/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java
index 8e3b6eb16bcc..f1ed649c7217 100644
--- a/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java
+++ b/plugins/junit/test/com/intellij/execution/junit/JUnitClasspathTest.java
@@ -99,11 +99,11 @@ public class JUnitClasspathTest extends JavaCodeInsightFixtureTestCase {
       file = preparePathsForComparison(FileUtil.loadFile(workingDirsFile), mod1, mod2);
       assertEquals("p\n" +
                    "MODULE_1\n" +
-                   "IDEA_HOME/lib/serviceMessages.jar;IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" +
+                   "APP_HOME/serviceMessages.jar;IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" +
                    "1\n" +
                    "p.T1\n" +
                    "MODULE_2\n" +
-                   "IDEA_HOME/lib/serviceMessages.jar;IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" +
+                   "APP_HOME/serviceMessages.jar;IDEA_HOME/lib/junit-4.12.jar;IDEA_HOME/java/mockJDK-1.8/jre/lib/rt.jar\n" +
                    "1\n" +
                    "p.T2\n", file);
     }