From 851a925b4eb5d532495febdff34f309cfc9ababc Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Thu, 13 Jul 2023 21:59:50 +0200 Subject: [PATCH] [Gradle] Fix tags count violation in tests ^KT-59799 Fixed --- .../org/jetbrains/kotlin/gradle/ExplicitApiIT.kt | 4 +++- .../kotlin/gradle/KaptIncrementalWithIsolatingApt.kt | 1 - .../org/jetbrains/kotlin/gradle/SubpluginsIT.kt | 12 +++++++++++- .../baseLibrary/build.gradle | 3 +++ .../mylibrary/build.gradle | 3 +++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExplicitApiIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExplicitApiIT.kt index 6f81690c8c8..25490a76256 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExplicitApiIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ExplicitApiIT.kt @@ -14,9 +14,9 @@ import org.junit.jupiter.api.DisplayName import kotlin.io.path.appendText @DisplayName("Explicit API DSL") -@JvmGradlePluginTests class ExplicitApiIT : KGPBaseTest() { + @JvmGradlePluginTests @DisplayName("Explicit api warning mode produces warnings") @GradleTest fun explicitApiWarning(gradleVersion: GradleVersion) { @@ -46,6 +46,7 @@ class ExplicitApiIT : KGPBaseTest() { } } + @JvmGradlePluginTests @DisplayName("Explicit api strict mode produces errors on violation") @GradleTest fun explicitApiStrict(gradleVersion: GradleVersion) { @@ -70,6 +71,7 @@ class ExplicitApiIT : KGPBaseTest() { } } + @JvmGradlePluginTests @DisplayName("KT-57653: Explicit api warning mode is not overridden by freeCompilerArgs") @GradleTest fun explicitApiWarningFreeArgsOverride(gradleVersion: GradleVersion) { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt index 44753f7834d..d00bd78d43b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KaptIncrementalWithIsolatingApt.kt @@ -285,7 +285,6 @@ open class KaptIncrementalWithIsolatingApt : KaptIncrementalIT() { } } - @AndroidGradlePluginTests @DisplayName("KT-34340: origins in classpath") @GradleAndroidTest @DisabledOnOs(OS.WINDOWS, disabledReason = "https://youtrack.jetbrains.com/issue/KTI-405") diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt index 71eb11293af..e98a1d1bcc9 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SubpluginsIT.kt @@ -13,9 +13,9 @@ import org.jetbrains.kotlin.test.util.JUnit4Assertions.assertTrue import org.junit.jupiter.api.DisplayName @DisplayName("Other plugins tests") -@OtherGradlePluginTests class SubpuginsIT : KGPBaseTest() { + @OtherGradlePluginTests @DisplayName("Subplugin example works as expected") @GradleTest fun testGradleSubplugin(gradleVersion: GradleVersion) { @@ -34,6 +34,7 @@ class SubpuginsIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("Allopen plugin opens classes and methods") @GradleTest fun testAllOpenPlugin(gradleVersion: GradleVersion) { @@ -60,6 +61,7 @@ class SubpuginsIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("Kotlin Spring plugin opens classes and methods") @GradleTest fun testKotlinSpringPlugin(gradleVersion: GradleVersion) { @@ -88,6 +90,7 @@ class SubpuginsIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("Jpa plugin generates no-arg constructor") @GradleTest fun testKotlinJpaPlugin(gradleVersion: GradleVersion) { @@ -107,6 +110,7 @@ class SubpuginsIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("NoArg: Don't invoke initializers by default") @GradleTest fun testNoArgKt18668(gradleVersion: GradleVersion) { @@ -115,6 +119,7 @@ class SubpuginsIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("sam-with-receiver works") @GradleTest fun testSamWithReceiverSimple(gradleVersion: GradleVersion) { @@ -123,6 +128,7 @@ class SubpuginsIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("assignment works") @GradleTest fun testAssignmentSimple(gradleVersion: GradleVersion) { @@ -131,6 +137,7 @@ class SubpuginsIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("Allopen plugin works when classpath dependency is not declared in current or root project ") @GradleTest fun testAllOpenFromNestedBuildscript(gradleVersion: GradleVersion) { @@ -143,6 +150,7 @@ class SubpuginsIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("Allopen applied from script works") @GradleTest fun testAllopenFromScript(gradleVersion: GradleVersion) { @@ -187,6 +195,7 @@ class SubpuginsIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("Lombok plugin is working") @GradleTest fun testLombokPlugin(gradleVersion: GradleVersion) { @@ -195,6 +204,7 @@ class SubpuginsIT : KGPBaseTest() { } } + @OtherGradlePluginTests @DisplayName("KT-51378: Using 'kotlin-dsl' with latest plugin version in buildSrc module") @GradleTestVersions( minVersion = TestVersions.Gradle.G_7_0 // Kotlin compiler 1.9 throws error on 1.3 language level (Gradle 6) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalWithParceler/baseLibrary/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalWithParceler/baseLibrary/build.gradle index 23f355b3d64..5e4585df37b 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalWithParceler/baseLibrary/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalWithParceler/baseLibrary/build.gradle @@ -6,6 +6,7 @@ plugins { android { compileSdkVersion 30 + namespace 'com.example.mylibrary2' defaultConfig { minSdkVersion 16 @@ -23,6 +24,8 @@ android { } } +kotlin.jvmToolchain(8) + dependencies { kapt 'org.parceler:parceler:1.1.12' implementation 'org.parceler:parceler-api:1.1.12' diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalWithParceler/mylibrary/build.gradle b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalWithParceler/mylibrary/build.gradle index 2eb4b67df7e..a5d42371c23 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalWithParceler/mylibrary/build.gradle +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/kaptIncrementalWithParceler/mylibrary/build.gradle @@ -6,6 +6,7 @@ plugins { android { compileSdkVersion 30 + namespace 'com.example.mylibrary' defaultConfig { minSdkVersion 16 @@ -23,6 +24,8 @@ android { } } +kotlin.jvmToolchain(8) + dependencies { kapt 'org.parceler:parceler:1.1.12' implementation 'org.parceler:parceler-api:1.1.12'