Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix statement id overriding in CoverageAggregator #73

Merged
merged 1 commit into from
Nov 28, 2014
Merged

Fix statement id overriding in CoverageAggregator #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions scalac-scoverage-plugin/src/main/scala/scoverage/report/CoverageAggregator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,16 @@ object CoverageAggregator {
}
}

def aggregatedCoverage(files: Seq[File]): Coverage = {
def aggregatedCoverage(files: Seq[File]): Coverage = {
var id = 0
val coverage = Coverage()
files foreach {
case file =>
val subcoverage = ScoverageXmlReader.read(file)
files foreach { file =>
val subcoverage = ScoverageXmlReader.read(file)
subcoverage.statements foreach { stmt =>
// need to ensure all the ids are unique otherwise the coverage object will have stmt collisions
id = id + 1
subcoverage.statements foreach { stmt => coverage add stmt.copy(id = id)}
coverage add stmt.copy(id = id)
}
}
coverage
}
Expand Down
7 changes: 4 additions & 3 deletions scalac-scoverage-plugin/src/test/scala/scoverage/CoverageAggregatorTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import java.io.File
import java.util.UUID

import org.scalatest.{FreeSpec, Matchers}
import scoverage.report.{ScoverageXmlWriter, CoverageAggregator}
import scoverage.report.{CoverageAggregator, ScoverageXmlWriter}

class CoverageAggregatorTest extends FreeSpec with Matchers {

Expand All @@ -20,7 +20,8 @@ class CoverageAggregatorTest extends FreeSpec with Matchers {
source)

val coverage1 = Coverage()
coverage1.add(Statement(source, location, 1, 155, 176, 4, "", "", "", true, 2))
coverage1.add(Statement(source, location, 1, 155, 176, 4, "", "", "", true, 1))
coverage1.add(Statement(source, location, 2, 200, 300, 5, "", "", "", false, 2))
val dir1 = new File(IOUtils.getTempPath, UUID.randomUUID.toString)
dir1.mkdir()
new ScoverageXmlWriter(new File("/home/sam"), dir1, false).write(coverage1)
Expand All @@ -42,7 +43,7 @@ class CoverageAggregatorTest extends FreeSpec with Matchers {
IOUtils.reportFile(dir2, debug = false),
IOUtils.reportFile(dir3, debug = false))
)
aggregated.statements.toSet.size shouldBe 3
aggregated.statements.toSet.size shouldBe 4
aggregated.statements.map(_.copy(id = 0)).toSet shouldBe
(coverage1.statements ++ coverage2.statements ++ coverage3.statements).map(_.copy(id = 0)).toSet
}
Expand Down