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

Cleanup, small fixes and more and better tests

Browse source
This commit is contained in:
Mathias 2013-01-22 13:48:36 +01:00
parent ba922fa2d7
commit 79accb810e
10 changed files with 127 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

74
akka-io/src/test/scala/akka/io/IntegrationSpec.scala
View file

@ -4,24 +4,17 @@
package akka.io
import akka.testkit.{ TestProbe, AkkaSpec }
import akka.actor.ActorRef
import akka.testkit.AkkaSpec
import akka.util.ByteString
import Tcp._
import TestUtils._
import collection.immutable
import annotation.tailrec
class IntegrationSpec extends AkkaSpec("akka.loglevel = INFO") {
class IntegrationSpec extends AkkaSpec("akka.loglevel = INFO") with IntegrationSpecSupport {
"The TCP transport implementation" should {
"properly bind a test server" in new TestSetup
"allow connecting to the test server" in new TestSetup {
establishNewClientConnection()
}
"allow connecting to and disconnecting from the test server" in new TestSetup {
val (clientHandler, clientConnection, serverHandler, serverConnection) = establishNewClientConnection()
clientHandler.send(clientConnection, Close)
@ -43,12 +36,12 @@ class IntegrationSpec extends AkkaSpec("akka.loglevel = INFO") {
"properly complete one client/server request/response cycle" in new TestSetup {
val (clientHandler, clientConnection, serverHandler, serverConnection) = establishNewClientConnection()
clientHandler.send(clientConnection, Write(ByteString("Captain on the bridge!"), 42))
clientHandler.expectMsg(42)
clientHandler.send(clientConnection, Write(ByteString("Captain on the bridge!"), 'Aye))
clientHandler.expectMsg('Aye)
serverHandler.expectMsgType[Received].data.decodeString("ASCII") must be("Captain on the bridge!")
serverHandler.send(serverConnection, Write(ByteString("For the king!"), 4242))
serverHandler.expectMsg(4242)
serverHandler.send(serverConnection, Write(ByteString("For the king!"), 'Yes))
serverHandler.expectMsg('Yes)
clientHandler.expectMsgType[Received].data.decodeString("ASCII") must be("For the king!")
serverHandler.send(serverConnection, Close)
@ -59,62 +52,17 @@ class IntegrationSpec extends AkkaSpec("akka.loglevel = INFO") {
verifyActorTermination(serverConnection)
}
"waiting for writes works with backpressure" in new TestSetup {
"support waiting for writes with backpressure" in new TestSetup {
val (clientHandler, clientConnection, serverHandler, serverConnection) = establishNewClientConnection()
serverHandler.send(serverConnection, Write(ByteString(Array.fill[Byte](100000)(0)), 4223))
serverHandler.expectMsg(4223)
serverHandler.send(serverConnection, Write(ByteString(Array.fill[Byte](100000)(0)), 'Ack))
serverHandler.expectMsg('Ack)
expectReceivedData(clientHandler, 100000)
override def bindOptions: immutable.Traversable[SocketOption] =
List(SO.SendBufferSize(1024))
override def connectOptions: immutable.Traversable[SocketOption] =
List(SO.ReceiveBufferSize(1024))
override def bindOptions = List(SO.SendBufferSize(1024))
override def connectOptions = List(SO.ReceiveBufferSize(1024))
}
//////////////////////////////////////
///////// more tests to come /////////
//////////////////////////////////////
}
class TestSetup {
val bindHandler = TestProbe()
val endpoint = TemporaryServerAddress()
bindServer()
def bindServer(): Unit = {
val bindCommander = TestProbe()
bindCommander.send(IO(Tcp), Bind(bindHandler.ref, endpoint, options = bindOptions))
bindCommander.expectMsg(Bound)
}
def establishNewClientConnection(): (TestProbe, ActorRef, TestProbe, ActorRef) = {
val connectCommander = TestProbe()
connectCommander.send(IO(Tcp), Connect(endpoint, options = connectOptions))
val Connected(`endpoint`, localAddress) = connectCommander.expectMsgType[Connected]
val clientHandler = TestProbe()
connectCommander.sender ! Register(clientHandler.ref)
val Connected(`localAddress`, `endpoint`) = bindHandler.expectMsgType[Connected]
val serverHandler = TestProbe()
bindHandler.sender ! Register(serverHandler.ref)
(clientHandler, connectCommander.sender, serverHandler, bindHandler.sender)
}
@tailrec final def expectReceivedData(handler: TestProbe, remaining: Int): Unit =
if (remaining > 0) {
val recv = handler.expectMsgType[Received]
expectReceivedData(handler, remaining - recv.data.size)
}
/** allow overriding socket options for server side channel */
def bindOptions: collection.immutable.Traversable[SocketOption] = Nil
/** allow overriding socket options for client side channel */
def connectOptions: collection.immutable.Traversable[SocketOption] = Nil
}
}