azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Distribute SimpleKotlinGradleIT test to other tags

Browse Source 
^KT-45745 In Progress
This commit is contained in:
Yahor Berdnikau
2022-03-15 15:19:18 +01:00
parent c051edcbee
commit b5a5f25b99
10 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheIT.kt
+1 -1
View File
@@ -27,7 +27,7 @@ import kotlin.io.path.writeText
@ExperimentalPathApi
@DisplayName("Local build cache")
@SimpleGradlePluginTests
@JvmGradlePluginTests
class BuildCacheIT : KGPBaseTest() {
override val defaultBuildOptions: BuildOptions =
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildCacheRelocationIT.kt
+13 -1
View File
@@ -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) {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildStatisticsIT.kt
+1 -1
View File
@@ -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")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheForAndroidIT.kt
+1
View File
@@ -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
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/ConfigurationCacheIT.kt
+11 -1
View File
@@ -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)
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/DeterministicBuildIT.kt
+1 -3
View File
@@ -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) {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SimpleKotlinGradleIT.kt
+1 -1
View File
@@ -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() {
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/SourceFileIsModifiedIT.kt
+1 -1
View File
@@ -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")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/tasks/CleanDataTaskIT.kt
+1 -1
View File
@@ -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")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testTags.kt
+1
View File
@@ -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
/**