From 640e54a16369662aa926eef712fe13289a812607 Mon Sep 17 00:00:00 2001 From: Matej Trakal Date: Mon, 8 Jul 2024 23:55:52 +0200 Subject: [PATCH] fix tests --- build.gradle.kts | 2 +- plugin/src/main/kotlin/com/jraska/module/graph/Parse.kt | 6 +++++- .../module/graph/assertion/ConfigurationAvoidanceTest.kt | 2 +- .../jraska/module/graph/assertion/FullProjectGradleTest.kt | 2 +- .../graph/assertion/FullProjectMultipleAppliedGradleTest.kt | 4 ++-- .../module/graph/assertion/FullProjectRootGradleTest.kt | 6 +++--- .../jraska/module/graph/assertion/OnAnyBuildAssertTest.kt | 2 +- 7 files changed, 14 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 09b21e2..40e7d41 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -75,7 +75,7 @@ subprojects { verbose.set(true) filter { exclude("**/generated/**", "**/build/**") - include("src//kotlin") + include("src/**/kotlin") } } diff --git a/plugin/src/main/kotlin/com/jraska/module/graph/Parse.kt b/plugin/src/main/kotlin/com/jraska/module/graph/Parse.kt index f3ad96d..0917680 100644 --- a/plugin/src/main/kotlin/com/jraska/module/graph/Parse.kt +++ b/plugin/src/main/kotlin/com/jraska/module/graph/Parse.kt @@ -6,7 +6,11 @@ object Parse { fun matcher(dependencyText: String): RegexpDependencyMatcher = matcher(dependencyText, DEPENDENCY_SIGN_DIVIDER) - fun restrictiveMatcher(matcherText: String): RegexpDependencyMatcher = matcher(matcherText, NO_DEPENDENCY_SIGN_DIVIDER) + fun restrictiveMatcher(matcherText: String): RegexpDependencyMatcher = + matcher( + matcherText, + NO_DEPENDENCY_SIGN_DIVIDER, + ) private fun matcher( matcherText: String, diff --git a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/ConfigurationAvoidanceTest.kt b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/ConfigurationAvoidanceTest.kt index fa16651..b3fb807 100644 --- a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/ConfigurationAvoidanceTest.kt +++ b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/ConfigurationAvoidanceTest.kt @@ -17,7 +17,7 @@ class ConfigurationAvoidanceTest { testProjectDir.newFile("build.gradle").writeText( """ plugins { - id 'com.jraska.module.graph.assertion' + id 'cz.mtrakal.module.graph.assertion' } moduleGraphAssert { diff --git a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectGradleTest.kt b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectGradleTest.kt index 926f55d..3854797 100644 --- a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectGradleTest.kt +++ b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectGradleTest.kt @@ -54,7 +54,7 @@ class FullProjectGradleTest { "app", content = """ plugins { - id 'com.jraska.module.graph.assertion' + id 'cz.mtrakal.module.graph.assertion' } apply plugin: 'java-library' diff --git a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectMultipleAppliedGradleTest.kt b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectMultipleAppliedGradleTest.kt index cd21171..101e132 100644 --- a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectMultipleAppliedGradleTest.kt +++ b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectMultipleAppliedGradleTest.kt @@ -40,7 +40,7 @@ class FullProjectMultipleAppliedGradleTest { "app", content = """ plugins { - id 'com.jraska.module.graph.assertion' + id 'cz.mtrakal.module.graph.assertion' } apply plugin: 'java-library' @@ -59,7 +59,7 @@ class FullProjectMultipleAppliedGradleTest { "no-dependencies", content = """ plugins { - id 'com.jraska.module.graph.assertion' + id 'cz.mtrakal.module.graph.assertion' } apply plugin: 'java-library' diff --git a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectRootGradleTest.kt b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectRootGradleTest.kt index 923867b..821026f 100644 --- a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectRootGradleTest.kt +++ b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/FullProjectRootGradleTest.kt @@ -19,7 +19,7 @@ class FullProjectRootGradleTest { content = """ plugins { - id 'com.jraska.module.graph.assertion' + id 'cz.mtrakal.module.graph.assertion' } apply plugin: 'java-library' @@ -62,7 +62,7 @@ class FullProjectRootGradleTest { content = """ plugins { - id 'com.jraska.module.graph.assertion' + id 'cz.mtrakal.module.graph.assertion' } apply plugin: 'java-library' @@ -76,7 +76,7 @@ class FullProjectRootGradleTest { "app", content = """ plugins { - id 'com.jraska.module.graph.assertion' + id 'cz.mtrakal.module.graph.assertion' } apply plugin: 'java-library' moduleGraphAssert { diff --git a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/OnAnyBuildAssertTest.kt b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/OnAnyBuildAssertTest.kt index ce1472a..b6b4068 100644 --- a/plugin/src/test/kotlin/com/jraska/module/graph/assertion/OnAnyBuildAssertTest.kt +++ b/plugin/src/test/kotlin/com/jraska/module/graph/assertion/OnAnyBuildAssertTest.kt @@ -57,7 +57,7 @@ class OnAnyBuildAssertTest { "app", content = """ plugins { - id 'com.jraska.module.graph.assertion' + id 'cz.mtrakal.module.graph.assertion' } apply plugin: 'java-library'