Updated coverage aggregation test

Author: sksamuel

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

@@ -9,56 +9,41 @@ import scoverage.report.{ScoverageXmlWriter, CoverageAggregator}
 class CoverageAggregatorTest extends FreeSpec with Matchers {
 
   "coverage aggregator" - {
-    "should merge coverage objects" in {
+    "should merge coverage objects with same id" 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 source = "/home/sam/src/main/scala/com/scoverage/class.scala"
+      val location = Location("com.scoverage.foo",
+        "ServiceState",
+        "Service",
+        ClassType.Trait,
+        "methlab",
+        source)
 
+      val coverage1 = Coverage()
+      coverage1.add(Statement(source, location, 1, 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))
-
+      coverage2.add(Statement(source, location, 1, 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 coverage3 = Coverage()
+      coverage3.add(Statement(source, location, 2, 14, 1515, 544, "", "", "", false, 1))
+      val dir3 = new File(IOUtils.getTempPath, UUID.randomUUID.toString)
+      dir3.mkdir()
+      new ScoverageXmlWriter(new File("/home/sam"), dir3, false).write(coverage3)
+
       val aggregated = CoverageAggregator.aggregatedCoverage(
-        Seq(IOUtils.reportFile(dir1, debug = false), IOUtils.reportFile(dir2, debug = false))
+        Seq(IOUtils.reportFile(dir1, debug = false),
+          IOUtils.reportFile(dir2, debug = false),
+          IOUtils.reportFile(dir3, debug = false))
       )
-      aggregated.statements.map(_.copy(id = 0)).toSet shouldEqual (coverage1.statements ++ coverage2.statements).map(_.copy(id = 0)).toSet
+      aggregated.statements.map(_.copy(id = 0)).toSet shouldEqual
+        (coverage1.statements ++ coverage2.statements ++ coverage3.statements).map(_.copy(id = 0)).toSet
     }
   }
 }