Issue/fix gradle filter #3257
Merged
Issue/fix gradle filter #3257
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
myuwono
commented
Oct 22, 2022
...rc/jvmMain/kotlin/io/kotest/runner/junit/platform/gradle/GradleClassMethodRegexTestFilter.kt
Show resolved
Hide resolved
myuwono
commented
Oct 22, 2022
| @@ -52,6 +59,12 @@ object GradlePostDiscoveryFilterExtractor { | |||
| return field.get(obj) as List<Any> | |||
| } | |||
|
|
|||
| private fun buildScriptIncludePatterns(obj: Any): List<Any> { | |||
| val field = obj::class.java.getDeclaredField("buildScriptIncludePatterns") | |||
There was a problem hiding this comment.
added support for filters defined in build script
There was a problem hiding this comment.
Are there build script exclude patterns as well? Not saying we need to fix it now, but could be flagged up as a potential future contribution
myuwono
commented
Oct 22, 2022
| val isPackageMatched by lazy { doesNotContainUppercase && packagePath.matches(laxRegexPattern) } // io.kotest | ||
| val isPackageWithDotMatched by lazy { doesNotContainUppercase && "$packagePath.".matches(laxRegexPattern) } // io.kotest.* | ||
|
|
||
| return isSimpleClassMatch || |
myuwono
force-pushed
the
issue/fix-gradle-filter
branch
from
277826f
to
9ed501f
Compare
Kantis
approved these changes
Oct 23, 2022
| @@ -52,6 +59,12 @@ object GradlePostDiscoveryFilterExtractor { | |||
| return field.get(obj) as List<Any> | |||
| } | |||
|
|
|||
| private fun buildScriptIncludePatterns(obj: Any): List<Any> { | |||
| val field = obj::class.java.getDeclaredField("buildScriptIncludePatterns") | |||
There was a problem hiding this comment.
Are there build script exclude patterns as well? Not saying we need to fix it now, but could be flagged up as a potential future contribution
Comment on lines
+14
to
+25
| withData( | ||
| nameFn = { filters -> "should be INCLUDED when evaluating $filters" }, | ||
| listOf("\\QGradleClassMethodRegexTestFilterTest\\E"), | ||
| listOf(".*\\QthodRegexTestFilterTest\\E"), | ||
| listOf(".*\\QTest\\E"), | ||
| listOf("\\Qio.kotest.runner.junit.platform.gradle.GradleClassMethodRegexTestFilterTest\\E"), | ||
| listOf(".*\\Q.platform.gradle.GradleClassMethodRegexTestFilterTest\\E"), | ||
| listOf(".*\\Qorm.gradle.GradleClassMethodRegexTestFilterTest\\E") | ||
| ) { filters -> | ||
| GradleClassMethodRegexTestFilter(filters).filter(spec) shouldBe TestFilterResult.Include | ||
| } | ||
| } |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In this PR
GradleClassMethodRegexTestFilterto translate patterns supplied by gradle to the proper test filters (fixes Gradle test regex are incorrectly applied #3250).GradleClassMethodRegexTestFilterTest.kttests to reflect the pattern supplied by latest gradle (gradle 7.5.1).filter { }defined in gradle.build.kts #3247)Patterns that works
tested against gradle 7.5.1, using both filters defined in
build.gradle.ktsand command line:gradle test --tests "SomeTest"gradle test --tests "*Test"gradle test --tests "io.package.*"gradle test --tests "io.package"gradle test --tests "io.package.SomeTest"gradle test --tests "io.package.SomeTest.first level context*"gradle test --tests "io.package.SomeTest.*"gradle test --tests "io.*.SomeTest"gradle test --tests "io.*.SomeTest.*"gradle test --tests "SomeTest.first level context*"gradle test --tests "*.first level context*"Pattern that does NOT work
In this PR I decided to omit the support for nested context / test matching. It's arguably quite involved so I'd reserve it for future contribution. Kotest support lazy test registration within nested context. Gradle test filter does not natively work nicely with kotest. In order to make it work we need to think of a way to recursively apply partial context-search as we dive deeper into the contexts. I.e. These patterns DOES NOT work yet:
gradle test --tests "SomeTest.first level context -- should assert this test description"gradle test --tests "SomeTest.first level context -- nested context -- *"gradle test --tests "SomeTest.first level context -- nested context -- yet another nested context -- *"Mechanism
Gradle supplies a pattern string which corresponds to a well-formed regex object. This can be directly usable for kotest.
A*becomes\QA\E.*A*Testbecomes\QA\E.*\QTest\Eio.*.A*Testbecomes\Qio.\E.*\Q.A\E.*\QTest\Eio.*.A*Test.AccountDetails*becomes\Qio.\E.*\Q.A\E.*\QTest.AccountDetails\E.*io.*.A*Test.some test context*becomes\Qio.\E.*\Q.A\E.*\QTest.some test context\E.*Within the code we get this pattern string and directly translate them into a regex object to be used against the path / classname / packagename as appropriate.