Use test fixtures at kotlinp-jvm
diff --git a/libraries/tools/kotlinp/jvm/build.gradle.kts b/libraries/tools/kotlinp/jvm/build.gradle.kts
index 4fb1d0c..2ea6ed0 100644
--- a/libraries/tools/kotlinp/jvm/build.gradle.kts
+++ b/libraries/tools/kotlinp/jvm/build.gradle.kts
@@ -5,6 +5,7 @@
plugins {
kotlin("jvm")
+ `java-test-fixtures`
id("jps-compatible")
}
@@ -17,6 +18,8 @@
api(project(":tools:kotlinp"))
implementation(libs.intellij.asm)
+ testFixturesApi(projectTests(":compiler:tests-common-new"))
+
testApi(intellijCore())
testCompileOnly(project(":kotlin-metadata"))
@@ -25,7 +28,6 @@
testApi(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter.api)
testRuntimeOnly(libs.junit.jupiter.engine)
- testApi(projectTests(":compiler:tests-common-new"))
testImplementation(projectTests(":generators:test-generator"))
testRuntimeOnly(project(":kotlin-metadata-jvm"))
@@ -39,6 +41,7 @@
sourceSets {
"main" { projectDefault() }
+ "testFixtures" { projectDefault() }
"test" {
projectDefault()
this.java.srcDir(generationRoot.name)
@@ -79,5 +82,3 @@
dependsOn(rootProject.tasks.named("dist"))
}
}
-
-testsJar()
diff --git a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractKotlinpTest.kt b/libraries/tools/kotlinp/jvm/testFixtures/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractKotlinpTest.kt
similarity index 100%
rename from libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractKotlinpTest.kt
rename to libraries/tools/kotlinp/jvm/testFixtures/org/jetbrains/kotlin/kotlinp/jvm/test/AbstractKotlinpTest.kt
diff --git a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/CompareMetadataHandler.kt b/libraries/tools/kotlinp/jvm/testFixtures/org/jetbrains/kotlin/kotlinp/jvm/test/CompareMetadataHandler.kt
similarity index 99%
rename from libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/CompareMetadataHandler.kt
rename to libraries/tools/kotlinp/jvm/testFixtures/org/jetbrains/kotlin/kotlinp/jvm/test/CompareMetadataHandler.kt
index f991ee9..52fd829 100644
--- a/libraries/tools/kotlinp/jvm/test/org/jetbrains/kotlin/kotlinp/jvm/test/CompareMetadataHandler.kt
+++ b/libraries/tools/kotlinp/jvm/testFixtures/org/jetbrains/kotlin/kotlinp/jvm/test/CompareMetadataHandler.kt
@@ -94,4 +94,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/plugins/plugin-sandbox/build.gradle.kts b/plugins/plugin-sandbox/build.gradle.kts
index 27f64f2..44b6594 100644
--- a/plugins/plugin-sandbox/build.gradle.kts
+++ b/plugins/plugin-sandbox/build.gradle.kts
@@ -33,7 +33,7 @@
testApi(project(":compiler:fir:checkers:checkers.native"))
testApi(project(":compiler:fir:checkers:checkers.wasm"))
testApi(project(":compiler:fir:plugin-utils"))
- testImplementation(projectTests(":tools:kotlinp-jvm"))
+ testImplementation(testFixtures(project(":tools:kotlinp-jvm")))
testRuntimeOnly(project(":core:descriptors.runtime"))
testRuntimeOnly(project(":compiler:fir:fir-serialization"))
diff --git a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/sourceSets.kt b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/sourceSets.kt
index bb244d2..cb4f6d8 100644
--- a/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/sourceSets.kt
+++ b/repo/gradle-build-conventions/buildsrc-compat/src/main/kotlin/sourceSets.kt
@@ -29,6 +29,10 @@
java.srcDirs("src")
this@projectDefault.resources.srcDir("resources")
}
+ "testFixtures" -> {
+ java.srcDirs("testFixtures")
+ this@projectDefault.resources.srcDir("testFixturesResources")
+ }
"test" -> {
java.srcDirs("test", "tests")
this@projectDefault.resources.srcDir("testResources")
