From a68bcd6fd8c65d460b4d14a429d08d7bc1cf6648 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Sun, 8 Jan 2023 19:53:26 +0100 Subject: [PATCH] tests: remove unnecessary deep checks, replace them with ShouldBeEquivalentTo from Shouldly --- .../Packets/CListPacketConverterTests.cs | 14 +----- .../Packets/InPacketConverterTests.cs | 46 +------------------ 2 files changed, 2 insertions(+), 58 deletions(-) diff --git a/Tests/NosSmooth.Packets.Tests/Converters/Packets/CListPacketConverterTests.cs b/Tests/NosSmooth.Packets.Tests/Converters/Packets/CListPacketConverterTests.cs index 1544ac5..c7a1222 100644 --- a/Tests/NosSmooth.Packets.Tests/Converters/Packets/CListPacketConverterTests.cs +++ b/Tests/NosSmooth.Packets.Tests/Converters/Packets/CListPacketConverterTests.cs @@ -186,19 +186,7 @@ public class CListPacketConverterTests 0, 0 ); - var packet = (CListPacket)packetResult.Entity; - packet.Class.ShouldBe(expectedPacket.Class); - packet.Level.ShouldBe(expectedPacket.Level); - packet.Name.ShouldBe(expectedPacket.Name); - packet.Sex.ShouldBe(expectedPacket.Sex); - packet.Slot.ShouldBe(expectedPacket.Slot); - packet.HairColor.ShouldBe(expectedPacket.HairColor); - packet.HatDesign.ShouldBe(expectedPacket.HatDesign); - packet.HeroLevel.ShouldBe(expectedPacket.HeroLevel); - packet.JobLevel.ShouldBe(expectedPacket.JobLevel); - packet.HairStyle.ShouldBe(expectedPacket.HairStyle); - packet.EquipmentSubPacket.ShouldBe(expectedPacket.EquipmentSubPacket); - packet.PetsSubPacket.ShouldBe(expectedPacket.PetsSubPacket); + packetResult.Entity.ShouldBeEquivalentTo(expectedPacket); } /// diff --git a/Tests/NosSmooth.Packets.Tests/Converters/Packets/InPacketConverterTests.cs b/Tests/NosSmooth.Packets.Tests/Converters/Packets/InPacketConverterTests.cs index cb71df1..025669a 100644 --- a/Tests/NosSmooth.Packets.Tests/Converters/Packets/InPacketConverterTests.cs +++ b/Tests/NosSmooth.Packets.Tests/Converters/Packets/InPacketConverterTests.cs @@ -113,51 +113,7 @@ public class InPacketConverterTests null ); result.IsSuccess.ShouldBeTrue(); - var packet = (InPacket)result.Entity; - packet.EntityType.ShouldBe(expectedPacket.EntityType); - packet.EntityId.ShouldBe(expectedPacket.EntityId); - packet.ItemSubPacket.ShouldBe(expectedPacket.ItemSubPacket); - packet.Direction.ShouldBe(expectedPacket.Direction); - packet.Name.ShouldBe(expectedPacket.Name); - packet.PositionX.ShouldBe(expectedPacket.PositionX); - packet.PositionY.ShouldBe(expectedPacket.PositionY); - packet.VNum.ShouldBe(expectedPacket.VNum); - packet.NonPlayerSubPacket.ShouldBe(expectedPacket.NonPlayerSubPacket); - - packet.PlayerSubPacket.ShouldNotBeNull(); - var playerSubPacket = packet.PlayerSubPacket!; - var expectedSubPacket = packet.PlayerSubPacket!; - - playerSubPacket.Level.ShouldBe(expectedSubPacket.Level); - playerSubPacket.FamilySubPacket.ShouldBe(expectedSubPacket.FamilySubPacket); - playerSubPacket.HeroLevel.ShouldBe(expectedSubPacket.HeroLevel); - playerSubPacket.Size.ShouldBe(expectedSubPacket.Size); - playerSubPacket.FamilyLevel.ShouldBe(expectedSubPacket.FamilyLevel); - playerSubPacket.MorphUpgrade.ShouldBe(expectedSubPacket.MorphUpgrade); - playerSubPacket.MorphUpgrade2.ShouldBe(expectedSubPacket.MorphUpgrade2); - playerSubPacket.Authority.ShouldBe(expectedSubPacket.Authority); - playerSubPacket.Class.ShouldBe(expectedSubPacket.Class); - playerSubPacket.Compliment.ShouldBe(expectedSubPacket.Compliment); - playerSubPacket.Equipment.ShouldBe(expectedSubPacket.Equipment); - playerSubPacket.Faction.ShouldBe(expectedSubPacket.Faction); - playerSubPacket.Fairy.ShouldBe(expectedSubPacket.Fairy); - playerSubPacket.Sex.ShouldBe(expectedSubPacket.Sex); - playerSubPacket.ArenaWinner.ShouldBe(expectedSubPacket.ArenaWinner); - playerSubPacket.FairyElement.ShouldBe(expectedSubPacket.FairyElement); - playerSubPacket.FamilyIcons.ShouldBe(expectedSubPacket.FamilyIcons); - playerSubPacket.FamilyName.ShouldBe(expectedSubPacket.FamilyName); - playerSubPacket.GroupId.ShouldBe(expectedSubPacket.GroupId); - playerSubPacket.HairColor.ShouldBe(expectedSubPacket.HairColor); - playerSubPacket.HairStyle.ShouldBe(expectedSubPacket.HairStyle); - playerSubPacket.HpPercentage.ShouldBe(expectedSubPacket.HpPercentage); - playerSubPacket.IsInvisible.ShouldBe(expectedSubPacket.IsInvisible); - playerSubPacket.IsSitting.ShouldBe(expectedSubPacket.IsSitting); - playerSubPacket.MpPercentage.ShouldBe(expectedSubPacket.MpPercentage); - playerSubPacket.ReputationIcon.ShouldBe(expectedSubPacket.ReputationIcon); - playerSubPacket.FamilySubPacket.ShouldBe(expectedSubPacket.FamilySubPacket); - playerSubPacket.ArmorUpgradeRareSubPacket.ShouldBe(expectedSubPacket.ArmorUpgradeRareSubPacket); - playerSubPacket.WeaponUpgradeRareSubPacket.ShouldBe(expectedSubPacket.WeaponUpgradeRareSubPacket); - playerSubPacket.MorphVNum.ShouldBe(expectedSubPacket.MorphVNum); + result.Entity.ShouldBeEquivalentTo(expectedPacket); } /// -- 2.49.0