From 426b1328f2c58a60bb4597e7e1d3f83087f48033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bone=CC=81r?= Date: Sun, 26 Jun 2011 15:26:32 +0200 Subject: [PATCH] Added 'node.shutdown()' to all multi-jvm tests. Renamed MigrationExplicit test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonas BoneĢr --- .../newleader/NewLeaderChangeListenerMultiJvmSpec.scala | 4 ++++ .../NodeConnectedChangeListenerMultiJvmSpec.scala | 4 ++++ .../NodeDisconnectedChangeListenerMultiJvmSpec.scala | 2 ++ ...MultiJvmNode1.conf => MigrationExplicitMultiJvmNode1.conf} | 0 ...MultiJvmNode1.opts => MigrationExplicitMultiJvmNode1.opts} | 0 ...MultiJvmNode2.conf => MigrationExplicitMultiJvmNode2.conf} | 0 ...MultiJvmNode2.opts => MigrationExplicitMultiJvmNode2.opts} | 0 ...MultiJvmSpec.scala => MigrationExplicitMultiJvmSpec.scala} | 4 ++++ 8 files changed, 14 insertions(+) rename akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/{MigrationApiMultiJvmNode1.conf => MigrationExplicitMultiJvmNode1.conf} (100%) rename akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/{MigrationApiMultiJvmNode1.opts => MigrationExplicitMultiJvmNode1.opts} (100%) rename akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/{MigrationApiMultiJvmNode2.conf => MigrationExplicitMultiJvmNode2.conf} (100%) rename akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/{MigrationApiMultiJvmNode2.opts => MigrationExplicitMultiJvmNode2.opts} (100%) rename akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/{MigrationApiMultiJvmSpec.scala => MigrationExplicitMultiJvmSpec.scala} (98%) diff --git a/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmSpec.scala b/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmSpec.scala index a25cc40646..eba50ab6a2 100644 --- a/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/newleader/NewLeaderChangeListenerMultiJvmSpec.scala @@ -39,6 +39,8 @@ class NewLeaderChangeListenerMultiJvmNode1 extends WordSpec with MustMatchers wi } latch.await(10, TimeUnit.SECONDS) must be === true + + node.shutdown() } } @@ -63,6 +65,8 @@ class NewLeaderChangeListenerMultiJvmNode2 extends WordSpec with MustMatchers { barrier("start-node2", NrOfNodes) { node.start() } + + node.shutdown() } } } diff --git a/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmSpec.scala b/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmSpec.scala index 8d966f8d92..d8bd90b8fd 100644 --- a/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodeconnected/NodeConnectedChangeListenerMultiJvmSpec.scala @@ -38,6 +38,8 @@ class NodeConnectedChangeListenerMultiJvmNode1 extends WordSpec with MustMatcher barrier("start-node2", NrOfNodes) { latch.await(5, TimeUnit.SECONDS) must be === true } + + node.shutdown() } } @@ -61,6 +63,8 @@ class NodeConnectedChangeListenerMultiJvmNode2 extends WordSpec with MustMatcher barrier("start-node2", NrOfNodes) { node.start() } + + node.shutdown() } } } diff --git a/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmSpec.scala b/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmSpec.scala index 284ae76707..30ca68946d 100644 --- a/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/api/changelisteners/nodedisconnected/NodeDisconnectedChangeListenerMultiJvmSpec.scala @@ -40,6 +40,8 @@ class NodeDisconnectedChangeListenerMultiJvmNode1 extends WordSpec with MustMatc latch.await(10, TimeUnit.SECONDS) must be === true } + + node.shutdown() } override def beforeAll() = { diff --git a/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmNode1.conf b/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmNode1.conf similarity index 100% rename from akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmNode1.conf rename to akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmNode1.conf diff --git a/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmNode1.opts b/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmNode1.opts similarity index 100% rename from akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmNode1.opts rename to akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmNode1.opts diff --git a/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmNode2.conf b/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmNode2.conf similarity index 100% rename from akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmNode2.conf rename to akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmNode2.conf diff --git a/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmNode2.opts b/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmNode2.opts similarity index 100% rename from akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmNode2.opts rename to akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmNode2.opts diff --git a/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmSpec.scala b/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmSpec.scala similarity index 98% rename from akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmSpec.scala rename to akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmSpec.scala index 1199ec1c1c..a887328745 100644 --- a/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationApiMultiJvmSpec.scala +++ b/akka-cluster/src/test/scala/akka/cluster/api/migration/explicit/MigrationExplicitMultiJvmSpec.scala @@ -61,6 +61,8 @@ class MigrationExplicitMultiJvmNode1 extends WordSpec with MustMatchers with Bef actorRef.address must be("hello-world") (actorRef ? "Hello").as[String].get must be("World from node [node1]") } + + node.shutdown() } } @@ -107,6 +109,8 @@ class MigrationExplicitMultiJvmNode2 extends WordSpec with MustMatchers { barrier("check-actor-is-moved-to-node1", NrOfNodes) { } + + node.shutdown() } } }