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

Factor out localhost and re-enable schoir.

Browse source
This commit is contained in:
Eugene Vigdorchik 2012-01-25 20:12:26 +04:00
parent 7f3a9cd756
commit c8cd25e913
8 changed files with 27 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

11
akka-remote/src/multi-jvm/scala/akka/remote/AbstractRemoteActorMultiJvmSpec.scala
View file

@ -6,14 +6,15 @@ trait AbstractRemoteActorMultiJvmSpec {
def NrOfNodes: Int
def commonConfig: Config
def remotes: Seq[String] = {
private[this] val remotes: Array[String] = {
val arrayOpt = Option(AkkaRemoteSpec.testNodes).map(_ split ",")
(arrayOpt getOrElse Array.fill(NrOfNodes)("localhost")).toSeq
(arrayOpt getOrElse Array.fill(NrOfNodes)("localhost")).toArray
}
def specString(count: Int): String = {
val specs = for ((host, idx) <- remotes.take(count).zipWithIndex) yield
"\"akka://AkkaRemoteSpec@%s:%d\"".format(host, 9991+idx)
def akkaSpec(idx: Int) = "AkkaRemoteSpec@%s:%d".format(remotes(idx), 9991+idx)
def akkaURIs(count: Int): String = {
val specs = for (idx <- 0 until count) yield "\"akka://" + akkaSpec(idx) + "\""
specs.mkString(",")
}

10
akka-remote/src/multi-jvm/scala/akka/remote/DirectRoutedRemoteActorMultiJvmSpec.scala
View file

@ -26,10 +26,12 @@ object DirectRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSp
/service-hello.remote = %s
}
}
}""" format specString(1))
}""" format akkaURIs(1))
}
class DirectRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(DirectRoutedRemoteActorMultiJvmSpec.nodeConfigs(0)) {
import DirectRoutedRemoteActorMultiJvmSpec._
class DirectRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(nodeConfigs(0)) {
import DirectRoutedRemoteActorMultiJvmSpec._
val nodes = NrOfNodes
@ -41,7 +43,7 @@ class DirectRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(DirectRoutedRe
}
}
class DirectRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec(DirectRoutedRemoteActorMultiJvmSpec.nodeConfigs(1)) with DefaultTimeout {
class DirectRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec(nodeConfigs(1)) with DefaultTimeout {
import DirectRoutedRemoteActorMultiJvmSpec._
val nodes = NrOfNodes
@ -53,7 +55,7 @@ class DirectRoutedRemoteActorMultiJvmNode2 extends AkkaRemoteSpec(DirectRoutedRe
val actor = system.actorOf(Props[SomeActor], "service-hello")
actor.isInstanceOf[RemoteActorRef] must be(true)
Await.result(actor ? "identify", timeout.duration) must equal("AkkaRemoteSpec@localhost:9991")
Await.result(actor ? "identify", timeout.duration) must equal(akkaSpec(0))
barrier("done")
}

4
akka-remote/src/multi-jvm/scala/akka/remote/NewRemoteActorMultiJvmSpec.scala
View file

@ -27,7 +27,7 @@ object NewRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSpec {
/service-hello.remote = %s
}
}
}""" format specString(1))
}""" format akkaURIs(1))
}
class NewRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(NewRemoteActorMultiJvmSpec.nodeConfigs(0)) {
@ -56,7 +56,7 @@ class NewRemoteActorMultiJvmNode2 extends AkkaRemoteSpec(NewRemoteActorMultiJvmS
barrier("start")
val actor = system.actorOf(Props[SomeActor], "service-hello")
Await.result(actor ? "identify", timeout.duration) must equal("AkkaRemoteSpec@localhost:9991")
Await.result(actor ? "identify", timeout.duration) must equal(akkaSpec(0))
barrier("done")
}

8
akka-remote/src/multi-jvm/scala/akka/remote/RandomRoutedRemoteActorMultiJvmSpec.scala
View file

@ -28,7 +28,7 @@ object RandomRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJvmSp
/service-hello.target.nodes = [%s]
}
}
}""" format (3, specString(3)))
}""" format (3, akkaURIs(3)))
}
class RandomRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(RandomRoutedRemoteActorMultiJvmSpec.nodeConfigs(0)) {
@ -84,9 +84,9 @@ class RandomRoutedRemoteActorMultiJvmNode4 extends AkkaRemoteSpec(RandomRoutedRe
val iterationCount = 10
var replies = Map(
"AkkaRemoteSpec@localhost:9991" -> 0,
"AkkaRemoteSpec@localhost:9992" -> 0,
"AkkaRemoteSpec@localhost:9993" -> 0)
akkaSpec(0) -> 0,
akkaSpec(1) -> 0,
akkaSpec(2) -> 0)
for (i ← 0 until iterationCount) {
for (k ← 0 until connectionCount) {

8
akka-remote/src/multi-jvm/scala/akka/remote/RoundRobinRoutedRemoteActorMultiJvmSpec.scala
View file

@ -29,7 +29,7 @@ object RoundRobinRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMultiJ
/service-hello.target.nodes = [%s]
}
}
}""" format (3, specString(3)))
}""" format (3, akkaURIs(3)))
}
class RoundRobinRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(RoundRobinRoutedRemoteActorMultiJvmSpec.nodeConfigs(0)) {
@ -85,9 +85,9 @@ class RoundRobinRoutedRemoteActorMultiJvmNode4 extends AkkaRemoteSpec(RoundRobin
val iterationCount = 10
var replies = Map(
"AkkaRemoteSpec@localhost:9991" -> 0,
"AkkaRemoteSpec@localhost:9992" -> 0,
"AkkaRemoteSpec@localhost:9993" -> 0)
akkaSpec(0) -> 0,
akkaSpec(1) -> 0,
akkaSpec(2) -> 0)
for (i ← 0 until iterationCount) {
for (k ← 0 until connectionCount) {

4
akka-remote/src/multi-jvm/scala/akka/remote/ScatterGatherRoutedRemoteActorMultiJvmSpec.scala
View file

@ -27,7 +27,7 @@ object ScatterGatherRoutedRemoteActorMultiJvmSpec extends AbstractRemoteActorMul
/service-hello.target.nodes = [%s]
}
}
}""" format (3, specString(3)))
}""" format (3, akkaURIs(3)))
}
class ScatterGatherRoutedRemoteActorMultiJvmNode1 extends AkkaRemoteSpec(ScatterGatherRoutedRemoteActorMultiJvmSpec.nodeConfigs(0)) {
@ -91,7 +91,7 @@ class ScatterGatherRoutedRemoteActorMultiJvmNode4 extends AkkaRemoteSpec(Scatter
val replies = (receiveWhile(5 seconds, messages = connectionCount * iterationCount) {
case name: String ⇒ (name, 1)
}).foldLeft(Map("AkkaRemoteSpec@localhost:9991" -> 0, "AkkaRemoteSpec@localhost:9992" -> 0, "AkkaRemoteSpec@localhost:9993" -> 0)) {
}).foldLeft(Map(akkaSpec(0) -> 0, akkaSpec(1) -> 0, akkaSpec(2) -> 0)) {
case (m, (n, c)) ⇒ m + (n -> (m(n) + c))
}

4
project/AkkaBuild.scala
View file

@ -8,7 +8,7 @@ import sbt._
import sbt.Keys._
import com.typesafe.sbtmultijvm.MultiJvmPlugin
import com.typesafe.sbtmultijvm.MultiJvmPlugin.{ MultiJvm, extraOptions, jvmOptions, scalatestOptions }
//import com.typesafe.schoir.SchoirPlugin.schoirSettings
import com.typesafe.schoir.SchoirPlugin.schoirSettings
import com.typesafe.sbtscalariform.ScalariformPlugin
import com.typesafe.sbtscalariform.ScalariformPlugin.ScalariformKeys
import java.lang.Boolean.getBoolean
@ -71,7 +71,7 @@ object AkkaBuild extends Build {
id = "akka-remote",
base = file("akka-remote"),
dependencies = Seq(actor, actorTests % "test->test", testkit % "test->test"),
settings = defaultSettings ++ multiJvmSettings ++ /*schoirSettings ++*/ Seq(
settings = defaultSettings ++ multiJvmSettings ++ schoirSettings ++ Seq(
libraryDependencies ++= Dependencies.remote,
// disable parallel tests
parallelExecution in Test := false,

2
project/plugins.sbt
View file

@ -3,7 +3,7 @@ resolvers += Classpaths.typesafeResolver
addSbtPlugin("com.typesafe.sbtmultijvm" % "sbt-multi-jvm" % "0.1.9")
//addSbtPlugin("com.typesafe.schoir" % "schoir" % "0.1.1")
addSbtPlugin("com.typesafe.schoir" % "schoir" % "0.1.2")
addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse" % "1.5.0")