[Gradle, Test] Make utility isTeamCityRun as top-level function

This commit is contained in:
Anton Lakotka
2024-02-19 09:28:35 +01:00
committed by Space Team
parent 0d2c68664d
commit cd8843289b
5 changed files with 14 additions and 5 deletions
@@ -47,8 +47,6 @@ abstract class BaseGradleIT {
open val defaultGradleVersion: GradleVersionRequired open val defaultGradleVersion: GradleVersionRequired
get() = GradleVersionRequired.None get() = GradleVersionRequired.None
val isTeamCityRun = System.getenv("TEAMCITY_VERSION") != null
@Before @Before
open fun setUp() { open fun setUp() {
// Aapt2 from Android Gradle Plugin 3.2 and below does not handle long paths on Windows. // Aapt2 from Android Gradle Plugin 3.2 and below does not handle long paths on Windows.
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle.testbase package org.jetbrains.kotlin.gradle.testbase
import com.intellij.testFramework.TestDataPath import com.intellij.testFramework.TestDataPath
import org.jetbrains.kotlin.gradle.util.isTeamCityRun
import org.jetbrains.kotlin.test.WithMuteInDatabase import org.jetbrains.kotlin.test.WithMuteInDatabase
import org.junit.jupiter.api.AfterAll import org.junit.jupiter.api.AfterAll
import org.junit.jupiter.api.Tag import org.junit.jupiter.api.Tag
@@ -42,7 +43,7 @@ abstract class KGPBaseTest {
@AfterAll @AfterAll
fun checkThatDefaultKonanHasNotBeenCreated() { fun checkThatDefaultKonanHasNotBeenCreated() {
if (System.getenv("TEAMCITY_VERSION") != null) { if (isTeamCityRun) {
val userHomeDir = System.getProperty("user.home") val userHomeDir = System.getProperty("user.home")
assertDirectoryDoesNotExist(Paths.get("$userHomeDir/.konan")) assertDirectoryDoesNotExist(Paths.get("$userHomeDir/.konan"))
} }
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.gradle.testbase package org.jetbrains.kotlin.gradle.testbase
import org.gradle.testkit.runner.BuildResult 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.testFramework.KtUsefulTestCase
import org.jetbrains.kotlin.test.util.convertLineSeparators import org.jetbrains.kotlin.test.util.convertLineSeparators
import org.jetbrains.kotlin.test.util.trimTrailingWhitespacesAndAddNewlineAtEOF 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() val textSanitized: String = actualText.trim().convertLineSeparators().trimTrailingWhitespacesAndAddNewlineAtEOF()
if (!expectedFile.exists()) { if (!expectedFile.exists()) {
if (KtUsefulTestCase.IS_UNDER_TEAMCITY) { if (isTeamCityRun) {
fail("Expected data file $expectedFile did not exist") fail("Expected data file $expectedFile did not exist")
} else { } else {
expectedFile.writeText(textSanitized) expectedFile.writeText(textSanitized)
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.gradle.testbase 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.condition.OS
import org.junit.jupiter.api.extension.ConditionEvaluationResult import org.junit.jupiter.api.extension.ConditionEvaluationResult
import org.junit.jupiter.api.extension.ExecutionCondition 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 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 enabledOnCurrentOs = "Enabled on operating system: ${System.getProperty("os.name")}"
private val notSupportedOnCurrentOs = "Test is not supported on operating system: ${System.getProperty("os.name")}" private val notSupportedOnCurrentOs = "Test is not supported on operating system: ${System.getProperty("os.name")}"
@@ -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