From 27a0e533f8db52888c0eb158e3b92c4c65900ba3 Mon Sep 17 00:00:00 2001 From: Roland Date: Fri, 27 Apr 2012 16:44:54 +0200 Subject: [PATCH 1/2] add one more test for wildcard deployment --- .../routing/ConfiguredLocalRoutingSpec.scala | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala index f79c9be840..d01f1cda04 100644 --- a/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala +++ b/akka-actor-tests/src/test/scala/akka/routing/ConfiguredLocalRoutingSpec.scala @@ -7,8 +7,7 @@ import java.util.concurrent.atomic.AtomicInteger import org.junit.runner.RunWith -import akka.actor.actorRef2Scala -import akka.actor.{ Props, LocalActorRef, Deploy, Actor } +import akka.actor.{ Props, LocalActorRef, Deploy, Actor, ActorRef } import akka.config.ConfigurationException import akka.dispatch.Await import akka.pattern.{ ask, gracefulStop } @@ -31,6 +30,14 @@ object ConfiguredLocalRoutingSpec { router = random nr-of-instances = 4 } + /weird { + router = round-robin + nr-of-instances = 3 + } + "/weird/*" { + router = round-robin + nr-of-instances = 2 + } } } } @@ -88,6 +95,17 @@ class ConfiguredLocalRoutingSpec extends AkkaSpec(ConfiguredLocalRoutingSpec.con } } + "not get confused when trying to wildcard-configure children" in { + val router = system.actorOf(Props(new Actor { + testActor ! self + def receive = { case _ ⇒ } + }).withRouter(FromConfig), "weird") + val recv = Set() ++ (for (_ ← 1 to 3) yield expectMsgType[ActorRef]) + val expc = Set('a', 'b', 'c') map (i ⇒ system.actorFor("/user/weird/$" + i)) + recv must be(expc) + expectNoMsg(1 second) + } + } "round robin router" must { From 1cfa267b80087ff9cb7719388b5712de43566c1a Mon Sep 17 00:00:00 2001 From: Roland Date: Fri, 27 Apr 2012 17:07:50 +0200 Subject: [PATCH 2/2] =?UTF-8?q?do=20not=20reuse=20same=20port=20in=20same?= =?UTF-8?q?=20=C3=B8mq=20test,=20fixes=20#2022?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scala/code/akka/docs/zeromq/ZeromqDocSpec.scala | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala b/akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala index e5e3325dd5..dba4989d87 100644 --- a/akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala +++ b/akka-docs/scala/code/akka/docs/zeromq/ZeromqDocSpec.scala @@ -118,12 +118,12 @@ class ZeromqDocSpec extends AkkaSpec("akka.loglevel=INFO") { //#pub-socket import akka.zeromq.ZeroMQExtension - val pubSocket = ZeroMQExtension(system).newSocket(SocketType.Pub, Bind("tcp://127.0.0.1:1234")) + val pubSocket = ZeroMQExtension(system).newSocket(SocketType.Pub, Bind("tcp://127.0.0.1:21231")) //#pub-socket //#pub-socket2 import akka.zeromq._ - val pubSocket2 = system.newSocket(SocketType.Pub, Bind("tcp://127.0.0.1:1234")) + val pubSocket2 = system.newSocket(SocketType.Pub, Bind("tcp://127.0.0.1:21232")) //#pub-socket2 //#sub-socket @@ -135,11 +135,11 @@ class ZeromqDocSpec extends AkkaSpec("akka.loglevel=INFO") { case _ ⇒ //... } })) - val subSocket = system.newSocket(SocketType.Sub, Listener(listener), Connect("tcp://127.0.0.1:1234"), SubscribeAll) + val subSocket = system.newSocket(SocketType.Sub, Listener(listener), Connect("tcp://127.0.0.1:21231"), SubscribeAll) //#sub-socket //#sub-topic-socket - val subTopicSocket = system.newSocket(SocketType.Sub, Listener(listener), Connect("tcp://127.0.0.1:1234"), Subscribe("foo.bar")) + val subTopicSocket = system.newSocket(SocketType.Sub, Listener(listener), Connect("tcp://127.0.0.1:21231"), Subscribe("foo.bar")) //#sub-topic-socket //#unsub-topic-socket @@ -151,11 +151,14 @@ class ZeromqDocSpec extends AkkaSpec("akka.loglevel=INFO") { pubSocket ! ZMQMessage(Seq(Frame("foo.bar"), Frame(payload))) //#pub-topic + system.stop(subSocket) + system.stop(subTopicSocket) + //#high-watermark val highWatermarkSocket = system.newSocket( SocketType.Router, Listener(listener), - Bind("tcp://127.0.0.1:1234"), + Bind("tcp://127.0.0.1:21233"), HighWatermark(50000)) //#high-watermark }