aboutsummaryrefslogtreecommitdiff
path: root/integration-tests/gradle/src/integrationTest/kotlin/org
diff options
context:
space:
mode:
authorsebastian.sellmair <sebastian.sellmair@jetbrains.com>2020-07-08 10:47:05 +0200
committerSebastian Sellmair <34319766+sellmair@users.noreply.github.com>2020-07-08 18:59:57 +0200
commitcaf48e76f3bff5e9907cd094cf0719f623e528d5 (patch)
tree554b313645a83749afba1e77af35b930bbf4448f /integration-tests/gradle/src/integrationTest/kotlin/org
parent6d1e25756c3e8c43ce4d5721e7665f439a19e47c (diff)
downloaddokka-caf48e76f3bff5e9907cd094cf0719f623e528d5.tar.gz
dokka-caf48e76f3bff5e9907cd094cf0719f623e528d5.tar.bz2
dokka-caf48e76f3bff5e9907cd094cf0719f623e528d5.zip
Implement simple MavenIntegrationTest.kt
Diffstat (limited to 'integration-tests/gradle/src/integrationTest/kotlin/org')
-rw-r--r--integration-tests/gradle/src/integrationTest/kotlin/org/jetbrains/dokka/it/gradle/Android0GradleIntegrationTest.kt14
1 files changed, 3 insertions, 11 deletions
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 e08dbca5..0a29555f 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,6 +1,8 @@
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.junit.runners.Parameterized.Parameters
import java.io.File
@@ -28,20 +30,10 @@ class Android0GradleIntegrationTest(override val versions: BuildVersions) : Abst
@BeforeTest
fun assumeAndroidInstallation() {
- val isCI = System.getenv("CI") != null
if (isCI) {
return
}
-
- val androidSdkRoot = System.getenv("ANDROID_SDK_ROOT")
- val androidHome = System.getenv("ANDROID_HOME")
-
- val isAndroidSdkInstalled = androidSdkRoot != null || androidHome != null
-
- Assume.assumeTrue(
- "Missing ANDROID_SDK_ROOT",
- isAndroidSdkInstalled
- )
+ Assume.assumeTrue("Missing ANDROID_SDK_ROOT", isAndroidSdkInstalled)
}
@BeforeTest