FixPlugin: Compare test files in course of building the TestResults by full paths

examples/kotlin-diktat/fix/sarif/save.toml

@@ -3,6 +3,8 @@
     description = "SARIF fix objects: Smoke tests for diktat"
     suiteName = "SARIF fix objects - Autofix"
 
-[fix]
-    actualFixFormat = "SARIF"
-    actualFixSarifFileName = "save-fixes.sarif"
+# FixMe: Until https://github.com/saveourtool/sarif-utils/issues/23
+# FixMe: compare only by names, but should by full paths
+#[fix]
+    #actualFixFormat = "SARIF"
+    #actualFixSarifFileName = "save-fixes.sarif"

examples/kotlin-diktat/fix/smoke/save.toml

@@ -2,5 +2,6 @@
     tags = ["smoke"]
     description = "Smoke tests for diktat"
     suiteName = "Autofix: Smoke Tests"
+    batchSize = 2
 
 [fix]

examples/kotlin-diktat/fix/smoke/src/main/kotlin/com/saveourtool/save/chapter2/Example1Expected.kt

@@ -0,0 +1,6 @@
+package com.saveourtool.save.chapter2
+
+class Example {
+    @get:JvmName("getIsValid")
+    val isValid = true
+}

examples/kotlin-diktat/fix/smoke/src/main/kotlin/com/saveourtool/save/chapter2/Example1Test.kt

@@ -0,0 +1,6 @@
+package test.smoke
+
+class example {
+    @get : JvmName("getIsValid")
+    val isValid = true
+}

examples/kotlin-diktat/fix/smoke/src/main/kotlin/com/saveourtool/save/chapter2/save.toml

@@ -0,0 +1,6 @@
+[general]
+tags = ["smoke"]
+description = "Test for tests with same name"
+suiteName = "Autofix: Smoke Tests"
+
+[fix]

save-cli/src/jvmTest/kotlin/com/saveourtool/save/cli/GeneralTest.kt

@@ -70,7 +70,7 @@ class GeneralTest {
     fun `examples test from subfolder`() {
         // Almost all result statuses should be Pass, except the few cases
         doTest("../examples/kotlin-diktat/", "fix/smoke") { reports ->
-            assertEquals(5, reports.size)
+            assertEquals(6, reports.size)
         }
     }
 

save-core/src/commonNonJsTest/kotlin/com/saveourtool/save/core/integration/ClassicFixTest.kt

@@ -19,7 +19,7 @@ class ClassicFixTest {
         runTestsWithDiktat(
             listOf(
                 "fix/save.toml"
-            ), 6
+            ), 7
         )
     }
 
@@ -28,7 +28,7 @@ class ClassicFixTest {
         runTestsWithDiktat(
             listOf(
                 "fix/smoke/save.toml"
-            ), 5
+            ), 6
         )
     }
 
@@ -37,7 +37,7 @@ class ClassicFixTest {
         runTestsWithDiktat(
             listOf(
                 "fix/smoke/src/main/kotlin/com/saveourtool/save/"
-            ), 5
+            ), 6
         )
     }
 
@@ -76,4 +76,16 @@ class ClassicFixTest {
             ), 1
         )
     }
+
+    @Test
+    fun `tests with the same name`() {
+        runTestsWithDiktat(
+            listOf(
+                "fix/smoke/src/main/kotlin/com/saveourtool/save/Example1Test.kt",
+                "fix/smoke/src/main/kotlin/com/saveourtool/save/Example1Expected.kt",
+                "fix/smoke/src/main/kotlin/com/saveourtool/save/chapter2/Example1Test.kt",
+                "fix/smoke/src/main/kotlin/com/saveourtool/save/chapter2/Example1Expected.kt",
+            ), 2
+        )
+    }
 }

save-core/src/commonNonJsTest/kotlin/com/saveourtool/save/core/integration/FixDirTest.kt

@@ -6,7 +6,7 @@ import kotlin.test.Test
 class FixDirTest {
     @Test
     fun `execute fix plugin`() {
-        runTestsWithDiktat(listOf("fix/smoke/src/main/kotlin/com/saveourtool/save"), 5)
+        runTestsWithDiktat(listOf("fix/smoke/src/main/kotlin/com/saveourtool/save"), 6)
     }
 
     @Test

save-plugins/fix-plugin/src/commonMain/kotlin/com/saveourtool/save/plugins/fix/FixPlugin.kt

@@ -230,10 +230,9 @@ class FixPlugin(
     ): List<TestResult> = testCopyToExpectedFilesMap.map { (testCopy, expected) ->
         val fixedLines = fs.readLines(testCopy)
         val expectedLines = fs.readLines(expected)
-
-        // FixMe: https://github.com/saveourtool/save-cli/issues/473
-        val test = testToExpectedFilesMap.first { (test, _) -> test.name == testCopy.name }.first
-
+        val test = testToExpectedFilesMap.first { (test, _) ->
+            isComparingTestAndCopy(test, testCopy)
+        }.first
         TestResult(
             FixTestFiles(test, expected),
             checkStatus(expectedLines, fixedLines),
@@ -247,6 +246,19 @@ class FixPlugin(
         )
     }
 
+    private fun isComparingTestAndCopy(test: Path, testCopy: Path): Boolean {
+        // TestCopyPath stored in tmpDir, holding the whole hierarchy of original file
+        // while testPath comes to us with path, starting from testRootPath, so we compare them in such way
+        val testCopyPath = testCopy.relativeTo(FileSystem.SYSTEM_TEMPORARY_DIRECTORY)
+            .toString()
+            .substringAfter(Path.DIRECTORY_SEPARATOR)
+            .toPath()
+
+        val testPath = test.createRelativePathToTheRoot(testConfig.getRootConfig().directory).toPath()
+
+        return testCopyPath.compareTo(testPath) == 0
+    }
+
     private fun failTestResult(
         chunk: List<FixTestFiles>,
         ex: ProcessExecutionException,