Fixed test (renamed Meter.exceptionMarkerPartialFunction to Meter.exc…

…eptionMarkerPF to bring it in line with Timer.timePF).
erikvanoosten · Aug 6, 2013 · 110ce4a · 110ce4a
1 parent 50a914b
commit 110ce4a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/main/scala/nl/grons/metrics/scala/Meter.scala b/src/main/scala/nl/grons/metrics/scala/Meter.scala
@@ -102,6 +102,7 @@ class Meter(private val metric: CHMeter) {
   }
 
   @deprecated("please use exceptionMarkerPF", "3.0.2")
+  @inline
   def exceptionMarkerPartialFunction = exceptionMarkerPF
 
   /**

diff --git a/src/main/scala_2.10/nl/grons/metrics/scala/ActorMetrics.scala b/src/main/scala_2.10/nl/grons/metrics/scala/ActorMetrics.scala
@@ -113,7 +113,7 @@ trait ReceiveExceptionMeterActor extends Actor { self: InstrumentedBuilder =>
   def receiveExceptionMeterName: String = MetricBuilder.metricName(getClass, Seq("receiveExceptionMeter"))
   lazy val meter: Meter = metrics.meter(receiveExceptionMeterName)
 
-  private[this] lazy val wrapped = meter.exceptionMarkerPartialFunction(super.receive)
+  private[this] lazy val wrapped = meter.exceptionMarkerPF(super.receive)
 
   abstract override def receive = wrapped
 

diff --git a/src/test/scala_2.10/nl/grons/metrics/scala/ActorMetricsSpec.scala b/src/test/scala_2.10/nl/grons/metrics/scala/ActorMetricsSpec.scala
@@ -84,7 +84,7 @@ object TestFixture {
   class ExceptionMeterTestActor(fixture: Fixture) extends ExceptionThrowingTestActor(fixture) with ReceiveExceptionMeterActor
 
   class ComposedActor(fixture: Fixture) extends TestActor(fixture)
-  with ReceiveCounterActor with ReceiveTimerActor with ReceiveExceptionMeterActor
+    with ReceiveCounterActor with ReceiveTimerActor with ReceiveExceptionMeterActor
 
 }
 
@@ -122,7 +122,7 @@ class ActorMetricsSpec extends FunSpec with ShouldMatchers {
       val fixture = new Fixture
       val ref = TestActorRef(new ExceptionMeterTestActor(fixture))
       intercept[RuntimeException] { ref.receive("test") }
-      verify(fixture.mockMeter).exceptionMarkerPartialFunction
+      verify(fixture.mockMeter).exceptionMarkerPF
     }
   }