diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index 791c8a17fba..1cb3e31b032 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -47,8 +47,6 @@ abstract class BaseGradleIT { open val defaultGradleVersion: GradleVersionRequired get() = GradleVersionRequired.None - val isTeamCityRun = System.getenv("TEAMCITY_VERSION") != null - @Before open fun setUp() { // Aapt2 from Android Gradle Plugin 3.2 and below does not handle long paths on Windows. diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt index bf175c70dbd..4a1175bdc11 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/KGPBaseTest.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.testbase import com.intellij.testFramework.TestDataPath +import org.jetbrains.kotlin.gradle.util.isTeamCityRun import org.jetbrains.kotlin.test.WithMuteInDatabase import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.Tag @@ -42,7 +43,7 @@ abstract class KGPBaseTest { @AfterAll fun checkThatDefaultKonanHasNotBeenCreated() { - if (System.getenv("TEAMCITY_VERSION") != null) { + if (isTeamCityRun) { val userHomeDir = System.getProperty("user.home") assertDirectoryDoesNotExist(Paths.get("$userHomeDir/.konan")) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/assertionsUtils.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/assertionsUtils.kt index 08a19175b10..f2e7ab33aee 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/assertionsUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/assertionsUtils.kt @@ -6,6 +6,7 @@ package org.jetbrains.kotlin.gradle.testbase import org.gradle.testkit.runner.BuildResult +import org.jetbrains.kotlin.gradle.util.isTeamCityRun import org.jetbrains.kotlin.test.testFramework.KtUsefulTestCase import org.jetbrains.kotlin.test.util.convertLineSeparators import org.jetbrains.kotlin.test.util.trimTrailingWhitespacesAndAddNewlineAtEOF @@ -38,7 +39,7 @@ internal fun assertEqualsToFile(expectedFile: File, actualText: String) { val textSanitized: String = actualText.trim().convertLineSeparators().trimTrailingWhitespacesAndAddNewlineAtEOF() if (!expectedFile.exists()) { - if (KtUsefulTestCase.IS_UNDER_TEAMCITY) { + if (isTeamCityRun) { fail("Expected data file $expectedFile did not exist") } else { expectedFile.writeText(textSanitized) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/osConditions.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/osConditions.kt index e191fa8fbc4..ce0f9593c50 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/osConditions.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/osConditions.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.testbase +import org.jetbrains.kotlin.gradle.util.isTeamCityRun import org.junit.jupiter.api.condition.OS import org.junit.jupiter.api.extension.ConditionEvaluationResult import org.junit.jupiter.api.extension.ExecutionCondition @@ -42,7 +43,7 @@ internal class ExecutionOnOsCondition : ExecutionCondition { private val logger = LoggerFactory.getLogger(ExecutionOnOsCondition::class.java) - private val isUnderTeamcity = System.getenv("TEAMCITY_VERSION") != null + private val isUnderTeamcity = isTeamCityRun private val enabledOnCurrentOs = "Enabled on operating system: ${System.getProperty("os.name")}" private val notSupportedOnCurrentOs = "Test is not supported on operating system: ${System.getProperty("os.name")}" diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/isTeamCityRun.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/isTeamCityRun.kt new file mode 100644 index 00000000000..9b8b4eeaabc --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/isTeamCityRun.kt @@ -0,0 +1,8 @@ +/* + * Copyright 2010-2024 JetBrains s.r.o. and Kotlin Programming Language contributors. + * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. + */ + +package org.jetbrains.kotlin.gradle.util + +val isTeamCityRun = System.getenv("TEAMCITY_VERSION") != null \ No newline at end of file