Updated XML writer to include top level class

Author: sksamuel

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

@@ -17,11 +17,25 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
     IOUtils.writeToFile(file, new PrettyPrinter(120, 4).format(xml(coverage)))
   }
 
-  def statement(stmt: Statement): Node = {
+  def xml(coverage: Coverage): Node = {
+    <scoverage statement-count={coverage.statementCount.toString}
+               statements-invoked={coverage.invokedStatementCount.toString}
+               statement-rate={coverage.statementCoverageFormatted}
+               branch-rate={coverage.branchCoverageFormatted}
+               version="1.0"
+               timestamp={System.currentTimeMillis.toString}>
+      <packages>
+        {coverage.packages.map(pack)}
+      </packages>
+    </scoverage>
+  }
+
+  private def statement(stmt: Statement): Node = {
     debug match {
       case true =>
         <statement package={stmt.location.packageName}
                    class={stmt.location.className}
+                   topLevelClass={stmt.location.topLevelClass}
                    method={stmt.location.method}
                    start={stmt.start.toString}
                    line={stmt.line.toString}
@@ -34,6 +48,7 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
       case false =>
           <statement package={stmt.location.packageName}
                      class={stmt.location.className}
+                     topLevelClass={stmt.location.topLevelClass}
                      method={stmt.location.method}
                      start={stmt.start.toString}
                      line={stmt.line.toString}
@@ -42,7 +57,7 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
     }
   }
 
-  def method(method: MeasuredMethod): Node = {
+  private def method(method: MeasuredMethod): Node = {
     <method name={method.name}
             statement-count={method.statementCount.toString}
             statements-invoked={method.invokedStatementCount.toString}
@@ -54,7 +69,7 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
     </method>
   }
 
-  def klass(klass: MeasuredClass): Node = {
+  private def klass(klass: MeasuredClass): Node = {
     <class name={klass.name}
            filename={klass.source.replace(sourceDir.getAbsolutePath, "")}
            statement-count={klass.statementCount.toString}
@@ -67,7 +82,7 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
     </class>
   }
 
-  def pack(pack: MeasuredPackage): Node = {
+  private def pack(pack: MeasuredPackage): Node = {
     <package name={pack.name}
              statement-count={pack.statementCount.toString}
              statements-invoked={pack.invokedStatementCount.toString}
@@ -78,17 +93,5 @@ class ScoverageXmlWriter(sourceDir: File, outputDir: File, debug: Boolean) {
     </package>
   }
 
-  def xml(coverage: Coverage): Node = {
-    <scoverage statement-count={coverage.statementCount.toString}
-               statements-invoked={coverage.invokedStatementCount.toString}
-               statement-rate={coverage.statementCoverageFormatted}
-               branch-rate={coverage.branchCoverageFormatted}
-               version="1.0"
-               timestamp={System.currentTimeMillis.toString}>
-      <packages>
-        {coverage.packages.map(pack)}
-      </packages>
-    </scoverage>
-  }
 }