From 1148a0fc8e3bba8eb07ca81b24fc0a1b2ced9ff5 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Thu, 30 Mar 2017 12:17:30 +0200
Subject: [PATCH] junit 5: avoid dependencies on engine classes in runtime
 scope

---
 plugins/junit/junit.iml                                    | 1 -
 .../junit/src/com/intellij/execution/junit/TestObject.java | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/junit/junit.iml b/plugins/junit/junit.iml
index de581663d334..0dc10445ef0e 100644
--- a/plugins/junit/junit.iml
+++ b/plugins/junit/junit.iml
@@ -22,7 +22,6 @@
     <orderEntry type="module" module-name="smRunner" exported="" />
     <orderEntry type="module" module-name="testFramework-java" scope="TEST" />
     <orderEntry type="module" module-name="debugger-impl" />
-    <orderEntry type="module" module-name="junit5_rt" />
     <orderEntry type="library" name="opentest4j" level="project" />
   </component>
   <component name="copyright">
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index e6261e94e9d8..c6100e7c6998 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -31,7 +31,7 @@ import com.intellij.execution.testframework.SourceScope;
 import com.intellij.execution.testframework.TestSearchScope;
 import com.intellij.execution.util.JavaParametersUtil;
 import com.intellij.execution.util.ProgramParametersUtil;
-import com.intellij.junit5.JUnit5IdeaTestRunner;
+import com.intellij.junit4.JUnit4IdeaTestRunner;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtilCore;
@@ -160,7 +160,10 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
     GlobalSearchScope globalSearchScope = getScopeForJUnit(getConfiguration().getConfigurationModule().getModule(), sourceScope, project);
     if (JUnitUtil.isJUnit5(globalSearchScope, project)) {
       javaParameters.getProgramParametersList().add(JUnitStarter.JUNIT5_PARAMETER);
-      javaParameters.getClassPath().add(PathUtil.getJarPathForClass(JUnit5IdeaTestRunner.class));
+      //detect junit 5 rt without dependency on junit5_rt module
+      File junit4Rt = new File(PathUtil.getJarPathForClass(JUnit4IdeaTestRunner.class));
+      String junit5Name = junit4Rt.getName().replace("junit", "junit5");
+      javaParameters.getClassPath().add(new File(junit4Rt.getParent(), junit5Name));
 
       final PathsList classPath = javaParameters.getClassPath();
       File lib = new File(PathUtil.getJarPathForClass(MultipleFailuresError.class)).getParentFile();