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

Add vararg overloads for Gradle test utils

Browse Source
This commit is contained in:
Alexey Tsvetkov
2018-05-04 17:58:16 +03:00
parent cf43be9fa3
commit 39c000bb4d
6 changed files with 30 additions and 19 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/BaseGradleIT.kt
+8
View File
@@ -387,12 +387,20 @@ abstract class BaseGradleIT {
} }
} }
fun CompiledProject.assertTasksExecuted(vararg tasks: String) {
assertTasksExecuted(tasks.toList())
}
fun CompiledProject.assertTasksUpToDate(tasks: Iterable<String>) { fun CompiledProject.assertTasksUpToDate(tasks: Iterable<String>) {
for (task in tasks) { for (task in tasks) {
assertContains("$task UP-TO-DATE") assertContains("$task UP-TO-DATE")
} }
} }
fun CompiledProject.assertTasksUpToDate(vararg tasks: String) {
assertTasksUpToDate(tasks.toList())
}
fun CompiledProject.getOutputForTask(taskName: String): String { fun CompiledProject.getOutputForTask(taskName: String): String {
val taskOutputRegex = ("\\[LIFECYCLE] \\[class org\\.gradle(?:\\.internal\\.buildevents)?\\.TaskExecutionLogger] :$taskName" + val taskOutputRegex = ("\\[LIFECYCLE] \\[class org\\.gradle(?:\\.internal\\.buildevents)?\\.TaskExecutionLogger] :$taskName" +
"([\\s\\S]+?)" + "([\\s\\S]+?)" +
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/Kapt3IT.kt
+1 -1
View File
@@ -229,7 +229,7 @@ open class Kapt3IT : Kapt3BaseIT() {
project.build("build", options = options) { project.build("build", options = options) {
assertSuccessful() assertSuccessful()
assertTasksExecuted(listOf(":kaptGenerateStubsKotlin", ":kaptKotlin", ":compileKotlin", ":compileJava")) assertTasksExecuted(":kaptGenerateStubsKotlin", ":kaptKotlin", ":compileKotlin", ":compileJava")
// generated sources // generated sources
assertFileExists("$generatedSrc/foo/bar/UseBar_MembersInjector.java") assertFileExists("$generatedSrc/foo/bar/UseBar_MembersInjector.java")
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/KotlinGradlePluginMultiVersionIT.kt
+10 -7
View File
@@ -41,9 +41,12 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() {
zip.close() zip.close()
} }
assertTasksExecuted(listOf( assertTasksExecuted(
":processor:kaptGenerateStubsKotlin", ":processor:kaptKotlin", ":processor:kaptGenerateStubsKotlin",
":app:kaptGenerateStubsKotlin", ":app:kaptKotlin")) ":processor:kaptKotlin",
":app:kaptGenerateStubsKotlin",
":app:kaptKotlin"
)
} }
project.projectDir.getFileByName("Test.kt").modify { text -> project.projectDir.getFileByName("Test.kt").modify { text ->
@@ -53,8 +56,8 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() {
project.build("build") { project.build("build") {
assertSuccessful() assertSuccessful()
assertTasksUpToDate(listOf(":processor:kaptGenerateStubsKotlin", ":processor:kaptKotlin", ":app:kaptKotlin")) assertTasksUpToDate(":processor:kaptGenerateStubsKotlin", ":processor:kaptKotlin", ":app:kaptKotlin")
assertTasksExecuted(listOf(":app:kaptGenerateStubsKotlin")) assertTasksExecuted(":app:kaptGenerateStubsKotlin")
} }
project.projectDir.getFileByName("Test.kt").modify { text -> project.projectDir.getFileByName("Test.kt").modify { text ->
@@ -63,8 +66,8 @@ class KotlinGradlePluginMultiVersionIT : BaseMultiGradleVersionIT() {
project.build("build") { project.build("build") {
assertSuccessful() assertSuccessful()
assertTasksUpToDate(listOf(":processor:kaptGenerateStubsKotlin", ":processor:kaptKotlin")) assertTasksUpToDate(":processor:kaptGenerateStubsKotlin", ":processor:kaptKotlin")
assertTasksExecuted(listOf(":app:kaptGenerateStubsKotlin", ":app:kaptKotlin")) assertTasksExecuted(":app:kaptGenerateStubsKotlin", ":app:kaptKotlin")
} }
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/MultiplatformGradleIT.kt
+5 -5
View File
@@ -144,16 +144,16 @@ class MultiplatformGradleIT : BaseGradleIT() {
jvmProjectDir.getFileByName("PlatformClass.kt").modify { it + "\n" } jvmProjectDir.getFileByName("PlatformClass.kt").modify { it + "\n" }
build("build") { build("build") {
assertSuccessful() assertSuccessful()
assertTasksExecuted(listOf(compileJvmTask)) assertTasksExecuted(compileJvmTask)
assertTasksUpToDate(listOf(compileCommonTask, compileJsTask)) assertTasksUpToDate(compileCommonTask, compileJsTask)
} }
val jsProjectDir = File(projectDir, "libJs") val jsProjectDir = File(projectDir, "libJs")
jsProjectDir.getFileByName("PlatformClass.kt").modify { it + "\n" } jsProjectDir.getFileByName("PlatformClass.kt").modify { it + "\n" }
build("build") { build("build") {
assertSuccessful() assertSuccessful()
assertTasksExecuted(listOf(compileJsTask)) assertTasksExecuted(compileJsTask)
assertTasksUpToDate(listOf(compileCommonTask, compileJvmTask)) assertTasksUpToDate(compileCommonTask, compileJvmTask)
} }
} }
@@ -198,7 +198,7 @@ class MultiplatformGradleIT : BaseGradleIT() {
build("build") { build("build") {
assertSuccessful() assertSuccessful()
assertTasksExecuted(listOf(":lib:compileKotlinCommon", ":libJvm:compileKotlin", ":libJs:compileKotlin2Js")) assertTasksExecuted(":lib:compileKotlinCommon", ":libJvm:compileKotlin", ":libJs:compileKotlin2Js")
} }
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/PluginsDslIT.kt
+2 -2
View File
@@ -15,7 +15,7 @@ class PluginsDslIT : BaseGradleIT() {
val project = projectWithMavenLocalPlugins("allopenPluginsDsl") val project = projectWithMavenLocalPlugins("allopenPluginsDsl")
project.build("build") { project.build("build") {
assertSuccessful() assertSuccessful()
assertTasksExecuted(listOf(":compileKotlin")) assertTasksExecuted(":compileKotlin")
} }
} }
@@ -24,7 +24,7 @@ class PluginsDslIT : BaseGradleIT() {
val project = projectWithMavenLocalPlugins("applyToSubprojects") val project = projectWithMavenLocalPlugins("applyToSubprojects")
project.build("build") { project.build("build") {
assertSuccessful() assertSuccessful()
assertTasksExecuted(listOf(":subproject:compileKotlin")) assertTasksExecuted(":subproject:compileKotlin")
} }
} }
libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/UpToDatenessIT.kt
+4 -4
View File
@@ -95,7 +95,7 @@ class UpToDateIT : BaseGradleIT() {
} }
override fun checkAfterRebuild(compiledProject: CompiledProject) = with(compiledProject) { 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) { 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) { override fun checkAfterRebuild(compiledProject: CompiledProject) = with(compiledProject) {
assertTasksExecuted(listOf(":compileKotlin")) assertTasksExecuted(":compileKotlin")
Assert.assertTrue(helloWorldKtClass.exists()) Assert.assertTrue(helloWorldKtClass.exists())
} }
} }
@@ -181,7 +181,7 @@ class UpToDateIT : BaseGradleIT() {
} }
override fun checkAfterRebuild(compiledProject: CompiledProject) = with(compiledProject) { override fun checkAfterRebuild(compiledProject: CompiledProject) = with(compiledProject) {
assertTasksExecuted(listOf(":compileKotlin")) assertTasksExecuted(":compileKotlin")
} }
} }
} }