From 729945012130717d44d039eed99f59e48141c32b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Antonsson?= Date: Thu, 6 Sep 2012 15:35:59 +0200 Subject: [PATCH] Make akka-testkit and akka-remote-tests contain enough for MultiNodeSpec. See #1802 --- .../scala/akka/remote/QuietReporter.scala | 0 .../scala/akka/remote/testkit/LogRoleReplace.scala | 0 .../scala/akka/remote/testkit/MultiNodeSpec.scala | 0 .../scala/akka/testkit/AkkaSpec.scala | 9 ++++----- .../src/test/scala/akka/testkit/TestTags.scala | 9 +++++++++ project/AkkaBuild.scala | 14 +++++++++++--- 6 files changed, 24 insertions(+), 8 deletions(-) rename akka-remote-tests/src/{multi-jvm => main}/scala/akka/remote/QuietReporter.scala (100%) rename akka-remote-tests/src/{test => main}/scala/akka/remote/testkit/LogRoleReplace.scala (100%) rename akka-remote-tests/src/{test => main}/scala/akka/remote/testkit/MultiNodeSpec.scala (100%) rename akka-testkit/src/{test => main}/scala/akka/testkit/AkkaSpec.scala (96%) create mode 100644 akka-testkit/src/test/scala/akka/testkit/TestTags.scala diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/QuietReporter.scala b/akka-remote-tests/src/main/scala/akka/remote/QuietReporter.scala similarity index 100% rename from akka-remote-tests/src/multi-jvm/scala/akka/remote/QuietReporter.scala rename to akka-remote-tests/src/main/scala/akka/remote/QuietReporter.scala diff --git a/akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala b/akka-remote-tests/src/main/scala/akka/remote/testkit/LogRoleReplace.scala similarity index 100% rename from akka-remote-tests/src/test/scala/akka/remote/testkit/LogRoleReplace.scala rename to akka-remote-tests/src/main/scala/akka/remote/testkit/LogRoleReplace.scala diff --git a/akka-remote-tests/src/test/scala/akka/remote/testkit/MultiNodeSpec.scala b/akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala similarity index 100% rename from akka-remote-tests/src/test/scala/akka/remote/testkit/MultiNodeSpec.scala rename to akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala diff --git a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala b/akka-testkit/src/main/scala/akka/testkit/AkkaSpec.scala similarity index 96% rename from akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala rename to akka-testkit/src/main/scala/akka/testkit/AkkaSpec.scala index a1d32e019e..a0e8948d6c 100644 --- a/akka-testkit/src/test/scala/akka/testkit/AkkaSpec.scala +++ b/akka-testkit/src/main/scala/akka/testkit/AkkaSpec.scala @@ -16,9 +16,6 @@ import java.util.concurrent.TimeoutException import akka.dispatch.Dispatchers import akka.pattern.ask -object TimingTest extends Tag("timing") -object LongRunningTest extends Tag("long-running") - object AkkaSpec { val testConf: Config = ConfigFactory.parseString(""" akka { @@ -36,7 +33,7 @@ object AkkaSpec { } } } - """) + """) def mapToConfig(map: Map[String, Any]): Config = { import scala.collection.JavaConverters._ @@ -117,7 +114,9 @@ class AkkaSpecSpec extends WordSpec with MustMatchers { "akka.actor.debug.lifecycle" -> true, "akka.actor.debug.event-stream" -> true, "akka.loglevel" -> "DEBUG", "akka.stdout-loglevel" -> "DEBUG") val system = ActorSystem("AkkaSpec1", ConfigFactory.parseMap(conf.asJava).withFallback(AkkaSpec.testConf)) - val spec = new AkkaSpec(system) { val ref = Seq(testActor, system.actorOf(Props.empty, "name")) } + val spec = new AkkaSpec(system) { + val ref = Seq(testActor, system.actorOf(Props.empty, "name")) + } spec.ref foreach (_.isTerminated must not be true) system.shutdown() spec.awaitCond(spec.ref forall (_.isTerminated), 2 seconds) diff --git a/akka-testkit/src/test/scala/akka/testkit/TestTags.scala b/akka-testkit/src/test/scala/akka/testkit/TestTags.scala new file mode 100644 index 0000000000..df33b511e8 --- /dev/null +++ b/akka-testkit/src/test/scala/akka/testkit/TestTags.scala @@ -0,0 +1,9 @@ +/** + * Copyright (C) 2009-2012 Typesafe Inc. + */ +package akka.testkit + +import org.scalatest.Tag + +object TimingTest extends Tag("timing") +object LongRunningTest extends Tag("long-running") diff --git a/project/AkkaBuild.scala b/project/AkkaBuild.scala index db819d68d8..2908659c0a 100644 --- a/project/AkkaBuild.scala +++ b/project/AkkaBuild.scala @@ -131,8 +131,9 @@ object AkkaBuild extends Build { lazy val remoteTests = Project( id = "akka-remote-tests", base = file("akka-remote-tests"), - dependencies = Seq(remote, actorTests % "test->test", testkit % "test->test"), + dependencies = Seq(remote, actorTests % "test->test", testkit % "compile;test->test"), settings = defaultSettings ++ multiJvmSettings ++ Seq( + libraryDependencies ++= Dependencies.remoteTests, // disable parallel tests parallelExecution in Test := false, extraOptions in MultiJvm <<= (sourceDirectory in MultiJvm) { src => @@ -147,7 +148,7 @@ object AkkaBuild extends Build { lazy val cluster = Project( id = "akka-cluster", base = file("akka-cluster"), - dependencies = Seq(remote, remoteTests % "compile;test->test;multi-jvm->multi-jvm", testkit % "test->test"), + dependencies = Seq(remote, remoteTests % "test->test;multi-jvm->multi-jvm", testkit % "test->test"), settings = defaultSettings ++ multiJvmSettings ++ OSGi.cluster ++ Seq( libraryDependencies ++= Dependencies.cluster, // disable parallel tests @@ -548,12 +549,14 @@ object Dependencies { val actor = Seq(config) - val testkit = Seq(Test.scalatest, Test.junit) + val testkit = Seq(Compile.scalatest, Compile.junit, Test.junit, Test.junit) val actorTests = Seq(Test.junit, Test.scalatest, Test.commonsMath, Test.mockito, Test.scalacheck, protobuf) val remote = Seq(netty, protobuf, uncommonsMath, Test.junit, Test.scalatest) + val remoteTests = Seq(Compile.scalatest, Test.junit, Test.scalatest) + val cluster = Seq(Test.junit, Test.scalatest) val slf4j = Seq(slf4jApi, Test.logback) @@ -612,6 +615,11 @@ object Dependency { val junitIntf = "com.novocode" % "junit-interface" % "0.8" % "test" // MIT } + object Compile { + val junit = "junit" % "junit" % "4.10" % "compile" // Common Public License 1.0 + val scalatest = "org.scalatest" % "scalatest" % "1.9-2.10.0-M7-B1" % "compile" cross CrossVersion.full // ApacheV2 + } + // Camel Sample object CamelSample { val camelJetty = "org.apache.camel" % "camel-jetty" % "2.10.0" // ApacheV2