Skip to content

Commit 866e1c3

Browse files
authored
File.pathSeparatorChar should be used to split value of "java.class.path" property
1 parent 41dcca0 commit 866e1c3

File tree

7 files changed

+15
-8
lines changed

7 files changed

+15
-8
lines changed

sonar-kotlin-api/src/test/java/org/sonarsource/kotlin/api/checks/ApiExtensionsKtTest.kt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import org.sonar.api.internal.SonarRuntimeImpl
6060
import org.sonar.api.utils.Version
6161
import org.sonarsource.kotlin.api.frontend.Environment
6262
import org.sonarsource.kotlin.testapi.kotlinTreeOf
63+
import java.io.File
6364
import java.nio.charset.StandardCharsets
6465
import java.nio.file.Path
6566
import java.util.TreeMap
@@ -703,7 +704,7 @@ class ApiExtensionsScopeFunctionResolutionTest {
703704
private fun parse(code: String) = kotlinTreeOf(
704705
code,
705706
Environment(
706-
listOf("build/classes/kotlin/main") + System.getProperty("java.class.path").split(System.getProperty("path.separator")),
707+
listOf("build/classes/kotlin/main") + System.getProperty("java.class.path").split(File.pathSeparatorChar),
707708
LanguageVersion.LATEST_STABLE
708709
),
709710
TestInputFileBuilder("moduleKey", "src/org/foo/kotlin.kt")
@@ -714,7 +715,7 @@ private fun parse(code: String) = kotlinTreeOf(
714715

715716
private fun parseWithoutParsingExceptions(code: String): KtFile {
716717
val environment = Environment(
717-
listOf("build/classes/kotlin/main") + System.getProperty("java.class.path").split(System.getProperty("path.separator")),
718+
listOf("build/classes/kotlin/main") + System.getProperty("java.class.path").split(File.pathSeparatorChar),
718719
LanguageVersion.LATEST_STABLE
719720
)
720721
val inputFile = TestInputFileBuilder("moduleKey", "src/org/foo/kotlin.kt")

sonar-kotlin-api/src/test/java/org/sonarsource/kotlin/api/frontend/KotlinSyntaxStructureTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import org.junit.jupiter.api.Test
3131
import org.junit.jupiter.api.assertThrows
3232
import org.sonar.api.batch.fs.internal.TestInputFileBuilder
3333
import org.sonarsource.kotlin.testapi.kotlinTreeOf
34+
import java.io.File
3435
import java.nio.charset.StandardCharsets
3536
import java.nio.file.Path
3637
import kotlin.io.path.readText
@@ -52,7 +53,7 @@ internal class KotlinSyntaxStructureTest {
5253
every { BindingContextUtils.getRecordedTypeInfo(any(), any()) } throws expectedException
5354

5455
val content = path.readText()
55-
val environment = Environment(System.getProperty("java.class.path").split(":"), LanguageVersion.LATEST_STABLE)
56+
val environment = Environment(System.getProperty("java.class.path").split(File.pathSeparatorChar), LanguageVersion.LATEST_STABLE)
5657
val inputFile = TestInputFileBuilder("moduleKey", path.toString())
5758
.setCharset(StandardCharsets.UTF_8)
5859
.initMetadata(content).build()

sonar-kotlin-checks/src/test/java/org/sonarsource/kotlin/checks/UnnecessaryImportsCheckTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,14 @@ package org.sonarsource.kotlin.checks
2121

2222
import org.junit.jupiter.api.Test
2323
import org.sonarsource.kotlin.testapi.KotlinVerifier
24+
import java.io.File
2425

2526
class UnnecessaryImportsCheckTest : CheckTestWithNoSemantics(UnnecessaryImportsCheck(), shouldReport = true) {
2627
@Test
2728
fun `with partial semantics`() {
2829
KotlinVerifier(check) {
2930
this.fileName = "${checkName}SamplePartialSemantics.kt"
30-
this.classpath = System.getProperty("java.class.path").split(":")
31+
this.classpath = System.getProperty("java.class.path").split(File.pathSeparatorChar)
3132
this.deps = emptyList()
3233
}.verify()
3334
}

sonar-kotlin-checks/src/test/java/org/sonarsource/kotlin/checks/UnusedLocalVariableCheckTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ package org.sonarsource.kotlin.checks
2222
import org.junit.jupiter.api.Test
2323
import org.sonarsource.kotlin.testapi.DEFAULT_KOTLIN_CLASSPATH
2424
import org.sonarsource.kotlin.testapi.KotlinVerifier
25+
import java.io.File
2526

2627
class UnusedLocalVariableCheckTest : CheckTestWithNoSemantics(UnusedLocalVariableCheck()) {
2728

2829
@Test
2930
fun `with partial semantics`() {
3031
KotlinVerifier(check) {
3132
this.fileName = "${checkName}SamplePartialSemantics.kt"
32-
this.classpath = DEFAULT_KOTLIN_CLASSPATH + System.getProperty("java.class.path").split(":")
33+
this.classpath = DEFAULT_KOTLIN_CLASSPATH + System.getProperty("java.class.path").split(File.pathSeparatorChar)
3334
this.deps = emptyList()
3435
}.verifyNoIssue()
3536
}

sonar-kotlin-checks/src/test/java/org/sonarsource/kotlin/checks/VarShouldBeValCheckTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,15 @@ package org.sonarsource.kotlin.checks
2222
import org.junit.jupiter.api.Test
2323
import org.sonarsource.kotlin.testapi.DEFAULT_KOTLIN_CLASSPATH
2424
import org.sonarsource.kotlin.testapi.KotlinVerifier
25+
import java.io.File
2526

2627
class VarShouldBeValCheckTest : CheckTestWithNoSemantics(VarShouldBeValCheck(), shouldReport=true) {
2728

2829
@Test
2930
fun `with partial semantics`() {
3031
KotlinVerifier(check) {
3132
this.fileName = "${checkName}Sample.kt"
32-
this.classpath = DEFAULT_KOTLIN_CLASSPATH + System.getProperty("java.class.path").split(":")
33+
this.classpath = DEFAULT_KOTLIN_CLASSPATH + System.getProperty("java.class.path").split(File.pathSeparatorChar)
3334
this.deps = emptyList()
3435
}.verify()
3536
}

sonar-kotlin-metrics/src/test/java/org/sonarsource/kotlin/metrics/IssueSuppressionVisitorTest.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ import org.sonarsource.kotlin.testapi.DEFAULT_KOTLIN_CLASSPATH
3939
import org.sonarsource.kotlin.testapi.KOTLIN_BASE_DIR
4040
import org.sonarsource.kotlin.testapi.kotlinTreeOf
4141
import org.sonarsource.kotlin.testapi.TestContext
42+
import java.io.File
4243
import java.nio.charset.StandardCharsets
4344
import java.nio.file.Files
4445
import java.nio.file.Path
@@ -81,7 +82,7 @@ class IssueSuppressionVisitorTest {
8182
)
8283

8384
private fun scanFile(path: Path, suppress: Boolean, check: AbstractCheck, vararg checks: AbstractCheck): SingleFileVerifier {
84-
val env = Environment(System.getProperty("java.class.path").split(System.getProperty("path.separator")) + DEFAULT_KOTLIN_CLASSPATH, LanguageVersion.LATEST_STABLE)
85+
val env = Environment(System.getProperty("java.class.path").split(File.pathSeparatorChar) + DEFAULT_KOTLIN_CLASSPATH, LanguageVersion.LATEST_STABLE)
8586
val verifier = SingleFileVerifier.create(path, StandardCharsets.UTF_8)
8687
val testFileContent = String(Files.readAllBytes(path), StandardCharsets.UTF_8)
8788
val inputFile = TestInputFileBuilder("moduleKey", "src/org/foo/kotlin.kt")

sonar-kotlin-test-api/src/main/java/org/sonarsource/kotlin/testapi/KotlinVerifier.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import org.sonarsource.kotlin.api.frontend.Environment
3131
import org.sonarsource.kotlin.api.frontend.KotlinTree
3232
import org.sonarsource.kotlin.api.visiting.Comment
3333
import org.sonarsource.kotlin.api.visiting.CommentAnnotationsAndTokenVisitor
34+
import java.io.File
3435
import java.io.IOException
3536
import java.nio.charset.StandardCharsets
3637
import java.nio.file.FileVisitResult
@@ -51,7 +52,7 @@ class KotlinVerifier(private val check: AbstractCheck) {
5152

5253
var fileName: String = ""
5354
var baseDir: Path = KOTLIN_BASE_DIR
54-
var classpath: List<String> = System.getProperty("java.class.path").split(System.getProperty("path.separator")) + DEFAULT_KOTLIN_CLASSPATH
55+
var classpath: List<String> = System.getProperty("java.class.path").split(File.pathSeparatorChar) + DEFAULT_KOTLIN_CLASSPATH
5556
var deps: List<String> = getClassPath(DEFAULT_TEST_JARS_DIRECTORY)
5657
var isAndroid = false
5758
var customDiagnostics: List<Diagnostic>? = null

0 commit comments

Comments
 (0)