From 7196323582dce7ca3f9b07262a1f94ecd8514539 Mon Sep 17 00:00:00 2001 From: "sebastian.sellmair" Date: Mon, 24 Aug 2020 14:02:07 +0200 Subject: - Move `test` projects into semantic parent projects - Implement new `:test-utils` project - Resolve requirement for Android SDK installation --- .../it/gradle/Android0GradleIntegrationTest.kt | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'integration-tests/gradle/src/integrationTest/kotlin') diff --git a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt index 6246cade..145992fc 100644 --- a/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt +++ b/integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt @@ -1,9 +1,7 @@ package org.jetbrains.dokka.it.gradle import org.gradle.testkit.runner.TaskOutcome -import org.jetbrains.dokka.it.isAndroidSdkInstalled -import org.jetbrains.dokka.it.isCI -import org.junit.Assume +import org.jetbrains.dokka.test.assumeAndroidSdkInstalled import org.junit.runners.Parameterized.Parameters import java.io.File import kotlin.test.* @@ -28,16 +26,10 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst ) } - @BeforeTest - fun assumeAndroidInstallation() { - if (isCI) { - return - } - Assume.assumeTrue("Missing ANDROID_SDK_ROOT", isAndroidSdkInstalled) - } @BeforeTest fun prepareProjectFiles() { + assumeAndroidSdkInstalled() val templateProjectDir = File("projects", "it-android-0") templateProjectDir.listFiles().orEmpty() @@ -91,9 +83,9 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst // TODO: remove this list when https://github.com/Kotlin/dokka/issues/1306 is closed private val knownUnresolvedDRIs = setOf( - "it.android/IntegrationTestActivity/findViewById/#kotlin.Int/PointingToGenericParameters(0)/", - "it.android/IntegrationTestActivity/getExtraData/#java.lang.Class[TypeParam(bounds=[androidx.core.app.ComponentActivity.ExtraData])]/PointingToGenericParameters(0)/", - "it.android/IntegrationTestActivity/getSystemService/#java.lang.Class[TypeParam(bounds=[kotlin.Any])]/PointingToGenericParameters(0)/", - "it.android/IntegrationTestActivity/requireViewById/#kotlin.Int/PointingToGenericParameters(0)/" - ) + "it.android/IntegrationTestActivity/findViewById/#kotlin.Int/PointingToGenericParameters(0)/", + "it.android/IntegrationTestActivity/getExtraData/#java.lang.Class[TypeParam(bounds=[androidx.core.app.ComponentActivity.ExtraData])]/PointingToGenericParameters(0)/", + "it.android/IntegrationTestActivity/getSystemService/#java.lang.Class[TypeParam(bounds=[kotlin.Any])]/PointingToGenericParameters(0)/", + "it.android/IntegrationTestActivity/requireViewById/#kotlin.Int/PointingToGenericParameters(0)/" + ) } -- cgit