From 5c3cb7c94ddb9fb800b01c47ea2d41f7e580bd6f Mon Sep 17 00:00:00 2001 From: momania Date: Fri, 23 Jul 2010 20:52:33 +0200 Subject: [PATCH] re-arranged tests into folders/packages --- akka-core/src/test/scala/Messages.scala | 2 +- .../{ => actor}/ActiveObjectContextSpec.scala | 1 - .../ActiveObjectGuiceConfiguratorSpec.scala | 2 -- .../{ => actor}/ActiveObjectLifecycleSpec.scala | 0 .../ActorFireForgetRequestReplySpec.scala | 0 .../ActorObjectUtilFunctionsSpec.scala | 2 +- .../scala/{ => actor}/ActorRegistrySpec.scala | 0 .../src/test/scala/{ => actor}/AgentSpec.scala | 4 ---- akka-core/src/test/scala/{ => actor}/Bench.scala | 0 ...isedNestedTransactionalActiveObjectSpec.scala | 3 --- ...SupervisedTransactionalActiveObjectSpec.scala | 3 --- .../scala/{ => actor}/ForwardActorSpec.scala | 0 .../src/test/scala/{ => actor}/FutureSpec.scala | 0 .../scala/{ => actor}/ReceiveTimeoutSpec.scala | 4 ++-- .../test/scala/{ => actor}/SchedulerSpec.scala | 2 +- .../{ => actor}/SupervisorHierarchySpec.scala | 0 .../test/scala/{ => actor}/SupervisorSpec.scala | 1 - .../test/scala/{ => actor}/TransactorSpec.scala | 0 ...utorBasedEventDrivenDispatcherActorSpec.scala | 3 ++- ...torBasedEventDrivenDispatcherActorsSpec.scala | 4 ++-- ...edEventDrivenWorkStealingDispatcherSpec.scala | 5 +++-- ...gleThreadEventDrivenDispatcherActorSpec.scala | 5 +++-- ...hreadPoolEventDrivenDispatcherActorSpec.scala | 3 ++- .../{ => dispatch}/ThreadBasedActorSpec.scala | 3 ++- .../ThreadBasedDispatcherSpec.scala | 0 .../ClientInitiatedRemoteActorSpec.scala | 5 ++--- .../{ => remote}/RemoteSupervisorSpec.scala | 11 ++++------- .../RemoteTransactionalActiveObjectSpec.scala | 7 ++----- .../ServerInitiatedRemoteActorSample.scala | 2 +- .../ServerInitiatedRemoteActorSpec.scala | 16 +++++++--------- .../test/scala/{ => remote}/ShutdownSpec.scala | 0 .../test/scala/{ => routing}/RoutingSpec.scala | 10 ++++------ .../ProtobufActorMessageSerializationSpec.scala | 7 +++---- .../SerializableTypeClassActorSpec.scala | 7 +++---- .../{ => serialization}/SerializerSpec.scala | 4 +--- akka-core/src/test/scala/{ => stm}/RefSpec.scala | 6 +++--- akka-core/src/test/scala/{ => stm}/StmSpec.scala | 7 +++---- .../src/test/scala/tickets/Proof001Spec.scala | 10 ++++++++++ 38 files changed, 62 insertions(+), 77 deletions(-) rename akka-core/src/test/scala/{ => actor}/ActiveObjectContextSpec.scala (97%) rename akka-core/src/test/scala/{ => actor}/ActiveObjectGuiceConfiguratorSpec.scala (97%) rename akka-core/src/test/scala/{ => actor}/ActiveObjectLifecycleSpec.scala (100%) rename akka-core/src/test/scala/{ => actor}/ActorFireForgetRequestReplySpec.scala (100%) rename akka-core/src/test/scala/{ => actor}/ActorObjectUtilFunctionsSpec.scala (93%) rename akka-core/src/test/scala/{ => actor}/ActorRegistrySpec.scala (100%) rename akka-core/src/test/scala/{ => actor}/AgentSpec.scala (95%) rename akka-core/src/test/scala/{ => actor}/Bench.scala (100%) rename akka-core/src/test/scala/{ => actor}/DeclarativelySupervisedNestedTransactionalActiveObjectSpec.scala (98%) rename akka-core/src/test/scala/{ => actor}/DeclarativelySupervisedTransactionalActiveObjectSpec.scala (97%) rename akka-core/src/test/scala/{ => actor}/ForwardActorSpec.scala (100%) rename akka-core/src/test/scala/{ => actor}/FutureSpec.scala (100%) rename akka-core/src/test/scala/{ => actor}/ReceiveTimeoutSpec.scala (99%) rename akka-core/src/test/scala/{ => actor}/SchedulerSpec.scala (99%) rename akka-core/src/test/scala/{ => actor}/SupervisorHierarchySpec.scala (100%) rename akka-core/src/test/scala/{ => actor}/SupervisorSpec.scala (99%) rename akka-core/src/test/scala/{ => actor}/TransactorSpec.scala (100%) rename akka-core/src/test/scala/{ => dispatch}/ExecutorBasedEventDrivenDispatcherActorSpec.scala (95%) rename akka-core/src/test/scala/{ => dispatch}/ExecutorBasedEventDrivenDispatcherActorsSpec.scala (93%) rename akka-core/src/test/scala/{ => dispatch}/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala (95%) rename akka-core/src/test/scala/{ => dispatch}/ReactorBasedSingleThreadEventDrivenDispatcherActorSpec.scala (95%) rename akka-core/src/test/scala/{ => dispatch}/ReactorBasedThreadPoolEventDrivenDispatcherActorSpec.scala (95%) rename akka-core/src/test/scala/{ => dispatch}/ThreadBasedActorSpec.scala (94%) rename akka-core/src/test/scala/{ => dispatch}/ThreadBasedDispatcherSpec.scala (100%) rename akka-core/src/test/scala/{ => remote}/ClientInitiatedRemoteActorSpec.scala (97%) rename akka-core/src/test/scala/{ => remote}/RemoteSupervisorSpec.scala (98%) rename akka-core/src/test/scala/{ => remote}/RemoteTransactionalActiveObjectSpec.scala (96%) rename akka-core/src/test/scala/{ => remote}/ServerInitiatedRemoteActorSample.scala (94%) rename akka-core/src/test/scala/{ => remote}/ServerInitiatedRemoteActorSpec.scala (84%) rename akka-core/src/test/scala/{ => remote}/ShutdownSpec.scala (100%) rename akka-core/src/test/scala/{ => routing}/RoutingSpec.scala (96%) rename akka-core/src/test/scala/{ => serialization}/ProtobufActorMessageSerializationSpec.scala (91%) rename akka-core/src/test/scala/{ => serialization}/SerializableTypeClassActorSpec.scala (98%) rename akka-core/src/test/scala/{ => serialization}/SerializerSpec.scala (93%) rename akka-core/src/test/scala/{ => stm}/RefSpec.scala (97%) rename akka-core/src/test/scala/{ => stm}/StmSpec.scala (96%) create mode 100644 akka-core/src/test/scala/tickets/Proof001Spec.scala diff --git a/akka-core/src/test/scala/Messages.scala b/akka-core/src/test/scala/Messages.scala index 436257e3b5..ad1fcf8885 100644 --- a/akka-core/src/test/scala/Messages.scala +++ b/akka-core/src/test/scala/Messages.scala @@ -7,9 +7,9 @@ package se.scalablesolutions.akka import se.scalablesolutions.akka.serialization.Serializable import sbinary._ import sbinary.Operations._ -import sbinary.DefaultProtocol._ sealed abstract class TestMessage + case object Ping extends TestMessage case object Pong extends TestMessage case object OneWay extends TestMessage diff --git a/akka-core/src/test/scala/ActiveObjectContextSpec.scala b/akka-core/src/test/scala/actor/ActiveObjectContextSpec.scala similarity index 97% rename from akka-core/src/test/scala/ActiveObjectContextSpec.scala rename to akka-core/src/test/scala/actor/ActiveObjectContextSpec.scala index 5a54f0a505..62b9962ac2 100644 --- a/akka-core/src/test/scala/ActiveObjectContextSpec.scala +++ b/akka-core/src/test/scala/actor/ActiveObjectContextSpec.scala @@ -5,7 +5,6 @@ package se.scalablesolutions.akka.actor import org.scalatest.Spec -import org.scalatest.Assertions import org.scalatest.matchers.ShouldMatchers import org.scalatest.BeforeAndAfterAll import org.scalatest.junit.JUnitRunner diff --git a/akka-core/src/test/scala/ActiveObjectGuiceConfiguratorSpec.scala b/akka-core/src/test/scala/actor/ActiveObjectGuiceConfiguratorSpec.scala similarity index 97% rename from akka-core/src/test/scala/ActiveObjectGuiceConfiguratorSpec.scala rename to akka-core/src/test/scala/actor/ActiveObjectGuiceConfiguratorSpec.scala index 3cb871d0d8..178d16f8d4 100644 --- a/akka-core/src/test/scala/ActiveObjectGuiceConfiguratorSpec.scala +++ b/akka-core/src/test/scala/actor/ActiveObjectGuiceConfiguratorSpec.scala @@ -8,7 +8,6 @@ import com.google.inject.AbstractModule import com.google.inject.Scopes import org.scalatest.Spec -import org.scalatest.Assertions import org.scalatest.matchers.ShouldMatchers import org.scalatest.BeforeAndAfterAll import org.scalatest.junit.JUnitRunner @@ -18,7 +17,6 @@ import se.scalablesolutions.akka.config.Config import se.scalablesolutions.akka.config.ActiveObjectConfigurator import se.scalablesolutions.akka.config.JavaConfig._ import se.scalablesolutions.akka.dispatch._ -import se.scalablesolutions.akka.dispatch.FutureTimeoutException @RunWith(classOf[JUnitRunner]) class ActiveObjectGuiceConfiguratorSpec extends diff --git a/akka-core/src/test/scala/ActiveObjectLifecycleSpec.scala b/akka-core/src/test/scala/actor/ActiveObjectLifecycleSpec.scala similarity index 100% rename from akka-core/src/test/scala/ActiveObjectLifecycleSpec.scala rename to akka-core/src/test/scala/actor/ActiveObjectLifecycleSpec.scala diff --git a/akka-core/src/test/scala/ActorFireForgetRequestReplySpec.scala b/akka-core/src/test/scala/actor/ActorFireForgetRequestReplySpec.scala similarity index 100% rename from akka-core/src/test/scala/ActorFireForgetRequestReplySpec.scala rename to akka-core/src/test/scala/actor/ActorFireForgetRequestReplySpec.scala diff --git a/akka-core/src/test/scala/ActorObjectUtilFunctionsSpec.scala b/akka-core/src/test/scala/actor/ActorObjectUtilFunctionsSpec.scala similarity index 93% rename from akka-core/src/test/scala/ActorObjectUtilFunctionsSpec.scala rename to akka-core/src/test/scala/actor/ActorObjectUtilFunctionsSpec.scala index 48424f3c17..3c540f02ab 100644 --- a/akka-core/src/test/scala/ActorObjectUtilFunctionsSpec.scala +++ b/akka-core/src/test/scala/actor/ActorObjectUtilFunctionsSpec.scala @@ -4,7 +4,7 @@ import org.scalatest.Suite import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest.matchers.MustMatchers -import org.junit.{Before, After, Test} +import org.junit.Test import java.util.concurrent.{ CountDownLatch, TimeUnit } @RunWith(classOf[JUnitRunner]) diff --git a/akka-core/src/test/scala/ActorRegistrySpec.scala b/akka-core/src/test/scala/actor/ActorRegistrySpec.scala similarity index 100% rename from akka-core/src/test/scala/ActorRegistrySpec.scala rename to akka-core/src/test/scala/actor/ActorRegistrySpec.scala diff --git a/akka-core/src/test/scala/AgentSpec.scala b/akka-core/src/test/scala/actor/AgentSpec.scala similarity index 95% rename from akka-core/src/test/scala/AgentSpec.scala rename to akka-core/src/test/scala/actor/AgentSpec.scala index de4326c646..71911c3ad8 100644 --- a/akka-core/src/test/scala/AgentSpec.scala +++ b/akka-core/src/test/scala/actor/AgentSpec.scala @@ -1,10 +1,6 @@ package se.scalablesolutions.akka.actor import se.scalablesolutions.akka.actor.Actor.transactor -import se.scalablesolutions.akka.stm.Transaction.Global.atomic -import se.scalablesolutions.akka.util.Logging -import Actor._ - import org.scalatest.Suite import org.scalatest.junit.JUnitRunner import org.scalatest.matchers.MustMatchers diff --git a/akka-core/src/test/scala/Bench.scala b/akka-core/src/test/scala/actor/Bench.scala similarity index 100% rename from akka-core/src/test/scala/Bench.scala rename to akka-core/src/test/scala/actor/Bench.scala diff --git a/akka-core/src/test/scala/DeclarativelySupervisedNestedTransactionalActiveObjectSpec.scala b/akka-core/src/test/scala/actor/DeclarativelySupervisedNestedTransactionalActiveObjectSpec.scala similarity index 98% rename from akka-core/src/test/scala/DeclarativelySupervisedNestedTransactionalActiveObjectSpec.scala rename to akka-core/src/test/scala/actor/DeclarativelySupervisedNestedTransactionalActiveObjectSpec.scala index ea244bf966..07da09edad 100644 --- a/akka-core/src/test/scala/DeclarativelySupervisedNestedTransactionalActiveObjectSpec.scala +++ b/akka-core/src/test/scala/actor/DeclarativelySupervisedNestedTransactionalActiveObjectSpec.scala @@ -5,17 +5,14 @@ package se.scalablesolutions.akka.actor import org.scalatest.Spec -import org.scalatest.Assertions import org.scalatest.matchers.ShouldMatchers import org.scalatest.BeforeAndAfterAll import org.scalatest.junit.JUnitRunner import org.junit.runner.RunWith import se.scalablesolutions.akka.config.Config -import se.scalablesolutions.akka.config._ import se.scalablesolutions.akka.config.ActiveObjectConfigurator import se.scalablesolutions.akka.config.JavaConfig._ -import se.scalablesolutions.akka.actor._ @RunWith(classOf[JUnitRunner]) class DeclarativelySupervisedNestedTransactionalActiveObjectSpec extends diff --git a/akka-core/src/test/scala/DeclarativelySupervisedTransactionalActiveObjectSpec.scala b/akka-core/src/test/scala/actor/DeclarativelySupervisedTransactionalActiveObjectSpec.scala similarity index 97% rename from akka-core/src/test/scala/DeclarativelySupervisedTransactionalActiveObjectSpec.scala rename to akka-core/src/test/scala/actor/DeclarativelySupervisedTransactionalActiveObjectSpec.scala index 95d7b8e5df..07bb52a890 100644 --- a/akka-core/src/test/scala/DeclarativelySupervisedTransactionalActiveObjectSpec.scala +++ b/akka-core/src/test/scala/actor/DeclarativelySupervisedTransactionalActiveObjectSpec.scala @@ -5,17 +5,14 @@ package se.scalablesolutions.akka.actor import org.scalatest.Spec -import org.scalatest.Assertions import org.scalatest.matchers.ShouldMatchers import org.scalatest.BeforeAndAfterAll import org.scalatest.junit.JUnitRunner import org.junit.runner.RunWith import se.scalablesolutions.akka.config.Config -import se.scalablesolutions.akka.config._ import se.scalablesolutions.akka.config.ActiveObjectConfigurator import se.scalablesolutions.akka.config.JavaConfig._ -import se.scalablesolutions.akka.actor._ @RunWith(classOf[JUnitRunner]) class DeclarativelySupervisedTransactionalActiveObjectSpec extends diff --git a/akka-core/src/test/scala/ForwardActorSpec.scala b/akka-core/src/test/scala/actor/ForwardActorSpec.scala similarity index 100% rename from akka-core/src/test/scala/ForwardActorSpec.scala rename to akka-core/src/test/scala/actor/ForwardActorSpec.scala diff --git a/akka-core/src/test/scala/FutureSpec.scala b/akka-core/src/test/scala/actor/FutureSpec.scala similarity index 100% rename from akka-core/src/test/scala/FutureSpec.scala rename to akka-core/src/test/scala/actor/FutureSpec.scala diff --git a/akka-core/src/test/scala/ReceiveTimeoutSpec.scala b/akka-core/src/test/scala/actor/ReceiveTimeoutSpec.scala similarity index 99% rename from akka-core/src/test/scala/ReceiveTimeoutSpec.scala rename to akka-core/src/test/scala/actor/ReceiveTimeoutSpec.scala index 5c50337894..248cbcbcab 100644 --- a/akka-core/src/test/scala/ReceiveTimeoutSpec.scala +++ b/akka-core/src/test/scala/actor/ReceiveTimeoutSpec.scala @@ -3,9 +3,9 @@ package se.scalablesolutions.akka.actor import org.scalatest.junit.JUnitSuite import org.junit.Test -import Actor._ import java.util.concurrent.TimeUnit import org.multiverse.api.latches.StandardLatch +import Actor._ class ReceiveTimeoutSpec extends JUnitSuite { @@ -74,4 +74,4 @@ class ReceiveTimeoutSpec extends JUnitSuite { assert(timeoutLatch.tryAwait(1, TimeUnit.SECONDS) == false) } -} +} \ No newline at end of file diff --git a/akka-core/src/test/scala/SchedulerSpec.scala b/akka-core/src/test/scala/actor/SchedulerSpec.scala similarity index 99% rename from akka-core/src/test/scala/SchedulerSpec.scala rename to akka-core/src/test/scala/actor/SchedulerSpec.scala index 08be87d728..b7e9b63b0b 100644 --- a/akka-core/src/test/scala/SchedulerSpec.scala +++ b/akka-core/src/test/scala/actor/SchedulerSpec.scala @@ -84,4 +84,4 @@ class SchedulerSpec extends JUnitSuite { // should be enough time for the ping countdown to recover and reach 6 pings assert(pingLatch.await(4, TimeUnit.SECONDS)) } -} +} \ No newline at end of file diff --git a/akka-core/src/test/scala/SupervisorHierarchySpec.scala b/akka-core/src/test/scala/actor/SupervisorHierarchySpec.scala similarity index 100% rename from akka-core/src/test/scala/SupervisorHierarchySpec.scala rename to akka-core/src/test/scala/actor/SupervisorHierarchySpec.scala diff --git a/akka-core/src/test/scala/SupervisorSpec.scala b/akka-core/src/test/scala/actor/SupervisorSpec.scala similarity index 99% rename from akka-core/src/test/scala/SupervisorSpec.scala rename to akka-core/src/test/scala/actor/SupervisorSpec.scala index fcbedd476b..01eb9cb006 100644 --- a/akka-core/src/test/scala/SupervisorSpec.scala +++ b/akka-core/src/test/scala/actor/SupervisorSpec.scala @@ -6,7 +6,6 @@ package se.scalablesolutions.akka.actor import se.scalablesolutions.akka.config.ScalaConfig._ import se.scalablesolutions.akka.config.OneForOneStrategy -import se.scalablesolutions.akka.dispatch.Dispatchers import se.scalablesolutions.akka.{OneWay, Die, Ping} import Actor._ diff --git a/akka-core/src/test/scala/TransactorSpec.scala b/akka-core/src/test/scala/actor/TransactorSpec.scala similarity index 100% rename from akka-core/src/test/scala/TransactorSpec.scala rename to akka-core/src/test/scala/actor/TransactorSpec.scala diff --git a/akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorSpec.scala b/akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorSpec.scala similarity index 95% rename from akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorSpec.scala rename to akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorSpec.scala index b25a02db5e..9cdf43682e 100644 --- a/akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorSpec.scala +++ b/akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorSpec.scala @@ -1,9 +1,10 @@ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.dispatch import java.util.concurrent.{CountDownLatch, TimeUnit} import org.scalatest.junit.JUnitSuite import org.junit.Test import se.scalablesolutions.akka.dispatch.Dispatchers +import se.scalablesolutions.akka.actor.Actor import Actor._ object ExecutorBasedEventDrivenDispatcherActorSpec { diff --git a/akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorsSpec.scala b/akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorsSpec.scala similarity index 93% rename from akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorsSpec.scala rename to akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorsSpec.scala index b2c9cf4422..fc8f1aa37f 100644 --- a/akka-core/src/test/scala/ExecutorBasedEventDrivenDispatcherActorsSpec.scala +++ b/akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenDispatcherActorsSpec.scala @@ -1,10 +1,10 @@ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.dispatch import org.scalatest.junit.JUnitSuite import org.junit.Test -import se.scalablesolutions.akka.dispatch.Dispatchers import org.scalatest.matchers.MustMatchers import java.util.concurrent.CountDownLatch +import se.scalablesolutions.akka.actor.Actor import Actor._ /** diff --git a/akka-core/src/test/scala/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala b/akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala similarity index 95% rename from akka-core/src/test/scala/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala rename to akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala index 8ad3e3f212..cde57a0544 100644 --- a/akka-core/src/test/scala/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala +++ b/akka-core/src/test/scala/dispatch/ExecutorBasedEventDrivenWorkStealingDispatcherSpec.scala @@ -1,4 +1,4 @@ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.dispatch import org.scalatest.matchers.MustMatchers import org.scalatest.junit.JUnitSuite @@ -6,9 +6,10 @@ import org.scalatest.junit.JUnitSuite import org.junit.Test import se.scalablesolutions.akka.dispatch.Dispatchers -import Actor._ import java.util.concurrent.{TimeUnit, CountDownLatch} +import se.scalablesolutions.akka.actor.{IllegalActorStateException, Actor} +import Actor._ object ExecutorBasedEventDrivenWorkStealingDispatcherSpec { val delayableActorDispatcher = Dispatchers.newExecutorBasedEventDrivenWorkStealingDispatcher("pooled-dispatcher") diff --git a/akka-core/src/test/scala/ReactorBasedSingleThreadEventDrivenDispatcherActorSpec.scala b/akka-core/src/test/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcherActorSpec.scala similarity index 95% rename from akka-core/src/test/scala/ReactorBasedSingleThreadEventDrivenDispatcherActorSpec.scala rename to akka-core/src/test/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcherActorSpec.scala index a84cdfc8e5..de9b912bf5 100644 --- a/akka-core/src/test/scala/ReactorBasedSingleThreadEventDrivenDispatcherActorSpec.scala +++ b/akka-core/src/test/scala/dispatch/ReactorBasedSingleThreadEventDrivenDispatcherActorSpec.scala @@ -1,11 +1,12 @@ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.dispatch import java.util.concurrent.{CountDownLatch, TimeUnit} import org.scalatest.junit.JUnitSuite import org.junit.Test -import Actor._ import se.scalablesolutions.akka.dispatch.Dispatchers +import se.scalablesolutions.akka.actor.Actor +import Actor._ object ReactorBasedSingleThreadEventDrivenDispatcherActorSpec { class TestActor extends Actor { diff --git a/akka-core/src/test/scala/ReactorBasedThreadPoolEventDrivenDispatcherActorSpec.scala b/akka-core/src/test/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcherActorSpec.scala similarity index 95% rename from akka-core/src/test/scala/ReactorBasedThreadPoolEventDrivenDispatcherActorSpec.scala rename to akka-core/src/test/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcherActorSpec.scala index f917b462b5..4001df8f56 100644 --- a/akka-core/src/test/scala/ReactorBasedThreadPoolEventDrivenDispatcherActorSpec.scala +++ b/akka-core/src/test/scala/dispatch/ReactorBasedThreadPoolEventDrivenDispatcherActorSpec.scala @@ -1,10 +1,11 @@ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.dispatch import java.util.concurrent.{CountDownLatch, TimeUnit} import org.scalatest.junit.JUnitSuite import org.junit.Test import se.scalablesolutions.akka.dispatch.Dispatchers +import se.scalablesolutions.akka.actor.Actor import Actor._ object ReactorBasedThreadPoolEventDrivenDispatcherActorSpec { diff --git a/akka-core/src/test/scala/ThreadBasedActorSpec.scala b/akka-core/src/test/scala/dispatch/ThreadBasedActorSpec.scala similarity index 94% rename from akka-core/src/test/scala/ThreadBasedActorSpec.scala rename to akka-core/src/test/scala/dispatch/ThreadBasedActorSpec.scala index fc726ecf49..d69ee984d8 100644 --- a/akka-core/src/test/scala/ThreadBasedActorSpec.scala +++ b/akka-core/src/test/scala/dispatch/ThreadBasedActorSpec.scala @@ -1,10 +1,11 @@ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.dispatch import java.util.concurrent.{CountDownLatch, TimeUnit} import org.scalatest.junit.JUnitSuite import org.junit.Test import se.scalablesolutions.akka.dispatch.Dispatchers +import se.scalablesolutions.akka.actor.Actor import Actor._ object ThreadBasedActorSpec { diff --git a/akka-core/src/test/scala/ThreadBasedDispatcherSpec.scala b/akka-core/src/test/scala/dispatch/ThreadBasedDispatcherSpec.scala similarity index 100% rename from akka-core/src/test/scala/ThreadBasedDispatcherSpec.scala rename to akka-core/src/test/scala/dispatch/ThreadBasedDispatcherSpec.scala diff --git a/akka-core/src/test/scala/ClientInitiatedRemoteActorSpec.scala b/akka-core/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala similarity index 97% rename from akka-core/src/test/scala/ClientInitiatedRemoteActorSpec.scala rename to akka-core/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala index ea48d45252..e9ed8d4fa5 100644 --- a/akka-core/src/test/scala/ClientInitiatedRemoteActorSpec.scala +++ b/akka-core/src/test/scala/remote/ClientInitiatedRemoteActorSpec.scala @@ -1,13 +1,12 @@ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.remote import java.util.concurrent.{CountDownLatch, TimeUnit} -import junit.framework.TestCase - import org.scalatest.junit.JUnitSuite import org.junit.{Test, Before, After} import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient} import se.scalablesolutions.akka.dispatch.Dispatchers +import se.scalablesolutions.akka.actor.{ActorRef, Actor} import Actor._ case class Send(actor: Actor) diff --git a/akka-core/src/test/scala/RemoteSupervisorSpec.scala b/akka-core/src/test/scala/remote/RemoteSupervisorSpec.scala similarity index 98% rename from akka-core/src/test/scala/RemoteSupervisorSpec.scala rename to akka-core/src/test/scala/remote/RemoteSupervisorSpec.scala index 10f8c3bcf9..936d1cf5c4 100644 --- a/akka-core/src/test/scala/RemoteSupervisorSpec.scala +++ b/akka-core/src/test/scala/remote/RemoteSupervisorSpec.scala @@ -2,20 +2,17 @@ * Copyright (C) 2009-2010 Scalable Solutions AB */ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.remote import java.util.concurrent.{LinkedBlockingQueue, TimeUnit, BlockingQueue} import se.scalablesolutions.akka.serialization.BinaryString import se.scalablesolutions.akka.config.ScalaConfig._ -import se.scalablesolutions.akka.config.Config -import se.scalablesolutions.akka.remote.{RemoteNode, RemoteServer, RemoteClient} +import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient} import se.scalablesolutions.akka.OneWay -import se.scalablesolutions.akka.dispatch.Dispatchers -import Actor._ - import org.scalatest.junit.JUnitSuite -import org.junit.Test import org.junit.{Test, Before, After} +import se.scalablesolutions.akka.actor.{SupervisorFactory, Supervisor, ActorRef, Actor} +import Actor._ object Log { val messageLog: BlockingQueue[String] = new LinkedBlockingQueue[String] diff --git a/akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala b/akka-core/src/test/scala/remote/RemoteTransactionalActiveObjectSpec.scala similarity index 96% rename from akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala rename to akka-core/src/test/scala/remote/RemoteTransactionalActiveObjectSpec.scala index 897318ce7d..21fadb14ac 100644 --- a/akka-core/src/test/scala/RemoteTransactionalActiveObjectSpec.scala +++ b/akka-core/src/test/scala/remote/RemoteTransactionalActiveObjectSpec.scala @@ -2,19 +2,16 @@ * Copyright (C) 2009-2010 Scalable Solutions AB */ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.remote import org.scalatest.Spec -import org.scalatest.Assertions import org.scalatest.matchers.ShouldMatchers import org.scalatest.BeforeAndAfterAll import org.scalatest.junit.JUnitRunner import org.junit.runner.RunWith -import org.junit.{Test, Before, After} - import se.scalablesolutions.akka.config.Config import se.scalablesolutions.akka.config.ActiveObjectConfigurator -import se.scalablesolutions.akka.remote.{RemoteNode, RemoteServer, RemoteClient} +import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient} object RemoteTransactionalActiveObjectSpec { val HOSTNAME = "localhost" diff --git a/akka-core/src/test/scala/ServerInitiatedRemoteActorSample.scala b/akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala similarity index 94% rename from akka-core/src/test/scala/ServerInitiatedRemoteActorSample.scala rename to akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala index dad54e6d3a..b9b8946bee 100644 --- a/akka-core/src/test/scala/ServerInitiatedRemoteActorSample.scala +++ b/akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSample.scala @@ -1,4 +1,4 @@ -package sample +package se.scalablesolutions.akka.actor.remote import se.scalablesolutions.akka.actor.Actor import se.scalablesolutions.akka.remote.{RemoteClient, RemoteNode} diff --git a/akka-core/src/test/scala/ServerInitiatedRemoteActorSpec.scala b/akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala similarity index 84% rename from akka-core/src/test/scala/ServerInitiatedRemoteActorSpec.scala rename to akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala index 51685a0073..59cfe3778d 100644 --- a/akka-core/src/test/scala/ServerInitiatedRemoteActorSpec.scala +++ b/akka-core/src/test/scala/remote/ServerInitiatedRemoteActorSpec.scala @@ -1,12 +1,12 @@ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.remote import java.util.concurrent.{CountDownLatch, TimeUnit} import org.scalatest.junit.JUnitSuite import org.junit.{Test, Before, After} -import Actor._ import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient} -import se.scalablesolutions.akka.dispatch.Dispatchers +import se.scalablesolutions.akka.actor.{ActorRef, Actor} +import Actor._ object ServerInitiatedRemoteActorSpec { val HOSTNAME = "localhost" @@ -52,8 +52,6 @@ object ServerInitiatedRemoteActorSpec { class ServerInitiatedRemoteActorSpec extends JUnitSuite { import ServerInitiatedRemoteActorSpec._ - import se.scalablesolutions.akka.config.Config.config - private val unit = TimeUnit.MILLISECONDS @Before @@ -84,7 +82,7 @@ class ServerInitiatedRemoteActorSpec extends JUnitSuite { @Test def shouldSendWithBang { val actor = RemoteClient.actorFor( - "se.scalablesolutions.akka.actor.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorUnidirectional", + "se.scalablesolutions.akka.actor.remote.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorUnidirectional", 5000L, HOSTNAME, PORT) val result = actor ! "OneWay" @@ -95,7 +93,7 @@ class ServerInitiatedRemoteActorSpec extends JUnitSuite { @Test def shouldSendWithBangBangAndGetReply { val actor = RemoteClient.actorFor( - "se.scalablesolutions.akka.actor.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional", + "se.scalablesolutions.akka.actor.remote.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional", 5000L, HOSTNAME, PORT) val result = actor !! "Hello" @@ -107,7 +105,7 @@ class ServerInitiatedRemoteActorSpec extends JUnitSuite { def shouldSendWithBangAndGetReplyThroughSenderRef { implicit val timeout = 500000000L val actor = RemoteClient.actorFor( - "se.scalablesolutions.akka.actor.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional", + "se.scalablesolutions.akka.actor.remote.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional", timeout, HOSTNAME, PORT) val sender = actorOf[RemoteActorSpecActorAsyncSender] @@ -122,7 +120,7 @@ class ServerInitiatedRemoteActorSpec extends JUnitSuite { def shouldSendWithBangBangAndReplyWithException { implicit val timeout = 500000000L val actor = RemoteClient.actorFor( - "se.scalablesolutions.akka.actor.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional", + "se.scalablesolutions.akka.actor.remote.ServerInitiatedRemoteActorSpec$RemoteActorSpecActorBidirectional", timeout, HOSTNAME, PORT) try { diff --git a/akka-core/src/test/scala/ShutdownSpec.scala b/akka-core/src/test/scala/remote/ShutdownSpec.scala similarity index 100% rename from akka-core/src/test/scala/ShutdownSpec.scala rename to akka-core/src/test/scala/remote/ShutdownSpec.scala diff --git a/akka-core/src/test/scala/RoutingSpec.scala b/akka-core/src/test/scala/routing/RoutingSpec.scala similarity index 96% rename from akka-core/src/test/scala/RoutingSpec.scala rename to akka-core/src/test/scala/routing/RoutingSpec.scala index 06b8117c24..b709714de9 100644 --- a/akka-core/src/test/scala/RoutingSpec.scala +++ b/akka-core/src/test/scala/routing/RoutingSpec.scala @@ -1,6 +1,5 @@ -package se.scalablesolutions.akka.routing +package se.scalablesolutions.akka.actor.routing -import se.scalablesolutions.akka.config.ScalaConfig._ import se.scalablesolutions.akka.actor.Actor import se.scalablesolutions.akka.actor.Actor._ import se.scalablesolutions.akka.util.Logging @@ -9,12 +8,11 @@ import org.scalatest.Suite import org.junit.runner.RunWith import org.scalatest.junit.JUnitRunner import org.scalatest.matchers.MustMatchers -import org.junit.{Before, After, Test} - -import scala.collection.mutable.HashSet +import org.junit.Test import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.{CountDownLatch, TimeUnit} +import se.scalablesolutions.akka.routing._ @RunWith(classOf[JUnitRunner]) class RoutingSpec extends junit.framework.TestCase with Suite with MustMatchers with Logging { @@ -174,4 +172,4 @@ class RoutingSpec extends junit.framework.TestCase with Suite with MustMatchers for(a <- List(t1,t2,d1,d2)) a.stop } -} +} \ No newline at end of file diff --git a/akka-core/src/test/scala/ProtobufActorMessageSerializationSpec.scala b/akka-core/src/test/scala/serialization/ProtobufActorMessageSerializationSpec.scala similarity index 91% rename from akka-core/src/test/scala/ProtobufActorMessageSerializationSpec.scala rename to akka-core/src/test/scala/serialization/ProtobufActorMessageSerializationSpec.scala index fbf5411e02..011c656f8d 100644 --- a/akka-core/src/test/scala/ProtobufActorMessageSerializationSpec.scala +++ b/akka-core/src/test/scala/serialization/ProtobufActorMessageSerializationSpec.scala @@ -1,12 +1,11 @@ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.serialization -import java.util.concurrent.{CountDownLatch, TimeUnit} +import java.util.concurrent.TimeUnit import org.scalatest.junit.JUnitSuite import org.junit.{Test, Before, After} import se.scalablesolutions.akka.remote.{RemoteServer, RemoteClient} -import se.scalablesolutions.akka.dispatch.Dispatchers - +import se.scalablesolutions.akka.actor.{ProtobufProtocol, Actor} import ProtobufProtocol.ProtobufPOJO import Actor._ diff --git a/akka-core/src/test/scala/SerializableTypeClassActorSpec.scala b/akka-core/src/test/scala/serialization/SerializableTypeClassActorSpec.scala similarity index 98% rename from akka-core/src/test/scala/SerializableTypeClassActorSpec.scala rename to akka-core/src/test/scala/serialization/SerializableTypeClassActorSpec.scala index 2b26c9ad81..1166daf6be 100644 --- a/akka-core/src/test/scala/SerializableTypeClassActorSpec.scala +++ b/akka-core/src/test/scala/serialization/SerializableTypeClassActorSpec.scala @@ -1,16 +1,15 @@ -package se.scalablesolutions.akka.actor +package se.scalablesolutions.akka.actor.serialization -import Actor._ import org.scalatest.Spec -import org.scalatest.Assertions import org.scalatest.matchers.ShouldMatchers import org.scalatest.BeforeAndAfterAll import org.scalatest.junit.JUnitRunner import org.junit.runner.RunWith -import com.google.protobuf.Message +import se.scalablesolutions.akka.actor._ import ActorSerialization._ +import Actor._ @RunWith(classOf[JUnitRunner]) class SerializableTypeClassActorSpec extends diff --git a/akka-core/src/test/scala/SerializerSpec.scala b/akka-core/src/test/scala/serialization/SerializerSpec.scala similarity index 93% rename from akka-core/src/test/scala/SerializerSpec.scala rename to akka-core/src/test/scala/serialization/SerializerSpec.scala index 95b291ed9d..bff387ec99 100644 --- a/akka-core/src/test/scala/SerializerSpec.scala +++ b/akka-core/src/test/scala/serialization/SerializerSpec.scala @@ -1,9 +1,7 @@ package se.scalablesolutions.akka.serialization -import junit.framework.TestCase - import org.scalatest.junit.JUnitSuite -import org.junit.{Test, Before, After} +import org.junit.Test import scala.reflect.BeanInfo diff --git a/akka-core/src/test/scala/RefSpec.scala b/akka-core/src/test/scala/stm/RefSpec.scala similarity index 97% rename from akka-core/src/test/scala/RefSpec.scala rename to akka-core/src/test/scala/stm/RefSpec.scala index 805e0834ea..33ce43ab10 100644 --- a/akka-core/src/test/scala/RefSpec.scala +++ b/akka-core/src/test/scala/stm/RefSpec.scala @@ -5,13 +5,13 @@ import org.scalatest.matchers.ShouldMatchers import org.scalatest.junit.JUnitRunner import org.junit.runner.RunWith -import se.scalablesolutions.akka.actor.Actor._ +import se.scalablesolutions.akka.stm.local._ @RunWith(classOf[JUnitRunner]) class RefSpec extends Spec with ShouldMatchers { describe("A Ref") { - import local._ + it("should optionally accept an initial value") { val emptyRef = Ref[Int] @@ -153,4 +153,4 @@ class RefSpec extends Spec with ShouldMatchers { optGreater2 should be(None) } } -} +} \ No newline at end of file diff --git a/akka-core/src/test/scala/StmSpec.scala b/akka-core/src/test/scala/stm/StmSpec.scala similarity index 96% rename from akka-core/src/test/scala/StmSpec.scala rename to akka-core/src/test/scala/stm/StmSpec.scala index 16912726a9..0bb2851274 100644 --- a/akka-core/src/test/scala/StmSpec.scala +++ b/akka-core/src/test/scala/stm/StmSpec.scala @@ -4,7 +4,6 @@ import se.scalablesolutions.akka.actor.{Actor, Transactor} import Actor._ import org.scalatest.Spec -import org.scalatest.Assertions import org.scalatest.matchers.ShouldMatchers import org.scalatest.BeforeAndAfterAll import org.scalatest.junit.JUnitRunner @@ -18,7 +17,7 @@ class StmSpec extends describe("Local STM") { it("should be able to do multiple consecutive atomic {..} statements") { - import local._ + import se.scalablesolutions.akka.stm.local._ lazy val ref = Ref[Int]() @@ -37,7 +36,7 @@ class StmSpec extends } it("should be able to do nested atomic {..} statements") { - import local._ + import se.scalablesolutions.akka.stm.local._ lazy val ref = Ref[Int]() @@ -59,7 +58,7 @@ class StmSpec extends } it("should roll back failing nested atomic {..} statements") { - import local._ + import se.scalablesolutions.akka.stm.local._ lazy val ref = Ref[Int]() diff --git a/akka-core/src/test/scala/tickets/Proof001Spec.scala b/akka-core/src/test/scala/tickets/Proof001Spec.scala new file mode 100644 index 0000000000..29e4ca3137 --- /dev/null +++ b/akka-core/src/test/scala/tickets/Proof001Spec.scala @@ -0,0 +1,10 @@ +package se.scalablesolutions.akka.actor.tickets + +import org.scalatest.junit.JUnitSuite +import org.junit.Test + +// Sample ticket spec +class Proof001Spec extends JUnitSuite { + + @Test def thisFixesSomeSpecifiedBug = () +} \ No newline at end of file