From b33785c618c90227510b68e09bafd5626e97d736 Mon Sep 17 00:00:00 2001
From: "Anna.Kozlova" <anna.kozlova@jetbrains.com>
Date: Thu, 13 Apr 2017 16:04:28 +0200
Subject: [PATCH] fix junit5 parameter passed

---
 .../junit/src/com/intellij/execution/junit/TestClass.java   | 2 +-
 .../junit/src/com/intellij/execution/junit/TestMethod.java  | 2 +-
 .../junit/src/com/intellij/execution/junit/TestObject.java  | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/junit/src/com/intellij/execution/junit/TestClass.java b/plugins/junit/src/com/intellij/execution/junit/TestClass.java
index 0e92a76c2a67..162690a34c44 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestClass.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestClass.java
@@ -53,7 +53,7 @@ class TestClass extends TestObject {
     final PsiClass psiClass = JavaExecutionUtil.findMainClass(project, getConfiguration().getPersistentData().getMainClassName(), globalSearchScope);
     if (psiClass != null) {
       if (JUnitUtil.isJUnit5TestClass(psiClass, false)) {
-        return JUnitStarter.JUNIT5_RUNNER_NAME;
+        return JUnitStarter.JUNIT5_PARAMETER;
       }
       return JUnitStarter.JUNIT4_PARAMETER;
     }
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestMethod.java b/plugins/junit/src/com/intellij/execution/junit/TestMethod.java
index b94f92d89e01..e6ced239d694 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestMethod.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestMethod.java
@@ -57,7 +57,7 @@ class TestMethod extends TestObject {
     if (psiClass == null) return null;
 
     if (JUnitUtil.isJUnit5TestClass(psiClass, false)) {
-      return JUnitStarter.JUNIT5_RUNNER_NAME;
+      return JUnitStarter.JUNIT5_PARAMETER;
     }
 
     if (JUnitUtil.isJUnit4TestClass(psiClass)) {
diff --git a/plugins/junit/src/com/intellij/execution/junit/TestObject.java b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
index a07706d592cf..5a21d43569a7 100644
--- a/plugins/junit/src/com/intellij/execution/junit/TestObject.java
+++ b/plugins/junit/src/com/intellij/execution/junit/TestObject.java
@@ -159,7 +159,7 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
     final SourceScope sourceScope = getSourceScope();
     GlobalSearchScope globalSearchScope = getScopeForJUnit(getConfiguration().getConfigurationModule().getModule(), sourceScope, project);
     String preferredRunner = getPreferredRunner(globalSearchScope);
-    if (JUnitStarter.JUNIT5_RUNNER_NAME.equals(preferredRunner)) {
+    if (JUnitStarter.JUNIT5_PARAMETER.equals(preferredRunner)) {
       //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");
@@ -176,6 +176,8 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
 
               fileName.startsWith("junit-platform-") && !hasPackageWithDirectories(psiFacade, "org.junit.platform", globalSearchScope) ||
 
+              fileName.startsWith("junit-platform-engine-") && !hasPackageWithDirectories(psiFacade, "org.junit.platform.engine", globalSearchScope) ||
+
               fileName.startsWith("junit-jupiter-engine-") && !hasPackageWithDirectories(psiFacade, "org.junit.jupiter.engine", globalSearchScope) &&
                                                                hasPackageWithDirectories(psiFacade, JUnitUtil.TEST5_PACKAGE_FQN, globalSearchScope)) {
             classPath.add(file.getAbsolutePath());
@@ -200,7 +202,7 @@ public abstract class TestObject extends JavaTestFrameworkRunnableState<JUnitCon
 
   @Nullable
   protected String getPreferredRunner(GlobalSearchScope globalSearchScope) {
-    return JUnitUtil.isJUnit5(globalSearchScope, getConfiguration().getProject()) ? JUnitStarter.JUNIT5_RUNNER_NAME : null;
+    return JUnitUtil.isJUnit5(globalSearchScope, getConfiguration().getProject()) ? JUnitStarter.JUNIT5_PARAMETER : null;
   }
 
   private static boolean hasPackageWithDirectories(JavaPsiFacade psiFacade,