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

Jump to bottom

Add exclusions support to cli #1581

Draft
wants to merge 11 commits into
base: master
Choose a base branch
from
Draft

Add exclusions support to cli #1581

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
900dca3
Add exclusions support to cli
Stark-X Feb 20, 2024
11400b6
Simplify codes in method
Stark-X Feb 21, 2024
a1811ac
Move FileFilter from org.jacoco.core to org.jacoco.report
Stark-X Feb 21, 2024
16e8e6a
Reformat
Stark-X Feb 21, 2024
4946d6d
Implement StringUtils.join to replace org.codehaus.plexus.util.String…
Stark-X Feb 22, 2024
11975a3
Implement FileUtils to replace org.codehaus.plexus.util.FileUtils
Stark-X Feb 23, 2024
b2e0da4
Fix Jdk5 syntax issue
Stark-X Feb 23, 2024
909f2bc
Should include baseDir by default for FileFilter
Stark-X Feb 23, 2024
dd9d15d
Drop unnecessary plexus-utils in org.jacoco.report
Stark-X Feb 24, 2024
ab81e08
Correct relativize usage
Stark-X Feb 24, 2024
85b457e
Compare relative path when filtering files
Stark-X Feb 24, 2024
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
1 change: 1 addition & 0 deletions jacoco-maven-plugin/src/org/jacoco/maven/InstrumentMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.codehaus.plexus.util.IOUtil;
import org.jacoco.core.instr.Instrumenter;
import org.jacoco.core.runtime.OfflineInstrumentationAccessGenerator;
import org.jacoco.report.FileFilter;

/**
* Performs offline instrumentation. Note that after execution of test you must
Expand Down
1 change: 1 addition & 0 deletions jacoco-maven-plugin/src/org/jacoco/maven/ReportAggregateMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.project.MavenProject;
import org.jacoco.report.FileFilter;
import org.jacoco.report.IReportGroupVisitor;

/**
Expand Down
1 change: 1 addition & 0 deletions jacoco-maven-plugin/src/org/jacoco/maven/ReportSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import org.jacoco.core.analysis.IBundleCoverage;
import org.jacoco.core.analysis.IClassCoverage;
import org.jacoco.core.tools.ExecFileLoader;
import org.jacoco.report.FileFilter;
import org.jacoco.report.IReportGroupVisitor;
import org.jacoco.report.IReportVisitor;
import org.jacoco.report.ISourceFileLocator;
Expand Down
13 changes: 12 additions & 1 deletion org.jacoco.cli/src/org/jacoco/cli/internal/commands/Report.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.jacoco.core.data.ExecutionDataStore;
import org.jacoco.core.tools.ExecFileLoader;
import org.jacoco.report.DirectorySourceFileLocator;
import org.jacoco.report.FileFilter;
import org.jacoco.report.FileMultiReportOutput;
import org.jacoco.report.IReportVisitor;
import org.jacoco.report.ISourceFileLocator;
Expand All @@ -48,6 +49,9 @@ public class Report extends Command {
@Argument(usage = "list of JaCoCo *.exec files to read", metaVar = "<execfiles>")
List<File> execfiles = new ArrayList<File>();

@Option(name = "--exclusions", usage = "pattern to excludes, e.g. **/*DTO.class", metaVar = "<pattern>")
List<String> exclusions = new ArrayList<String>();

@Option(name = "--classfiles", usage = "location of Java class files", metaVar = "<path>", required = true)
List<File> classfiles = new ArrayList<File>();

Expand Down Expand Up @@ -106,8 +110,15 @@ private IBundleCoverage analyze(final ExecutionDataStore data,
final PrintWriter out) throws IOException {
final CoverageBuilder builder = new CoverageBuilder();
final Analyzer analyzer = new Analyzer(data, builder);
final FileFilter fileFilter = new FileFilter(null, exclusions);
for (final File f : classfiles) {
analyzer.analyzeAll(f);
if (!f.isDirectory()) {
analyzer.analyzeAll(f);
continue;
}
for (final File filtered : fileFilter.getFiles(f)) {
analyzer.analyzeAll(filtered);
}
}
printNoMatchWarning(builder.getNoMatchClasses(), out);
return builder.getBundle(name);
Expand Down
5 changes: 5 additions & 0 deletions org.jacoco.report/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@
<groupId>${project.groupId}</groupId>
<artifactId>org.jacoco.core</artifactId>
</dependency>
<dependency>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Really, we don't want to have that dependency outside the Maven plugin. Why should any user of our library get an dependeny on the Maven framework?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the exiting filtering in core we use our own class WildcardMatcher, maybe this works here.

<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
<version>3.0.24</version>
</dependency>
</dependencies>

<build>
Expand Down
9 changes: 4 additions & 5 deletions ...ugin/src/org/jacoco/maven/FileFilter.java → ...ort/src/org/jacoco/report/FileFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Kyle Lieber - implementation of CheckMojo
*
*******************************************************************************/
package org.jacoco.maven;
package org.jacoco.report;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -92,10 +92,9 @@ public String getExcludes() {

private String buildPattern(final List<String> patterns,
final String defaultPattern) {
String pattern = defaultPattern;
if (patterns != null && !patterns.isEmpty()) {
pattern = StringUtils.join(patterns.iterator(), ",");
if (patterns == null || patterns.isEmpty()) {
return defaultPattern;
}
return pattern;
return StringUtils.join(patterns.iterator(), ",");
}
}