From ca76c00b6c61cbf2cd57dc0bf7fe9a53a815f711 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 8 Mar 2022 16:44:29 +0100 Subject: [PATCH] Also provide BuildResult in assert block ^KT-45745 In Progress --- .../kotlin/gradle/util/testResolveAllConfigurations.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt index 1297dcbdc04..1a769272916 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/util/testResolveAllConfigurations.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.gradle.util +import org.gradle.testkit.runner.BuildResult import org.jetbrains.kotlin.gradle.BaseGradleIT import org.jetbrains.kotlin.gradle.testbase.* import java.nio.file.Files @@ -47,7 +48,9 @@ fun TestProject.testResolveAllConfigurations( skipSetup: Boolean = false, excludeConfigurations: List = listOf(), options: BuildOptions = buildOptions, - withUnresolvedConfigurationNames: TestProject.(List) -> Unit = { assertTrue("Unresolved configurations: $it") { it.isEmpty() } } + withUnresolvedConfigurationNames: TestProject.(List, BuildResult) -> Unit = { conf, _ -> + assertTrue("Unresolved configurations: $conf") { conf.isEmpty() } + } ) { if (!skipSetup) { when { @@ -62,7 +65,7 @@ fun TestProject.testResolveAllConfigurations( build(RESOLVE_ALL_CONFIGURATIONS_TASK_NAME, buildOptions = options) { assertTasksExecuted(":${subproject?.let { "$it:" }.orEmpty()}$RESOLVE_ALL_CONFIGURATIONS_TASK_NAME") val unresolvedConfigurations = unresolvedConfigurationRegex.findAll(output).map { it.groupValues[1] }.toList() - withUnresolvedConfigurationNames(unresolvedConfigurations) + withUnresolvedConfigurationNames(unresolvedConfigurations, this) } }