Migrated smoke test to diktat cli

diktat-cli/build.gradle.kts

@@ -19,9 +19,11 @@ dependencies {
     implementation(projects.diktatRules)
     implementation(libs.kotlinx.cli)
     implementation(libs.kotlin.logging)
+    implementation(libs.slf4j.api)
     implementation(libs.log4j2.core)
     implementation(libs.log4j2.slf4j2)
 
+    testImplementation(projects.diktatTestFramework)
     testImplementation(libs.junit.jupiter)
     testImplementation(libs.junit.platform.suite)
     testImplementation(libs.assertj.core)

diktat-ruleset/src/test/kotlin/com/saveourtool/diktat/ruleset/smoke/DiktatSaveSmokeTest.kt → diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSaveSmokeTest.kt

@@ -1,19 +1,16 @@
-package com.saveourtool.diktat.ruleset.smoke
+package com.saveourtool.diktat.smoke
 
 import com.saveourtool.diktat.api.DiktatError
 import com.saveourtool.diktat.test.framework.processing.TestComparatorUnit
 import com.saveourtool.diktat.test.framework.util.checkForkedJavaHome
-import com.saveourtool.diktat.test.framework.util.deleteIfExistsRecursively
 import com.saveourtool.diktat.test.framework.util.deleteIfExistsSilently
 import com.saveourtool.diktat.test.framework.util.inheritJavaHome
 import com.saveourtool.diktat.test.framework.util.isWindows
 import com.saveourtool.diktat.test.framework.util.temporaryDirectory
-import generated.KTLINT_VERSION
 
 import io.github.oshai.kotlinlogging.KotlinLogging
 import org.assertj.core.api.Assertions.fail
 import org.assertj.core.api.SoftAssertions.assertSoftly
-import org.junit.jupiter.api.AfterAll
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.condition.DisabledOnOs
 import org.junit.jupiter.api.condition.OS
@@ -73,15 +70,6 @@ class DiktatSaveSmokeTest : DiktatSmokeTestBase() {
                  */
                 inheritJavaHome()
 
-                /*
-                 * On Windows, ktlint is often unable to relativize paths
-                 * (see https://github.com/pinterest/ktlint/issues/1608).
-                 *
-                 * Also, ktlint needs `.editorconfig` to disable standard rules
-                 *
-                 * So let's force the temporary directory to be the
-                 * sub-directory of the project root.
-                 */
                 temporaryDirectory(baseDirectoryPath / TEMP_DIRECTORY)
             }
 
@@ -152,9 +140,9 @@ class DiktatSaveSmokeTest : DiktatSmokeTestBase() {
                 }
 
                 /*
-                 * The fat JAR should reside in the same directory as `ktlint` and
-                 * `save*` and be named `diktat.jar`
-                 * (see `diktat-rules/src/test/resources/test/smoke/save.toml`).
+                 * The fat JAR should reside in the same directory as `save*` and
+                 * be named `diktat.jar`
+                 * (see `diktat-cli/src/test/resources/test/smoke/save.toml`).
                  */
                 val buildDirectory = Path(BUILD_DIRECTORY)
                 softly.assertThat(buildDirectory)
@@ -170,10 +158,8 @@ class DiktatSaveSmokeTest : DiktatSmokeTestBase() {
 
                 val diktat = baseDirectoryPath / DIKTAT_FAT_JAR
                 val save = baseDirectoryPath / getSaveForCurrentOs()
-                val ktlint = baseDirectoryPath / KTLINT_FAT_JAR
 
                 downloadFile(URL("https://github.com/saveourtool/save-cli/releases/download/v$SAVE_VERSION/${getSaveForCurrentOs()}"), save)
-                downloadFile(URL("https://github.com/pinterest/ktlint/releases/download/$KTLINT_VERSION/ktlint"), ktlint)
 
                 diktatFrom?.copyTo(diktat, overwrite = true)
             }

diktat-ruleset/src/test/kotlin/com/saveourtool/diktat/ruleset/smoke/DiktatSmokeTest.kt → diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTest.kt

@@ -1,4 +1,4 @@
-package com.saveourtool.diktat.ruleset.smoke
+package com.saveourtool.diktat.smoke
 
 import com.saveourtool.diktat.api.DiktatError
 import com.saveourtool.diktat.ktlint.format

diktat-ruleset/src/test/kotlin/com/saveourtool/diktat/ruleset/smoke/DiktatSmokeTestBase.kt → diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestBase.kt

@@ -4,7 +4,7 @@
     "BACKTICKS_PROHIBITED",
 )
 
