From d280c2f66072be77c5accac7304119a71d4d8ff8 Mon Sep 17 00:00:00 2001 From: Diego Date: Thu, 3 Mar 2016 00:47:53 -0300 Subject: = system-metrics: runSafe in UlimitMetrics and include a test --- .../test/scala/kamon/metric/MetricScaleDecoratorSpec.scala | 6 +++--- .../test/scala/kamon/metric/instrument/HistogramSpec.scala | 8 ++++---- .../kamon/metric/instrument/UnitOfMeasurementSpec.scala | 2 +- kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala | 12 ++++++------ 4 files changed, 14 insertions(+), 14 deletions(-) (limited to 'kamon-core/src/test/scala') diff --git a/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala b/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala index 04821923..902102cd 100644 --- a/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/MetricScaleDecoratorSpec.scala @@ -18,7 +18,7 @@ package kamon.metric import kamon.Kamon import kamon.metric.SubscriptionsDispatcher.TickMetricSnapshot -import kamon.metric.instrument.{InstrumentFactory, Memory, Time, UnitOfMeasurement} +import kamon.metric.instrument.{ InstrumentFactory, Memory, Time, UnitOfMeasurement } import kamon.testkit.BaseKamonSpec import kamon.util.MilliTimestamp import org.scalatest.OptionValues._ @@ -62,10 +62,10 @@ class MetricScaleDecoratorSpec extends BaseKamonSpec("metrics-scale-decorator-sp } trait SnapshotFixtures { - self: BaseKamonSpec => + self: BaseKamonSpec ⇒ class ScaleDecoratorTestMetrics(instrumentFactory: InstrumentFactory) - extends GenericEntityRecorder(instrumentFactory) { + extends GenericEntityRecorder(instrumentFactory) { val nanoTime = histogram("nano-time", Time.Nanoseconds) val microTime = counter("micro-time", Time.Microseconds) val byteMemory = histogram("byte-memory", Memory.Bytes) diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala b/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala index ff71cd56..adfcd826 100644 --- a/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/instrument/HistogramSpec.scala @@ -64,8 +64,8 @@ class HistogramSpec extends WordSpec with Matchers { snapshot.sum should be(41300) snapshot.numberOfMeasurements should be(203) - val records = snapshot.recordsIterator.map(r => r.level -> r.count).toSeq - records.size should be (4) + val records = snapshot.recordsIterator.map(r ⇒ r.level -> r.count).toSeq + records.size should be(4) records(0) should be(100 -> 1) records(1) should be(200 -> 200) records(2) should be(300 -> 1) @@ -88,8 +88,8 @@ class HistogramSpec extends WordSpec with Matchers { snapshot.sum should be(41300000) snapshot.numberOfMeasurements should be(203) - val records = snapshot.recordsIterator.map(r => r.level -> r.count).toSeq - records.size should be (4) + val records = snapshot.recordsIterator.map(r ⇒ r.level -> r.count).toSeq + records.size should be(4) records(0) should be(100000 -> 1) records(1) should be(200000 -> 200) records(2) should be(300000 -> 1) diff --git a/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala b/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala index 7133579e..10604fe5 100644 --- a/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala +++ b/kamon-core/src/test/scala/kamon/metric/instrument/UnitOfMeasurementSpec.scala @@ -17,7 +17,7 @@ package kamon.metric.instrument import kamon.metric.instrument.UnitOfMeasurement.Unknown -import org.scalatest.{Matchers, WordSpec} +import org.scalatest.{ Matchers, WordSpec } class UnitOfMeasurementSpec extends WordSpec with Matchers { diff --git a/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala b/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala index 3486a60c..a53451b6 100644 --- a/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala +++ b/kamon-core/src/test/scala/kamon/util/NeedToScaleSpec.scala @@ -17,8 +17,8 @@ package kamon.util import com.typesafe.config.ConfigFactory -import kamon.metric.instrument.{Memory, Time} -import org.scalatest.{Matchers, WordSpec} +import kamon.metric.instrument.{ Memory, Time } +import org.scalatest.{ Matchers, WordSpec } class NeedToScaleSpec extends WordSpec with Matchers { @@ -30,7 +30,7 @@ class NeedToScaleSpec extends WordSpec with Matchers { """.stripMargin) config match { - case NeedToScale(timeUnits, memoryUnits) => + case NeedToScale(timeUnits, memoryUnits) ⇒ timeUnits should be(Some(Time.Milliseconds)) memoryUnits should be(None) } @@ -42,7 +42,7 @@ class NeedToScaleSpec extends WordSpec with Matchers { """.stripMargin) config match { - case NeedToScale(timeUnits, memoryUnits) => + case NeedToScale(timeUnits, memoryUnits) ⇒ timeUnits should be(None) memoryUnits should be(Some(Memory.KiloBytes)) } @@ -54,9 +54,9 @@ class NeedToScaleSpec extends WordSpec with Matchers { """.stripMargin) config match { - case NeedToScale(timeUnits, memoryUnits) => + case NeedToScale(timeUnits, memoryUnits) ⇒ fail("Should not match") - case _ => + case _ ⇒ } } } -- cgit v1.2.3