Implemented xml reader

Author: sksamuel

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

@@ -99,13 +99,20 @@ case class Statement(source: String,
   def isInvoked = count > 0
 }
 
+sealed trait ClassType
 object ClassType {
   case object Object extends ClassType
   case object Class extends ClassType
   case object Trait extends ClassType
+  def fromString(str: String): ClassType = {
+    str.toLowerCase match {
+      case "object" => Object
+      case "trait" => Trait
+      case _ => Class
+    }
+  }
 }
 
-sealed trait ClassType
 
 
 

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

@@ -0,0 +1,61 @@
+package scoverage.report
+
+import java.io.File
+
+import scoverage._
+
+import scala.xml.XML
+
+/**
+ * Reads in an Scoverage XML report and converts to a Coverage instance.
+ */
+object ScoverageXmlReader {
+
+  def read(file: File): Coverage = {
+    val xml = XML.loadFile(file)
+
+    var id = 0
+    val coverage = Coverage()
+    (xml \ "statement") foreach { node => {
+
+      val source = node \ "@source"
+      val pkg = node \ "@package"
+      val classname = node \ "@class"
+      val classType = node \ "@class-type"
+      val topLevelClass = node \ "@top-level-class"
+      val method = node \ "@method"
+      val start = node \ "@start"
+      val end = node \ "@end"
+      val line = node \ "@line"
+      val branch = node \ "@branch"
+      val count = node \ "@invocation-count"
+      val symbolName = node \ "@symbol"
+      val treeName = node \ "@tree"
+
+      val location = Location(pkg.text,
+        classname.text,
+        topLevelClass.text,
+        ClassType fromString classType.text,
+        method.text,
+        source.text)
+
+      id = id + 1
+
+      coverage add Statement(
+        source.text,
+        location,
+        id,
+        start.text.toInt,
+        end.text.toInt,
+        line.text.toInt,
+        "", // not interested in debug info when re-creating
+        symbolName.text,
+        treeName.text,
+        branch.text.toBoolean,
+        count.text.toInt
+      )
+    }
+    }
+    coverage
+  }
+}

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

@@ -35,9 +35,12 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
       case true =>
         <statement package={stmt.location.packageName}
                    class={stmt.location.className}
-                   topLevelClass={stmt.location.topLevelClass}
+                   class-type={stmt.location.classType.toString}
+                   top-level-class={stmt.location.topLevelClass}
+                   source={stmt.source}
                    method={stmt.location.method}
                    start={stmt.start.toString}
+                   end={stmt.end.toString}
                    line={stmt.line.toString}
                    symbol={Serializer.escape(stmt.symbolName)}
                    tree={Serializer.escape(stmt.treeName)}
@@ -48,9 +51,12 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
       case false =>
           <statement package={stmt.location.packageName}
                      class={stmt.location.className}
-                     topLevelClass={stmt.location.topLevelClass}
+                     class-type={stmt.location.classType.toString}
+                     top-level-class={stmt.location.topLevelClass}
+                     source={stmt.source}
                      method={stmt.location.method}
                      start={stmt.start.toString}
+                     end={stmt.end.toString}
                      line={stmt.line.toString}
                      branch={stmt.branch.toString}
                      invocation-count={stmt.count.toString}/>