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

repairing tests

Browse source
This commit is contained in:
FateJH 2018-06-16 20:09:25 -04:00
parent 20a4fdfe45
commit 41f0cdc0a0
3 changed files with 37 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
common/src/main/scala/net/psforever/objects/Vehicle.scala
View file

@ -323,13 +323,12 @@ class Vehicle(private val vehicleDef : VehicleDefinition) extends PlanetSideServ
Some(AccessPermissionGroup.Passenger) Some(AccessPermissionGroup.Passenger)
} }
case None => case None =>
None CargoHold(seatNumber) match {
} case Some(_) =>
CargoHold(seatNumber) match { Some(AccessPermissionGroup.Passenger)
case Some(_) => case None =>
Some(AccessPermissionGroup.Passenger) None
case None => }
None
} }
} }
} }

47
common/src/test/scala/objects/BuildingTest.scala
View file

@ -11,8 +11,10 @@ import net.psforever.objects.zones.Zone
import net.psforever.packet.game.PlanetSideGUID import net.psforever.packet.game.PlanetSideGUID
import net.psforever.types.PlanetSideEmpire import net.psforever.types.PlanetSideEmpire
import org.specs2.mutable.Specification import org.specs2.mutable.Specification
import services.ServiceManager
import services.galaxy.GalaxyService
import scala.concurrent.duration.Duration import scala.concurrent.duration._
class AmenityTest extends Specification { class AmenityTest extends Specification {
class AmenityObject extends Amenity { class AmenityObject extends Amenity {
@ -122,15 +124,20 @@ class BuildingControl1Test extends ActorTest {
} }
class BuildingControl2Test extends ActorTest { class BuildingControl2Test extends ActorTest {
ServiceManager.boot(system) ! ServiceManager.Register(Props[GalaxyService], "galaxy")
val bldg = Building(10, Zone.Nowhere, StructureType.Building)
bldg.Faction = PlanetSideEmpire.TR
bldg.Actor = system.actorOf(Props(classOf[BuildingControl], bldg), "test")
"Building Control" should { "Building Control" should {
"convert and assert faction affinity on convert request" in { "convert and assert faction affinity on convert request" in {
val bldg = Building(10, Zone.Nowhere, StructureType.Building) expectNoMsg(250 milliseconds)
bldg.Faction = PlanetSideEmpire.TR bldg.Actor ! "startup"
bldg.Actor = system.actorOf(Props(classOf[BuildingControl], bldg), "test") expectNoMsg(250 milliseconds)
assert(bldg.Faction == PlanetSideEmpire.TR)
assert(bldg.Faction == PlanetSideEmpire.TR)
bldg.Actor ! FactionAffinity.ConvertFactionAffinity(PlanetSideEmpire.VS) bldg.Actor ! FactionAffinity.ConvertFactionAffinity(PlanetSideEmpire.VS)
val reply = receiveOne(Duration.create(100, "ms")) val reply = receiveOne(500 milliseconds)
assert(reply.isInstanceOf[FactionAffinity.AssertFactionAffinity]) assert(reply.isInstanceOf[FactionAffinity.AssertFactionAffinity])
assert(reply.asInstanceOf[FactionAffinity.AssertFactionAffinity].obj == bldg) assert(reply.asInstanceOf[FactionAffinity.AssertFactionAffinity].obj == bldg)
assert(reply.asInstanceOf[FactionAffinity.AssertFactionAffinity].faction == PlanetSideEmpire.VS) assert(reply.asInstanceOf[FactionAffinity.AssertFactionAffinity].faction == PlanetSideEmpire.VS)
@ -140,19 +147,25 @@ class BuildingControl2Test extends ActorTest {
} }
class BuildingControl3Test extends ActorTest { class BuildingControl3Test extends ActorTest {
ServiceManager.boot(system) ! ServiceManager.Register(Props[GalaxyService], "galaxy")
val bldg = Building(10, Zone.Nowhere, StructureType.Building)
bldg.Faction = PlanetSideEmpire.TR
bldg.Actor = system.actorOf(Props(classOf[BuildingControl], bldg), "test")
val door1 = Door(GlobalDefinitions.door)
door1.GUID = PlanetSideGUID(1)
door1.Actor = system.actorOf(Props(classOf[DoorControl], door1), "door1-test")
val door2 = Door(GlobalDefinitions.door)
door2.GUID = PlanetSideGUID(2)
door2.Actor = system.actorOf(Props(classOf[DoorControl], door2), "door2-test")
bldg.Amenities = door2
bldg.Amenities = door1
"Building Control" should { "Building Control" should {
"convert and assert faction affinity on convert request, and for each of its amenities" in { "convert and assert faction affinity on convert request, and for each of its amenities" in {
val bldg = Building(10, Zone.Nowhere, StructureType.Building) expectNoMsg(250 milliseconds)
bldg.Faction = PlanetSideEmpire.TR bldg.Actor ! "startup"
bldg.Actor = system.actorOf(Props(classOf[BuildingControl], bldg), "building-test") expectNoMsg(250 milliseconds)
val door1 = Door(GlobalDefinitions.door)
door1.GUID = PlanetSideGUID(1)
door1.Actor = system.actorOf(Props(classOf[DoorControl], door1), "door1-test")
val door2 = Door(GlobalDefinitions.door)
door2.GUID = PlanetSideGUID(2)
door2.Actor = system.actorOf(Props(classOf[DoorControl], door2), "door2-test")
bldg.Amenities = door2
bldg.Amenities = door1
assert(bldg.Faction == PlanetSideEmpire.TR) assert(bldg.Faction == PlanetSideEmpire.TR)
assert(bldg.Amenities.length == 2) assert(bldg.Amenities.length == 2)
assert(bldg.Amenities.head == door2) assert(bldg.Amenities.head == door2)

2
common/src/test/scala/objects/VehicleTest.scala
View file

@ -1,7 +1,7 @@
// Copyright (c) 2017 PSForever // Copyright (c) 2017 PSForever
package objects package objects
import akka.actor.{ActorSystem, Props} import akka.actor.Props
import net.psforever.objects._ import net.psforever.objects._
import net.psforever.objects.definition.{SeatDefinition, VehicleDefinition} import net.psforever.objects.definition.{SeatDefinition, VehicleDefinition}
import net.psforever.objects.serverobject.mount.Mountable import net.psforever.objects.serverobject.mount.Mountable