Replace kotlin-test project dependencies in the project

Use dependency helper function that chooses whether to take them
from the bootstrap repository or from a configuration of kotlin-test

KT-61969

analysis/analysis-api-fir/build.gradle.kts

@@ -44,7 +44,7 @@ dependencies {
     testImplementation(project(":analysis:analysis-api-standalone:analysis-api-fir-standalone-base"))
     testImplementation(project(":analysis:decompiled:decompiler-to-file-stubs"))
     testImplementation(project(":analysis:decompiled:decompiler-to-psi"))
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testApi(projectTests(":analysis:analysis-test-framework"))
 
     testImplementation(toolsJar())

analysis/analysis-api-impl-barebone/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
     testApi(platform(libs.junit.bom))
     testImplementation(libs.junit.jupiter.api)
     testRuntimeOnly(libs.junit.jupiter.engine)
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(projectTests(":compiler:tests-common"))
     testApi(projectTests(":compiler:test-infrastructure-utils"))
     testApi(projectTests(":compiler:test-infrastructure"))

analysis/analysis-api-impl-base/build.gradle.kts

@@ -16,7 +16,7 @@ dependencies {
     testApi(platform(libs.junit.bom))
     testImplementation(libs.junit.jupiter.api)
     testRuntimeOnly(libs.junit.jupiter.engine)
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(project(":analysis:analysis-api"))
     testImplementation(project(":analysis:analysis-api-standalone:analysis-api-standalone-base"))
     testImplementation(projectTests(":compiler:tests-common"))

analysis/analysis-api-standalone/build.gradle.kts

@@ -20,7 +20,7 @@ dependencies {
     testImplementation(projectTests(":analysis:analysis-api-impl-base"))
     testImplementation(projectTests(":analysis:analysis-api-fir"))
 
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(toolsJar())
     testApi(platform(libs.junit.bom))
     testImplementation(libs.junit.jupiter.api)

analysis/analysis-test-framework/build.gradle.kts

@@ -10,7 +10,7 @@ dependencies {
     testImplementation(libs.junit.jupiter.api)
     testRuntimeOnly(libs.junit.jupiter.engine)
 
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(project(":analysis:analysis-internal-utils"))
     testImplementation(project(":compiler:psi"))
     testImplementation(project(":analysis:kt-references"))

analysis/low-level-api-fir/build.gradle.kts

@@ -50,7 +50,7 @@ dependencies {
     testImplementation(projectTests(":analysis:analysis-api-impl-barebone"))
     testImplementation(projectTests(":analysis:analysis-test-framework"))
     testImplementation(projectTests(":analysis:analysis-api-impl-base"))
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testApi(platform(libs.junit.bom))
     testImplementation(libs.junit.jupiter.api)
     testRuntimeOnly(libs.junit.jupiter.engine)

compiler/build.gradle.kts

@@ -12,13 +12,12 @@ dependencies {
     testImplementation(intellijCore()) // Should come before compiler, because of "progarded" stuff needed for tests
 
     testApi(project(":kotlin-script-runtime"))
-    testApi(project(":kotlin-test:kotlin-test-jvm"))
-    
+
     testApi(kotlinStdlib())
 
+    testApi(kotlinTest())
+    testCompileOnly(kotlinTest("junit"))
     testImplementation(libs.junit4)
-    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
-    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
     testApi(projectTests(":compiler:tests-common"))
     testApi(projectTests(":compiler:tests-common-new"))
     testApi(projectTests(":compiler:fir:raw-fir:psi2fir"))

compiler/container/build.gradle.kts

@@ -10,8 +10,7 @@ dependencies {
     compileOnly(intellijCore())
     testApi(kotlinStdlib())
     testCompileOnly("org.jetbrains:annotations:13.0")
-    testApi(project(":kotlin-test:kotlin-test-jvm"))
-    testApi(project(":kotlin-test:kotlin-test-junit"))
+    testApi(kotlinTest("junit"))
     testImplementation(libs.junit4)
     testCompileOnly(intellijCore())
 

compiler/daemon/daemon-tests/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 
 dependencies {
     testImplementation(kotlinStdlib())
-    testImplementation(project(":kotlin-test:kotlin-test-jvm"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(project(":kotlin-daemon"))
     testImplementation(project(":kotlin-daemon-client"))
     testImplementation(libs.junit4)

compiler/fir/analysis-tests/legacy-fir-tests/build.gradle.kts

@@ -14,8 +14,7 @@ dependencies {
     compileOnly(intellijCore())
 
     testImplementation(libs.junit4)
-    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
-    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
+    testCompileOnly(kotlinTest("junit"))
     testApi(projectTests(":compiler:tests-common"))
     testApi(project(":compiler:fir:checkers"))
     testApi(project(":compiler:fir:checkers:checkers.jvm"))

compiler/fir/fir2ir/build.gradle.kts

@@ -21,8 +21,7 @@ dependencies {
 
     compileOnly(intellijCore())
 
-    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
-    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
+    testCompileOnly(kotlinTest("junit"))
     testApi(projectTests(":compiler:test-infrastructure"))
     testApi(projectTests(":compiler:test-infrastructure-utils"))
     testApi(projectTests(":compiler:tests-compiler-utils"))

compiler/fir/modularized-tests/build.gradle.kts

@@ -19,8 +19,7 @@ dependencies {
     testRuntimeOnly(commonDependency("commons-lang:commons-lang"))
 
     testImplementation(libs.junit4)
-    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
-    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
+    testCompileOnly(kotlinTest("junit"))
     testApi(projectTests(":compiler:tests-common"))
 
     testRuntimeOnly(project(":core:descriptors.runtime"))

compiler/fir/raw-fir/light-tree2fir/build.gradle.kts

@@ -26,8 +26,7 @@ dependencies {
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(projectTests(":compiler:fir:raw-fir:psi2fir"))
 
-    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
-    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
+    testCompileOnly(kotlinTest("junit"))
 
     testRuntimeOnly(project(":core:descriptors.runtime"))
 

compiler/fir/raw-fir/psi2fir/build.gradle.kts

@@ -22,8 +22,7 @@ dependencies {
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }
 
-    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
-    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
+    testCompileOnly(kotlinTest("junit"))
 
     testRuntimeOnly(project(":core:descriptors.runtime"))
 

compiler/incremental-compilation-impl/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     compileOnly(intellijCore())
 
     testImplementation(libs.junit4)
-    testApi(project(":kotlin-test:kotlin-test-junit"))
+    testApi(kotlinTest("junit"))
     testApi(kotlinStdlib())
     testApi(projectTests(":kotlin-build-common"))
     testApi(projectTests(":compiler:tests-common"))

compiler/tests-common/build.gradle.kts

@@ -51,7 +51,7 @@ dependencies {
     testCompileOnly(project(":plugins:android-extensions-compiler"))
     testApi(projectTests(":generators:test-generator"))
     testApi(projectTests(":compiler:tests-compiler-utils"))
-    testApi(project(":kotlin-test:kotlin-test-jvm"))
+    testApi(kotlinTest())
     testApi(project(":kotlin-scripting-compiler-impl"))
     testApi(projectTests(":compiler:test-infrastructure-utils"))
     testApi(libs.junit4) // for ComparisonFailure

kotlin-native/Interop/StubGenerator/build.gradle.kts

@@ -39,8 +39,7 @@ dependencies {
     implementation(project(":compiler:util"))
     implementation(project(":compiler:ir.serialization.common"))
 
-    testImplementation(kotlin("test-junit"))
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
 }
 
 tasks {

kotlin-native/endorsedLibraries/kotlinx.cli/build.gradle.kts

@@ -15,8 +15,7 @@ kotlin {
         commonTest {
             dependencies {
                 // projectOrFiles is required for the performance project that includes kotlinx.cli compositely
-                projectOrFiles(project, ":kotlin-test:kotlin-test-common")?.let { implementation(it) }
-                projectOrFiles(project, ":kotlin-test:kotlin-test-annotations-common")?.let { implementation(it) }
+                projectOrFiles(project, ":kotlin-test")?.let { implementation(it) }
             }
             kotlin.srcDir("src/tests")
         }
@@ -30,7 +29,7 @@ kotlin {
             // JVM-specific tests and their dependencies:
             compilations["test"].defaultSourceSet {
                 dependencies {
-                    implementation(project(":kotlin-test:kotlin-test-junit"))
+                    implementation(kotlinTest("junit"))
                 }
             }
 

kotlin-native/klib/build.gradle

@@ -24,7 +24,7 @@ dependencies {
     implementation project(path: ':kotlin-native:backend.native', configuration: 'cli_bcApiElements')
     implementation project(":kotlin-native:utilities:basic-utils")
     testImplementation libs.junit4
-    testImplementation project(":kotlin-test:kotlin-test-junit")
+    testImplementation RepoDependencies.kotlinTest(project, "junit")
 }
 
 test {

kotlin-native/performance/build.gradle

@@ -47,11 +47,9 @@ def platformManager = new PlatformManager(DistributionKt.buildDistribution(Utils
 def kotlinDist = null
 if (hasProperty("kotlin_dist")) {
     kotlinDist = file(findProperty("kotlin_dist"))
-    ext["notationMapping"] = [':kotlin-stdlib-common'                      : project.file("${kotlinDist}/kotlinc/lib/kotlin-stdlib.jar").absolutePath,
-                              ':kotlin-test:kotlin-test-common'            : project.file("${kotlinDist}/kotlinc/lib/kotlin-test.jar").absolutePath,
-                              ':kotlin-test:kotlin-test-annotations-common': project.file("${kotlinDist}/kotlinc/lib/kotlin-test.jar").absolutePath,
-                              ':kotlin-test:kotlin-test-junit'             : project.file("${kotlinDist}/kotlinc/lib/kotlin-test-junit.jar").absolutePath,
-                              ':kotlin-stdlib-jdk8'                        : project.file("${kotlinDist}/kotlinc/lib/kotlin-stdlib-jdk8.jar").absolutePath]
+    ext["notationMapping"] = [':kotlin-stdlib-common' : project.file("${kotlinDist}/kotlinc/lib/kotlin-stdlib.jar").absolutePath,
+                              ':kotlin-test'          : project.file("${kotlinDist}/kotlinc/lib/kotlin-test.jar").absolutePath,
+                              ':kotlin-stdlib-jdk8'   : project.file("${kotlinDist}/kotlinc/lib/kotlin-stdlib-jdk8.jar").absolutePath]
     ext.targetList = []
 }
 

kotlin-native/prepare/kotlin-native-compiler-embeddable/build.gradle.kts

@@ -56,7 +56,7 @@ dependencies {
     kotlinNativeJavadoc(project(":kotlin-native:backend.native"))
 
     testImplementation(libs.junit4)
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
 }
 
 val compiler = embeddableCompiler("kotlin-native-compiler-embeddable") {

libraries/examples/kotlin-gradle-subplugin-example/build.gradle

@@ -17,8 +17,6 @@ dependencies {
     // Use this dependency instead when building apart from the other modules:
     // compile "org.jetbrains.kotlin:kotlin-gradle-plugin-api:$kotlin_version"
 
-    api project(':kotlin-test:kotlin-test-junit')
-
     compileOnly RepoDependencies.kotlinStdlib(project)
     compileOnly project(':compiler')
     compileOnly project(':compiler:plugin-api')

libraries/kotlinx-metadata/jvm/build.gradle.kts

@@ -44,7 +44,7 @@ dependencies {
     embedded(project(":core:metadata"))
     embedded(project(":core:metadata.jvm"))
     embedded(protobufLite())
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(libs.junit4)
     testImplementation(commonDependency("org.jetbrains.intellij.deps:asm-all"))
     testImplementation(commonDependency("org.jetbrains.kotlin:kotlin-reflect")) { isTransitive = false }

libraries/scripting/jvm-host-test/build.gradle.kts

@@ -25,8 +25,7 @@ dependencies {
     testRuntimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
     
     embeddableTestRuntime(project(":kotlin-scripting-jvm-host"))
-    embeddableTestRuntime(project(":kotlin-test:kotlin-test-jvm"))
-    embeddableTestRuntime(project(":kotlin-test:kotlin-test-junit"))
+    embeddableTestRuntime(kotlinTest("junit"))
     embeddableTestRuntime(projectTests(":compiler:tests-common")) { isTransitive = false }
     embeddableTestRuntime(testSourceSet.output)
 }

libraries/tools/binary-compatibility-validator/build.gradle

@@ -8,7 +8,7 @@ dependencies {
     api("org.jetbrains.kotlinx:binary-compatibility-validator:0.13.0")
     api("org.jetbrains.kotlinx:kotlinx-metadata-jvm:0.7.0")
 
-    testApi project(':kotlin-test:kotlin-test-junit')
+    testApi RepoDependencies.kotlinTest(project, "junit")
 
     testArtifacts project(':kotlin-stdlib')
     testArtifacts project(':kotlin-stdlib-jdk7')

libraries/tools/jdk-api-validator/build.gradle.kts

@@ -18,7 +18,7 @@ dependencies {
     implementation("org.codehaus.mojo:animal-sniffer:1.21")
     implementation(kotlinStdlib())
 
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
 
     testArtifacts(project(":kotlin-reflect"))
 

libraries/tools/kotlin-gradle-build-metrics/build.gradle.kts

@@ -17,7 +17,7 @@ extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
 dependencies {
     compileOnly(kotlinStdlib())
 
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(libs.junit4)
 }
 

libraries/tools/kotlin-gradle-plugin-idea-proto/build.gradle.kts

@@ -25,7 +25,7 @@ dependencies {
     api(project(":kotlin-gradle-plugin-idea"))
     embedded("com.google.protobuf:protobuf-java:3.21.9")
     embedded("com.google.protobuf:protobuf-kotlin:3.21.9")
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(kotlin("reflect"))
     testImplementation(testFixtures(project(":kotlin-gradle-plugin-idea")))
 }

libraries/tools/kotlin-gradle-plugin-idea/build.gradle.kts

@@ -30,7 +30,7 @@ dependencies {
     testImplementation(gradleKotlinDsl())
     testImplementation(project(":kotlin-gradle-plugin"))
     testImplementation(project(":kotlin-gradle-plugin-idea-proto"))
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
 
     testImplementation("org.reflections:reflections:0.10.2") {
         because("Tests on the object graph are performed. This library will find implementations of interfaces at runtime")
@@ -40,7 +40,7 @@ dependencies {
     testFixturesImplementation(gradleKotlinDsl())
     testFixturesImplementation(project(":kotlin-tooling-core"))
     testFixturesImplementation(project(":kotlin-gradle-plugin-idea-proto"))
-    testFixturesImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testFixturesImplementation(kotlinTest()) // no test annotations, only assertions are needed
 }
 
 

libraries/tools/kotlin-gradle-plugin-integration-tests/build.gradle.kts

@@ -63,7 +63,7 @@ dependencies {
     testImplementation(project(":kotlin-tooling-metadata"))
     testImplementation(kotlinGradlePluginTest)
     testImplementation(project(":kotlin-gradle-subplugin-example"))
-    testImplementation(project(":kotlin-test:kotlin-test-jvm"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(project(":kotlin-util-klib"))
 
     testImplementation(project(":native:kotlin-native-utils"))
@@ -100,9 +100,6 @@ dependencies {
 
     testRuntimeOnly(project(":compiler:tests-mutes"))
 
-    // Workaround for missing transitive import of the common(project `kotlin-test-common`
-    // for `kotlin-test-jvm` into the IDE:
-    testCompileOnly(project(":kotlin-test:kotlin-test-common")) { isTransitive = false }
     testCompileOnly(commonDependency("org.jetbrains.intellij.deps:asm-all"))
 }
 

libraries/tools/kotlin-gradle-plugin/build.gradle.kts

@@ -120,7 +120,7 @@ dependencies {
     testImplementation(commonDependency("org.jetbrains.teamcity:serviceMessages"))
     testImplementation(projectTests(":kotlin-build-common"))
     testImplementation(project(":kotlin-compiler-runner"))
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(libs.junit4)
     testImplementation(project(":kotlin-gradle-statistics"))
     testImplementation(project(":kotlin-tooling-metadata"))

libraries/tools/kotlin-gradle-statistics/build.gradle.kts

@@ -17,7 +17,7 @@ extensions.extraProperties["kotlin.stdlib.default.dependency"] = "false"
 dependencies {
     compileOnly(kotlinStdlib())
 
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(libs.junit4)
 }
 

libraries/tools/kotlin-tooling-core/build.gradle.kts

@@ -12,7 +12,7 @@ configureKotlinCompileTasksGradleCompatibility()
 dependencies {
     api(platform(project(":kotlin-gradle-plugins-bom")))
     compileOnly(kotlinStdlib())
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
 }
 
 tasks {

libraries/tools/kotlin-tooling-metadata/build.gradle.kts

@@ -12,5 +12,5 @@ configureKotlinCompileTasksGradleCompatibility()
 dependencies {
     implementation(kotlinStdlib())
     implementation(commonDependency("com.google.code.gson:gson"))
-    testImplementation(project(":kotlin-test:kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
 }

native/commonizer-api/build.gradle.kts

@@ -12,7 +12,7 @@ publish()
 dependencies {
     implementation(kotlinStdlib())
     implementation(project(":native:kotlin-native-utils"))
-    testImplementation(project(":kotlin-test::kotlin-test-junit"))
+    testImplementation(kotlinTest("junit"))
     testImplementation(libs.junit4)
     testImplementation(projectTests(":compiler:tests-common"))
     testRuntimeOnly(project(":native:kotlin-klib-commonizer"))

plugins/android-extensions/android-extensions-compiler/build.gradle.kts

@@ -36,7 +36,7 @@ dependencies {
     testApi(project(":compiler:cli"))
     testApi(project(":kotlin-android-extensions-runtime"))
     testApi(projectTests(":compiler:tests-common"))
-    testApi(project(":kotlin-test:kotlin-test-jvm"))
+    testApi(kotlinTest("junit"))
     testImplementation(libs.junit4)
 
     robolectricDependency("org.robolectric:android-all:5.0.2_r3-robolectric-r0")

plugins/atomicfu/atomicfu-compiler/build.gradle.kts

@@ -84,7 +84,7 @@ dependencies {
 
     testImplementation(projectTests(":js:js.tests"))
     testImplementation(libs.junit4)
-    testApi(project(":kotlin-test:kotlin-test-jvm"))
+    testApi(kotlinTest())
 
     // Dependencies for Kotlin/Native test infra:
     if (!kotlinBuildProperties.isInIdeaSync) {

plugins/parcelize/parcelize-compiler/build.gradle.kts

@@ -34,7 +34,7 @@ dependencies {
     testApi(project(":compiler:cli"))
     testApi(project(":plugins:parcelize:parcelize-runtime"))
     testApi(project(":kotlin-android-extensions-runtime"))
-    testApi(project(":kotlin-test:kotlin-test-jvm"))
+    testApi(kotlinTest())
 
     testApi(projectTests(":compiler:tests-common-new"))
     testApi(projectTests(":compiler:test-infrastructure"))

prepare/compiler-client-embeddable/build.gradle.kts

@@ -22,8 +22,7 @@ dependencies {
     testApi(project(":daemon-common"))
     testApi(project(":kotlin-daemon-client"))
     testImplementation(libs.junit4)
-    testApi(project(":kotlin-test:kotlin-test-jvm"))
-    testApi(project(":kotlin-test:kotlin-test-junit"))
+    testApi(kotlinTest("junit"))
     testCompilerClasspath(project(":kotlin-compiler"))
     testCompilerClasspath(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
     testCompilerClasspath(project(":kotlin-scripting-compiler"))

prepare/compiler-embeddable/build.gradle.kts

@@ -23,7 +23,7 @@ dependencies {
     runtimeOnly(project(":kotlin-daemon-embeddable"))
     runtimeOnly(commonDependency("org.jetbrains.intellij.deps", "trove4j"))
     testImplementation(libs.junit4)
-    testApi(project(":kotlin-test:kotlin-test-junit"))
+    testApi(kotlinTest("junit"))
     testCompilationClasspath(kotlinStdlib())
 }
 

repo/artifacts-tests/build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
     testImplementation(kotlinStdlib("jdk8"))
-    testImplementation(project(":kotlin-test:kotlin-test-junit5"))
+    testImplementation(kotlinTest("junit5"))
     testApi(platform(libs.junit.bom))
     testImplementation(libs.junit.jupiter.api)
     testRuntimeOnly(libs.junit.jupiter.engine)

repo/artifacts-tests/src/test/resources/org/jetbrains/kotlin/kotlin-gradle-plugin-idea/kotlin-gradle-plugin-idea.pom

@@ -52,7 +52,7 @@
     </dependency>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
-      <artifactId>kotlin-test-junit</artifactId>
+      <artifactId>kotlin-test</artifactId>
       <version>ArtifactsTest.version</version>
       <scope>runtime</scope>
       <optional>true</optional>

repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/repoDependencies.kt

@@ -74,7 +74,9 @@ fun Project.kotlinStdlib(suffix: String? = null, classifier: String? = null): An
  */
 @JvmOverloads
 fun Project.kotlinTest(suffix: String? = null, classifier: String? = null): Any {
-    return run {
+    return if (kotlinBuildProperties.isJpsBuildEnabled) {
+        kotlinDep(listOfNotNull("test", suffix?.lowercase()).joinToString("-"), bootstrapKotlinVersion, classifier)
+    } else {
         val elementsType = when (classifier) {
             null -> "Runtime"
             "sources" -> "Sources"

wasm/wasm.ir/build.gradle.kts

@@ -55,8 +55,7 @@ dependencies {
     implementation(kotlinStdlib())
     implementation(kotlinxCollectionsImmutable())
     testImplementation(libs.junit4)
-    testCompileOnly(project(":kotlin-test:kotlin-test-jvm"))
-    testCompileOnly(project(":kotlin-test:kotlin-test-junit"))
+    testCompileOnly(kotlinTest("junit"))
     testImplementation(projectTests(":compiler:tests-common"))
     testImplementation(commonDependency("org.jetbrains.kotlinx", "kotlinx-serialization-json"))