Skip to content

Commit 690a5ad

Browse files
authored
DGP integration tests: Add @TestsKotlinJvm tag (#4356)
Tag tests that use Kotlin JVM plugin. (This will become more relevant when we add a test for AGP9 with Kotlin-built-in.)
1 parent f90ede9 commit 690a5ad

File tree

4 files changed

+14
-5
lines changed

4 files changed

+14
-5
lines changed

dokka-integration-tests/gradle/src/main/kotlin/org/jetbrains/dokka/it/gradle/junit/testTags.kt

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@ annotation class TestsDGPv2
3838
annotation class TestsKotlinMultiplatform
3939

4040

41+
/**
42+
* JUnit [Tag] indicating the test involves a Kotlin JVM project.
43+
*/
44+
@Tag("KotlinJvm")
45+
@Target(FUNCTION, CLASS)
46+
@MustBeDocumented
47+
@Inherited
48+
annotation class TestsKotlinJvm
49+
50+
4151
/**
4252
* JUnit [Tag] indicating the test involves an Android project.
4353
*

dokka-integration-tests/gradle/src/test/kotlin/AndroidComposeIT.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import kotlin.io.path.readText
2424
*/
2525
@TestsDGPv2
2626
@TestsAndroidCompose
27+
@TestsKotlinJvm
2728
@WithGradleProperties(GradlePropertiesProvider.Android::class)
2829
class AndroidComposeIT {
2930

dokka-integration-tests/gradle/src/test/kotlin/AndroidProjectIT.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import kotlin.io.path.readText
2424
*/
2525
@TestsAndroid
2626
@TestsDGPv2
27+
@TestsKotlinJvm
2728
@WithGradleProperties(GradlePropertiesProvider.Android::class)
2829
class AndroidProjectIT {
2930

dokka-integration-tests/gradle/src/test/kotlin/MultiplatformAndroidJvmProjectIT.kt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,9 @@ import io.kotest.matchers.paths.shouldBeAFile
99
import io.kotest.matchers.shouldBe
1010
import io.kotest.matchers.string.shouldNotContain
1111
import org.gradle.testkit.runner.TaskOutcome.SUCCESS
12+
import org.jetbrains.dokka.gradle.utils.*
1213
import org.jetbrains.dokka.gradle.utils.addArguments
1314
import org.jetbrains.dokka.gradle.utils.build
14-
import org.jetbrains.dokka.gradle.utils.findFiles
15-
import org.jetbrains.dokka.gradle.utils.shouldBeADirectoryWithSameContentAs
16-
import org.jetbrains.dokka.gradle.utils.shouldNotContainAnyOf
17-
import org.jetbrains.dokka.gradle.utils.sideBySide
18-
import org.jetbrains.dokka.gradle.utils.toTreeString
1915
import org.jetbrains.dokka.it.gradle.junit.*
2016
import kotlin.io.path.name
2117
import kotlin.io.path.readText
@@ -26,6 +22,7 @@ import kotlin.io.path.readText
2622
@TestsAndroid
2723
@TestsDGPv2
2824
@WithGradleProperties(GradlePropertiesProvider.Android::class)
25+
@TestsKotlinMultiplatform
2926
class MultiplatformAndroidJvmProjectIT {
3027

3128
@DokkaGradlePluginTest(sourceProjectName = "it-multiplatform-android-jvm")

0 commit comments

Comments
 (0)