Fixed failing test.

Author: sksamuel

scalac-scoverage-plugin/src/main/scala/scoverage/IOUtils.scala

@@ -55,7 +55,7 @@ object IOUtils {
     override def accept(pathname: File): Boolean = pathname.getName.startsWith(Constants.MeasurementsPrefix)
   })
 
-  def reportFileSearch(baseDir: File): Seq[File] = {
+  def reportFileSearch(baseDir: File, condition: File => Boolean): Seq[File] = {
     def search(file: File): Seq[File] = file match {
       case dir if dir.isDirectory => dir.listFiles().toSeq.map(search).flatten
       case f if isReportFile(f) => Seq(f)
@@ -66,6 +66,7 @@ object IOUtils {
 
   val isMeasurementFile = (file: File) => file.getName.startsWith(Constants.MeasurementsPrefix)
   val isReportFile = (file: File) => file.getName == Constants.XMLReportFilename
+  val isDebugReportFile = (file: File) => file.getName == Constants.XMLReportFilenameWithDebug
 
   // loads all the invoked statement ids from the given files
   def invoked(files: Seq[File]): Set[Int] = {

scalac-scoverage-plugin/src/main/scala/scoverage/report/CoverageAggregator.scala

@@ -7,7 +7,7 @@ import scoverage.{Coverage, IOUtils}
 object CoverageAggregator {
 
   def aggregate(baseDir: File, targetDir: File): Option[Coverage] = {
-    val files = IOUtils.reportFileSearch(baseDir)
+    val files = IOUtils.reportFileSearch(baseDir, IOUtils.isReportFile)
     println(s"[info] Found ${files.size} subproject report files [${files.mkString(",")}]")
     if (files.size > 0) {
       val coverage = aggregatedCoverage(files)

scalac-scoverage-plugin/src/main/scala/scoverage/report/ScoverageXmlReader.scala

@@ -14,6 +14,7 @@ object ScoverageXmlReader {
   def read(file: File): Coverage = {
     val xml = XML.loadFile(file)
 
+    var id = 0
     val coverage = Coverage()
     (xml \\ "statement") foreach { node => {
 
@@ -38,10 +39,12 @@ object ScoverageXmlReader {
         method.text,
         source.text)
 
+      id = id + 1
+
       coverage add Statement(
         source.text,
         location,
-        0, // ids are irrelevant in the XML form
+        id,
         start.text.toInt,
         end.text.toInt,
         line.text.toInt,

scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageXmlReaderTest.scala

@@ -25,8 +25,8 @@ class ScoverageXmlReaderTest extends FreeSpec with Matchers {
         176,
         4,
         "",
-        "sym",
-        "tree",
+        "",
+        "",
         true,
         2))
 
@@ -42,18 +42,20 @@ class ScoverageXmlReaderTest extends FreeSpec with Matchers {
         105,
         19,
         "",
-        "sym2",
-        "tree2",
+        "",
+        "",
         false,
         0))
 
       val temp = new File(IOUtils.getTempPath, UUID.randomUUID.toString)
       temp.mkdir()
-      new ScoverageXmlWriter(new File("/home/sam"), temp, true).write(coverage)
+      temp.deleteOnExit()
+      new ScoverageXmlWriter(new File("/home/sam"), temp, false).write(coverage)
 
-      val actual = ScoverageXmlReader.read(IOUtils.reportFile(temp, true))
+      val actual = ScoverageXmlReader.read(IOUtils.reportFile(temp, false))
       // we don't care about the statement ids as the will change on reading back in
       actual.statements.map(_.copy(id = 0)).toSet shouldEqual coverage.statements.map(_.copy(id = 0)).toSet
+
     }
   }
 }