Skip to content

Commit aa2e39b

Browse files
committed
Pass all source root directories to Scoverage reports.
1 parent 4ba69ad commit aa2e39b

File tree

1 file changed

+16
-4
lines changed

1 file changed

+16
-4
lines changed

src/main/java/org/scoverage/plugin/SCoverageReportMojo.java

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919

2020
import java.io.File;
2121
//import java.io.IOException;
22+
import java.util.ArrayList;
23+
import java.util.List;
2224
import java.util.Locale;
2325
import java.util.ResourceBundle;
2426

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

4345
import scala.Predef$;
46+
import scala.collection.JavaConversions;
47+
import scala.collection.Seq;
48+
4449
import scoverage.Coverage;
4550
import scoverage.IOUtils;
4651
import scoverage.Serializer;
@@ -162,7 +167,12 @@ public void generate( Sink sink, Locale locale )
162167
{
163168
long ts = System.currentTimeMillis();
164169

165-
File sourceDir = new File( project.getBuild().getSourceDirectory() );
170+
List<String> sourceDirs = project.getExecutionProject().getCompileSourceRoots();
171+
List<File> sourceRoots = new ArrayList<File>( sourceDirs.size() );
172+
for ( String dir: sourceDirs )
173+
{
174+
sourceRoots.add( new File( dir ) );
175+
}
166176

167177
mkdirs( outputDirectory );
168178
mkdirs( xmlOutputDirectory );
@@ -196,14 +206,16 @@ public void generate( Sink sink, Locale locale )
196206
.wrapRefArray( measurementFiles ) );
197207
coverage.apply( measurements );
198208

209+
Seq<File> sourceRootsAsScalaSeq = JavaConversions.asScalaBuffer( sourceRoots );
210+
199211
getLog().info( "[scoverage] Generating cobertura XML report..." );
200-
new CoberturaXmlWriter( project.getBasedir(), xmlOutputDirectory ).write( coverage );
212+
new CoberturaXmlWriter( sourceRootsAsScalaSeq, xmlOutputDirectory ).write( coverage );
201213

202214
getLog().info( "[scoverage] Generating scoverage XML report..." );
203-
new ScoverageXmlWriter( sourceDir, xmlOutputDirectory, false ).write( coverage );
215+
new ScoverageXmlWriter( sourceRootsAsScalaSeq, xmlOutputDirectory, false ).write( coverage );
204216

205217
getLog().info( "[scoverage] Generating scoverage HTML report..." );
206-
new ScoverageHtmlWriter( sourceDir, outputDirectory ).write( coverage );
218+
new ScoverageHtmlWriter( sourceRootsAsScalaSeq, outputDirectory ).write( coverage );
207219

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

0 commit comments

Comments
 (0)