From c8fe5a15841c3aff9fe52afd430068d17e8ef540 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Tue, 6 Oct 2020 14:33:35 +0200
Subject: [PATCH] gradle: update to junit 5 (IDEA-252293)

GitOrigin-RevId: a6ee8523059e003802a7562f6353534afcabe290
---
 .../GradleJavaFrameworkSupportProvider.java          |  6 +++++-
 .../importing/GradleProjectWizardTest.java           | 12 +++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugins/gradle/java/src/frameworkSupport/GradleJavaFrameworkSupportProvider.java b/plugins/gradle/java/src/frameworkSupport/GradleJavaFrameworkSupportProvider.java
index 69a58c49d124..5e4e48fde1cd 100644
--- a/plugins/gradle/java/src/frameworkSupport/GradleJavaFrameworkSupportProvider.java
+++ b/plugins/gradle/java/src/frameworkSupport/GradleJavaFrameworkSupportProvider.java
@@ -53,6 +53,10 @@ public class GradleJavaFrameworkSupportProvider extends GradleFrameworkSupportPr
     buildScriptData
       .addPluginDefinitionInPluginsGroup("id 'java'")
       .addRepositoriesDefinition("mavenCentral()")
-      .addDependencyNotation("testCompile group: 'junit', name: 'junit', version: '4.12'");
+      .addOther("test {\n" +
+                "    useJUnitPlatform()\n" +
+                "}")
+      .addDependencyNotation("testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'")
+      .addDependencyNotation("testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'");
   }
 }
diff --git a/plugins/gradle/java/testSources/importing/GradleProjectWizardTest.java b/plugins/gradle/java/testSources/importing/GradleProjectWizardTest.java
index 6672fcdf7d1b..1f647fd3f3c5 100644
--- a/plugins/gradle/java/testSources/importing/GradleProjectWizardTest.java
+++ b/plugins/gradle/java/testSources/importing/GradleProjectWizardTest.java
@@ -90,7 +90,8 @@ public class GradleProjectWizardTest extends NewProjectWizardTestCase {
     assertNotNull(buildScript);
     assertEquals("plugins {\n" +
                  "    id 'java'\n" +
-                 "}\n\n" +
+                 "}\n" +
+                 "\n" +
                  "version '1.0-SNAPSHOT'\n" +
                  "\n" +
                  "repositories {\n" +
@@ -98,8 +99,13 @@ public class GradleProjectWizardTest extends NewProjectWizardTestCase {
                  "}\n" +
                  "\n" +
                  "dependencies {\n" +
-                 "    testCompile group: 'junit', name: 'junit', version: '4.12'\n" +
-                 "}\n",
+                 "    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'\n" +
+                 "    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'\n" +
+                 "}\n" +
+                 "\n" +
+                 "test {\n" +
+                 "    useJUnitPlatform()\n" +
+                 "}",
                  StringUtil.convertLineSeparators(VfsUtilCore.loadText(buildScript)));
 
     Module childModule = createModuleFromTemplate("Gradle", null, project, step -> {