[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:
committed by
Space Team
parent
9449e23538
commit
322799f823
+1
-1
@@ -48,7 +48,7 @@ class IdeAndroidDependencyResolutionTest {
|
|||||||
|
|
||||||
@BeforeTest
|
@BeforeTest
|
||||||
fun checkEnvironment() {
|
fun checkEnvironment() {
|
||||||
assumeAndroidSdkAvailable()
|
assertAndroidSdkAvailable()
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
+1
-1
@@ -84,7 +84,7 @@ class IdeBinaryDependencyResolverTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `test - android artifact transformation`() {
|
fun `test - android artifact transformation`() {
|
||||||
assumeAndroidSdkAvailable()
|
assertAndroidSdkAvailable()
|
||||||
|
|
||||||
/* Setup simple project that can resolve MVIKotlin */
|
/* Setup simple project that can resolve MVIKotlin */
|
||||||
val project = buildProject {
|
val project = buildProject {
|
||||||
|
|||||||
+1
-1
@@ -24,7 +24,7 @@ class IdeJvmAndAndroidDependencyResolutionTest {
|
|||||||
|
|
||||||
@BeforeTest
|
@BeforeTest
|
||||||
fun checkEnvironment() {
|
fun checkEnvironment() {
|
||||||
assumeAndroidSdkAvailable()
|
assertAndroidSdkAvailable()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun Project.configureAndroidAndMultiplatform(enableDefaultStdlib: Boolean = false) {
|
private fun Project.configureAndroidAndMultiplatform(enableDefaultStdlib: Boolean = false) {
|
||||||
|
|||||||
+1
-1
@@ -133,7 +133,7 @@ class IdeSourceDependencyResolutionTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun `test - multiplatform to multiplatform - sample 1 - jvmAndAndroid`() {
|
fun `test - multiplatform to multiplatform - sample 1 - jvmAndAndroid`() {
|
||||||
assumeAndroidSdkAvailable()
|
assertAndroidSdkAvailable()
|
||||||
val root = buildProject()
|
val root = buildProject()
|
||||||
|
|
||||||
fun Project.setup() {
|
fun Project.setup() {
|
||||||
|
|||||||
+1
-1
@@ -168,7 +168,7 @@ class KotlinTargetHierarchyDslTest {
|
|||||||
|
|
||||||
val kotlin = project.multiplatformExtension
|
val kotlin = project.multiplatformExtension
|
||||||
|
|
||||||
assumeAndroidSdkAvailable()
|
assertAndroidSdkAvailable()
|
||||||
project.androidLibrary { compileSdk = 31 }
|
project.androidLibrary { compileSdk = 31 }
|
||||||
|
|
||||||
kotlin.targetHierarchy.default {
|
kotlin.targetHierarchy.default {
|
||||||
|
|||||||
+4
-4
@@ -6,14 +6,14 @@
|
|||||||
package org.jetbrains.kotlin.gradle.util
|
package org.jetbrains.kotlin.gradle.util
|
||||||
|
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
import org.junit.Assume
|
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
import kotlin.test.assertTrue
|
||||||
|
|
||||||
val androidSdk: String? = System.getProperty("android.sdk")?.replace("\\", "/")
|
val androidSdk: String? = System.getProperty("android.sdk")?.replace("\\", "/")
|
||||||
|
|
||||||
fun assumeAndroidSdkAvailable() {
|
fun assertAndroidSdkAvailable() {
|
||||||
Assume.assumeTrue("Missing android sdk in <$androidSdk> location.",
|
assertTrue(androidSdk?.let { root -> File(root).exists() } ?: false,
|
||||||
androidSdk?.let { root -> File(root).exists() } ?: false)
|
"Missing android sdk in <$androidSdk> location.")
|
||||||
}
|
}
|
||||||
|
|
||||||
fun setAndroidSdkDirProperty(project: Project) {
|
fun setAndroidSdkDirProperty(project: Project) {
|
||||||
|
|||||||
Reference in New Issue
Block a user