Add vararg overloads for Gradle test utils
This commit is contained in:
+8
@@ -387,12 +387,20 @@ abstract class BaseGradleIT {
|
||||
}
|
||||
}
|
||||
|
||||
fun CompiledProject.assertTasksExecuted(vararg tasks: String) {
|
||||
assertTasksExecuted(tasks.toList())
|
||||
}
|
||||
|
||||
fun CompiledProject.assertTasksUpToDate(tasks: Iterable<String>) {
|
||||
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]+?)" +
|
||||
|
||||
+1
-1
@@ -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")
|
||||
|
||||
+10
-7
@@ -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")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+5
-5
@@ -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")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -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")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+4
-4
@@ -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")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user