Skip to content

Commit 9cd568f

Browse files
committed
Fixing locale-dependent tests
Some tests failed when your system had `,` as decimal separator instead of `.`.
1 parent d021bc3 commit 9cd568f

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scoverage
22

33
import java.io.File
4-
import java.util.UUID
4+
import java.util.{Locale, UUID}
55
import javax.xml.parsers.DocumentBuilderFactory
66

77
import org.scalatest.{BeforeAndAfter, FunSuite, OneInstancePerTest}
@@ -97,8 +97,10 @@ class CoberturaXmlWriterTest extends FunSuite with BeforeAndAfter with OneInstan
9797

9898
val xml = XML.loadFile(fileIn(dir))
9999

100-
assert(xml \\ "coverage" \@ "line-rate" === "0.33", "line-rate")
101-
assert(xml \\ "coverage" \@ "branch-rate" === "0.50", "branch-rate")
100+
def formattedLocally(decimal: BigDecimal) = "%.2f".format(decimal)
101+
102+
assert(xml \\ "coverage" \@ "line-rate" === formattedLocally(0.33), "line-rate")
103+
assert(xml \\ "coverage" \@ "branch-rate" === formattedLocally(0.50), "branch-rate")
102104

103105
}
104106
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ class ScoverageXmlMergerTest extends FreeSpec with Matchers {
99
val node1 = scala.xml.XML.load(getClass.getResourceAsStream("/scoverage/report1.xml"))
1010
val node2 = scala.xml.XML.load(getClass.getResourceAsStream("/scoverage/report2.xml"))
1111

12+
private def formattedLocally(decimal: BigDecimal) = "%.2f".format(decimal)
13+
1214
"scoverage xml merger" - {
1315
"should add top level statement-count" in {
1416
val node = ScoverageXmlMerger.merge(List(node1, node2))
@@ -20,7 +22,7 @@ class ScoverageXmlMergerTest extends FreeSpec with Matchers {
2022
}
2123
"should recalculate statement-rate" in {
2224
val node = ScoverageXmlMerger.merge(List(node1, node2))
23-
(node \ "@statement-rate").text.toDouble shouldBe 91.67
25+
(node \ "@statement-rate").text shouldBe formattedLocally(91.67)
2426
}
2527
"should reset timestamp" in {
2628
val node = ScoverageXmlMerger.merge(List(node1, node2))

0 commit comments

Comments
 (0)