Skip to content

Updated plugin to support JaCoCo version 0.7.0+ #3

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updated plugin to support JaCoCo version 0.7.0+ #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,7 @@
.cache
.settings/
target/

### for IntelliJ ###
.idea/
**/*.iml
2 changes: 1 addition & 1 deletion jacoco-scala-maven-plugin-acceptance-tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>timezra.maven</groupId>
<artifactId>jacoco-scala-maven-plugin-acceptance-tests</artifactId>
<version>0.6.3.2-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<name>JaCoCo Scala Maven Plugin Acceptance Tests</name>
<url>https://github.com/timezra/jacoco-scala-maven-plugin</url>

Expand Down
4 changes: 2 additions & 2 deletions jacoco-scala-maven-plugin/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>timezra.maven</groupId>
<artifactId>jacoco-scala-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
<version>0.6.3.2-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<name>JaCoCo Scala Maven Plugin</name>
<url>https://github.com/timezra/jacoco-scala-maven-plugin</url>

Expand Down Expand Up @@ -118,7 +118,7 @@
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.6.3.201306030806</version>
<version>0.7.0.201403182114</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand Down
10 changes: 6 additions & 4 deletions jacoco-scala-maven-plugin/src/main/java/timezra/maven/jacoco/scala/ReportMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
import org.jacoco.core.analysis.ICoverageNode;
import org.jacoco.core.analysis.ICoverageVisitor;
import org.jacoco.core.analysis.IMethodCoverage;
import org.jacoco.core.data.ExecFileLoader;
import org.jacoco.core.data.ExecutionData;
import org.jacoco.core.data.ExecutionDataStore;
import org.jacoco.core.data.SessionInfoStore;
Expand All @@ -46,6 +45,7 @@
import org.jacoco.core.internal.flow.ClassProbesVisitor;
import org.jacoco.core.internal.flow.MethodProbesVisitor;
import org.jacoco.core.internal.instr.InstrSupport;
import org.jacoco.core.tools.ExecFileLoader;
import org.jacoco.maven.FileFilter;
import org.jacoco.report.FileMultiReportOutput;
import org.jacoco.report.IReportGroupVisitor;
Expand All @@ -59,6 +59,8 @@
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.Opcodes;

import static org.objectweb.asm.ClassReader.EXPAND_FRAMES;

/**
* Creates a code coverage report for a single project in multiple formats (HTML, XML, and CSV).
*
Expand Down Expand Up @@ -405,7 +407,7 @@ public SanitizingAnalyzer(final ExecutionDataStore executionData, final ICoverag
@Override
public void analyzeClass(final ClassReader reader) {
final ClassVisitor visitor = createSanitizingVisitor(CRC64.checksum(reader.b));
reader.accept(visitor, 0);
reader.accept(visitor, EXPAND_FRAMES);
}

private ClassVisitor createSanitizingVisitor(final long classid) {
Expand All @@ -414,7 +416,7 @@ private ClassVisitor createSanitizingVisitor(final long classid) {
final StringPool stringPool = new StringPool();
final ClassProbesVisitor analyzer = new SanitizingClassAnalyzer(classid, probes, stringPool, coverageVisitor,
filter);
return new ClassProbesAdapter(analyzer);
return new ClassProbesAdapter(analyzer, true);
}
}

Expand Down Expand Up @@ -488,7 +490,7 @@ private static final class SanitizingClassAnalyzer extends ClassAnalyzer {

private SanitizingClassAnalyzer(final long classid, final boolean[] probes, final StringPool stringPool,
final ICoverageVisitor coverageVisitor, final MethodCoverageFilter filter) {
super(classid, probes, stringPool);
super(classid, true, probes, stringPool);
this.stringPool = stringPool;
this.probes = probes;
this.coverageVisitor = coverageVisitor;
Expand Down
8 changes: 4 additions & 4 deletions jacoco-scalatest-maven-plugin-example/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>timezra.maven</groupId>
<artifactId>jacoco-scalatest-maven-plugin-example</artifactId>
<version>0.6.3.2-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<name>Example of JaCoCo and ScalaTest Code Coverage via Maven</name>
<url>https://github.com/timezra/jacoco-scala-maven-plugin</url>

Expand Down Expand Up @@ -83,7 +83,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.6.3.201306030806</version>
<version>0.7.0.201403182114</version>
<executions>
<execution>
<id>pre-test</id>
Expand All @@ -96,7 +96,7 @@
<plugin>
<groupId>timezra.maven</groupId>
<artifactId>jacoco-scala-maven-plugin</artifactId>
<version>0.6.3.1</version>
<version>${project.version}</version>
<executions>
<execution>
<id>post-integration-test</id>
Expand Down Expand Up @@ -124,7 +124,7 @@
<plugin>
<groupId>org.scalatest</groupId>
<artifactId>scalatest-maven-plugin</artifactId>
<version>1.0-RC1</version>
<version>1.0</version>
<configuration>
<reportsDirectory>${project.build.directory}/surefire-reports</reportsDirectory>
<junitxml>.</junitxml>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>timezra.maven</groupId>
<artifactId>jacoco-scala-maven-plugin-aggregator</artifactId>
<packaging>pom</packaging>
<version>0.6.3.2-SNAPSHOT</version>
<version>0.7.0-SNAPSHOT</version>
<name>JaCoCo Scala Maven Plugin Aggregator</name>
<url>https://github.com/timezra/jacoco-scala-maven-plugin</url>

Expand Down