From 51b011706bcb87cc075c21a3ae29a3f69ae41b28 Mon Sep 17 00:00:00 2001 From: Alexander Likhachev Date: Tue, 3 Jan 2023 19:20:20 +0100 Subject: [PATCH] [Gradle] Check if configuration cache was stored in JS CoCa tests --- .../org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt | 8 ++++++-- .../kotlin/gradle/testbase/configurationCacheHelpers.kt | 6 +++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt index ce42ad446cf..fa1a191e795 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/JsConfigurationCacheIT.kt @@ -61,7 +61,9 @@ abstract class AbstractJsConfigurationCacheIT(protected val irBackend: Boolean) @GradleTest fun testBrowserDistributionOnIdeaPropertyChange(gradleVersion: GradleVersion) { project("kotlin-js-browser-project", gradleVersion) { - build(":app:build") + build(":app:build") { + assertConfigurationCacheStored() + } // check IdeaPropertiesEvaluator for the logic build(":app:build", "-Didea.version=2020.1") { assertConfigurationCacheReused() @@ -99,7 +101,9 @@ abstract class AbstractJsConfigurationCacheIT(protected val irBackend: Boolean) @GradleTest fun testNodeJsOnIdeaPropertyChange(gradleVersion: GradleVersion) { project("kotlin-js-nodejs-project", gradleVersion) { - build(":build") + build(":build") { + assertConfigurationCacheStored() + } // check IdeaPropertiesEvaluator for the logic build(":build", "-Didea.version=2020.1") { assertConfigurationCacheReused() diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/configurationCacheHelpers.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/configurationCacheHelpers.kt index 5b3bb6bbae2..4c4c709cf38 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/configurationCacheHelpers.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/configurationCacheHelpers.kt @@ -33,7 +33,7 @@ fun TestProject.assertSimpleConfigurationCacheScenarioWorks( "Calculating task graph as no configuration cache is available for tasks: ${buildArguments.joinToString(separator = " ")}" ) - assertOutputContains("Configuration cache entry stored.") + assertConfigurationCacheStored() } build("clean", buildOptions = buildOptions) @@ -51,6 +51,10 @@ fun TestProject.assertSimpleConfigurationCacheScenarioWorks( } } +fun BuildResult.assertConfigurationCacheStored() { + assertOutputContains("Configuration cache entry stored.") +} + fun BuildResult.assertConfigurationCacheReused() { assertOutputContains("Reusing configuration cache.") }