From 39c000bb4da10f068b73a89bd0fc3c96072492fb Mon Sep 17 00:00:00 2001 From: Alexey Tsvetkov Date: Fri, 4 May 2018 17:58:16 +0300 Subject: [PATCH] Add vararg overloads for Gradle test utils --- .../org/jetbrains/kotlin/gradle/BaseGradleIT.kt | 8 ++++++++ .../org/jetbrains/kotlin/gradle/Kapt3IT.kt | 2 +- .../gradle/KotlinGradlePluginMultiVersionIT.kt | 17 ++++++++++------- .../kotlin/gradle/MultiplatformGradleIT.kt | 10 +++++----- .../org/jetbrains/kotlin/gradle/PluginsDslIT.kt | 4 ++-- .../jetbrains/kotlin/gradle/UpToDatenessIT.kt | 8 ++++---- 6 files changed, 30 insertions(+), 19 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt index bcab73913c3..e92d154e711 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BaseGradleIT.kt @@ -387,12 +387,20 @@ abstract class BaseGradleIT { } } + fun CompiledProject.assertTasksExecuted(vararg tasks: String) { + assertTasksExecuted(tasks.toList()) + } + fun CompiledProject.assertTasksUpToDate(tasks: Iterable) { for (task in tasks) { assertContains("$task UP-TO-DATE") } } + fun CompiledProject.assertTasksUpToDate(vararg tasks: String) { + assertTasksUpToDate(tasks.toList()) + } + fun CompiledProject.getOutputForTask(taskName: String): String { val taskOutputRegex = ("\\[LIFECYCLE] \\[class org\\.gradle(?:\\.internal\\.buildevents)?\\.TaskExecutionLogger] :$taskName" + "([\\s\\S]+?)" + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt index df9877fc85e..137565233fe 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt @@ -229,7 +229,7 @@ open class Kapt3IT : Kapt3BaseIT() { project.build("build", options = options) { assertSuccessful() - assertTasksExecuted(listOf(":kaptGenerateStubsKotlin", ":kaptKotlin", ":compileKotlin", ":compileJava")) + assertTasksExecuted(":kaptGenerateStubsKotlin", ":kaptKotlin", ":compileKotlin", ":compileJava") // generated sources assertFileExists("$generatedSrc/foo/bar/UseBar_MembersInjector.java") 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 499ecef51aa..d7512f0baf6 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 @@ -41,9 +41,12 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() { zip.close() } - assertTasksExecuted(listOf( - ":processor:kaptGenerateStubsKotlin", ":processor:kaptKotlin", - ":app:kaptGenerateStubsKotlin", ":app:kaptKotlin")) + assertTasksExecuted( + ":processor:kaptGenerateStubsKotlin", + ":processor:kaptKotlin", + ":app:kaptGenerateStubsKotlin", + ":app:kaptKotlin" + ) } project.projectDir.getFileByName("Test.kt").modify { text -> @@ -53,8 +56,8 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() { project.build("build") { assertSuccessful() - assertTasksUpToDate(listOf(":processor:kaptGenerateStubsKotlin", ":processor:kaptKotlin", ":app:kaptKotlin")) - assertTasksExecuted(listOf(":app:kaptGenerateStubsKotlin")) + assertTasksUpToDate(":processor:kaptGenerateStubsKotlin", ":processor:kaptKotlin", ":app:kaptKotlin") + assertTasksExecuted(":app:kaptGenerateStubsKotlin") } project.projectDir.getFileByName("Test.kt").modify { text -> @@ -63,8 +66,8 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() { project.build("build") { assertSuccessful() - assertTasksUpToDate(listOf(":processor:kaptGenerateStubsKotlin", ":processor:kaptKotlin")) - assertTasksExecuted(listOf(":app:kaptGenerateStubsKotlin", ":app:kaptKotlin")) + assertTasksUpToDate(":processor:kaptGenerateStubsKotlin", ":processor:kaptKotlin") + assertTasksExecuted(":app:kaptGenerateStubsKotlin", ":app:kaptKotlin") } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt index 428ca10fe0c..80cd9e39c45 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt @@ -144,16 +144,16 @@ class MultiplatformGradleIT : BaseGradleIT() { jvmProjectDir.getFileByName("PlatformClass.kt").modify { it + "\n" } build("build") { assertSuccessful() - assertTasksExecuted(listOf(compileJvmTask)) - assertTasksUpToDate(listOf(compileCommonTask, compileJsTask)) + assertTasksExecuted(compileJvmTask) + assertTasksUpToDate(compileCommonTask, compileJsTask) } val jsProjectDir = File(projectDir, "libJs") jsProjectDir.getFileByName("PlatformClass.kt").modify { it + "\n" } build("build") { assertSuccessful() - assertTasksExecuted(listOf(compileJsTask)) - assertTasksUpToDate(listOf(compileCommonTask, compileJvmTask)) + assertTasksExecuted(compileJsTask) + assertTasksUpToDate(compileCommonTask, compileJvmTask) } } @@ -198,7 +198,7 @@ class MultiplatformGradleIT : BaseGradleIT() { build("build") { assertSuccessful() - assertTasksExecuted(listOf(":lib:compileKotlinCommon", ":libJvm:compileKotlin", ":libJs:compileKotlin2Js")) + assertTasksExecuted(":lib:compileKotlinCommon", ":libJvm:compileKotlin", ":libJs:compileKotlin2Js") } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/PluginsDslIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/PluginsDslIT.kt index e9530f75c19..3411182d798 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/PluginsDslIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/PluginsDslIT.kt @@ -15,7 +15,7 @@ class PluginsDslIT : BaseGradleIT() { val project = projectWithMavenLocalPlugins("allopenPluginsDsl") project.build("build") { assertSuccessful() - assertTasksExecuted(listOf(":compileKotlin")) + assertTasksExecuted(":compileKotlin") } } @@ -24,7 +24,7 @@ class PluginsDslIT : BaseGradleIT() { val project = projectWithMavenLocalPlugins("applyToSubprojects") project.build("build") { assertSuccessful() - assertTasksExecuted(listOf(":subproject:compileKotlin")) + assertTasksExecuted(":subproject:compileKotlin") } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDatenessIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDatenessIT.kt index 0b3f4c1e209..4edd45bf028 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDatenessIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDatenessIT.kt @@ -95,7 +95,7 @@ class UpToDateIT : BaseGradleIT() { } override fun checkAfterRebuild(compiledProject: CompiledProject) = with(compiledProject) { - assertTasksExecuted(listOf(":compileKotlin", ":kaptGenerateStubsKotlin", ":kaptKotlin")) + assertTasksExecuted(":compileKotlin", ":kaptGenerateStubsKotlin", ":kaptKotlin") } } @@ -115,7 +115,7 @@ class UpToDateIT : BaseGradleIT() { } override fun checkAfterRebuild(compiledProject: CompiledProject) = with(compiledProject) { - assertTasksExecuted(listOf(":compileKotlin")) + assertTasksExecuted(":compileKotlin") } } @@ -140,7 +140,7 @@ class UpToDateIT : BaseGradleIT() { } override fun checkAfterRebuild(compiledProject: CompiledProject) = with(compiledProject) { - assertTasksExecuted(listOf(":compileKotlin")) + assertTasksExecuted(":compileKotlin") Assert.assertTrue(helloWorldKtClass.exists()) } } @@ -181,7 +181,7 @@ class UpToDateIT : BaseGradleIT() { } override fun checkAfterRebuild(compiledProject: CompiledProject) = with(compiledProject) { - assertTasksExecuted(listOf(":compileKotlin")) + assertTasksExecuted(":compileKotlin") } } }