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

Merge pull request #1358 from drewhk/wip-3245-udp-temporary-address-drewhk

Browse source 
Udp tests now use ports acquired from a DatagramSocket
This commit is contained in:
drewhk 2013-04-22 07:32:31 -07:00
commit 7094daf313
3 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
akka-actor-tests/src/test/scala/akka/TestUtils.scala
View file

@ -5,22 +5,31 @@
package akka package akka
import scala.collection.immutable import scala.collection.immutable
import java.net.InetSocketAddress import java.net.{ SocketAddress, ServerSocket, DatagramSocket, InetSocketAddress }
import java.nio.channels.ServerSocketChannel import java.nio.channels.{ DatagramChannel, ServerSocketChannel }
import akka.actor.{ Terminated, ActorSystem, ActorRef } import akka.actor.{ Terminated, ActorSystem, ActorRef }
import akka.testkit.TestProbe import akka.testkit.TestProbe
object TestUtils { object TestUtils {
def temporaryServerAddress(address: String = "127.0.0.1"): InetSocketAddress = // Structural type needed since DatagramSocket and ServerSocket has no common ancestor apart from Object
temporaryServerAddresses(1, address).head type GeneralSocket = {
def bind(sa: SocketAddress): Unit
def close(): Unit
def getLocalPort(): Int
}
def temporaryServerAddresses(numberOfAddresses: Int, hostname: String = "127.0.0.1"): immutable.IndexedSeq[InetSocketAddress] = { def temporaryServerAddress(address: String = "127.0.0.1", udp: Boolean = false): InetSocketAddress =
temporaryServerAddresses(1, address, udp).head
def temporaryServerAddresses(numberOfAddresses: Int, hostname: String = "127.0.0.1", udp: Boolean = false): immutable.IndexedSeq[InetSocketAddress] = {
val sockets = for (_ ← 1 to numberOfAddresses) yield { val sockets = for (_ ← 1 to numberOfAddresses) yield {
val serverSocket = ServerSocketChannel.open() val serverSocket: GeneralSocket =
serverSocket.socket.bind(new InetSocketAddress(hostname, 0)) if (udp) DatagramChannel.open().socket()
val port = serverSocket.socket.getLocalPort else ServerSocketChannel.open().socket()
(serverSocket, new InetSocketAddress(hostname, port))
serverSocket.bind(new InetSocketAddress(hostname, 0))
(serverSocket, new InetSocketAddress(hostname, serverSocket.getLocalPort))
} }
sockets collect { case (socket, address) ⇒ socket.close(); address } sockets collect { case (socket, address) ⇒ socket.close(); address }

2
akka-actor-tests/src/test/scala/akka/io/UdpConnectedIntegrationSpec.scala
View file

@ -12,7 +12,7 @@ import akka.actor.ActorRef
class UdpConnectedIntegrationSpec extends AkkaSpec("akka.loglevel = INFO") with ImplicitSender { class UdpConnectedIntegrationSpec extends AkkaSpec("akka.loglevel = INFO") with ImplicitSender {
val addresses = temporaryServerAddresses(3) val addresses = temporaryServerAddresses(3, udp = true)
def bindUdp(address: InetSocketAddress, handler: ActorRef): ActorRef = { def bindUdp(address: InetSocketAddress, handler: ActorRef): ActorRef = {
val commander = TestProbe() val commander = TestProbe()

2
akka-actor-tests/src/test/scala/akka/io/UdpIntegrationSpec.scala
View file

@ -12,7 +12,7 @@ import akka.actor.ActorRef
class UdpIntegrationSpec extends AkkaSpec("akka.loglevel = INFO") with ImplicitSender { class UdpIntegrationSpec extends AkkaSpec("akka.loglevel = INFO") with ImplicitSender {
val addresses = temporaryServerAddresses(3) val addresses = temporaryServerAddresses(3, udp = true)
def bindUdp(address: InetSocketAddress, handler: ActorRef): ActorRef = { def bindUdp(address: InetSocketAddress, handler: ActorRef): ActorRef = {
val commander = TestProbe() val commander = TestProbe()