From fdbd3cd8cbd375c46ac72276e7a7e7892388c55c Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Thu, 17 May 2018 17:30:02 +0300 Subject: [PATCH] Test: remove unsupported Gradle versions from tests --- .../AbstractKotlinAndroidGradleTests.kt | 26 ------------------- .../kotlin/gradle/BaseMultiGradleVersionIT.kt | 2 +- .../IncrementalCompilationMultiProjectIT.kt | 4 --- .../KotlinGradlePluginMultiVersionIT.kt | 22 +++------------- .../kotlin/gradle/TestRootAffectedIT.kt | 9 ++++--- .../kotlin/jps/BaseIncrementalGradleIT.kt | 2 +- 6 files changed, 12 insertions(+), 53 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt index 523b5c11219..96c40f4ce52 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/AbstractKotlinAndroidGradleTests.kt @@ -13,8 +13,6 @@ import java.io.File class KotlinAndroidGradleIT : AbstractKotlinAndroidGradleTests(gradleVersion = GradleVersionRequired.AtLeast("3.4"), androidGradlePluginVersion = "2.3.0") -class KotlinAndroidWithJackGradleIT : AbstractKotlinAndroidWithJackGradleTests(androidGradlePluginVersion = "2.3.+") - // TODO If we there is a way to fetch the latest Android plugin version, test against the latest version class KotlinAndroid32GradleIT : KotlinAndroid3GradleIT(GradleVersionRequired.AtLeast("4.6"), "3.2.0-alpha15") { @@ -382,28 +380,4 @@ fun getSomething() = 10 assertFileExists("libAndroid/build/tmp/kotlin-classes/debugUnitTest/foo/PlatformTest.class") } } -} - - -abstract class AbstractKotlinAndroidWithJackGradleTests( - private val androidGradlePluginVersion: String -) : BaseGradleIT() { - - fun getEnvJDK_18() = System.getenv()["JDK_18"] - - override fun defaultBuildOptions() = - super.defaultBuildOptions().copy( - androidHome = KotlinTestUtils.findAndroidSdk(), - androidGradlePluginVersion = androidGradlePluginVersion, javaHome = File(getEnvJDK_18()) - ) - - @Test - fun testSimpleCompile() { - val project = Project("AndroidJackProject", GradleVersionRequired.Exact("3.4")) - - project.build("assemble") { - assertFailed() - assertContains("Kotlin Gradle plugin does not support the deprecated Jack toolchain") - } - } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseMultiGradleVersionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseMultiGradleVersionIT.kt index d2e2135adc7..80bee11f6e7 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseMultiGradleVersionIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseMultiGradleVersionIT.kt @@ -15,6 +15,6 @@ abstract class BaseMultiGradleVersionIT : BaseGradleIT() { companion object { @JvmStatic @Parameters(name = "Test with Gradle version {0}") - fun params() = listOf("2.10", "2.14.1", "3.3", "3.4", "4.0").map { arrayOf(it) } + fun params() = listOf("3.5", "4.0").map { arrayOf(it) } } } \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt index 785bb9464f9..8f860d7d003 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/IncrementalCompilationMultiProjectIT.kt @@ -284,10 +284,6 @@ class IncrementalJavaChangeDisablePreciseIT : IncrementalCompilationJavaChangesB } abstract class IncrementalCompilationJavaChangesBase(val usePreciseJavaTracking: Boolean?) : BaseGradleIT() { - companion object { - protected val GRADLE_VERSION = "2.10" - } - override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().copy(withDaemon = true, incremental = true) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginMultiVersionIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginMultiVersionIT.kt index 661ffc58d66..3c859c96ba8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginMultiVersionIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginMultiVersionIT.kt @@ -60,10 +60,6 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() { @Test fun testJavaIcCompatibility() { val project = Project("kotlinJavaProject", gradleVersion) - - val expectIncrementalCompilation = project.testGradleVersionAtLeast("2.14") - val expectVerboseIncrementalLogs = project.testGradleVersionBelow("3.4") - project.setupWorkingDir() val buildScript = File(project.projectDir, "build.gradle") @@ -77,11 +73,8 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() { File(project.projectDir, "src/main/java/demo/HelloWorld.java").modify { "$it\n" + "class NewClass { }" } project.build("build") { assertSuccessful() - if (expectIncrementalCompilation && expectVerboseIncrementalLogs) - assertContains("Incremental compilation") - if (expectIncrementalCompilation) - assertNotContains("not incremental") else - assertContains("not incremental") + assertContains("Incremental compilation") + assertNotContains("not incremental") } // Then modify a Kotlin source and check that Gradle sees that Java is not up-to-date: @@ -91,9 +84,7 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() { project.build("build") { assertSuccessful() assertTasksExecuted(":compileKotlin", ":compileJava") - if (expectIncrementalCompilation) - assertNotContains("not incremental") else - assertContains("not incremental") + assertNotContains("not incremental") assertNotContains("None of the classes needs to be compiled!") } } @@ -119,12 +110,7 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() { @Test fun testJavaLibraryCompatibility() { - val project = Project("javaLibraryProject", gradleVersion) - - Assume.assumeTrue( - "The java-library plugin is supported only in Gradle 3.4+ (current: $gradleVersion)", - project.testGradleVersionAtLeast("3.4") - ) + val project = Project("javaLibraryProject") val compileKotlinTasks = listOf(":libA:compileKotlin", ":libB:compileKotlin", ":app:compileKotlin") project.build("build") { diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/TestRootAffectedIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/TestRootAffectedIT.kt index fcec7c4a9e7..6f0e3da1e7a 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/TestRootAffectedIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/TestRootAffectedIT.kt @@ -1,8 +1,10 @@ package org.jetbrains.kotlin.gradle +import org.jetbrains.kotlin.gradle.util.allKotlinFiles import org.jetbrains.kotlin.gradle.util.getFileByName import org.jetbrains.kotlin.gradle.util.modify import org.junit.Test +import java.io.File class TestRootAffectedIT : BaseGradleIT() { @Test @@ -36,8 +38,7 @@ class TestRootAffectedIT : BaseGradleIT() { @Test fun testSourceRootClassIsRemovedIC() { - // todo: update Gradle after https://github.com/gradle/gradle/issues/3051 is resolved - val project = Project("kotlinProject", GradleVersionRequired.Exact("3.0")) + val project = Project("kotlinProject") val buildOptions = defaultBuildOptions().copy(incremental = true) project.build("build", options = buildOptions) { @@ -49,7 +50,9 @@ class TestRootAffectedIT : BaseGradleIT() { project.build("build", options = buildOptions) { assertSuccessful() - assertCompiledKotlinSources(emptyList()) + // see KT-20541 + val kotlinTestFiles = File(project.projectDir, "src/test").allKotlinFiles() + assertCompiledKotlinSources(project.relativize(kotlinTestFiles)) } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/jps/BaseIncrementalGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/jps/BaseIncrementalGradleIT.kt index e951d36e57c..0fe57953784 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/jps/BaseIncrementalGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/jps/BaseIncrementalGradleIT.kt @@ -17,7 +17,7 @@ abstract class BaseIncrementalGradleIT : BaseGradleIT() { val resourcesBase: File, val relPath: String, minLogLevel: LogLevel = LogLevel.DEBUG - ) : Project(File(relPath).name, GradleVersionRequired.Exact("2.10"), null, minLogLevel) { + ) : Project(File(relPath).name, GradleVersionRequired.None, null, minLogLevel) { override val resourcesRoot = File(resourcesBase, relPath) val mapWorkingToOriginalFile = hashMapOf()