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

[PowerAssert] Use OS path separator to parse JUnit5 classpath property

Browse Source
This commit is contained in:
Brian Norman
2024-02-14 07:49:59 -06:00
committed by Space Team
parent 184d773cd0
commit f0268721c1
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/power-assert/build.gradle.kts
+1 -1
View File
@@ -49,6 +49,6 @@ projectTest(parallel = true) {
val localJunit5Classpath: FileCollection = junit5Classpath val localJunit5Classpath: FileCollection = junit5Classpath
doFirst { doFirst {
systemProperty("junit5.classpath", localJunit5Classpath.files.joinToString(",") { it.absolutePath }) systemProperty("junit5.classpath", localJunit5Classpath.asPath)
} }
} }
plugins/power-assert/test/org/jetbrains/kotlin/powerassert/JunitTestServices.kt
+4 -3
View File
@@ -14,7 +14,8 @@ import org.jetbrains.kotlin.test.services.RuntimeClasspathProvider
import org.jetbrains.kotlin.test.services.TestServices import org.jetbrains.kotlin.test.services.TestServices
import java.io.File import java.io.File
private val junit5Classpath = System.getProperty("junit5.classpath").split(",") private val junit5Classpath = System.getProperty("junit5.classpath")?.split(File.pathSeparator)?.map(::File)
?: error("Unable to get a valid classpath from 'junit5.classpath' property")
fun TestConfigurationBuilder.enableJunit() { fun TestConfigurationBuilder.enableJunit() {
useConfigurators(::JunitEnvironmentConfigurator) useConfigurators(::JunitEnvironmentConfigurator)
@@ -24,7 +25,7 @@ fun TestConfigurationBuilder.enableJunit() {
class JunitEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) { class JunitEnvironmentConfigurator(testServices: TestServices) : EnvironmentConfigurator(testServices) {
override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) { override fun configureCompilerConfiguration(configuration: CompilerConfiguration, module: TestModule) {
if (PowerAssertConfigurationDirectives.WITH_JUNIT5 in module.directives) { if (PowerAssertConfigurationDirectives.WITH_JUNIT5 in module.directives) {
for (file in junit5Classpath.map { File(it) }) { for (file in junit5Classpath) {
configuration.addJvmClasspathRoot(file) configuration.addJvmClasspathRoot(file)
} }
} }
@@ -34,7 +35,7 @@ class JunitEnvironmentConfigurator(testServices: TestServices) : EnvironmentConf
class JunitRuntimeClassPathProvider(testServices: TestServices) : RuntimeClasspathProvider(testServices) { class JunitRuntimeClassPathProvider(testServices: TestServices) : RuntimeClasspathProvider(testServices) {
override fun runtimeClassPaths(module: TestModule): List<File> { override fun runtimeClassPaths(module: TestModule): List<File> {
if (PowerAssertConfigurationDirectives.WITH_JUNIT5 in module.directives) { if (PowerAssertConfigurationDirectives.WITH_JUNIT5 in module.directives) {
return junit5Classpath.map { File(it) } return junit5Classpath
} else { } else {
return emptyList() return emptyList()
} }