Add support for tests with parentheses at the end of the name #272
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
jean-andre-gauthier
force-pushed
the
jgauthier/269/parentheses
branch
from
46e1eb8 to
df89987
Compare
jean-andre-gauthier
changed the title
jean-andre-gauthier
force-pushed
the
jgauthier/269/parentheses
branch
from
4647bb7 to
267db85
Compare
jean-andre-gauthier
requested review from
skuzzle,
leonard84,
snoopcheri and
pshevche
snoopcheri
reviewed
Apr 8, 2024
| @@ -118,7 +118,7 @@ private boolean processSpockTest(TestFilterBuilder filters, TestsReader testsRea | |||
|
|
|||
| private void addPotentiallyParameterizedSuffixed(TestFilterBuilder filters, String className, String name) { | |||
| // It's a common pattern to add all the parameters on the end of a literal method name with [] | |||
| String strippedParameterName = name.replaceAll("(?:\\([^)]*?\\)|\\[[^]]*?])*$", ""); | |||
| String strippedParameterName = name.replaceAll("(?:\\([^)]*?\\))?(?:\\[[^]]*?](?:\\([^)]*?\\))?)?$", ""); | |||
There was a problem hiding this comment.
+1, can we add a comment explaining what should match and what not? Or maybe a unit test?
There was a problem hiding this comment.
I've realised I made the regex more complicated than necessary. I've updated it to match only (...), or (...)[...], added a comment, and an additional test case in ParenthesesFuncTest
pshevche
approved these changes
Apr 8, 2024
| @@ -118,7 +118,7 @@ private boolean processSpockTest(TestFilterBuilder filters, TestsReader testsRea | |||
|
|
|||
| private void addPotentiallyParameterizedSuffixed(TestFilterBuilder filters, String className, String name) { | |||
| // It's a common pattern to add all the parameters on the end of a literal method name with [] | |||
| String strippedParameterName = name.replaceAll("(?:\\([^)]*?\\)|\\[[^]]*?])*$", ""); | |||
| String strippedParameterName = name.replaceAll("(?:\\([^)]*?\\))?(?:\\[[^]]*?](?:\\([^)]*?\\))?)?$", ""); | |||
There was a problem hiding this comment.
+1, can we add a comment explaining what should match and what not? Or maybe a unit test?
leonard84
reviewed
Apr 9, 2024
...in/java/org/gradle/testretry/internal/executer/framework/BaseJunitTestFrameworkStrategy.java
Outdated
Show resolved
Hide resolved
plugin/src/test/groovy/org/gradle/testretry/ParenthesesFuncTest.groovy
Outdated
Show resolved
Hide resolved
Signed-off-by: Jean Gauthier <[email protected]>
Signed-off-by: Jean Gauthier <[email protected]>
Signed-off-by: Jean Gauthier <[email protected]>
Signed-off-by: Jean Gauthier <[email protected]>
Signed-off-by: Jean Gauthier <[email protected]>
Signed-off-by: Jean Gauthier <[email protected]>
Signed-off-by: Jean Gauthier <[email protected]>
jean-andre-gauthier
force-pushed
the
jgauthier/269/parentheses
branch
from
4b280bd to
9c1ba4b
Compare
This was referenced Apr 10, 2024
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.
BaseJunitTestFrameworkStrategy.addPotentiallyParameterizedSuffixed(), to only remove(...), or(...)[...], without matching an arbitrary number of parentheses / brackets, as was the case up until nowAbstractPluginFuncTest.testLanguage()and modifies the signature ofAbstractPluginFuncTest.writeTestSource, to allow creating kotlin sample test classesParenthesesFuncTest, that tests retry does not work with JUnitParamsRunner #101, Retry won't work with Kotlin parametrised tests enclosed in backticks #123, and "The following test methods could not be retried, which is unexpected" for the test method with parentheses in its name #263