diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeAndroidDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeAndroidDependencyResolutionTest.kt index a76cd737fad..fc3a78a762c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeAndroidDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeAndroidDependencyResolutionTest.kt @@ -48,7 +48,7 @@ class IdeAndroidDependencyResolutionTest { @BeforeTest fun checkEnvironment() { - assumeAndroidSdkAvailable() + assertAndroidSdkAvailable() } @Test diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeBinaryDependencyResolverTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeBinaryDependencyResolverTest.kt index 32c043f1d20..d317513dc93 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeBinaryDependencyResolverTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeBinaryDependencyResolverTest.kt @@ -84,7 +84,7 @@ class IdeBinaryDependencyResolverTest { @Test fun `test - android artifact transformation`() { - assumeAndroidSdkAvailable() + assertAndroidSdkAvailable() /* Setup simple project that can resolve MVIKotlin */ val project = buildProject { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt index 9813e4db189..bb3d7db1591 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeJvmAndAndroidDependencyResolutionTest.kt @@ -24,7 +24,7 @@ class IdeJvmAndAndroidDependencyResolutionTest { @BeforeTest fun checkEnvironment() { - assumeAndroidSdkAvailable() + assertAndroidSdkAvailable() } private fun Project.configureAndroidAndMultiplatform(enableDefaultStdlib: Boolean = false) { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeSourceDependencyResolutionTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeSourceDependencyResolutionTest.kt index 577f806e23d..b6b8bf43fdf 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeSourceDependencyResolutionTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/dependencyResolutionTests/tcs/IdeSourceDependencyResolutionTest.kt @@ -133,7 +133,7 @@ class IdeSourceDependencyResolutionTest { @Test fun `test - multiplatform to multiplatform - sample 1 - jvmAndAndroid`() { - assumeAndroidSdkAvailable() + assertAndroidSdkAvailable() val root = buildProject() fun Project.setup() { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt index 7e3df5e1739..718aba3d476 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/unitTests/KotlinTargetHierarchyDslTest.kt @@ -168,7 +168,7 @@ class KotlinTargetHierarchyDslTest { val kotlin = project.multiplatformExtension - assumeAndroidSdkAvailable() + assertAndroidSdkAvailable() project.androidLibrary { compileSdk = 31 } kotlin.targetHierarchy.default { diff --git a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt index 148e6019ca3..2894cdc5182 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/functionalTest/kotlin/org/jetbrains/kotlin/gradle/util/androidUtils.kt @@ -6,14 +6,14 @@ package org.jetbrains.kotlin.gradle.util import org.gradle.api.Project -import org.junit.Assume import java.io.File +import kotlin.test.assertTrue val androidSdk: String? = System.getProperty("android.sdk")?.replace("\\", "/") -fun assumeAndroidSdkAvailable() { - Assume.assumeTrue("Missing android sdk in <$androidSdk> location.", - androidSdk?.let { root -> File(root).exists() } ?: false) +fun assertAndroidSdkAvailable() { + assertTrue(androidSdk?.let { root -> File(root).exists() } ?: false, + "Missing android sdk in <$androidSdk> location.") } fun setAndroidSdkDirProperty(project: Project) {