From ef0fb557a5dbbc2205df6d4cbff52bf7abecb8db Mon Sep 17 00:00:00 2001
From: "Alexander.Likhachev" <Alexander.Likhachev@jetbrains.com>
Date: Wed, 16 Aug 2023 17:58:34 +0200
Subject: [PATCH] [Build] Split `junit-jupiter` into `api` and `engine`

#KTI-1349 In Progress
---
 build-common/build.gradle.kts                               | 1 +
 compiler/tests-spec/build.gradle.kts                        | 2 +-
 gradle/libs.versions.toml                                   | 3 ++-
 gradle/verification-metadata.xml                            | 6 ------
 plugins/pill/generate-all-tests/build.gradle.kts            | 2 +-
 .../buildsrc-compat/src/main/kotlin/repoDependencies.kt     | 3 ++-
 6 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/build-common/build.gradle.kts b/build-common/build.gradle.kts
index bf90e5c760d..b9dd0921f9b 100644
--- a/build-common/build.gradle.kts
+++ b/build-common/build.gradle.kts
@@ -23,6 +23,7 @@ dependencies {
 
     testCompileOnly(project(":compiler:cli-common"))
     testApi(projectTests(":compiler:tests-common"))
+    testApiJUnit5(jupiterParams = true)
     testApi(libs.junit4)
     testApi(protobufFull())
     testApi(kotlinStdlib())
diff --git a/compiler/tests-spec/build.gradle.kts b/compiler/tests-spec/build.gradle.kts
index 04ce8253da5..7244cd5470f 100644
--- a/compiler/tests-spec/build.gradle.kts
+++ b/compiler/tests-spec/build.gradle.kts
@@ -16,7 +16,7 @@ dependencies {
 
     testRuntimeOnly(project(":core:descriptors.runtime"))
 
-    testApiJUnit5(vintageEngine = true)
+    testApiJUnit5(vintageEngine = true, jupiterParams = true)
 }
 
 sourceSets {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 8aebb4ce39d..986faf154bf 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -55,7 +55,8 @@ jdom2 = { module = "org.jdom:jdom2", version.ref = "jdom2" }
 jgit = { module = "org.eclipse.jgit:org.eclipse.jgit", version.ref = "jgit" }
 junit4 = { module = "junit:junit", version.ref = "junit4" }
 junit-bom = { module = "org.junit:junit-bom", version.ref = "junit5" }
-junit-jupyter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
+junit-jupyter-api = { module = "org.junit.jupiter:junit-jupiter-api", version.ref = "junit5" }
+junit-jupyter-engine = { module = "org.junit.jupiter:junit-jupiter-engine", version.ref = "junit5" }
 junit-jupyter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" }
 junit-vintage-engine = { module = "org.junit.vintage:junit-vintage-engine", version.ref = "junit5" }
 junit-platform-commons = { module = "org.junit.platform:junit-platform-commons", version.ref = "junit-platform" }
diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
index ff16cedbf1d..0916ff81ea3 100644
--- a/gradle/verification-metadata.xml
+++ b/gradle/verification-metadata.xml
@@ -4425,12 +4425,6 @@
             <sha256 value="e20a5e78b1372f2a4e620832db4442d5077e5cbde280b24c666a3770844999bc" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="org.junit.jupiter" name="junit-jupiter" version="5.9.1">
-         <artifact name="junit-jupiter-5.9.1.jar">
-            <md5 value="f9e29d72f8e9dc363e63b77600fc430a" origin="Generated by Gradle"/>
-            <sha256 value="e305ce7b01adfcc89b4eee03bca473eeb68925a596d8ccca404a436344fc1965" origin="Generated by Gradle"/>
-         </artifact>
-      </component>
       <component group="org.junit.jupiter" name="junit-jupiter-api" version="5.0.0">
          <artifact name="junit-jupiter-api-5.0.0.jar">
             <md5 value="59468e20e8d8c03c17bd089659d26654" origin="Generated by Gradle"/>
diff --git a/plugins/pill/generate-all-tests/build.gradle.kts b/plugins/pill/generate-all-tests/build.gradle.kts
index ef771eee756..3e1c4930d31 100644
--- a/plugins/pill/generate-all-tests/build.gradle.kts
+++ b/plugins/pill/generate-all-tests/build.gradle.kts
@@ -25,7 +25,7 @@ dependencies {
 
     testRuntimeOnly(files("${rootProject.projectDir}/dist/kotlinc/lib/kotlin-reflect.jar"))
     testRuntimeOnly(platform(libs.junit.bom))
-    testRuntimeOnly(libs.junit.jupyter)
+    testRuntimeOnly(libs.junit.jupyter.engine)
 
     if (kotlinBuildProperties.isInJpsBuildIdeaSync) {
         testRuntimeOnly(project(":core:descriptors.runtime"))
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt
index 3d7b891e622..83987e3d055 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt
@@ -202,7 +202,8 @@ fun Project.testApiJUnit5(
     with(dependencies) {
         val libsVersionCatalog = libsVersionCatalog
         testApi(platform(libsVersionCatalog.findLibrary("junit-bom").orElseThrow { GradleException("No version for `junit-bom`") }))
-        testApi(libsVersionCatalog.findLibrary("junit-jupyter").orElseThrow { GradleException("No version for `junit-jupyter`") })
+        testApi(libsVersionCatalog.findLibrary("junit-jupyter-api").orElseThrow { GradleException("No version for `junit-jupyter-api`") })
+        testRuntimeOnly(libsVersionCatalog.findLibrary("junit-jupyter-engine").orElseThrow { GradleException("No version for `junit-jupyter-engine`") })
         if (vintageEngine) {
             testRuntimeOnly(
                 libsVersionCatalog.findLibrary("junit-vintage-engine")