From 9e75fd1191c6f08ff52f1a0461d72d943da59057 Mon Sep 17 00:00:00 2001 From: FateJH Date: Mon, 28 May 2018 09:04:09 -0400 Subject: [PATCH] even more generosity with the tests --- common/src/test/scala/objects/ZoneTest.scala | 33 ++++++++----------- pslogin/src/test/scala/RemoverActorTest.scala | 24 +++++++------- 2 files changed, 26 insertions(+), 31 deletions(-) diff --git a/common/src/test/scala/objects/ZoneTest.scala b/common/src/test/scala/objects/ZoneTest.scala index 882f2344..70642ee9 100644 --- a/common/src/test/scala/objects/ZoneTest.scala +++ b/common/src/test/scala/objects/ZoneTest.scala @@ -470,13 +470,11 @@ class ZoneGroundDropItemTest extends ActorTest { hub.register(item, 10) val zone = new Zone("test", new ZoneMap("test-map"), 0) zone.GUID(hub) - zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") - zone.Actor ! Zone.Init() - receiveOne(200 milliseconds) //consume + system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!" "DropItem" should { "drop item on ground" in { - expectNoMsg(100 milliseconds) + receiveOne(1 second) //consume assert(!zone.EquipmentOnGround.contains(item)) zone.Ground ! Zone.Ground.DropItem(item, Vector3(1.1f, 2.2f, 3.3f), Vector3(4.4f, 5.5f, 6.6f)) @@ -496,12 +494,11 @@ class ZoneGroundCanNotDropItem1Test extends ActorTest { //hub.register(item, 10) //!important val zone = new Zone("test", new ZoneMap("test-map"), 0) zone.GUID(hub) - zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") - zone.Actor ! Zone.Init() + system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!" "DropItem" should { "not drop an item that is not registered" in { - expectNoMsg(100 milliseconds) + receiveOne(1 second) //consume assert(!zone.EquipmentOnGround.contains(item)) zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero) @@ -521,12 +518,11 @@ class ZoneGroundCanNotDropItem2Test extends ActorTest { hub.register(item, 10) //!important val zone = new Zone("test", new ZoneMap("test-map"), 0) //zone.GUID(hub) //!important - zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") - zone.Actor ! Zone.Init() + system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!" "DropItem" should { "not drop an item that is not registered to the zone" in { - expectNoMsg(100 milliseconds) + receiveOne(1 second) //consume assert(!zone.EquipmentOnGround.contains(item)) zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero) @@ -546,12 +542,11 @@ class ZoneGroundCanNotDropItem3Test extends ActorTest { hub.register(item, 10) //!important val zone = new Zone("test", new ZoneMap("test-map"), 0) zone.GUID(hub) //!important - zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") - zone.Actor ! Zone.Init() + system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!" "DropItem" should { "not drop an item that has already been dropped" in { - expectNoMsg(100 milliseconds) + receiveOne(1 second) //consume assert(!zone.EquipmentOnGround.contains(item)) assert(zone.EquipmentOnGround.isEmpty) zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero) @@ -579,11 +574,11 @@ class ZoneGroundPickupItemTest extends ActorTest { hub.register(item, 10) val zone = new Zone("test", new ZoneMap("test-map"), 0) zone.GUID(hub) - zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") - zone.Actor ! Zone.Init() + system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!" "PickupItem" should { "pickup an item from ground" in { + receiveOne(1 second) //consume assert(!zone.EquipmentOnGround.contains(item)) zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero) @@ -606,11 +601,11 @@ class ZoneGroundCanNotPickupItemTest extends ActorTest { hub.register(item, 10) val zone = new Zone("test", new ZoneMap("test-map"), 0) zone.GUID(hub) //still registered to this zone - zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") - zone.Actor ! Zone.Init() + system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!" "PickupItem" should { "not pickup an item if it can not be found" in { + receiveOne(1 second) //consume assert(!zone.EquipmentOnGround.contains(item)) zone.Ground ! Zone.Ground.PickupItem(item.GUID) @@ -629,11 +624,11 @@ class ZoneGroundRemoveItemTest extends ActorTest { hub.register(item, 10) val zone = new Zone("test", new ZoneMap("test-map"), 0) zone.GUID(hub) //still registered to this zone - zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") - zone.Actor ! Zone.Init() + system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!" "RemoveItem" should { "remove an item from the ground without callback (even if the item is not found)" in { + receiveOne(1 second) assert(!zone.EquipmentOnGround.contains(item)) zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero) receiveOne(200 milliseconds) diff --git a/pslogin/src/test/scala/RemoverActorTest.scala b/pslogin/src/test/scala/RemoverActorTest.scala index cfeaae30..316c58af 100644 --- a/pslogin/src/test/scala/RemoverActorTest.scala +++ b/pslogin/src/test/scala/RemoverActorTest.scala @@ -17,7 +17,7 @@ class StandardRemoverActorTest extends ActorTest { "RemoverActor" should { "handle a simple task" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere) @@ -46,7 +46,7 @@ class DelayedRemoverActorTest extends ActorTest { "RemoverActor" should { "handle a simple task (timed)" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(100 milliseconds)) @@ -76,7 +76,7 @@ class ExcludedRemoverActorTest extends ActorTest { "RemoverActor" should { "allow only specific objects" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(AlternateTestObject, Zone.Nowhere) @@ -95,7 +95,7 @@ class MultipleRemoverActorTest extends ActorTest { "RemoverActor" should { "work on parallel tasks" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere) @@ -129,7 +129,7 @@ class HurrySpecificRemoverActorTest extends ActorTest { "RemoverActor" should { "be able to hurry certain tasks" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(10 minutes)) //TEN MINUTE WAIT @@ -160,7 +160,7 @@ class HurrySelectionRemoverActorTest extends ActorTest { "RemoverActor" should { "be able to hurry certain tasks, but let others finish normally" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) @@ -211,7 +211,7 @@ class HurryMultipleRemoverActorTest extends ActorTest { "RemoverActor" should { "be able to hurry certain tasks, but only valid ones" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) @@ -263,7 +263,7 @@ class HurryByZoneRemoverActorTest extends ActorTest { "RemoverActor" should { "be able to hurry certain tasks by their zone" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) @@ -322,7 +322,7 @@ class HurryAllRemoverActorTest extends ActorTest { "RemoverActor" should { "be able to hurry all tasks to completion" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(20 seconds)) @@ -368,7 +368,7 @@ class ClearSelectionRemoverActorTest extends ActorTest { "RemoverActor" should { "be able to clear certain tasks" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) @@ -408,7 +408,7 @@ class ClearAllRemoverActorTest extends ActorTest { "RemoverActor" should { "be able to clear all tasks, with no more work on them" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) @@ -437,7 +437,7 @@ class EarlyDeathRemoverActorTest extends ActorTest { "RemoverActor" should { "be able to hurry certain tasks" in { - expectNoMsg(200 milliseconds) + expectNoMsg(500 milliseconds) val probe = TestProbe() val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds))