Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ordered report tasks before verification #216

Merged
merged 2 commits into from
Aug 23, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package kotlinx.kover.test.functional.cases

import kotlinx.kover.test.functional.cases.utils.*
import kotlinx.kover.test.functional.core.*
import kotlinx.kover.test.functional.core.BaseGradleScriptTest
import kotlin.test.*

internal class TasksOrderingTests : BaseGradleScriptTest() {
@Test
fun testProjectTasks() {
val build = diverseBuild()
build.addKoverRootProject {
sourcesFrom("simple")
kover {
verify {
rule {
bound {
minValue = 100
}
}
}
}
}
val runner = build.prepare()
runner.runWithError("koverVerify", "koverReport") {
// reports should be generated even if verification failed with an error
checkDefaultReports()
}
}

@Test
fun testMergedTasks() {
val build = diverseBuild()
build.addKoverRootProject {
sourcesFrom("simple")
koverMerged {
enable()
verify {
rule {
bound {
minValue = 100
}
}
}
}
}
val runner = build.prepare()
runner.runWithError("koverMergedVerify", "koverMergedReport") {
// reports should be generated even if verification failed with an error
checkDefaultMergedReports()
}
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,19 @@ internal class RepositoriesState : Repositories {
internal class TestKoverMergedConfigState : TestKoverMergedConfig {
var enabled: Boolean = false
val filters: TestKoverMergedFiltersState = TestKoverMergedFiltersState()
val verify: TestKoverVerifyConfigState = TestKoverVerifyConfigState()

override fun enable() {
enabled = true
}

override fun filters(config: TestKoverMergedFilters.() -> Unit) {
filters.also(config)
}

override fun verify(config: TestKoverVerifyConfig.() -> Unit) {
verify.also(config)
}
}

internal class TestKoverMergedFiltersState : TestKoverMergedFilters {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ internal interface TestKoverMergedConfig {
public fun enable()

public fun filters(config: TestKoverMergedFilters.() -> Unit)

public fun verify(config: TestKoverVerifyConfig.() -> Unit)
}

public interface TestKoverMergedFilters {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ internal fun PrintWriter.printKoverMerged(merged: TestKoverMergedConfigState?, s
indented(indents, "koverMerged {")
printEnabled(merged.enabled, indents + 1)
printFilters(merged.filters, slice, indents + 1)
printVerify(merged.verify, slice, indents + 1)
indented(indents, "}")
}

Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/kotlinx/kover/appliers/KoverMergedApplier.kt
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ private class ProcessMergeExtensionAction(private val extension: KoverMergedConf
// TODO `onlyIf` block moved out from config lambda because of bug in Kotlin compiler - it implicitly adds closure on `Project` inside onlyIf's lambda
verifyTask.onlyIf { extension.verify.hasActiveRules() }

// ordering of task calls, so that if a verification error occurs, reports are generated and the values can be viewed in them
verifyTask.shouldRunAfter(xmlTask, htmlTask)
qwwdfsad marked this conversation as resolved.
Show resolved Hide resolved

container.tasks.create(MERGED_REPORT_TASK_NAME) {
it.group = VERIFICATION_GROUP
Expand Down
2 changes: 2 additions & 0 deletions src/main/kotlin/kotlinx/kover/appliers/KoverProjectApplier.kt
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ internal fun Project.applyToProject() {
// TODO `onlyIf` block moved out from config lambda because of bug in Kotlin compiler - it implicitly adds closure on `Project` inside onlyIf's lambda
verifyTask.onlyIf { extension.verify.hasActiveRules() }

// ordering of task calls, so that if a verification error occurs, reports are generated and the values can be viewed in them
verifyTask.shouldRunAfter(xmlTask, htmlTask)

tasks.create(KoverNames.REPORT_TASK_NAME) {
it.group = KoverNames.VERIFICATION_GROUP
Expand Down