Migrated smoke test to diktat cli

### What's done: - moved smoke tests from `diktat-ruleset` to `diktat-cli` It closes #1781
saveourtool · Nov 7, 2023 · 71a8c4b · 71a8c4b
1 parent c1c3cab
commit 71a8c4b
Show file tree

Hide file tree

Showing 46 changed files with 7 additions and 20 deletions.
diff --git a/diktat-cli/build.gradle.kts b/diktat-cli/build.gradle.kts
@@ -22,6 +22,7 @@ dependencies {
     implementation(libs.log4j2.core)
     implementation(libs.log4j2.slf4j2)
 
+    testImplementation(projects.diktatTestFramework)
     testImplementation(libs.junit.jupiter)
     testImplementation(libs.junit.platform.suite)
     testImplementation(libs.assertj.core)

diff --git a/...ktat/ruleset/smoke/DiktatSaveSmokeTest.kt → ...rtool/diktat/smoke/DiktatSaveSmokeTest.kt b/...ktat/ruleset/smoke/DiktatSaveSmokeTest.kt → ...rtool/diktat/smoke/DiktatSaveSmokeTest.kt
@@ -1,9 +1,8 @@
-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
@@ -13,7 +12,6 @@ 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

diff --git a/...l/diktat/ruleset/smoke/DiktatSmokeTest.kt → ...veourtool/diktat/smoke/DiktatSmokeTest.kt b/...l/diktat/ruleset/smoke/DiktatSmokeTest.kt → ...veourtool/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

diff --git a/...ktat/ruleset/smoke/DiktatSmokeTestBase.kt → ...rtool/diktat/smoke/DiktatSmokeTestBase.kt b/...ktat/ruleset/smoke/DiktatSmokeTestBase.kt → ...rtool/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
@@ -336,7 +336,7 @@ abstract class DiktatSmokeTestBase {
             )
         )  // so that trailing newline isn't checked, because it's incorrectly read in tests and we are comparing file with itself
         // file name is `gradle_` so that IDE doesn't suggest to import gradle project