-package com.saveourtool.diktat.ruleset.smoke
+package com.saveourtool.diktat.smoke
 
 import com.saveourtool.diktat.api.DiktatError
 import com.saveourtool.diktat.common.config.rules.DIKTAT_COMMON
@@ -414,7 +414,6 @@ abstract class DiktatSmokeTestBase {
                         "Example1Test.kt" -> dest.copyTo(dest.parent.resolve("Example1-2Test.kt"))
                     }
                 }
-
             }
         }
     }

diktat-ruleset/src/test/kotlin/com/saveourtool/diktat/ruleset/smoke/DiktatSmokeTestUtils.kt → diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestUtils.kt

@@ -1,6 +1,6 @@
 @file:Suppress("HEADER_MISSING_IN_NON_SINGLE_CLASS_FILE")
 
-package com.saveourtool.diktat.ruleset.smoke
+package com.saveourtool.diktat.smoke
 
 import com.saveourtool.diktat.test.framework.util.retry
 import io.github.oshai.kotlinlogging.KotlinLogging
@@ -13,8 +13,7 @@ import kotlin.system.measureNanoTime
 
 internal const val BUILD_DIRECTORY = "build/libs"
 internal const val DIKTAT_FAT_JAR = "diktat.jar"
-internal const val DIKTAT_FAT_JAR_GLOB = "diktat-*.jar"
-internal const val KTLINT_FAT_JAR = "ktlint"
+internal const val DIKTAT_FAT_JAR_GLOB = "diktat-cli-*.jar"
 
 private val logger = KotlinLogging.logger {}
 

diktat-ruleset/src/test/resources/test/smoke/save.toml → diktat-cli/src/test/resources/test/smoke/save.toml

@@ -1,5 +1,5 @@
 [general]
-execCmd="java -showversion -jar ktlint --log-level=debug -R diktat.jar"
+execCmd="java -showversion -jar diktat.jar --log-level debug"
 tags = ["smokeTest"]
 description = "SmokeTest"
 suiteName = "SmokeTest"
@@ -9,7 +9,7 @@ timeOutMillis = 3600000
 
 ["fix and warn"]
     ["fix and warn".fix]
-        execFlags="-F"
+        execFlags="--mode fix"
     ["fix and warn".warn]
         lineCaptureGroup = 1
         columnCaptureGroup = 2

diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/save.toml → diktat-cli/src/test/resources/test/smoke/src/main/kotlin/save.toml

@@ -1,5 +1,5 @@
 [general]
-execCmd="java -showversion -jar ktlint --log-level=debug -R diktat.jar"
+execCmd="java -showversion -jar diktat.jar --log-level debug"
 tags = ["smokeTest"]
 description = "SmokeTest"
 suiteName = "SmokeTest"
@@ -8,7 +8,7 @@ expectedWarningsPattern = "// ;warn:?(.*):(\\d*): (.+)"
 
 ["fix and warn"]
     ["fix and warn".fix]
-        execFlags="-F"
+        execFlags="--mode fix"
     ["fix and warn".warn]
         actualWarningsPattern = "(\\w+\\..+):(\\d+):(\\d+): (\\[.*\\].*)$"
         exactWarningsMatch = false

diktat-ruleset/build.gradle.kts

@@ -31,18 +31,6 @@ dependencies {
     implementation(libs.ktlint.cli.ruleset.core)
     implementation(libs.ktlint.logger)
     implementation(libs.slf4j.api)
-    testImplementation(projects.diktatTestFramework)
-    testImplementation(projects.diktatKtlintEngine)
-    testImplementation(libs.log4j2.slf4j2)
-    testImplementation(libs.kotlin.stdlib.common)
-    testImplementation(libs.kotlin.stdlib.jdk7)
-    testImplementation(libs.kotlin.stdlib.jdk8)
-    testImplementation(libs.kotlin.stdlib)
-    testImplementation(libs.kotlin.compiler.embeddable)
-    testImplementation(libs.junit.jupiter)
-    testImplementation(libs.junit.platform.suite)
-    testImplementation(libs.assertj.core)
-    testImplementation(libs.mockito)
 }
 
 tasks.named<ShadowJar>("shadowJar") {