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

Fix ActorLoggingSpec for Scala 2.11, #26368

Browse source 
* no point in spending time on trying to make the detectLoggerClassFromStack
  smarter for 2.11 since 2.11 will be dropped in Akka 2.6 and perhaps even
  earlier than that for Typed
This commit is contained in:
Patrik Nordwall 2019-02-12 17:04:09 +01:00
parent 6d25b38e56
commit 57cff2e551
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
akka-actor-typed-tests/src/test/scala/akka/actor/typed/scaladsl/ActorLoggingSpec.scala
View file

@ -6,6 +6,8 @@ package akka.actor.typed.scaladsl
import java.util.concurrent.atomic.AtomicInteger
import scala.util.Properties
import akka.actor.testkit.typed.scaladsl.ScalaTestWithActorTestKit
import akka.actor.testkit.typed.TestException
import akka.actor.typed.scaladsl.adapter._
@ -41,6 +43,8 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit("""
akka.loggers = ["akka.testkit.TestEventListener"]
""") with WordSpecLike {
private val isScala211 = Properties.versionNumberString.startsWith("2.11")
val marker = LogMarker("marker")
val cause = new TestException("böö")
@ -68,6 +72,11 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit("""
"contain the class name where the first log was called" in {
val eventFilter = EventFilter.custom({
case l: LogEvent if l.logClass == classOf[ActorLoggingSpec] ⇒ true
case l: LogEvent if isScala211 ⇒
// TODO remove in Akka 2.6 when we drop Scala 2.11
// the class with 2.11 is like
// ActorLoggingSpec$$anonfun$1$$anonfun$apply$mcV$sp$26$$anonfun$apply$6$$anonfun$apply$7
l.logClass.getName.startsWith(classOf[ActorLoggingSpec].getName)
case l: LogEvent ⇒
println(l.logClass)
false
@ -88,6 +97,11 @@ class ActorLoggingSpec extends ScalaTestWithActorTestKit("""
"contain the object class name where the first log was called" in {
val eventFilter = EventFilter.custom({
case l: LogEvent if l.logClass == WhereTheBehaviorIsDefined.getClass ⇒ true
case l: LogEvent if isScala211 ⇒
// TODO remove in Akka 2.6 when we drop Scala 2.11
// the class with 2.11 is like
// WhereTheBehaviorIsDefined$$anonfun$behavior$1
l.logClass.getName.startsWith(WhereTheBehaviorIsDefined.getClass.getName)
case l: LogEvent ⇒
println(l.logClass)
false