From 999627952a7dbe81597666db50f60da5ac708d09 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Fri, 23 Oct 2020 02:24:06 +0300 Subject: [PATCH] [Gradle, K/N] Add proper assumptions for Mac only integration tests --- .../jetbrains/kotlin/gradle/native/CocoaPodsIT.kt | 11 ++++++++--- .../kotlin/gradle/native/CommonNativeIT.kt | 12 +++++++++--- .../kotlin/gradle/native/FatFrameworkIT.kt | 13 +++++++++---- 3 files changed, 26 insertions(+), 10 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt index f7aeb9dbaed..9c8f6120eed 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt @@ -21,6 +21,7 @@ import org.jetbrains.kotlin.gradle.util.modify import org.jetbrains.kotlin.konan.target.HostManager import org.junit.Assume.assumeTrue import org.junit.Before +import org.junit.BeforeClass import org.junit.Test import java.io.File import java.util.concurrent.TimeUnit @@ -867,7 +868,6 @@ class CocoaPodsIT : BaseGradleIT() { vararg args: String ) { // check that test executable - assumeTrue(HostManager.hostIsMac) build(taskName, *args) { //base checks assertSuccessful() @@ -1082,7 +1082,6 @@ class CocoaPodsIT : BaseGradleIT() { subprojectsToFrameworkNamesMap: Map, subprojectsToPodspecContentMap: Map ) { - assumeTrue(HostManager.hostIsMac) val gradleProject = transformProjectWithPluginsDsl(projectName, gradleVersion) for ((subproject, frameworkName) in subprojectsToFrameworkNamesMap) { @@ -1154,7 +1153,6 @@ class CocoaPodsIT : BaseGradleIT() { iosAppLocation: String?, subprojectsToFrameworkNamesMap: Map ) { - assumeTrue(HostManager.hostIsMac) val gradleProject = transformProjectWithPluginsDsl(projectName, gradleVersion) with(gradleProject) { @@ -1304,4 +1302,11 @@ class CocoaPodsIT : BaseGradleIT() { end """.trimIndent() + companion object { + @BeforeClass + @JvmStatic + fun assumeItsMac() { + assumeTrue(HostManager.hostIsMac) + } + } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt index e7c5071ae05..f7d50c756a2 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CommonNativeIT.kt @@ -10,6 +10,7 @@ import org.jetbrains.kotlin.gradle.GradleVersionRequired import org.jetbrains.kotlin.gradle.transformProjectWithPluginsDsl import org.jetbrains.kotlin.konan.target.HostManager import org.junit.Assume +import org.junit.BeforeClass import org.junit.Test class CommonNativeIT : BaseGradleIT() { @@ -54,7 +55,6 @@ class CommonNativeIT : BaseGradleIT() { @Test fun testCommonIos() { - Assume.assumeTrue(HostManager.hostIsMac) doCommonNativeTest( "common-ios", libTargets = listOf("iosLibArm64", "iosLibX64"), @@ -64,7 +64,6 @@ class CommonNativeIT : BaseGradleIT() { @Test fun testCommonWatchos() { - Assume.assumeTrue(HostManager.hostIsMac) doCommonNativeTest( "common-watchos", libTargets = listOf("watchosLibArm32", "watchosLibArm64", "watchosLibX86"), @@ -74,12 +73,19 @@ class CommonNativeIT : BaseGradleIT() { @Test fun testCommonTvos() { - Assume.assumeTrue(HostManager.hostIsMac) doCommonNativeTest( "common-tvos", libTargets = listOf("tvosLibArm64", "tvosLibX64"), appTargets = listOf("tvosArm64", "tvosX64") ) } + + companion object { + @BeforeClass + @JvmStatic + fun assumeItsMac() { + Assume.assumeTrue(HostManager.hostIsMac) + } + } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt index 119d29e84e9..d53e2d903a5 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/FatFrameworkIT.kt @@ -13,6 +13,7 @@ import org.jetbrains.kotlin.gradle.util.modify import org.jetbrains.kotlin.gradle.util.runProcess import org.jetbrains.kotlin.konan.target.HostManager import org.junit.Assume +import org.junit.BeforeClass import org.junit.Test import kotlin.test.assertTrue @@ -23,7 +24,6 @@ class FatFrameworkIT : BaseGradleIT() { @Test fun smokeIos() { - Assume.assumeTrue(HostManager.hostIsMac) transformProjectWithPluginsDsl( "smoke", directoryPrefix = "native-fat-framework" @@ -46,7 +46,6 @@ class FatFrameworkIT : BaseGradleIT() { @Test fun smokeWatchos() { - Assume.assumeTrue(HostManager.hostIsMac) with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "native-fat-framework")) { gradleBuildScript().modify { @@ -113,7 +112,6 @@ class FatFrameworkIT : BaseGradleIT() { @Test fun testDuplicatedArchitecture() { - Assume.assumeTrue(HostManager.hostIsMac) with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "native-fat-framework")) { gradleBuildScript().modify { it + """ @@ -132,7 +130,6 @@ class FatFrameworkIT : BaseGradleIT() { @Test fun testIncorrectFamily() { - Assume.assumeTrue(HostManager.hostIsMac) with(transformProjectWithPluginsDsl("smoke", directoryPrefix = "native-fat-framework")) { gradleBuildScript().modify { it + """ @@ -148,5 +145,13 @@ class FatFrameworkIT : BaseGradleIT() { } } } + + companion object { + @BeforeClass + @JvmStatic + fun assumeItsMac() { + Assume.assumeTrue(HostManager.hostIsMac) + } + } }