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

=all #3837 Make akkaScalaNightly compile on scala 2.11.0-M8

Browse source
This commit is contained in:
Björn Antonsson 2014-01-31 11:14:13 +01:00
parent 85698688e4
commit 179faba453
82 changed files with 651 additions and 643 deletions
Download patch file Download diff file Expand all files Collapse all files

8
akka-docs/rst/scala/code/docs/actor/ActorDocSpec.scala
View file

@ -505,7 +505,7 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
val b = system.actorOf(Props(classOf[Follower], this))
watch(b)
system.stop(a)
expectMsgType[akka.actor.Terminated].actor should equal(b)
expectMsgType[akka.actor.Terminated].actor should be(b)
}
}
@ -567,12 +567,12 @@ class ActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
implicit val me = testActor
actor ! 42
expectMsg(42)
lastSender should equal(actor)
lastSender should be(actor)
actor ! me
expectMsg("reply")
lastSender.path.toStringWithoutAddress should equal("/user")
lastSender.path.toStringWithoutAddress should be("/user")
expectMsg("reply")
lastSender.path.toStringWithoutAddress should equal("/user")
lastSender.path.toStringWithoutAddress should be("/user")
}
"using ActorDSL outside of akka.actor package" in {

8
akka-docs/rst/scala/code/docs/actor/TypedActorDocSpec.scala
View file

@ -124,11 +124,11 @@ class TypedActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
//#typed-actor-call-strict
//#typed-actor-calls
Await.result(fSquare, 3 seconds) should equal(100)
Await.result(fSquare, 3 seconds) should be(100)
oSquare should equal(Some(100))
oSquare should be(Some(100))
iSquare should equal(100)
iSquare should be(100)
//#typed-actor-stop
TypedActor(system).stop(mySquarer)
@ -174,6 +174,6 @@ class TypedActorDocSpec extends AkkaSpec(Map("akka.loglevel" -> "INFO")) {
TypedActor(system).poisonPill(awesomeFooBar)
//#typed-actor-supercharge-usage
Await.result(f, 3 seconds) should equal("YES")
Await.result(f, 3 seconds) should be("YES")
}
}

22
akka-docs/rst/scala/code/docs/agent/AgentDocSpec.scala
View file

@ -28,20 +28,20 @@ class AgentDocSpec extends AkkaSpec {
//#read-apply
val result = agent()
//#read-apply
result should equal(0)
result should be(0)
}
{
//#read-get
val result = agent.get
//#read-get
result should equal(0)
result should be(0)
}
{
//#read-future
val future = agent.future
//#read-future
Await.result(future, 5 seconds) should equal(0)
Await.result(future, 5 seconds) should be(0)
}
}
@ -67,7 +67,7 @@ class AgentDocSpec extends AkkaSpec {
agent sendOff longRunningOrBlockingFunction
//#send-off
Await.result(agent.future, 5 seconds) should equal(16)
Await.result(agent.future, 5 seconds) should be(16)
}
"alter and alterOff" in {
@ -91,7 +91,7 @@ class AgentDocSpec extends AkkaSpec {
val f4: Future[Int] = agent alterOff longRunningOrBlockingFunction
//#alter-off
Await.result(f4, 5 seconds) should equal(16)
Await.result(f4, 5 seconds) should be(16)
}
"transfer example" in {
@ -120,9 +120,9 @@ class AgentDocSpec extends AkkaSpec {
val toValue = to.future // -> 70
//#transfer-example
Await.result(fromValue, 5 seconds) should equal(50)
Await.result(toValue, 5 seconds) should equal(70)
ok should equal(true)
Await.result(fromValue, 5 seconds) should be(50)
Await.result(toValue, 5 seconds) should be(70)
ok should be(true)
}
"monadic example" in {
@ -149,8 +149,8 @@ class AgentDocSpec extends AkkaSpec {
} yield value1 + value2
//#monadic-example
agent3() should equal(4)
agent4() should equal(4)
agent5() should equal(8)
agent3() should be(4)
agent4() should be(4)
agent5() should be(8)
}
}

2
akka-docs/rst/scala/code/docs/remoting/RemoteDeploymentDocSpec.scala
View file

@ -47,7 +47,7 @@ class RemoteDeploymentDocSpec extends AkkaSpec("""
val one = AddressFromURIString("akka.tcp://sys@host:1234")
val two = Address("akka.tcp", "sys", "host", 1234) // this gives the same
//#make-address
one should equal(two)
one should be(two)
}
"demonstrate sampleActor" in {

8
akka-docs/rst/scala/code/docs/serialization/SerializationDocSpec.scala
View file

@ -123,9 +123,9 @@ package docs.serialization {
#//#serialization-bindings-config
""")
val a = ActorSystem("system", config)
SerializationExtension(a).serializerFor(classOf[String]).getClass should equal(classOf[JavaSerializer])
SerializationExtension(a).serializerFor(classOf[Customer]).getClass should equal(classOf[JavaSerializer])
SerializationExtension(a).serializerFor(classOf[java.lang.Boolean]).getClass should equal(classOf[MyOwnSerializer])
SerializationExtension(a).serializerFor(classOf[String]).getClass should be(classOf[JavaSerializer])
SerializationExtension(a).serializerFor(classOf[Customer]).getClass should be(classOf[JavaSerializer])
SerializationExtension(a).serializerFor(classOf[java.lang.Boolean]).getClass should be(classOf[MyOwnSerializer])
shutdown(a)
}
@ -149,7 +149,7 @@ package docs.serialization {
val back = serializer.fromBinary(bytes, manifest = None)
// Voilá!
back should equal(original)
back should be(original)
//#programmatic
shutdown(system)