each zone now has access to its own bundle of task resolver objects; primary changes to reflect this has been the simplification of item moving parameters; tests corrected

src/test/scala/objects/AutoRepairTest.scala

@@ -16,11 +16,13 @@ import net.psforever.objects.vital.Vitality
 import net.psforever.objects.vital.damage.DamageProfile
 import net.psforever.objects.zones.{Zone, ZoneMap}
 import net.psforever.objects.{GlobalDefinitions, Player, Tool}
+import net.psforever.services.ServiceManager
 import net.psforever.types.{CharacterGender, CharacterVoice, PlanetSideEmpire, Vector3}
 
 import scala.concurrent.duration._
 
 class AutoRepairRequestNtuTest extends FreedContextActorTest {
+  ServiceManager.boot
   val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
   player.Spawn()
   val weapon = new Tool(GlobalDefinitions.suppressor)
@@ -80,6 +82,7 @@ class AutoRepairRequestNtuTest extends FreedContextActorTest {
 }
 
 class AutoRepairRequestNtuRepeatTest extends FreedContextActorTest {
+  ServiceManager.boot
   val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
   player.Spawn()
   val weapon = new Tool(GlobalDefinitions.suppressor)
@@ -141,6 +144,7 @@ class AutoRepairRequestNtuRepeatTest extends FreedContextActorTest {
 }
 
 class AutoRepairNoRequestNtuTest extends FreedContextActorTest {
+  ServiceManager.boot
   val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
   player.Spawn()
   val weapon = new Tool(GlobalDefinitions.suppressor)
@@ -195,6 +199,7 @@ class AutoRepairNoRequestNtuTest extends FreedContextActorTest {
 }
 
 class AutoRepairRestoreRequestNtuTest extends FreedContextActorTest {
+  ServiceManager.boot
   val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
   player.Spawn()
   val weapon = new Tool(GlobalDefinitions.suppressor)
@@ -258,6 +263,7 @@ class AutoRepairRestoreRequestNtuTest extends FreedContextActorTest {
 }
 
 class AutoRepairRepairWithNtuTest extends FreedContextActorTest {
+  ServiceManager.boot
   val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
   player.Spawn()
   val weapon = new Tool(GlobalDefinitions.suppressor)
@@ -316,6 +322,7 @@ class AutoRepairRepairWithNtuTest extends FreedContextActorTest {
 }
 
 class AutoRepairRepairWithNtuUntilDoneTest extends FreedContextActorTest {
+  ServiceManager.boot
   val player = Player(Avatar(0, "TestCharacter", PlanetSideEmpire.TR, CharacterGender.Male, 0, CharacterVoice.Mute))
   player.Spawn()
   val weapon = new Tool(GlobalDefinitions.suppressor)

src/test/scala/objects/ResourceSiloTest.scala

@@ -2,11 +2,10 @@
 package objects
 
 import akka.actor.{Actor, Props}
-import akka.routing.RandomPool
 import akka.testkit.TestProbe
 import base.ActorTest
 import net.psforever.actors.zone.{BuildingActor, ZoneActor}
-import net.psforever.objects.guid.{NumberPoolHub, TaskResolver}
+import net.psforever.objects.guid.NumberPoolHub
 import net.psforever.objects.guid.source.MaxNumberSource
 import net.psforever.objects.serverobject.CommonMessages
 import net.psforever.objects.{GlobalDefinitions, Ntu, Player, Vehicle}
@@ -17,7 +16,6 @@ import net.psforever.objects.zones.{Zone, ZoneMap}
 import net.psforever.packet.game.UseItemMessage
 import net.psforever.types._
 import org.specs2.mutable.Specification
-import net.psforever.services.ServiceManager
 import net.psforever.services.avatar.{AvatarAction, AvatarServiceMessage}
 import akka.actor.typed.scaladsl.adapter._
 import net.psforever.objects.avatar.Avatar
@@ -77,18 +75,21 @@ class ResourceSiloTest extends Specification {
 }
 
 class ResourceSiloControlStartupTest extends ActorTest {
-  val serviceManager = ServiceManager.boot(system)
-  serviceManager ! ServiceManager.Register(RandomPool(1).props(Props[TaskResolver]()), "taskResolver")
   val obj = ResourceSilo()
   obj.GUID = PlanetSideGUID(1)
-  val probe = TestProbe()
-  serviceManager ! ServiceManager.Register(Props(classOf[ResourceSiloTest.ProbedAvatarService], probe), "avatar")
+  obj.Actor = system.actorOf(Props(classOf[ResourceSiloControl], obj), "test-silo")
+  val zone = new Zone("nowhere", new ZoneMap("nowhere-map"), 0)
+  val buildingEvents = TestProbe("test-building-events")
+  obj.Owner =
+    new Building("Building", building_guid = 6, map_id = 0, zone, StructureType.Building, GlobalDefinitions.building) {
+      Actor = buildingEvents.ref
+    }
+  obj.Owner.GUID = PlanetSideGUID(6)
 
   "Resource silo" should {
     "startup properly" in {
-      expectNoMessage(500 milliseconds)
-      system.actorOf(Props(classOf[ResourceSiloControl], obj), "test-silo") ! "startup"
-      expectNoMessage(1 seconds)
+      obj.Actor ! "startup"
+      expectNoMessage(max = 1000 milliseconds)
     }
   }
 }

src/test/scala/objects/VehicleTest.scala

@@ -15,7 +15,7 @@ import net.psforever.objects.zones.{Zone, ZoneMap}
 import net.psforever.packet.game.{CargoMountPointStatusMessage, ObjectDetachMessage, PlanetsideAttributeMessage}
 import net.psforever.types.{PlanetSideGUID, _}
 import org.specs2.mutable._
-import net.psforever.services.{RemoverActor, ServiceManager}
+import net.psforever.services.ServiceManager
 import net.psforever.services.vehicle.{VehicleAction, VehicleServiceMessage}
 
 import scala.concurrent.duration._
@@ -342,23 +342,7 @@ class VehicleControlPrepareForDeletionTest extends ActorTest {
   "VehicleControl" should {
     "submit for unregistering when marked for deconstruction" in {
       vehicle.Actor ! Vehicle.Deconstruct()
-
-      val vehicle_msg = vehicleProbe.receiveN(1, 500 milliseconds)
-      assert(
-        vehicle_msg.head match {
-          case VehicleServiceMessage.Decon(RemoverActor.AddTask(v, z, _)) => (v eq vehicle) && (z == vehicle.Zone)
-          case _                                                          => false
-        }
-      )
-
-      val vehicle_msg_final = vehicleProbe.receiveN(1, 6 seconds)
-      assert(
-        vehicle_msg_final.head match {
-          case VehicleServiceMessage("test", VehicleAction.UnloadVehicle(_, z, v, PlanetSideGUID(1))) =>
-            (v eq vehicle) && (z == vehicle.Zone)
-          case _ => false
-        }
-      )
+      vehicleProbe.expectNoMessage(5 seconds)
     }
   }
 }
@@ -383,7 +367,7 @@ class VehicleControlPrepareForDeletionPassengerTest extends ActorTest {
     "kick all players when marked for deconstruction" in {
       vehicle.Actor ! Vehicle.Deconstruct()
 
-      val vehicle_msg = vehicleProbe.receiveN(2, 500 milliseconds)
+      val vehicle_msg = vehicleProbe.receiveN(1, 500 milliseconds)
       assert(
         vehicle_msg.head match {
           case VehicleServiceMessage(
@@ -396,12 +380,6 @@ class VehicleControlPrepareForDeletionPassengerTest extends ActorTest {
       )
       assert(player1.VehicleSeated.isEmpty)
       assert(vehicle.Seats(1).Occupant.isEmpty)
-      assert(
-        vehicle_msg(1) match {
-          case VehicleServiceMessage.Decon(RemoverActor.AddTask(v, z, _)) => (v eq vehicle) && (z == vehicle.Zone)
-          case _                                                          => false
-        }
-      )
     }
   }
 }
@@ -451,7 +429,7 @@ class VehicleControlPrepareForDeletionMountedInTest extends FreedContextActorTes
     "if mounted as cargo, self-eject when marked for deconstruction" in {
       vehicle.Actor ! Vehicle.Deconstruct()
 
-      val vehicle_msg = vehicleProbe.receiveN(7, 500 milliseconds)
+      val vehicle_msg = vehicleProbe.receiveN(6, 500 milliseconds)
       //dismounting as cargo messages
       assert(
         vehicle_msg.head match {
@@ -523,12 +501,6 @@ class VehicleControlPrepareForDeletionMountedInTest extends FreedContextActorTes
       )
       assert(player1.VehicleSeated.isEmpty)
       assert(vehicle.Seats(1).Occupant.isEmpty)
-      assert(
-        vehicle_msg(6) match {
-          case VehicleServiceMessage.Decon(RemoverActor.AddTask(v, z, _)) => (v eq vehicle) && (z == vehicle.Zone)
-          case _                                                          => false
-        }
-      )
     }
   }
 }
@@ -580,7 +552,7 @@ class VehicleControlPrepareForDeletionMountedCargoTest extends FreedContextActor
     "if with mounted cargo, eject it when marked for deconstruction" in {
       lodestar.Actor ! Vehicle.Deconstruct()
 
-      val vehicle_msg = vehicleProbe.receiveN(7, 500 milliseconds)
+      val vehicle_msg = vehicleProbe.receiveN(6, 500 milliseconds)
       assert(
         vehicle_msg.head match {
           case VehicleServiceMessage(
@@ -650,13 +622,6 @@ class VehicleControlPrepareForDeletionMountedCargoTest extends FreedContextActor
           case _ => false
         }
       )
-      //cargo dismounting messages
-      assert(
-        vehicle_msg(6) match {
-          case VehicleServiceMessage.Decon(RemoverActor.AddTask(v, z, _)) => (v eq lodestar) && (z == vehicle.Zone)
-          case _                                                          => false
-        }
-      )
     }
   }
 }

src/test/scala/objects/ZoneTest.scala

@@ -2,6 +2,7 @@
 package objects
 
 import java.util.concurrent.atomic.AtomicInteger
+
 import akka.actor.ActorContext
 import base.ActorTest
 import net.psforever.objects.entity.IdentifiableEntity
@@ -19,6 +20,7 @@ import org.specs2.mutable.Specification
 import akka.actor.typed.scaladsl.adapter._
 import net.psforever.actors.zone.ZoneActor
 import net.psforever.objects.avatar.Avatar
+import net.psforever.services.ServiceManager
 
 import scala.concurrent.duration._
 
@@ -120,6 +122,7 @@ class ZoneTest extends Specification {
 }
 
 class ZoneActorTest extends ActorTest {
+  ServiceManager.boot
   "Zone" should {
     "refuse new number pools after the Actor is started" in {
       val zone = new Zone("test", new ZoneMap("map6"), 1) { override def SetupNumberPools() = {} }