Added tests for XML Reader

Author: sksamuel

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

@@ -5,6 +5,7 @@ object Constants {
   val CoverageFileName = "scoverage.coverage.xml"
   // the final scoverage report
   val XMLReportFilename = "scoverage.xml"
+  val XMLReportFilenameWithDebug = "scoverage-debug.xml"
   // directory that contains all the measurement data but not reports
   val DataDir = "scoverage-data"
   // the prefix the measurement files have

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

@@ -27,6 +27,11 @@ object IOUtils {
     path.drop(index + 1)
   }
 
+  def reportFile(outputDir: File, debug: Boolean = false): File = debug match {
+    case true => new File(outputDir, Constants.XMLReportFilenameWithDebug)
+    case false => new File(outputDir, Constants.XMLReportFilename)
+  }
+
   def clean(dataDir: File): Unit = findMeasurementFiles(dataDir).foreach(_.delete)
   def clean(dataDir: String): Unit = clean(new File(dataDir))
 

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

@@ -16,7 +16,7 @@ object ScoverageXmlReader {
 
     var id = 0
     val coverage = Coverage()
-    (xml \ "statement") foreach { node => {
+    (xml \\ "statement") foreach { node => {
 
       val source = node \ "@source"
       val pkg = node \ "@package"

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

@@ -10,14 +10,11 @@ import scala.xml.{Node, PrettyPrinter}
 class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
 
   def write(coverage: Coverage): Unit = {
-    val file = debug match {
-      case true => new File(outputDir.getAbsolutePath + "/scoverage-debug.xml")
-      case false => new File(outputDir.getAbsolutePath + "/" + Constants.XMLReportFilename)
-    }
+    val file = IOUtils.reportFile(outputDir, debug)
     IOUtils.writeToFile(file, new PrettyPrinter(120, 4).format(xml(coverage)))
   }
 
-  def xml(coverage: Coverage): Node = {
+  private def xml(coverage: Coverage): Node = {
     <scoverage statement-count={coverage.statementCount.toString}
                statements-invoked={coverage.invokedStatementCount.toString}
                statement-rate={coverage.statementCoverageFormatted}

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

@@ -0,0 +1,60 @@
+package scoverage
+
+import java.io.File
+import java.util.UUID
+
+import org.scalatest.{FreeSpec, Matchers}
+import scoverage.report.{ScoverageXmlReader, ScoverageXmlWriter}
+
+class ScoverageXmlReader extends FreeSpec with Matchers {
+
+  "scoverage xml reader" - {
+    "should read output from ScoverageXmlWriter" in {
+
+      val coverage = Coverage()
+
+      coverage.add(Statement("/home/sam/src/main/scala/com/scoverage/class.scala",
+        Location("com.scoverage",
+          "Test",
+          "TopLevel",
+          ClassType.Object,
+          "somemeth",
+          "/home/sam/src/main/scala/com/scoverage/class.scala"),
+        14,
+        155,
+        176,
+        4,
+        "",
+        "sym",
+        "tree",
+        true,
+        2))
+
+      coverage.add(Statement("/home/sam/src/main/scala/com/scoverage/foo/class.scala",
+        Location("com.scoverage.foo",
+          "ServiceState",
+          "Service",
+          ClassType.Trait,
+          "methlab",
+          "/home/sam/src/main/scala/com/scoverage/foo/class.scala"),
+        16,
+        95,
+        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)
+      println(temp.getAbsolutePath)
+
+      val actual = ScoverageXmlReader.read(IOUtils.reportFile(temp, true))
+      // 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
+    }
+  }
+}