From bf0d4cfb9232177e6bbc8dcd41c5ebf833130f4c Mon Sep 17 00:00:00 2001 From: Benedikt Mehl Date: Fri, 21 Feb 2025 10:30:06 +0100 Subject: [PATCH] chore(analysis): add test libs to global gradle #3938 --- analysis/build.gradle.kts | 3 +++ analysis/export/CSVExporter/build.gradle.kts | 4 ---- analysis/filter/EdgeFilter/build.gradle.kts | 3 --- analysis/filter/MergeFilter/build.gradle.kts | 3 --- analysis/filter/StructureModifier/build.gradle.kts | 2 -- analysis/import/CSVImporter/build.gradle.kts | 2 -- analysis/import/CodeMaatImporter/build.gradle.kts | 2 -- analysis/import/MetricGardenerImporter/build.gradle.kts | 3 +-- analysis/import/SonarImporter/build.gradle.kts | 3 +-- analysis/import/SourceMonitorImporter/build.gradle.kts | 2 -- analysis/import/TokeiImporter/build.gradle.kts | 2 -- analysis/model/build.gradle.kts | 3 +-- analysis/parser/GitLogParser/build.gradle.kts | 2 -- analysis/parser/RawTextParser/build.gradle.kts | 3 +-- analysis/parser/SVNLogParser/build.gradle.kts | 2 -- analysis/parser/SourceCodeParser/build.gradle.kts | 3 +-- analysis/tools/InspectionTool/build.gradle.kts | 3 --- analysis/tools/ValidationTool/build.gradle.kts | 2 -- analysis/tools/ccsh/build.gradle.kts | 3 --- 19 files changed, 8 insertions(+), 42 deletions(-) diff --git a/analysis/build.gradle.kts b/analysis/build.gradle.kts index c06514bc4c..e220da8609 100644 --- a/analysis/build.gradle.kts +++ b/analysis/build.gradle.kts @@ -42,6 +42,9 @@ subprojects { testImplementation(rootProject.libs.junit.jupiter.api) testImplementation(rootProject.libs.junit.jupiter.engine) testImplementation(rootProject.libs.junit.jupiter.params) + testImplementation(rootProject.libs.assertj.core) + testImplementation(rootProject.libs.mockk) + testImplementation(rootProject.libs.junit.platform.runner) } tasks.test { diff --git a/analysis/export/CSVExporter/build.gradle.kts b/analysis/export/CSVExporter/build.gradle.kts index 4123eb55bc..dce153ec0a 100644 --- a/analysis/export/CSVExporter/build.gradle.kts +++ b/analysis/export/CSVExporter/build.gradle.kts @@ -7,10 +7,6 @@ dependencies { implementation(libs.picocli) implementation(libs.univocity.parsers) implementation(libs.kotlin.inquirer) - - testImplementation(libs.mockk) - testImplementation(libs.assertj.core) - testImplementation(libs.junit.platform.runner) } tasks.test { diff --git a/analysis/filter/EdgeFilter/build.gradle.kts b/analysis/filter/EdgeFilter/build.gradle.kts index d14439cd47..3e38f0ed20 100644 --- a/analysis/filter/EdgeFilter/build.gradle.kts +++ b/analysis/filter/EdgeFilter/build.gradle.kts @@ -8,9 +8,6 @@ dependencies { implementation(libs.kotlin.inquirer) testImplementation(libs.kotlin.test) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) - testImplementation(libs.junit.platform.runner) testRuntimeOnly(libs.kotlin.reflect) } diff --git a/analysis/filter/MergeFilter/build.gradle.kts b/analysis/filter/MergeFilter/build.gradle.kts index 7d3d791fc3..1552aaa09a 100644 --- a/analysis/filter/MergeFilter/build.gradle.kts +++ b/analysis/filter/MergeFilter/build.gradle.kts @@ -4,10 +4,7 @@ dependencies { implementation(libs.picocli) implementation(libs.kotlin.inquirer) - testImplementation(libs.kotlin.test) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) testRuntimeOnly(libs.kotlin.reflect) } diff --git a/analysis/filter/StructureModifier/build.gradle.kts b/analysis/filter/StructureModifier/build.gradle.kts index e2fee883a8..9c44c6fa8d 100644 --- a/analysis/filter/StructureModifier/build.gradle.kts +++ b/analysis/filter/StructureModifier/build.gradle.kts @@ -8,8 +8,6 @@ dependencies { testImplementation(libs.kotlin.test) testImplementation(libs.junit.jupiter.api) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) } tasks.test { diff --git a/analysis/import/CSVImporter/build.gradle.kts b/analysis/import/CSVImporter/build.gradle.kts index c57f19e7c5..60a3401470 100644 --- a/analysis/import/CSVImporter/build.gradle.kts +++ b/analysis/import/CSVImporter/build.gradle.kts @@ -8,11 +8,9 @@ dependencies { implementation(libs.slf4j.simple) implementation(libs.kotlin.inquirer) - testImplementation(libs.assertj.core) testImplementation(libs.junit.jupiter.api) testImplementation(libs.kotlin.test) testImplementation(libs.jsonassert) - testImplementation(libs.mockk) testRuntimeOnly(libs.kotlin.reflect) } diff --git a/analysis/import/CodeMaatImporter/build.gradle.kts b/analysis/import/CodeMaatImporter/build.gradle.kts index dbec69b8c0..6e9b290c17 100644 --- a/analysis/import/CodeMaatImporter/build.gradle.kts +++ b/analysis/import/CodeMaatImporter/build.gradle.kts @@ -8,8 +8,6 @@ dependencies { testImplementation(libs.junit.jupiter.api) testImplementation(libs.kotlin.test) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) testRuntimeOnly(libs.kotlin.reflect) } diff --git a/analysis/import/MetricGardenerImporter/build.gradle.kts b/analysis/import/MetricGardenerImporter/build.gradle.kts index 1bd4e77b8c..8840b40097 100644 --- a/analysis/import/MetricGardenerImporter/build.gradle.kts +++ b/analysis/import/MetricGardenerImporter/build.gradle.kts @@ -15,8 +15,7 @@ dependencies { implementation(libs.slf4j.simple) testImplementation(libs.junit.jupiter.api) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) + testImplementation(libs.wiremock) } diff --git a/analysis/import/SonarImporter/build.gradle.kts b/analysis/import/SonarImporter/build.gradle.kts index 9e8f87739d..53afad619e 100644 --- a/analysis/import/SonarImporter/build.gradle.kts +++ b/analysis/import/SonarImporter/build.gradle.kts @@ -13,9 +13,8 @@ dependencies { implementation(libs.javax.activation) testImplementation(libs.junit.jupiter.api) - testImplementation(libs.mockk) + testImplementation(libs.wiremock) - testImplementation(libs.assertj.core) } tasks.test { diff --git a/analysis/import/SourceMonitorImporter/build.gradle.kts b/analysis/import/SourceMonitorImporter/build.gradle.kts index 47e823b41d..dead08e9ea 100644 --- a/analysis/import/SourceMonitorImporter/build.gradle.kts +++ b/analysis/import/SourceMonitorImporter/build.gradle.kts @@ -9,11 +9,9 @@ dependencies { implementation(libs.slf4j.simple) implementation(libs.kotlin.inquirer) - testImplementation(libs.assertj.core) testImplementation(libs.junit.jupiter.api) testImplementation(libs.kotlin.test) testImplementation(libs.jsonassert) - testImplementation(libs.mockk) testRuntimeOnly(libs.kotlin.reflect) } diff --git a/analysis/import/TokeiImporter/build.gradle.kts b/analysis/import/TokeiImporter/build.gradle.kts index e689982fbd..898126e052 100644 --- a/analysis/import/TokeiImporter/build.gradle.kts +++ b/analysis/import/TokeiImporter/build.gradle.kts @@ -11,8 +11,6 @@ dependencies { testImplementation(libs.junit.jupiter.api) testImplementation(libs.kotlin.test) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) testRuntimeOnly(libs.kotlin.reflect) } diff --git a/analysis/model/build.gradle.kts b/analysis/model/build.gradle.kts index 8d73e1b5cc..dfef5e3896 100644 --- a/analysis/model/build.gradle.kts +++ b/analysis/model/build.gradle.kts @@ -10,8 +10,7 @@ dependencies { testImplementation(libs.kotlin.test) testImplementation(libs.junit.jupiter.api) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) + testImplementation(libs.jsonassert) testImplementation(libs.commons.text) testImplementation(project(":tools:PipeableParser")) diff --git a/analysis/parser/GitLogParser/build.gradle.kts b/analysis/parser/GitLogParser/build.gradle.kts index 78f419861b..f4143c0b13 100644 --- a/analysis/parser/GitLogParser/build.gradle.kts +++ b/analysis/parser/GitLogParser/build.gradle.kts @@ -10,10 +10,8 @@ dependencies { implementation(libs.slf4j.simple) implementation(libs.kotlin.inquirer) - testImplementation(libs.assertj.core) testImplementation(libs.kotlin.test) testImplementation(libs.junit.jupiter.api) - testImplementation(libs.mockk) testRuntimeOnly(libs.kotlin.reflect) } diff --git a/analysis/parser/RawTextParser/build.gradle.kts b/analysis/parser/RawTextParser/build.gradle.kts index 2ea89c936e..94c41979df 100644 --- a/analysis/parser/RawTextParser/build.gradle.kts +++ b/analysis/parser/RawTextParser/build.gradle.kts @@ -10,8 +10,7 @@ dependencies { implementation(libs.kotlin.inquirer) testImplementation(libs.junit.jupiter.api) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) + testImplementation(libs.jsonassert) } diff --git a/analysis/parser/SVNLogParser/build.gradle.kts b/analysis/parser/SVNLogParser/build.gradle.kts index 1d8736f124..75493e6445 100644 --- a/analysis/parser/SVNLogParser/build.gradle.kts +++ b/analysis/parser/SVNLogParser/build.gradle.kts @@ -10,8 +10,6 @@ dependencies { implementation(libs.kotlin.inquirer) testImplementation(libs.junit.jupiter.api) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) } tasks.test { diff --git a/analysis/parser/SourceCodeParser/build.gradle.kts b/analysis/parser/SourceCodeParser/build.gradle.kts index 577e6a0a0a..5ac68c5ed0 100644 --- a/analysis/parser/SourceCodeParser/build.gradle.kts +++ b/analysis/parser/SourceCodeParser/build.gradle.kts @@ -14,10 +14,9 @@ dependencies { implementation(libs.kotlin.inquirer) testImplementation(libs.junit.jupiter.api) - testImplementation(libs.assertj.core) + testImplementation(libs.mockito.kotlin) testImplementation(libs.mockito.core) - testImplementation(libs.mockk) } tasks.test { diff --git a/analysis/tools/InspectionTool/build.gradle.kts b/analysis/tools/InspectionTool/build.gradle.kts index b87096bd05..4be873d6f1 100644 --- a/analysis/tools/InspectionTool/build.gradle.kts +++ b/analysis/tools/InspectionTool/build.gradle.kts @@ -4,9 +4,6 @@ dependencies { implementation(libs.picocli) implementation(libs.kotlin.inquirer) - - testImplementation(libs.mockk) - testImplementation(libs.assertj.core) } tasks.test { diff --git a/analysis/tools/ValidationTool/build.gradle.kts b/analysis/tools/ValidationTool/build.gradle.kts index 125cb0e02f..dbeff31ac0 100644 --- a/analysis/tools/ValidationTool/build.gradle.kts +++ b/analysis/tools/ValidationTool/build.gradle.kts @@ -8,8 +8,6 @@ dependencies { testImplementation(libs.kotlin.test) testImplementation(libs.junit.jupiter.api) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) testRuntimeOnly(libs.kotlin.reflect) } diff --git a/analysis/tools/ccsh/build.gradle.kts b/analysis/tools/ccsh/build.gradle.kts index f088ef5c42..f2f830cfd2 100644 --- a/analysis/tools/ccsh/build.gradle.kts +++ b/analysis/tools/ccsh/build.gradle.kts @@ -29,9 +29,6 @@ dependencies { implementation(libs.kotlin.inquirer) testImplementation(libs.junit.jupiter.api) - testImplementation(libs.assertj.core) - testImplementation(libs.mockk) - testImplementation(libs.junit.platform.runner) } tasks.jar {