Remove diktat-test-framework

### What's done: - removed `diktat-test-framework` - added `diktat-test-common` with common util methods for tests - removed usage of diff multiplatform tool It closes #1768
saveourtool · Nov 8, 2023 · d36f8dd · d36f8dd
1 parent dc0f747
commit d36f8dd
Show file tree

Hide file tree

Showing 31 changed files with 8 additions and 471 deletions.
diff --git a/.github/workflows/dependencies.yml b/.github/workflows/dependencies.yml
@@ -39,12 +39,12 @@ jobs:
  gradle-build-module: |-
  :diktat-api
  :diktat-common
+ :diktat-common-test
  :diktat-ktlint-engine
  :diktat-gradle-plugin
  :diktat-maven-plugin
  :diktat-rules
  :diktat-ruleset
- :diktat-test-framework
  :diktat-dev-ksp
  :diktat-cli
  gradle-build-configuration: |-

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -12,7 +12,7 @@ Rules are very simple:
 
 Main components are:
 1) diktat-rules — number of rules that are supported by diKTat;
-2) diktat-test-framework — functional/unit test framework that can be used for running your code fixer on the initial code and compare it with the expected result;
+2) diktat-common-test — util methods for functional/unit tests that can be used for running your code fixer on the initial code and compare it with the expected result;
 3) also see our demo: diktat-demo in a separate repository.
 
 Mainly we wanted to create a common configurable mechanism that
@@ -31,7 +31,7 @@ Before you make a pull request, make sure the build is clean as we have lot of t
 $ mvn clean install
 ```
 
-# Hooks 
+# Hooks
 
 We have some hooks to a commit messages:
 1) your commit message should have the following format:
@@ -40,7 +40,7 @@ Brief Description
 
 ### What's done:
 1) Long description
-2) Long description 
+2) Long description
 ```
 
 2) Please also do not forget to update documentation on Wiki after the merge approval and before merge.
diff --git a/diktat-cli/build.gradle.kts b/diktat-cli/build.gradle.kts
@@ -23,7 +23,7 @@ dependencies {
  implementation(libs.log4j2.core)
  implementation(libs.log4j2.slf4j2)
 
- testImplementation(projects.diktatTestFramework)
+ testImplementation(projects.diktatCommonTest)
  testImplementation(libs.junit.jupiter)
  testImplementation(libs.junit.platform.suite)
  testImplementation(libs.assertj.core)

diff --git a/diktat-test-framework/build.gradle.kts → diktat-common-test/build.gradle.kts b/diktat-test-framework/build.gradle.kts → diktat-common-test/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
  id("com.saveourtool.diktat.buildutils.publishing-default-configuration")
 }
 
-project.description = "Test framework for diktat"
+project.description = "Diktat coommon for tests"
 
 dependencies {
  api(projects.diktatCommon)

diff --git a/...t/framework/config/TestArgumentsReader.kt → ...t/framework/config/TestArgumentsReader.kt b/...t/framework/config/TestArgumentsReader.kt → ...t/framework/config/TestArgumentsReader.kt
diff --git a/...iktat/test/framework/config/TestConfig.kt → ...iktat/test/framework/config/TestConfig.kt b/...iktat/test/framework/config/TestConfig.kt → ...iktat/test/framework/config/TestConfig.kt
diff --git a/...test/framework/config/TestConfigReader.kt → ...test/framework/config/TestConfigReader.kt b/...test/framework/config/TestConfigReader.kt → ...test/framework/config/TestConfigReader.kt
diff --git a/...amework/config/TestFrameworkProperties.kt → ...amework/config/TestFrameworkProperties.kt b/...amework/config/TestFrameworkProperties.kt → ...amework/config/TestFrameworkProperties.kt
diff --git a/...st/framework/processing/FileComparator.kt → ...st/framework/processing/FileComparator.kt b/...st/framework/processing/FileComparator.kt → ...st/framework/processing/FileComparator.kt
diff --git a/...mework/processing/FileComparisonResult.kt → ...mework/processing/FileComparisonResult.kt b/...mework/processing/FileComparisonResult.kt → ...mework/processing/FileComparisonResult.kt
diff --git a/...st/framework/processing/ResourceReader.kt → ...st/framework/processing/ResourceReader.kt b/...st/framework/processing/ResourceReader.kt → ...st/framework/processing/ResourceReader.kt
diff --git a/...ramework/processing/TestComparatorUnit.kt → ...ramework/processing/TestComparatorUnit.kt b/...ramework/processing/TestComparatorUnit.kt → ...ramework/processing/TestComparatorUnit.kt
diff --git a/...l/diktat/test/framework/util/TestUtils.kt → ...l/diktat/test/framework/util/TestUtils.kt b/...l/diktat/test/framework/util/TestUtils.kt → ...l/diktat/test/framework/util/TestUtils.kt
diff --git a/diktat-rules/build.gradle.kts b/diktat-rules/build.gradle.kts
@@ -17,7 +17,7 @@ dependencies {
  // guava is used for string case utils
  implementation(libs.guava)
  implementation(libs.kotlin.logging)
- testImplementation(projects.diktatTestFramework)
+ testImplementation(projects.diktatCommonTest)
  testImplementation(projects.diktatKtlintEngine)
  testImplementation(libs.log4j2.slf4j2)
  testImplementation(libs.junit.jupiter)

diff --git a/diktat-test-framework/src/main/kotlin/com/saveourtool/diktat/test/framework/TestEntry.kt b/diktat-test-framework/src/main/kotlin/com/saveourtool/diktat/test/framework/TestEntry.kt
diff --git a/...framework/src/main/kotlin/com/saveourtool/diktat/test/framework/common/ExecutionResult.kt b/...framework/src/main/kotlin/com/saveourtool/diktat/test/framework/common/ExecutionResult.kt
diff --git a/...work/src/main/kotlin/com/saveourtool/diktat/test/framework/common/LocalCommandExecutor.kt b/...work/src/main/kotlin/com/saveourtool/diktat/test/framework/common/LocalCommandExecutor.kt
diff --git a/...t-test-framework/src/main/kotlin/com/saveourtool/diktat/test/framework/common/TestBase.kt b/...t-test-framework/src/main/kotlin/com/saveourtool/diktat/test/framework/common/TestBase.kt
diff --git a/...amework/src/main/kotlin/com/saveourtool/diktat/test/framework/processing/TestCheckWarn.kt b/...amework/src/main/kotlin/com/saveourtool/diktat/test/framework/processing/TestCheckWarn.kt
diff --git a/...framework/src/main/kotlin/com/saveourtool/diktat/test/framework/processing/TestCompare.kt b/...framework/src/main/kotlin/com/saveourtool/diktat/test/framework/processing/TestCompare.kt
diff --git a/...t-framework/src/main/kotlin/com/saveourtool/diktat/test/framework/processing/TestMixed.kt b/...t-framework/src/main/kotlin/com/saveourtool/diktat/test/framework/processing/TestMixed.kt