raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 11

Merge pull request #15810 from ktoso/fix-pretty-formatting-locale-ktoso

Browse source 
=tes #15808 force the locale in pretty duration, its only a helper
This commit is contained in:
Konrad Malawski 2014-09-05 13:30:55 +02:00
commit 427a43d9ae
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
akka-testkit/src/test/scala/akka/testkit/metrics/reporter/PrettyDuration.scala
View file

@ -3,6 +3,8 @@
*/ */
package akka.testkit.metrics.reporter package akka.testkit.metrics.reporter
import java.util.Locale
import scala.concurrent.duration._ import scala.concurrent.duration._
object PrettyDuration { object PrettyDuration {
@ -21,10 +23,11 @@ object PrettyDuration {
val unit = chooseUnit(nanos) val unit = chooseUnit(nanos)
val value = nanos.toDouble / NANOSECONDS.convert(1, unit) val value = nanos.toDouble / NANOSECONDS.convert(1, unit)
s"%.${precision}g %s%s".format(value, abbreviate(unit), if (includeNanos) s" ($nanos ns)" else "") s"%.${precision}g %s%s".formatLocal(Locale.ROOT, value, abbreviate(unit), if (includeNanos) s" ($nanos ns)" else "")
case d: Duration.Infinite if d == Duration.MinusInf ⇒ s" -∞ (minus infinity)" case Duration.MinusInf ⇒ s"-∞ (minus infinity)"
case d ⇒ s"∞ (infinity)" case Duration.Inf ⇒ s"∞ (infinity)"
case _ ⇒ "undefined"
} }
} }

8
akka-testkit/src/test/scala/akka/testkit/metrics/reporter/PrettyDurationSpec.scala
View file

@ -29,8 +29,8 @@ class PrettyDurationSpec extends FlatSpec with Matchers {
cases foreach { cases foreach {
case (d, expectedValue) ⇒ case (d, expectedValue) ⇒
it should s"print $d seconds as $expectedValue" in { it should s"print $d nanos as $expectedValue" in {
d.pretty should fullyMatch regex expectedValue.replace(".", "[,.]") d.pretty should be(expectedValue)
} }
} }
@ -41,4 +41,8 @@ class PrettyDurationSpec extends FlatSpec with Matchers {
it should "work with -infinity" in { it should "work with -infinity" in {
Duration.MinusInf.pretty should include("minus infinity") Duration.MinusInf.pretty should include("minus infinity")
} }
it should "work with undefined" in {
Duration.Undefined.pretty should include("undefined")
}
} }