Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[SUREFIRE-1964] Support for method filtering on excludesFile and includesFile #400

Closed
wants to merge 9 commits into from
Closed

[SUREFIRE-1964] Support for method filtering on excludesFile and includesFile #400

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
29efe8b
Support for method filtering on excludesFile
imonteroperez Dec 3, 2021
00f1ba8
Merge remote-tracking branch 'upstream/master' into method-filtering-…
imonteroperez Dec 3, 2021
abfd73f
Merge remote-tracking branch 'upstream/master' into method-filtering-…
imonteroperez Dec 20, 2021
85d0c72
Fix detected bug on setting up the includes
imonteroperez Dec 20, 2021
4e33bf1
Fix on filtering test classes
imonteroperez Dec 21, 2021
1adf848
Fix on dealing with specified tests
imonteroperez Dec 21, 2021
2717853
Remove extra field
imonteroperez Dec 22, 2021
37cf5fc
Refactor based on some feedback
imonteroperez Jan 11, 2022
bc8768b
Refactor solve method and provide description
imonteroperez Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix on filtering test classes
  • Loading branch information
@imonteroperez
imonteroperez committed Dec 21, 2021
commit 4e33bf1b6eeb2770c507b8e28fd4bb889f75bfc2
17 changes: 16 additions & 1 deletion ...-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2244,11 +2244,26 @@ private void maybeAppendList( List<String> base, List<String> list )
actualExcludes = Collections.singletonList( getDefaultExcludes() );
}
}
return new IncludeExcludeList( filterNulls( actualExcludes ),
return new IncludeExcludeList(
filterNulls( filterClasses (
actualExcludes ) ),
filterNulls ( getExcludedMethods(
getMethodFilterInIncludesExcludes( actualExcludes ) ) ) );
}

private List<String> filterClasses( List<String> excludes )
{
List<String> filter = new LinkedList<>();
for ( String exclude : excludes )
{
if ( exclude != null && !exclude.contains ( "#" ) )
{
filter.add( exclude );
}
}
return filter;
}

private List<String> getExcludedMethods( List<String> methodFilterInIncludesExcludes )
{
List<String> excludedMethods = new LinkedList<>();
Expand Down