From 7e7552bf5d31ad13f1e7cdbc31e8db1c811727b0 Mon Sep 17 00:00:00 2001
From: Yahor Berdnikau <yahor.berdnikau@jetbrains.com>
Date: Wed, 10 Mar 2021 17:50:56 +0100
Subject: [PATCH] Use JUnit 5 platform to run KGP tests.

Enabled vintage engine, so existing tests could run without any
modification.

^KT-45353 In Progress
---
 .../build.gradle.kts                          | 38 ++++++++++++++++---
 1 file changed, 32 insertions(+), 6 deletions(-)

diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
index 9a5b43cee9b..8f463dab006 100644
--- a/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
+++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts
@@ -39,6 +39,7 @@ dependencies {
 
     testImplementation(gradleApi())
     testImplementation("com.google.code.gson:gson:${rootProject.extra["versions.jar.gson"]}")
+    testApiJUnit5(vintageEngine = true)
 
     testRuntimeOnly(projectRuntimeJar(":kotlin-android-extensions"))
     testRuntimeOnly(project(":compiler:tests-mutes"))
@@ -85,32 +86,56 @@ fun Test.advanceGradleVersion() {
 }
 
 // additional configuration in tasks.withType<Test> below
-projectTest("test", shortenTempRootName = shortenTempRootName) {
+projectTest(
+    "test",
+    shortenTempRootName = shortenTempRootName,
+    jUnit5Enabled = true
+) {
     includeMppAndAndroid(false)
     includeNative(false)
 }
 
-projectTest("testAdvanceGradleVersion", shortenTempRootName = shortenTempRootName) {
+projectTest(
+    "testAdvanceGradleVersion",
+    shortenTempRootName = shortenTempRootName,
+    jUnit5Enabled = true
+) {
     advanceGradleVersion()
     includeMppAndAndroid(false)
     includeNative(false)
 }
 
 if (isTeamcityBuild) {
-    projectTest("testNative", shortenTempRootName = shortenTempRootName) {
+    projectTest(
+        "testNative",
+        shortenTempRootName = shortenTempRootName,
+        jUnit5Enabled = true
+    ) {
         includeNative(true)
     }
 
-    projectTest("testAdvanceGradleVersionNative", shortenTempRootName = shortenTempRootName) {
+    projectTest(
+        "testAdvanceGradleVersionNative",
+        shortenTempRootName = shortenTempRootName,
+        jUnit5Enabled = true
+    ) {
         advanceGradleVersion()
         includeNative(true)
     }
 
-    projectTest("testMppAndAndroid", shortenTempRootName = shortenTempRootName) {
+    projectTest(
+        "testMppAndAndroid",
+        shortenTempRootName = shortenTempRootName,
+        jUnit5Enabled = true
+    ) {
         includeMppAndAndroid(true)
     }
 
-    projectTest("testAdvanceGradleVersionMppAndAndroid", shortenTempRootName = shortenTempRootName) {
+    projectTest(
+        "testAdvanceGradleVersionMppAndAndroid",
+        shortenTempRootName = shortenTempRootName,
+        jUnit5Enabled = true
+    ) {
         advanceGradleVersion()
         includeMppAndAndroid(true)
     }
@@ -177,6 +202,7 @@ tasks.withType<Test> {
     useAndroidSdk()
 
     maxHeapSize = "512m"
+    useJUnitPlatform()
 
     testLogging {
         // set options for log level LIFECYCLE