[FunctionalTests] Fail tests if androidSDK is not available, not ignore

Tests use kotlin/dependencies/android-sdk, androidSDK should be always available
This commit is contained in:
Pavel Kargashinsky
2023-05-22 09:26:43 +02:00
committed by Space Team
parent 9449e23538
commit 322799f823
6 changed files with 9 additions and 9 deletions
@@ -48,7 +48,7 @@ class IdeAndroidDependencyResolutionTest {
@BeforeTest
fun checkEnvironment() {
assumeAndroidSdkAvailable()
assertAndroidSdkAvailable()
}
@Test
@@ -84,7 +84,7 @@ class IdeBinaryDependencyResolverTest {
@Test
fun `test - android artifact transformation`() {
assumeAndroidSdkAvailable()
assertAndroidSdkAvailable()
/* Setup simple project that can resolve MVIKotlin */
val project = buildProject {
@@ -24,7 +24,7 @@ class IdeJvmAndAndroidDependencyResolutionTest {
@BeforeTest
fun checkEnvironment() {
assumeAndroidSdkAvailable()
assertAndroidSdkAvailable()
}
private fun Project.configureAndroidAndMultiplatform(enableDefaultStdlib: Boolean = false) {
@@ -133,7 +133,7 @@ class IdeSourceDependencyResolutionTest {
@Test
fun `test - multiplatform to multiplatform - sample 1 - jvmAndAndroid`() {
assumeAndroidSdkAvailable()
assertAndroidSdkAvailable()
val root = buildProject()
fun Project.setup() {
@@ -168,7 +168,7 @@ class KotlinTargetHierarchyDslTest {
val kotlin = project.multiplatformExtension
assumeAndroidSdkAvailable()
assertAndroidSdkAvailable()
project.androidLibrary { compileSdk = 31 }
kotlin.targetHierarchy.default {
@@ -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) {