PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-13 15:34:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

even more generosity with the tests

Browse source
This commit is contained in:
FateJH 2018-05-28 09:04:09 -04:00
parent d26e8834c6
commit 9e75fd1191
2 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

33
common/src/test/scala/objects/ZoneTest.scala
View file

@ -470,13 +470,11 @@ class ZoneGroundDropItemTest extends ActorTest {
hub.register(item, 10) hub.register(item, 10)
val zone = new Zone("test", new ZoneMap("test-map"), 0) val zone = new Zone("test", new ZoneMap("test-map"), 0)
zone.GUID(hub) zone.GUID(hub)
zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!"
zone.Actor ! Zone.Init()
receiveOne(200 milliseconds) //consume
"DropItem" should { "DropItem" should {
"drop item on ground" in { "drop item on ground" in {
expectNoMsg(100 milliseconds) receiveOne(1 second) //consume
assert(!zone.EquipmentOnGround.contains(item)) 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)) 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 //hub.register(item, 10) //!important
val zone = new Zone("test", new ZoneMap("test-map"), 0) val zone = new Zone("test", new ZoneMap("test-map"), 0)
zone.GUID(hub) zone.GUID(hub)
zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!"
zone.Actor ! Zone.Init()
"DropItem" should { "DropItem" should {
"not drop an item that is not registered" in { "not drop an item that is not registered" in {
expectNoMsg(100 milliseconds) receiveOne(1 second) //consume
assert(!zone.EquipmentOnGround.contains(item)) assert(!zone.EquipmentOnGround.contains(item))
zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero) zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero)
@ -521,12 +518,11 @@ class ZoneGroundCanNotDropItem2Test extends ActorTest {
hub.register(item, 10) //!important hub.register(item, 10) //!important
val zone = new Zone("test", new ZoneMap("test-map"), 0) val zone = new Zone("test", new ZoneMap("test-map"), 0)
//zone.GUID(hub) //!important //zone.GUID(hub) //!important
zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!"
zone.Actor ! Zone.Init()
"DropItem" should { "DropItem" should {
"not drop an item that is not registered to the zone" in { "not drop an item that is not registered to the zone" in {
expectNoMsg(100 milliseconds) receiveOne(1 second) //consume
assert(!zone.EquipmentOnGround.contains(item)) assert(!zone.EquipmentOnGround.contains(item))
zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero) zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero)
@ -546,12 +542,11 @@ class ZoneGroundCanNotDropItem3Test extends ActorTest {
hub.register(item, 10) //!important hub.register(item, 10) //!important
val zone = new Zone("test", new ZoneMap("test-map"), 0) val zone = new Zone("test", new ZoneMap("test-map"), 0)
zone.GUID(hub) //!important zone.GUID(hub) //!important
zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!"
zone.Actor ! Zone.Init()
"DropItem" should { "DropItem" should {
"not drop an item that has already been dropped" in { "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.contains(item))
assert(zone.EquipmentOnGround.isEmpty) assert(zone.EquipmentOnGround.isEmpty)
zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero) zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero)
@ -579,11 +574,11 @@ class ZoneGroundPickupItemTest extends ActorTest {
hub.register(item, 10) hub.register(item, 10)
val zone = new Zone("test", new ZoneMap("test-map"), 0) val zone = new Zone("test", new ZoneMap("test-map"), 0)
zone.GUID(hub) zone.GUID(hub)
zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!"
zone.Actor ! Zone.Init()
"PickupItem" should { "PickupItem" should {
"pickup an item from ground" in { "pickup an item from ground" in {
receiveOne(1 second) //consume
assert(!zone.EquipmentOnGround.contains(item)) assert(!zone.EquipmentOnGround.contains(item))
zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero) zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero)
@ -606,11 +601,11 @@ class ZoneGroundCanNotPickupItemTest extends ActorTest {
hub.register(item, 10) hub.register(item, 10)
val zone = new Zone("test", new ZoneMap("test-map"), 0) val zone = new Zone("test", new ZoneMap("test-map"), 0)
zone.GUID(hub) //still registered to this zone zone.GUID(hub) //still registered to this zone
zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!"
zone.Actor ! Zone.Init()
"PickupItem" should { "PickupItem" should {
"not pickup an item if it can not be found" in { "not pickup an item if it can not be found" in {
receiveOne(1 second) //consume
assert(!zone.EquipmentOnGround.contains(item)) assert(!zone.EquipmentOnGround.contains(item))
zone.Ground ! Zone.Ground.PickupItem(item.GUID) zone.Ground ! Zone.Ground.PickupItem(item.GUID)
@ -629,11 +624,11 @@ class ZoneGroundRemoveItemTest extends ActorTest {
hub.register(item, 10) hub.register(item, 10)
val zone = new Zone("test", new ZoneMap("test-map"), 0) val zone = new Zone("test", new ZoneMap("test-map"), 0)
zone.GUID(hub) //still registered to this zone zone.GUID(hub) //still registered to this zone
zone.Actor = system.actorOf(Props(classOf[ZoneActor], zone), "drop-test-zone") system.actorOf(Props(classOf[ZoneTest.ZoneInitActor], zone), "drop-test-zone") ! "!"
zone.Actor ! Zone.Init()
"RemoveItem" should { "RemoveItem" should {
"remove an item from the ground without callback (even if the item is not found)" in { "remove an item from the ground without callback (even if the item is not found)" in {
receiveOne(1 second)
assert(!zone.EquipmentOnGround.contains(item)) assert(!zone.EquipmentOnGround.contains(item))
zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero) zone.Ground ! Zone.Ground.DropItem(item, Vector3.Zero, Vector3.Zero)
receiveOne(200 milliseconds) receiveOne(200 milliseconds)

24
pslogin/src/test/scala/RemoverActorTest.scala
View file

@ -17,7 +17,7 @@ class StandardRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"handle a simple task" in { "handle a simple task" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere) remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere)
@ -46,7 +46,7 @@ class DelayedRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"handle a simple task (timed)" in { "handle a simple task (timed)" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(100 milliseconds)) remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(100 milliseconds))
@ -76,7 +76,7 @@ class ExcludedRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"allow only specific objects" in { "allow only specific objects" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(AlternateTestObject, Zone.Nowhere) remover ! RemoverActor.AddTask(AlternateTestObject, Zone.Nowhere)
@ -95,7 +95,7 @@ class MultipleRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"work on parallel tasks" in { "work on parallel tasks" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere) remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere)
@ -129,7 +129,7 @@ class HurrySpecificRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"be able to hurry certain tasks" in { "be able to hurry certain tasks" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(10 minutes)) //TEN MINUTE WAIT remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(10 minutes)) //TEN MINUTE WAIT
@ -160,7 +160,7 @@ class HurrySelectionRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"be able to hurry certain tasks, but let others finish normally" in { "be able to hurry certain tasks, but let others finish normally" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds))
@ -211,7 +211,7 @@ class HurryMultipleRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"be able to hurry certain tasks, but only valid ones" in { "be able to hurry certain tasks, but only valid ones" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds))
@ -263,7 +263,7 @@ class HurryByZoneRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"be able to hurry certain tasks by their zone" in { "be able to hurry certain tasks by their zone" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds))
@ -322,7 +322,7 @@ class HurryAllRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"be able to hurry all tasks to completion" in { "be able to hurry all tasks to completion" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(20 seconds)) remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(20 seconds))
@ -368,7 +368,7 @@ class ClearSelectionRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"be able to clear certain tasks" in { "be able to clear certain tasks" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds))
@ -408,7 +408,7 @@ class ClearAllRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"be able to clear all tasks, with no more work on them" in { "be able to clear all tasks, with no more work on them" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds))
@ -437,7 +437,7 @@ class EarlyDeathRemoverActorTest extends ActorTest {
"RemoverActor" should { "RemoverActor" should {
"be able to hurry certain tasks" in { "be able to hurry certain tasks" in {
expectNoMsg(200 milliseconds) expectNoMsg(500 milliseconds)
val probe = TestProbe() val probe = TestProbe()
val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover") val remover = system.actorOf(Props(classOf[RemoverActorTest.TestRemover], probe), "test-remover")
remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds)) remover ! RemoverActor.AddTask(RemoverActorTest.TestObject, Zone.Nowhere, Some(5 seconds))