From eeb95f2feb9612c4624e3f22c4e6e8fa57773c42 Mon Sep 17 00:00:00 2001 From: Dmitry Savvinov Date: Wed, 3 May 2023 09:54:37 +0100 Subject: [PATCH] [Gradle] Minor: compare against expected testData in tmpDir This might become an issue if (when) the editable diff window will be supported, but for now it doesn't make much difference against which file we compare the actual output. --- .../kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt | 2 +- .../test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt index 9582cc10175..53d19f0cdc8 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/mpp/MppDiagnosticsIt.kt @@ -18,7 +18,7 @@ class MppDiagnosticsIt : KGPBaseTest() { @GradleTest fun testDiagnosticsRenderingSmoke(gradleVersion: GradleVersion) { project("diagnosticsRenderingSmoke", gradleVersion) { - val expectedOutputFile = projectName.testProjectPath.resolve("expectedOutput.txt").toFile() + val expectedOutputFile = projectPath.resolve("expectedOutput.txt").toFile() build { assertEqualsToFile(expectedOutputFile, extractProjectsAndTheirVerboseDiagnostics()) } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt index af9d4056526..9e42e2abcef 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/testbase/testDsl.kt @@ -471,7 +471,7 @@ private fun setupProjectFromTestResources( } } -internal val String.testProjectPath: Path get() = Paths.get("src", "test", "resources", "testProject", this) +private val String.testProjectPath: Path get() = Paths.get("src", "test", "resources", "testProject", this) internal fun Path.addDefaultBuildFiles() { addPluginManagementToSettings()