From a7e3f7b3a63464f8f090efe7188f21736e82e07b Mon Sep 17 00:00:00 2001 From: "Alexander.Likhachev" Date: Tue, 31 Oct 2023 00:05:55 +0100 Subject: [PATCH] [Gradle] Apply IDEA suggestions to `BuildReportsIT.kt` --- .../jetbrains/kotlin/gradle/BuildReportsIT.kt | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildReportsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildReportsIT.kt index b7ccef273f7..e3ec6c9c498 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildReportsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/BuildReportsIT.kt @@ -96,17 +96,25 @@ class BuildReportsIT : KGPBaseTest() { ) @GradleTest fun testBuildMetricsForJsProject(gradleVersion: GradleVersion) { - testBuildReportInFile("kotlin-js-plugin-project", "compileKotlinJs", gradleVersion, - languageVersion = KotlinVersion.KOTLIN_1_7.version) + testBuildReportInFile( + "kotlin-js-plugin-project", + "compileKotlinJs", + gradleVersion, + languageVersion = KotlinVersion.KOTLIN_1_7.version + ) } - private fun testBuildReportInFile(project: String, task: String, gradleVersion: GradleVersion, - languageVersion: String = KotlinVersion.KOTLIN_2_0.version) { + private fun testBuildReportInFile( + project: String, + task: String, + gradleVersion: GradleVersion, + languageVersion: String = KotlinVersion.KOTLIN_2_0.version, + ) { project(project, gradleVersion) { build(task) { assertBuildReportPathIsPrinted() } - //Should contains build metrics for all compile kotlin tasks + //Should contain build metrics for all compile kotlin tasks validateBuildReportFile(KotlinVersion.DEFAULT.version) } @@ -114,7 +122,7 @@ class BuildReportsIT : KGPBaseTest() { build(task, buildOptions = buildOptions.copy(languageVersion = languageVersion)) { assertBuildReportPathIsPrinted() } - //Should contains build metrics for all compile kotlin tasks + //Should contain build metrics for all compile kotlin tasks validateBuildReportFile(languageVersion) } } @@ -330,7 +338,7 @@ class BuildReportsIT : KGPBaseTest() { files.single().bufferedReader().use { reader -> val kotlinVersion = reader.readLine() assertTrue("kotlin version should be in the error file") { - kotlinVersion != null && kotlinVersion.trim().equals("kotlin version: ${buildOptions.kotlinVersion}") + kotlinVersion != null && kotlinVersion.trim() == "kotlin version: ${buildOptions.kotlinVersion}" } val errorMessage = reader.readLine() assertTrue("Error message should start with 'error message: ' to parse it on IDEA side") {