azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Daemon] Use JUnit Vintage engine to run JUnit4 tests

Browse Source
This commit is contained in:
Alexander.Likhachev
2023-11-14 16:20:13 +01:00
committed by Space Team
parent 2a7403a979
commit b8d1398bdb
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/daemon/daemon-tests/build.gradle.kts
+6 -1
View File
@@ -11,8 +11,11 @@ dependencies {
testImplementation(project(":kotlin-daemon")) testImplementation(project(":kotlin-daemon"))
testImplementation(project(":kotlin-daemon-client")) testImplementation(project(":kotlin-daemon-client"))
testImplementation(libs.junit4) testImplementation(libs.junit4)
testImplementation(libs.junit.jupiter.api)
testImplementation(projectTests(":compiler:tests-common")) testImplementation(projectTests(":compiler:tests-common"))
testImplementation(intellijCore()) testImplementation(intellijCore())
testRuntimeOnly(libs.junit.jupiter.engine)
testRuntimeOnly(libs.junit.vintage.engine)
} }
sourceSets { sourceSets {
@@ -20,10 +23,12 @@ sourceSets {
"test" { projectDefault() } "test" { projectDefault() }
} }
projectTest(parallel = true) { projectTest(parallel = true, jUnitMode = JUnitMode.JUnit5) {
dependsOn(":dist") dependsOn(":dist")
workingDir = rootDir workingDir = rootDir
useJUnitPlatform()
val testClassesDirs = testSourceSet.output.classesDirs val testClassesDirs = testSourceSet.output.classesDirs
doFirst { doFirst {
systemProperty("kotlin.test.script.classpath", testClassesDirs.joinToString(File.pathSeparator)) systemProperty("kotlin.test.script.classpath", testClassesDirs.joinToString(File.pathSeparator))