Skip to content

Support multiple source roots in report generators #16

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

Merged
merged 2 commits into from
Mar 11, 2015
Merged

Support multiple source roots in report generators #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ba69ad
"scalac-scoverage-plugin" dependency version changed from "1.0.4" to …
gslowikowski Mar 3, 2015
aa2e39b
Pass all source root directories to Scoverage reports.
gslowikowski Mar 3, 2015
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
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 @@ -85,7 +85,7 @@ under the License.
<maven.version>2.2.1</maven.version>
<maven-plugin-plugin.version>3.3</maven-plugin-plugin.version>

<scalac-scoverage-plugin.version>1.0.4</scalac-scoverage-plugin.version>
<scalac-scoverage-plugin.version>1.0.5-SNAPSHOT</scalac-scoverage-plugin.version>
</properties>

<dependencies>
Expand Down
20 changes: 16 additions & 4 deletions src/main/java/org/scoverage/plugin/SCoverageReportMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@

import java.io.File;
//import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.ResourceBundle;

Expand All @@ -41,6 +43,9 @@
import org.codehaus.plexus.util.StringUtils;

import scala.Predef$;
import scala.collection.JavaConversions;
import scala.collection.Seq;

import scoverage.Coverage;
import scoverage.IOUtils;
import scoverage.Serializer;
Expand Down Expand Up @@ -162,7 +167,12 @@ public void generate( Sink sink, Locale locale )
{
long ts = System.currentTimeMillis();

File sourceDir = new File( project.getBuild().getSourceDirectory() );
List<String> sourceDirs = project.getExecutionProject().getCompileSourceRoots();
List<File> sourceRoots = new ArrayList<File>( sourceDirs.size() );
for ( String dir: sourceDirs )
{
sourceRoots.add( new File( dir ) );
}

mkdirs( outputDirectory );
mkdirs( xmlOutputDirectory );
Expand Down Expand Up @@ -196,14 +206,16 @@ public void generate( Sink sink, Locale locale )
.wrapRefArray( measurementFiles ) );
coverage.apply( measurements );

Seq<File> sourceRootsAsScalaSeq = JavaConversions.asScalaBuffer( sourceRoots );

getLog().info( "[scoverage] Generating cobertura XML report..." );
new CoberturaXmlWriter( project.getBasedir(), xmlOutputDirectory ).write( coverage );
new CoberturaXmlWriter( sourceRootsAsScalaSeq, xmlOutputDirectory ).write( coverage );

getLog().info( "[scoverage] Generating scoverage XML report..." );
new ScoverageXmlWriter( sourceDir, xmlOutputDirectory, false ).write( coverage );
new ScoverageXmlWriter( sourceRootsAsScalaSeq, xmlOutputDirectory, false ).write( coverage );

getLog().info( "[scoverage] Generating scoverage HTML report..." );
new ScoverageHtmlWriter( sourceDir, outputDirectory ).write( coverage );
new ScoverageHtmlWriter( sourceRootsAsScalaSeq, outputDirectory ).write( coverage );

long te = System.currentTimeMillis();
getLog().debug( String.format( "Mojo execution time: %d ms", te - ts ) );
Expand Down