Migrate diktat smoke tests to SAVE-cli mechanism

### What's done: * migrated diktat smoke tests to SAVE-cli mechanism Closes #1383
saveourtool · Jul 11, 2022 · 3785fe8 · 3785fe8
1 parent fa10731
commit 3785fe8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/diktat-rules/src/test/kotlin/org/cqfn/diktat/util/FixTestBase.kt b/diktat-rules/src/test/kotlin/org/cqfn/diktat/util/FixTestBase.kt
@@ -76,11 +76,12 @@ open class FixTestBase(
     }
 
     private fun getProcessBuilder(expectedPath: String, testPath: String): ProcessBuilder {
-        val saveDir = "src/test/resources/test/smoke"
+        val saveDir = "src/test/resources/test/smoke/${getSaveForCurrentOs()}"
+        val filesDir = "src/test/resources/test/smoke/${getSaveForCurrentOs()}"
         val systemName = System.getProperty("os.name")
         return when {
             systemName.startsWith("Linux", ignoreCase = true) || systemName.startsWith("Mac", ignoreCase = true) ->
-                ProcessBuilder("chmod", "-R", "777", saveDir, "&", saveDir, "src/test/resources/test/smoke/src/main/kotlin", expectedPath, testPath)
+                ProcessBuilder("chmod", "-R", "777", filesDir, "&", saveDir, "src/test/resources/test/smoke/src/main/kotlin", expectedPath, testPath)
             else -> ProcessBuilder(saveDir, "src/test/resources/test/smoke/src/main/kotlin", expectedPath, testPath)
         }
     }
@@ -119,7 +120,7 @@ open class FixTestBase(
                 ?.single { it.name.contains("diktat") }
                 ?.pathString ?: ""
 
-        val file = File("tmpSave.txt")
+        val file = File("src/test/resources/test/smoke/tmpSave.txt")
         val diktat = File("src/test/resources/test/smoke/diktat.jar")
         val configFile = File("src/test/resources/test/smoke/diktat-analysis.yml")
         val diktatFrom = File(diktatDir)

diff --git a/diktat-rules/src/test/resources/test/smoke/save.toml b/diktat-rules/src/test/resources/test/smoke/save.toml
@@ -1,5 +1,5 @@
 [general]
-execCmd="chmod 777 ktlint & chmod 777 diktat.jar & java -jar ktlint -R diktat.jar"
+execCmd="java -jar ktlint -R diktat.jar"
 tags = ["smokeTest"]
 description = "SmokeTest"
 suiteName = "SmokeTest"

diff --git a/diktat-rules/src/test/resources/test/smoke/src/main/kotlin/save.toml b/diktat-rules/src/test/resources/test/smoke/src/main/kotlin/save.toml
@@ -1,5 +1,5 @@
 [general]
-execCmd="chmod 777 ktlint & chmod 777 diktat.jar & java -jar ktlint -R diktat.jar"
+execCmd="java -jar ktlint -R diktat.jar"
 tags = ["smokeTest"]
 description = "SmokeTest"
 suiteName = "SmokeTest"