diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/BaseReportWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/BaseReportWriter.scala index e3af4b51..294bc0f7 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/report/BaseReportWriter.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/report/BaseReportWriter.scala @@ -2,9 +2,7 @@ package scoverage.report import java.io.File -import scoverage.Coverage - -class BaseReportWriter(sourceDirectories: Seq[File], outputDir: File, ignoreStatementsNotInSrcDirs: Boolean) { +class BaseReportWriter(sourceDirectories: Seq[File], outputDir: File) { // Source paths in canonical form WITH trailing file separator private val formattedSourcePaths: Seq[String] = sourceDirectories filter ( _.isDirectory ) map ( _.getCanonicalPath + File.separator ) @@ -12,7 +10,7 @@ class BaseReportWriter(sourceDirectories: Seq[File], outputDir: File, ignoreStat /** * Converts absolute path to relative one if any of the source directories is it's parent. * If there is no parent directory, the path is returned unchanged (absolute). - * + * * @param src absolute file path in canonical form */ def relativeSource(src: String): String = relativeSource(src, formattedSourcePaths) @@ -31,32 +29,4 @@ class BaseReportWriter(sourceDirectories: Seq[File], outputDir: File, ignoreStat } } - def preprocessCoverage(coverage: Coverage): Coverage = { - if (ignoreStatementsNotInSrcDirs) - filteredCoverage(coverage) - else - coverage - } - - /** - * Filters out statements not in source roots - * @return new Coverage instance with statements whose src paths are in root source paths. - */ - private def filteredCoverage(coverage: Coverage): Coverage = { - val filteredCoverage = Coverage() - coverage.statements.foreach { stmt => - if (isInSourceRoots(stmt.source)) - filteredCoverage.add(stmt) - } - coverage.ignoredStatements.foreach { stmt => - if (isInSourceRoots(stmt.source)) - filteredCoverage.addIgnoredStatement(stmt) - } - filteredCoverage - } - - private def isInSourceRoots(src: String): Boolean = { - formattedSourcePaths.exists(sourcePath => src.startsWith(sourcePath)) - } - } diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala index 3958cec9..f6ff5082 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/report/CoberturaXmlWriter.scala @@ -8,17 +8,16 @@ import scoverage._ import scala.xml.{Node, PrettyPrinter} /** @author Stephen Samuel */ -class CoberturaXmlWriter(sourceDirectories: Seq[File], outputDir: File, ignoreStatementsNotInSrcDirs: Boolean) - extends BaseReportWriter(sourceDirectories, outputDir, ignoreStatementsNotInSrcDirs) { +class CoberturaXmlWriter(sourceDirectories: Seq[File], outputDir: File) extends BaseReportWriter(sourceDirectories, outputDir) { - def this (baseDir: File, outputDir: File, ignoreStatementsNotInSrcDirs: Boolean = false) { - this(Seq(baseDir), outputDir, ignoreStatementsNotInSrcDirs) + def this (baseDir: File, outputDir: File) { + this(Seq(baseDir), outputDir) } def write(coverage: Coverage): Unit = { val file = new File(outputDir, "cobertura.xml") IOUtils.writeToFile(file, "\n\n" + - new PrettyPrinter(120, 4).format(xml(preprocessCoverage(coverage)))) + new PrettyPrinter(120, 4).format(xml(coverage))) } def method(method: MeasuredMethod): Node = { diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala index 2321f987..b4d05827 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageHtmlWriter.scala @@ -8,12 +8,11 @@ import scoverage._ import scala.xml.Node /** @author Stephen Samuel */ -class ScoverageHtmlWriter(sourceDirectories: Seq[File], outputDir: File, sourceEncoding: Option[String], ignoreStatementsNotInSrcDirs: Boolean) - extends BaseReportWriter(sourceDirectories, outputDir, ignoreStatementsNotInSrcDirs) { +class ScoverageHtmlWriter(sourceDirectories: Seq[File], outputDir: File, sourceEncoding: Option[String]) extends BaseReportWriter(sourceDirectories, outputDir) { // for backward compatibility only - def this (sourceDirectories: Seq[File], outputDir: File, ignoreStatementsNotInSrcDirs: Boolean = false) { - this(sourceDirectories, outputDir, None, ignoreStatementsNotInSrcDirs) + def this (sourceDirectories: Seq[File], outputDir: File) { + this(sourceDirectories, outputDir, None); } // for backward compatibility only @@ -22,18 +21,16 @@ class ScoverageHtmlWriter(sourceDirectories: Seq[File], outputDir: File, sourceE } def write(coverage: Coverage): Unit = { - val preprocessedCoverage = preprocessCoverage(coverage) - val indexFile = new File(outputDir.getAbsolutePath + "/index.html") val packageFile = new File(outputDir.getAbsolutePath + "/packages.html") val overviewFile = new File(outputDir.getAbsolutePath + "/overview.html") val index = IOUtils.readStreamAsString(getClass.getResourceAsStream("/scoverage/index.html")) IOUtils.writeToFile(indexFile, index) - IOUtils.writeToFile(packageFile, packageList(preprocessedCoverage).toString()) - IOUtils.writeToFile(overviewFile, overview(preprocessedCoverage).toString()) + IOUtils.writeToFile(packageFile, packageList(coverage).toString()) + IOUtils.writeToFile(overviewFile, overview(coverage).toString()) - preprocessedCoverage.packages.foreach(writePackage) + coverage.packages.foreach(writePackage) } private def writePackage(pkg: MeasuredPackage): Unit = { diff --git a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala index 4e0643a5..7d3b8f90 100644 --- a/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala +++ b/scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlWriter.scala @@ -7,24 +7,15 @@ import scoverage._ import scala.xml.{Node, PrettyPrinter} /** @author Stephen Samuel */ -class ScoverageXmlWriter(sourceDirectories: Seq[File], outputDir: File, debug: Boolean, ignoreStatementsNotInSrcDirs: Boolean) - extends BaseReportWriter(sourceDirectories, outputDir, ignoreStatementsNotInSrcDirs) { +class ScoverageXmlWriter(sourceDirectories: Seq[File], outputDir: File, debug: Boolean) extends BaseReportWriter(sourceDirectories, outputDir) { - def this (sourceDir: File, outputDir: File, debug: Boolean, ignoreStatementsNotInSrcDirs: Boolean) { - this(Seq(sourceDir), outputDir, debug, ignoreStatementsNotInSrcDirs) - } - - def this (sourceDir: File, outputDir: File, debug: Boolean){ - this(Seq(sourceDir), outputDir, debug, ignoreStatementsNotInSrcDirs = false) - } - - def this (sourceDirectories: Seq[File], outputDir: File, debug: Boolean) { - this(sourceDirectories, outputDir, debug, ignoreStatementsNotInSrcDirs = false) + def this (sourceDir: File, outputDir: File, debug: Boolean) { + this(Seq(sourceDir), outputDir, debug) } def write(coverage: Coverage): Unit = { val file = IOUtils.reportFile(outputDir, debug) - IOUtils.writeToFile(file, new PrettyPrinter(120, 4).format(xml(preprocessCoverage(coverage)))) + IOUtils.writeToFile(file, new PrettyPrinter(120, 4).format(xml(coverage))) } private def xml(coverage: Coverage): Node = {