ADded tests for coverage aggregator

Author: sksamuel

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

@@ -64,8 +64,6 @@ object IOUtils {
     search(baseDir)
   }
 
-
-
   val isMeasurementFile = (file: File) => file.getName.startsWith(Constants.MeasurementsPrefix)
   val isReportFile = (file: File) => file.getName == Constants.XMLReportFilename
 

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

@@ -17,7 +17,7 @@ object CoverageAggregator {
     }
   }
 
-  private def aggregatedCoverage(files: Seq[File]): Coverage = {
+   def aggregatedCoverage(files: Seq[File]): Coverage = {
     var id = 0
     val coverage = Coverage()
     files foreach {

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

@@ -0,0 +1,64 @@
+package scoverage
+
+import java.io.File
+import java.util.UUID
+
+import org.scalatest.{FreeSpec, Matchers}
+import scoverage.report.{ScoverageXmlWriter, CoverageAggregator}
+
+class CoverageAggregatorTest extends FreeSpec with Matchers {
+
+  "coverage aggregator" - {
+    "should merge coverage objects" in {
+
+      val coverage1 = Coverage()
+      coverage1.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,
+        "",
+        "",
+        "",
+        true,
+        2))
+
+      val dir1 = new File(IOUtils.getTempPath, UUID.randomUUID.toString)
+      dir1.mkdir()
+      new ScoverageXmlWriter(new File("/home/sam"), dir1, false).write(coverage1)
+
+      val coverage2 = Coverage()
+      coverage2.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,
+        "",
+        "",
+        "",
+        false,
+        0))
+
+      val dir2 = new File(IOUtils.getTempPath, UUID.randomUUID.toString)
+      dir2.mkdir()
+      new ScoverageXmlWriter(new File("/home/sam"), dir2, false).write(coverage2)
+
+      val aggregated = CoverageAggregator.aggregatedCoverage(
+        Seq(IOUtils.reportFile(dir1, debug = false), IOUtils.reportFile(dir2, debug = false))
+      )
+      aggregated.statements.map(_.copy(id = 0)).toSet shouldEqual (coverage1.statements ++ coverage2.statements).map(_.copy(id = 0)).toSet
+    }
+  }
+}

scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageXmlReader.scala renamed to scalac-scoverage-plugin/src/test/scala/scoverage/ScoverageXmlReaderTest.scala

@@ -6,7 +6,7 @@ import java.util.UUID
 import org.scalatest.{FreeSpec, Matchers}
 import scoverage.report.{ScoverageXmlReader, ScoverageXmlWriter}
 
-class ScoverageXmlReader extends FreeSpec with Matchers {
+class ScoverageXmlReaderTest extends FreeSpec with Matchers {
 
   "scoverage xml reader" - {
     "should read output from ScoverageXmlWriter" in {
@@ -50,7 +50,6 @@ class ScoverageXmlReader extends FreeSpec with Matchers {
       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