Skip to content

Commit f07302a

Browse files
committed
Revert "Fixing locale-dependent tests"
This reverts commit 9cd568f.
1 parent b9a26fc commit f07302a

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

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

Lines changed: 3 additions & 5 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.{Locale, UUID}
4+
import java.util.UUID
55
import javax.xml.parsers.DocumentBuilderFactory
66

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

102102
val xml = XML.loadFile(fileIn(dir))
103103

104-
def formattedLocally(decimal: BigDecimal) = "%.2f".format(decimal)
105-
106-
assert(xml \\ "coverage" \@ "line-rate" === formattedLocally(0.33), "line-rate")
107-
assert(xml \\ "coverage" \@ "branch-rate" === formattedLocally(0.50), "branch-rate")
104+
assert(xml \\ "coverage" \@ "line-rate" === "0.33", "line-rate")
105+
assert(xml \\ "coverage" \@ "branch-rate" === "0.50", "branch-rate")
108106

109107
}
110108
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ 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-
1412
"scoverage xml merger" - {
1513
"should add top level statement-count" in {
1614
val node = ScoverageXmlMerger.merge(List(node1, node2))
@@ -22,7 +20,7 @@ class ScoverageXmlMergerTest extends FreeSpec with Matchers {
2220
}
2321
"should recalculate statement-rate" in {
2422
val node = ScoverageXmlMerger.merge(List(node1, node2))
25-
(node \ "@statement-rate").text shouldBe formattedLocally(91.67)
23+
(node \ "@statement-rate").text.toDouble shouldBe 91.67
2624
}
2725
"should reset timestamp" in {
2826
val node = ScoverageXmlMerger.merge(List(node1, node2))

0 commit comments

Comments
 (0)