diff --git a/diktat-cli/build.gradle.kts b/diktat-cli/build.gradle.kts index 268a030487..bd5ef27792 100644 --- a/diktat-cli/build.gradle.kts +++ b/diktat-cli/build.gradle.kts @@ -19,6 +19,7 @@ dependencies { implementation(projects.diktatRules) implementation(libs.kotlinx.cli) implementation(libs.kotlin.logging) + implementation(libs.slf4j.api) implementation(libs.log4j2.core) implementation(libs.log4j2.slf4j2) diff --git a/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSaveSmokeTest.kt b/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSaveSmokeTest.kt index 53fbb10182..1a7a607647 100644 --- a/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSaveSmokeTest.kt +++ b/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSaveSmokeTest.kt @@ -7,7 +7,6 @@ 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 diff --git a/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestBase.kt b/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestBase.kt index 51ed0b38cd..bccf4687a2 100644 --- a/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestBase.kt +++ b/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestBase.kt @@ -414,7 +414,6 @@ abstract class DiktatSmokeTestBase { "Example1Test.kt" -> dest.copyTo(dest.parent.resolve("Example1-2Test.kt")) } } - } } } diff --git a/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestUtils.kt b/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestUtils.kt index ac8b5c2ec7..650ef9fc23 100644 --- a/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestUtils.kt +++ b/diktat-cli/src/test/kotlin/com/saveourtool/diktat/smoke/DiktatSmokeTestUtils.kt @@ -13,7 +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 DIKTAT_FAT_JAR_GLOB = "diktat-cli-*.jar" private val logger = KotlinLogging.logger {} diff --git a/diktat-cli/src/test/resources/test/smoke/save.toml b/diktat-cli/src/test/resources/test/smoke/save.toml index 1903d8c850..939988a3af 100644 --- a/diktat-cli/src/test/resources/test/smoke/save.toml +++ b/diktat-cli/src/test/resources/test/smoke/save.toml @@ -1,5 +1,5 @@ [general] -execCmd="java -showversion -jar diktat.jar --log-level=debug" +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="--mode=fix" + execFlags="--mode fix" ["fix and warn".warn] lineCaptureGroup = 1 columnCaptureGroup = 2 diff --git a/diktat-cli/src/test/resources/test/smoke/src/main/kotlin/save.toml b/diktat-cli/src/test/resources/test/smoke/src/main/kotlin/save.toml index 282722cfe1..73bc4f526b 100644 --- a/diktat-cli/src/test/resources/test/smoke/src/main/kotlin/save.toml +++ b/diktat-cli/src/test/resources/test/smoke/src/main/kotlin/save.toml @@ -1,5 +1,5 @@ [general] -execCmd="java -showversion -jar diktat.jar --log-level=debug" +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="--mode=fix" + execFlags="--mode fix" ["fix and warn".warn] actualWarningsPattern = "(\\w+\\..+):(\\d+):(\\d+): (\\[.*\\].*)$" exactWarningsMatch = false