From 9a6a2e14a5d9f786ccd0cc72e2b10e139ce55c9d Mon Sep 17 00:00:00 2001 From: Sergey Rostov Date: Thu, 16 May 2019 12:10:50 +0300 Subject: [PATCH] Gradle, js, tests: don't add prefix if platform and/or sub target name is null --- .../kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt | 4 +++- .../kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt index 10076a21f34..06141a1ba7d 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/subtargets/KotlinJsSubTarget.kt @@ -79,7 +79,9 @@ abstract class KotlinJsSubTarget( } testJs.compilation = compilation - testJs.targetName = target.disambiguationClassifier + "," + disambiguationClassifier + testJs.targetName = listOfNotNull(target.disambiguationClassifier, disambiguationClassifier) + .takeIf { it.isNotEmpty() } + ?.joinToString() testJs.configureConventions() } diff --git a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt index 0542c4a9328..85be8b53fdf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/main/kotlin/org/jetbrains/kotlin/gradle/targets/js/testing/karma/KotlinKarma.kt @@ -270,7 +270,9 @@ class KotlinKarma(override val compilation: KotlinJsCompilation) : KotlinJsTestF val browser = withoutOs.substring(rawSuiteNameOnly.length + 1) // HeadlessChrome 74.0.3729 .replace(" ", "") // HeadlessChrome74.0.3729 - testNameSuffix = "$baseTestNameSuffix,$browser,$os" + testNameSuffix = listOfNotNull(baseTestNameSuffix, browser, os) + .takeIf { it.isNotEmpty() } + ?.joinToString() return rawSuiteNameOnly.replace(" ", ".") // sample.a.DeepPackageTest.Inner }