From b5a5f25b9937a5a8be7cbacffbc72c157a4d5648 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 15 Mar 2022 15:19:18 +0100 Subject: [PATCH] Distribute SimpleKotlinGradleIT test to other tags ^KT-45745 In Progress --- .../org/jetbrains/kotlin/gradle/BuildCacheIT.kt | 2 +- .../kotlin/gradle/BuildCacheRelocationIT.kt | 14 +++++++++++++- .../jetbrains/kotlin/gradle/BuildStatisticsIT.kt | 2 +- .../gradle/ConfigurationCacheForAndroidIT.kt | 1 + .../kotlin/gradle/ConfigurationCacheIT.kt | 12 +++++++++++- .../kotlin/gradle/DeterministicBuildIT.kt | 4 +--- .../kotlin/gradle/SimpleKotlinGradleIT.kt | 2 +- .../kotlin/gradle/SourceFileIsModifiedIT.kt | 2 +- .../kotlin/gradle/tasks/CleanDataTaskIT.kt | 2 +- .../jetbrains/kotlin/gradle/testbase/testTags.kt | 1 + 10 files changed, 32 insertions(+), 10 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheIT.kt index 93dd1c7e6a4..846c4f1d492 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheIT.kt @@ -27,7 +27,7 @@ import kotlin.io.path.writeText @ExperimentalPathApi @DisplayName("Local build cache") -@SimpleGradlePluginTests +@JvmGradlePluginTests class BuildCacheIT : KGPBaseTest() { override val defaultBuildOptions: BuildOptions = diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt index 10a4e518c91..bf4bc7db647 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt @@ -25,13 +25,13 @@ import org.junit.jupiter.api.DisplayName import kotlin.io.path.createDirectory @DisplayName("Build cache relocation") -@SimpleGradlePluginTests class BuildCacheRelocationIT : KGPBaseTest() { override val defaultBuildOptions = super.defaultBuildOptions.copy(buildCacheEnabled = true) private val localBuildCacheDir get() = workingDir.resolve("remote-jdk-build-cache") + @JvmGradlePluginTests @DisplayName("works for Kotlin simple project") @GradleTest fun testRelocationSimpleProject(gradleVersion: GradleVersion) { @@ -45,6 +45,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { ) } + @OtherGradlePluginTests @DisplayName("works for Kotlin with Kapt simple project") @GradleTest fun testRelocationSimpleKapt(gradleVersion: GradleVersion) { @@ -68,6 +69,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { ) } + @JsGradlePluginTests @DisplayName("works with JS/DCE project") @GradleTest fun testRelocationKotlin2JsDce(gradleVersion: GradleVersion) { @@ -94,6 +96,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { ) } + @MppGradlePluginTests @DisplayName("works with Multiplatform") @GradleTest fun testRelocationMultiplatform(gradleVersion: GradleVersion) { @@ -119,6 +122,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { ) } + @JvmGradlePluginTests @DisplayName("works with Android project") @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_7) @GradleTest @@ -143,6 +147,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { ) } + @JvmGradlePluginTests @DisplayName("Test relocation for Android with dagger project") @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_7) @GradleTest @@ -167,6 +172,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { ) } + @JvmGradlePluginTests @DisplayName("KT-48617: Kapt ignores empty directories from Android variant") @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8) @GradleTest @@ -194,6 +200,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { ) } + @JvmGradlePluginTests @DisplayName("KT-48849: Kotlin compile should ignore empty layout resource directories added by kotlin android extensions") @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8) @GradleTest @@ -227,6 +234,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { ) } + @OtherGradlePluginTests // TODO: change to native tag @DisplayName("with native project") @GradleTest fun testRelocationNative(gradleVersion: GradleVersion) { @@ -262,6 +270,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { ) } + @OtherGradlePluginTests @DisplayName("Kapt incremental compilation works with cache") @GradleTest fun testKaptCachingIncrementalBuildWithoutRelocation(gradleVersion: GradleVersion) { @@ -272,6 +281,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("Kapt incremental compilation build does not break relocated build cache") @GradleTest fun testKaptCachingIncrementalBuildWithRelocation(gradleVersion: GradleVersion) { @@ -320,6 +330,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { } } + @JvmGradlePluginTests @DisplayName("Kotlin incremental compilation should work correctly") @GradleTest fun testKotlinIncrementalCompilation(gradleVersion: GradleVersion) { @@ -328,6 +339,7 @@ class BuildCacheRelocationIT : KGPBaseTest() { } } + @JvmGradlePluginTests @DisplayName("Kotlin incremental compilation with `kotlin.incremental.useClasspathSnapshot` feature should work correctly") @GradleTest fun testKotlinIncrementalCompilation_withGradleClasspathSnapshot(gradleVersion: GradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildStatisticsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildStatisticsIT.kt index 7a78818f870..30dfc82f387 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildStatisticsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildStatisticsIT.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.gradle.testbase.* import org.junit.jupiter.api.DisplayName @DisplayName("Build statistics") -@SimpleGradlePluginTests +@JvmGradlePluginTests class BuildStatisticsIT : KGPBaseTest() { @DisplayName("Http build report url problems are logged only ones") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt index 9c01222c3d1..981c10831f8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt @@ -12,6 +12,7 @@ import org.junit.jupiter.api.DisplayName @DisplayName("Configuration cache in Android project") @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_7) +@JvmGradlePluginTests class ConfigurationCacheForAndroidIT : AbstractConfigurationCacheIT() { override val defaultBuildOptions = super.defaultBuildOptions.copy( androidVersion = AGP_42 diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt index d7c7edc48a0..7d25e28148a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt @@ -16,12 +16,14 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { @DisplayName("works in simple Kotlin project") @GradleTest + @JvmGradlePluginTests fun testSimpleKotlinJvmProject(gradleVersion: GradleVersion) { project("kotlinProject", gradleVersion) { testConfigurationCacheOf(":compileKotlin") } } + @JvmGradlePluginTests @DisplayName("works with publishing") @GradleTest fun testJvmWithMavenPublish(gradleVersion: GradleVersion) { @@ -56,6 +58,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } } + @MppGradlePluginTests @DisplayName("works with MPP publishing") @GradleTest @OptIn(ExperimentalStdlibApi::class) @@ -71,6 +74,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } } + @OtherGradlePluginTests @DisplayName("with project using incremental kapt") @GradleTest fun testIncrementalKaptProject(gradleVersion: GradleVersion) { @@ -94,6 +98,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } // Set min Gradle version to 6.8 because of using DependencyResolutionManagement API to add repositories. + @JvmGradlePluginTests @DisplayName("with instance execution") @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8) @GradleTest @@ -106,6 +111,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } } + @JvmGradlePluginTests @DisplayName("KT-43605: instant execution with buildSrc") @GradleTest fun testInstantExecutionWithBuildSrc(gradleVersion: GradleVersion) { @@ -117,6 +123,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } } + @JvmGradlePluginTests @DisplayName("instant execution works with included build plugin") @GradleTestVersions(minVersion = TestVersions.Gradle.G_6_8) @GradleTest @@ -129,12 +136,14 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } } + @JsGradlePluginTests @DisplayName("works with Dukat") @GradleTest fun testConfigurationCacheDukatSrc(gradleVersion: GradleVersion) { testConfigurationCacheDukat(gradleVersion) } + @JsGradlePluginTests @DisplayName("works with Dukat binaries") @GradleTest fun testConfigurationCacheDukatBinaries(gradleVersion: GradleVersion) { @@ -160,6 +169,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { ) } + @MppGradlePluginTests @DisplayName("works in MPP withJava project") @GradleTestVersions(minVersion = TestVersions.Gradle.G_7_0, maxVersion = TestVersions.Gradle.G_7_1) @GradleTest @@ -173,6 +183,7 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } } + @JvmGradlePluginTests @DisplayName("with build report") @GradleTest fun testBuildReportSmokeTestForConfigurationCache(gradleVersion: GradleVersion) { @@ -189,7 +200,6 @@ class ConfigurationCacheIT : AbstractConfigurationCacheIT() { } } -@SimpleGradlePluginTests abstract class AbstractConfigurationCacheIT : KGPBaseTest() { override val defaultBuildOptions = super.defaultBuildOptions.copy(configurationCache = true) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DeterministicBuildIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DeterministicBuildIT.kt index 2b095843806..2ddd8091307 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DeterministicBuildIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DeterministicBuildIT.kt @@ -10,15 +10,13 @@ import org.jetbrains.kotlin.gradle.testbase.* import org.jetbrains.kotlin.gradle.util.allJavaFiles import org.junit.jupiter.api.DisplayName import java.io.File -import kotlin.io.path.ExperimentalPathApi import kotlin.io.path.writeText import kotlin.test.assertEquals @DisplayName("Tests that the outputs of a build are deterministic") -@SimpleGradlePluginTests -@OptIn(ExperimentalPathApi::class) class DeterministicBuildIT : KGPBaseTest() { + @OtherGradlePluginTests @DisplayName("Kapt generate stubs task - KT-40882") @GradleTest fun testKaptGenerateStubsTask(gradleVersion: GradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt index a21e82a39a2..59a16bce20c 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt @@ -7,7 +7,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompilerExecutionStrategy import org.jetbrains.kotlin.gradle.testbase.* import org.junit.jupiter.api.DisplayName -@SimpleGradlePluginTests +@JvmGradlePluginTests @DisplayName("KGP simple tests") class SimpleKotlinGradleIT : KGPBaseTest() { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SourceFileIsModifiedIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SourceFileIsModifiedIT.kt index fdcd13c94f5..35f9f67acb6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SourceFileIsModifiedIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SourceFileIsModifiedIT.kt @@ -9,7 +9,7 @@ import kotlin.test.assertNull import kotlin.test.assertTrue @DisplayName("Source file modifications") -@SimpleGradlePluginTests +@JvmGradlePluginTests class SourceFileIsModifiedIT : KGPBaseTest() { @DisplayName("Removed in non-incremental compilation") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanDataTaskIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanDataTaskIT.kt index bca860ead8a..b101cde76c6 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanDataTaskIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanDataTaskIT.kt @@ -13,7 +13,7 @@ import org.junit.Test import org.junit.jupiter.api.DisplayName -@SimpleGradlePluginTests +@JsGradlePluginTests class CleanDataTaskIT : KGPBaseTest() { @DisplayName("nodejs is deleted from Gradle user home") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt index 42c61d8f21e..6962cb4be04 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt @@ -13,6 +13,7 @@ import org.junit.jupiter.api.Tag @Target(AnnotationTarget.CLASS, AnnotationTarget.ANNOTATION_CLASS, AnnotationTarget.FUNCTION) @Retention(AnnotationRetention.RUNTIME) @Tag("SimpleKGP") +@Deprecated("will be removed soon", level = DeprecationLevel.ERROR) annotation class SimpleGradlePluginTests /**