-        val tmpFilePath = "../../../build.gradle.kts"
+        val tmpFilePath = "build.gradle.kts"
         fixAndCompare(configFilePath, tmpFilePath, tmpFilePath)
         assertUnfixedLintErrors { unfixedLintErrors ->
             assertThat(unfixedLintErrors).isEmpty()
@@ -397,7 +397,7 @@ abstract class DiktatSmokeTestBase {
 
     companion object {
         private const val DEFAULT_CONFIG_PATH = "../diktat-analysis.yml"
-        private const val ROOT_RESOURCE_FILE_PATH = "test/smoke"
+        private const val ROOT_RESOURCE_FILE_PATH = "smoke"
         private const val TEST_TIMEOUT_SECONDS = 30L
 
         @JvmStatic

diff --git a/...tat/ruleset/smoke/DiktatSmokeTestUtils.kt → ...tool/diktat/smoke/DiktatSmokeTestUtils.kt b/...tat/ruleset/smoke/DiktatSmokeTestUtils.kt → ...tool/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

diff --git a/...c/test/resources/test/smoke/.editorconfig → ...c/test/resources/test/smoke/.editorconfig b/...c/test/resources/test/smoke/.editorconfig → ...c/test/resources/test/smoke/.editorconfig
diff --git a/.../src/test/resources/test/smoke/.gitignore → .../src/test/resources/test/smoke/.gitignore b/.../src/test/resources/test/smoke/.gitignore → .../src/test/resources/test/smoke/.gitignore
diff --git a/...st/resources/test/smoke/build.gradle.kts_ → ...st/resources/test/smoke/build.gradle.kts_ b/...st/resources/test/smoke/build.gradle.kts_ → ...st/resources/test/smoke/build.gradle.kts_
diff --git a/...t/src/test/resources/test/smoke/save.toml → ...i/src/test/resources/test/smoke/save.toml b/...t/src/test/resources/test/smoke/save.toml → ...i/src/test/resources/test/smoke/save.toml
diff --git a/...eourtool/diktat/scripts/ScriptExpected.kt → ...eourtool/diktat/scripts/ScriptExpected.kt b/...eourtool/diktat/scripts/ScriptExpected.kt → ...eourtool/diktat/scripts/ScriptExpected.kt
diff --git a/.../saveourtool/diktat/scripts/ScriptTest.kt → .../saveourtool/diktat/scripts/ScriptTest.kt b/.../saveourtool/diktat/scripts/ScriptTest.kt → .../saveourtool/diktat/scripts/ScriptTest.kt
diff --git a/...est/smoke/src/main/kotlin/Bug1Expected.kt → ...est/smoke/src/main/kotlin/Bug1Expected.kt b/...est/smoke/src/main/kotlin/Bug1Expected.kt → ...est/smoke/src/main/kotlin/Bug1Expected.kt
diff --git a/...es/test/smoke/src/main/kotlin/Bug1Test.kt → ...es/test/smoke/src/main/kotlin/Bug1Test.kt b/...es/test/smoke/src/main/kotlin/Bug1Test.kt → ...es/test/smoke/src/main/kotlin/Bug1Test.kt
diff --git a/...src/main/kotlin/DefaultPackageExpected.kt → ...src/main/kotlin/DefaultPackageExpected.kt b/...src/main/kotlin/DefaultPackageExpected.kt → ...src/main/kotlin/DefaultPackageExpected.kt
diff --git a/...oke/src/main/kotlin/DefaultPackageTest.kt → ...oke/src/main/kotlin/DefaultPackageTest.kt b/...oke/src/main/kotlin/DefaultPackageTest.kt → ...oke/src/main/kotlin/DefaultPackageTest.kt
diff --git a/...oke/src/main/kotlin/Example1-2Expected.kt → ...oke/src/main/kotlin/Example1-2Expected.kt b/...oke/src/main/kotlin/Example1-2Expected.kt → ...oke/src/main/kotlin/Example1-2Expected.kt
diff --git a/...smoke/src/main/kotlin/Example1Expected.kt → ...smoke/src/main/kotlin/Example1Expected.kt b/...smoke/src/main/kotlin/Example1Expected.kt → ...smoke/src/main/kotlin/Example1Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example1Test.kt → ...est/smoke/src/main/kotlin/Example1Test.kt b/...est/smoke/src/main/kotlin/Example1Test.kt → ...est/smoke/src/main/kotlin/Example1Test.kt
diff --git a/...smoke/src/main/kotlin/Example2Expected.kt → ...smoke/src/main/kotlin/Example2Expected.kt b/...smoke/src/main/kotlin/Example2Expected.kt → ...smoke/src/main/kotlin/Example2Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example2Test.kt → ...est/smoke/src/main/kotlin/Example2Test.kt b/...est/smoke/src/main/kotlin/Example2Test.kt → ...est/smoke/src/main/kotlin/Example2Test.kt
diff --git a/...smoke/src/main/kotlin/Example3Expected.kt → ...smoke/src/main/kotlin/Example3Expected.kt b/...smoke/src/main/kotlin/Example3Expected.kt → ...smoke/src/main/kotlin/Example3Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example3Test.kt → ...est/smoke/src/main/kotlin/Example3Test.kt b/...est/smoke/src/main/kotlin/Example3Test.kt → ...est/smoke/src/main/kotlin/Example3Test.kt
diff --git a/...smoke/src/main/kotlin/Example4Expected.kt → ...smoke/src/main/kotlin/Example4Expected.kt b/...smoke/src/main/kotlin/Example4Expected.kt → ...smoke/src/main/kotlin/Example4Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example4Test.kt → ...est/smoke/src/main/kotlin/Example4Test.kt b/...est/smoke/src/main/kotlin/Example4Test.kt → ...est/smoke/src/main/kotlin/Example4Test.kt
diff --git a/...smoke/src/main/kotlin/Example5Expected.kt → ...smoke/src/main/kotlin/Example5Expected.kt b/...smoke/src/main/kotlin/Example5Expected.kt → ...smoke/src/main/kotlin/Example5Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example5Test.kt → ...est/smoke/src/main/kotlin/Example5Test.kt b/...est/smoke/src/main/kotlin/Example5Test.kt → ...est/smoke/src/main/kotlin/Example5Test.kt
diff --git a/...smoke/src/main/kotlin/Example6Expected.kt → ...smoke/src/main/kotlin/Example6Expected.kt b/...smoke/src/main/kotlin/Example6Expected.kt → ...smoke/src/main/kotlin/Example6Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example6Test.kt → ...est/smoke/src/main/kotlin/Example6Test.kt b/...est/smoke/src/main/kotlin/Example6Test.kt → ...est/smoke/src/main/kotlin/Example6Test.kt
diff --git a/...smoke/src/main/kotlin/Example7Expected.kt → ...smoke/src/main/kotlin/Example7Expected.kt b/...smoke/src/main/kotlin/Example7Expected.kt → ...smoke/src/main/kotlin/Example7Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example7Test.kt → ...est/smoke/src/main/kotlin/Example7Test.kt b/...est/smoke/src/main/kotlin/Example7Test.kt → ...est/smoke/src/main/kotlin/Example7Test.kt
diff --git a/...smoke/src/main/kotlin/Example8Expected.kt → ...smoke/src/main/kotlin/Example8Expected.kt b/...smoke/src/main/kotlin/Example8Expected.kt → ...smoke/src/main/kotlin/Example8Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example8Test.kt → ...est/smoke/src/main/kotlin/Example8Test.kt b/...est/smoke/src/main/kotlin/Example8Test.kt → ...est/smoke/src/main/kotlin/Example8Test.kt
diff --git a/...in/KdocFormattingMultilineTagsExpected.kt → ...in/KdocFormattingMultilineTagsExpected.kt b/...in/KdocFormattingMultilineTagsExpected.kt → ...in/KdocFormattingMultilineTagsExpected.kt
diff --git a/...kotlin/KdocFormattingMultilineTagsTest.kt → ...kotlin/KdocFormattingMultilineTagsTest.kt b/...kotlin/KdocFormattingMultilineTagsTest.kt → ...kotlin/KdocFormattingMultilineTagsTest.kt
diff --git a/...kotlin/LocalVariableWithOffsetExpected.kt → ...kotlin/LocalVariableWithOffsetExpected.kt b/...kotlin/LocalVariableWithOffsetExpected.kt → ...kotlin/LocalVariableWithOffsetExpected.kt
diff --git a/...ain/kotlin/LocalVariableWithOffsetTest.kt → ...ain/kotlin/LocalVariableWithOffsetTest.kt b/...ain/kotlin/LocalVariableWithOffsetTest.kt → ...ain/kotlin/LocalVariableWithOffsetTest.kt
diff --git a/...in/ManyLineTransformInLongLineExpected.kt → ...in/ManyLineTransformInLongLineExpected.kt b/...in/ManyLineTransformInLongLineExpected.kt → ...in/ManyLineTransformInLongLineExpected.kt
diff --git a/...kotlin/ManyLineTransformInLongLineTest.kt → ...kotlin/ManyLineTransformInLongLineTest.kt b/...kotlin/ManyLineTransformInLongLineTest.kt → ...kotlin/ManyLineTransformInLongLineTest.kt
diff --git a/...kotlin/kotlin-library-expected.gradle.kts → ...kotlin/kotlin-library-expected.gradle.kts b/...kotlin/kotlin-library-expected.gradle.kts → ...kotlin/kotlin-library-expected.gradle.kts
diff --git a/...src/main/kotlin/kotlin-library.gradle.kts → ...src/main/kotlin/kotlin-library.gradle.kts b/...src/main/kotlin/kotlin-library.gradle.kts → ...src/main/kotlin/kotlin-library.gradle.kts
diff --git a/...rces/test/smoke/src/main/kotlin/save.toml → ...rces/test/smoke/src/main/kotlin/save.toml b/...rces/test/smoke/src/main/kotlin/save.toml → ...rces/test/smoke/src/main/kotlin/save.toml
diff --git a/...kotlin/script/PackageInScriptExpected.kts → ...kotlin/script/PackageInScriptExpected.kts b/...kotlin/script/PackageInScriptExpected.kts → ...kotlin/script/PackageInScriptExpected.kts
diff --git a/...ain/kotlin/script/PackageInScriptTest.kts → ...ain/kotlin/script/PackageInScriptTest.kts b/...ain/kotlin/script/PackageInScriptTest.kts → ...ain/kotlin/script/PackageInScriptTest.kts
diff --git a/...tlin/script/SimpleRunInScriptExpected.kts → ...tlin/script/SimpleRunInScriptExpected.kts b/...tlin/script/SimpleRunInScriptExpected.kts → ...tlin/script/SimpleRunInScriptExpected.kts
diff --git a/...n/kotlin/script/SimpleRunInScriptTest.kts → ...n/kotlin/script/SimpleRunInScriptTest.kts b/...n/kotlin/script/SimpleRunInScriptTest.kts → ...n/kotlin/script/SimpleRunInScriptTest.kts
diff --git a/diktat-ruleset/build.gradle.kts b/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") {