PSForever/PSF-LoginServer
1
0
Fork 0
mirror of https://github.com/psforever/PSF-LoginServer.git synced 2026-04-29 16:25:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes for MeritCommendation tests

Browse source
This commit is contained in:
FateJH 2017-09-08 20:12:36 -04:00
parent 5b4ba246e1
commit 5444048e8d
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/src/test/scala/game/DisplayedAwardMessageTest.scala
View file

@ -14,7 +14,7 @@ class DisplayedAwardMessageTest extends Specification {
PacketCoding.DecodePacket(string).require match { PacketCoding.DecodePacket(string).require match {
case DisplayedAwardMessage(player_guid, ribbon, bar) => case DisplayedAwardMessage(player_guid, ribbon, bar) =>
player_guid mustEqual PlanetSideGUID(1695) player_guid mustEqual PlanetSideGUID(1695)
ribbon mustEqual MeritCommendation.TwoYearTR ribbon mustEqual MeritCommendation.TwoYearVS
bar mustEqual RibbonBarsSlot.TermOfService bar mustEqual RibbonBarsSlot.TermOfService
case _ => case _ =>
ko ko
@ -22,7 +22,7 @@ class DisplayedAwardMessageTest extends Specification {
} }
"encode" in { "encode" in {
val msg = DisplayedAwardMessage(PlanetSideGUID(1695), MeritCommendation.TwoYearTR, RibbonBarsSlot.TermOfService) val msg = DisplayedAwardMessage(PlanetSideGUID(1695), MeritCommendation.TwoYearVS, RibbonBarsSlot.TermOfService)
val pkt = PacketCoding.EncodePacket(msg).require.toByteVector val pkt = PacketCoding.EncodePacket(msg).require.toByteVector
pkt mustEqual string pkt mustEqual string

28
common/src/test/scala/game/ObjectCreateMessageTest.scala
View file

@ -691,10 +691,10 @@ class ObjectCreateMessageTest extends Specification {
pc.appearance.is_cloaking mustEqual false pc.appearance.is_cloaking mustEqual false
pc.appearance.charging_pose mustEqual false pc.appearance.charging_pose mustEqual false
pc.appearance.on_zipline mustEqual false pc.appearance.on_zipline mustEqual false
pc.appearance.ribbons.upper mustEqual MeritCommendation.Loser4 pc.appearance.ribbons.upper mustEqual MeritCommendation.MarkovVeteran
pc.appearance.ribbons.middle mustEqual MeritCommendation.HeavyInfantry3 pc.appearance.ribbons.middle mustEqual MeritCommendation.HeavyInfantry4
pc.appearance.ribbons.lower mustEqual MeritCommendation.TankBuster6 pc.appearance.ribbons.lower mustEqual MeritCommendation.TankBuster7
pc.appearance.ribbons.tos mustEqual MeritCommendation.SixYearNC pc.appearance.ribbons.tos mustEqual MeritCommendation.SixYearTR
pc.health mustEqual 255 pc.health mustEqual 255
pc.armor mustEqual 253 pc.armor mustEqual 253
pc.uniform_upgrade mustEqual UniformStyle.ThirdUpgrade pc.uniform_upgrade mustEqual UniformStyle.ThirdUpgrade
@ -787,10 +787,10 @@ class ObjectCreateMessageTest extends Specification {
pc.appearance.is_cloaking mustEqual false pc.appearance.is_cloaking mustEqual false
pc.appearance.charging_pose mustEqual false pc.appearance.charging_pose mustEqual false
pc.appearance.on_zipline mustEqual false pc.appearance.on_zipline mustEqual false
pc.appearance.ribbons.upper mustEqual MeritCommendation.Jacking pc.appearance.ribbons.upper mustEqual MeritCommendation.Jacking2
pc.appearance.ribbons.middle mustEqual MeritCommendation.ScavengerTR6 pc.appearance.ribbons.middle mustEqual MeritCommendation.ScavengerVS1
pc.appearance.ribbons.lower mustEqual MeritCommendation.AMSSupport4 pc.appearance.ribbons.lower mustEqual MeritCommendation.AMSSupport4
pc.appearance.ribbons.tos mustEqual MeritCommendation.SixYearTR pc.appearance.ribbons.tos mustEqual MeritCommendation.SixYearVS
pc.health mustEqual 0 pc.health mustEqual 0
pc.armor mustEqual 0 pc.armor mustEqual 0
pc.uniform_upgrade mustEqual UniformStyle.ThirdUpgrade pc.uniform_upgrade mustEqual UniformStyle.ThirdUpgrade
@ -1115,10 +1115,10 @@ class ObjectCreateMessageTest extends Specification {
GrenadeState.None, GrenadeState.None,
false, false, false, false, false, false,
RibbonBars( RibbonBars(
MeritCommendation.Loser4, MeritCommendation.MarkovVeteran,
MeritCommendation.HeavyInfantry3, MeritCommendation.HeavyInfantry4,
MeritCommendation.TankBuster6, MeritCommendation.TankBuster7,
MeritCommendation.SixYearNC MeritCommendation.SixYearTR
) )
), ),
255, 253, 255, 253,
@ -1172,10 +1172,10 @@ class ObjectCreateMessageTest extends Specification {
GrenadeState.None, GrenadeState.None,
false, false, false, false, false, false,
RibbonBars( RibbonBars(
MeritCommendation.Jacking, MeritCommendation.Jacking2,
MeritCommendation.ScavengerTR6, MeritCommendation.ScavengerVS1,
MeritCommendation.AMSSupport4, MeritCommendation.AMSSupport4,
MeritCommendation.SixYearTR MeritCommendation.SixYearVS
) )
), ),
0, 0, 0, 0,