From 931dc279e7136a631fb9318b42ae75b03bdfa1a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?= Date: Sat, 7 Jan 2023 14:20:55 +0100 Subject: [PATCH] chore(test): update tests --- .../Basic/BoolStringConverterTests.cs | 6 +- .../Converters/Basic/StringConverterTests.cs | 18 +++- .../Packets/CListPacketConverterTests.cs | 5 +- .../Packets/PinitPacketConverterTest.cs | 83 +++++++++++++++++-- 4 files changed, 96 insertions(+), 16 deletions(-) diff --git a/Tests/NosSmooth.Packets.Tests/Converters/Basic/BoolStringConverterTests.cs b/Tests/NosSmooth.Packets.Tests/Converters/Basic/BoolStringConverterTests.cs index c44ee0c..7359ed5 100644 --- a/Tests/NosSmooth.Packets.Tests/Converters/Basic/BoolStringConverterTests.cs +++ b/Tests/NosSmooth.Packets.Tests/Converters/Basic/BoolStringConverterTests.cs @@ -52,7 +52,7 @@ public class BoolStringConverterTests { var deserialize = "-1"; var stringEnumerator = new PacketStringEnumerator(deserialize); - var deserializeResult = _stringSerializer.Deserialize(ref stringEnumerator); + var deserializeResult = _stringSerializer.Deserialize(ref stringEnumerator, default); Assert.True(deserializeResult.IsSuccess, !deserializeResult.IsSuccess ? deserializeResult.Error.Message : string.Empty); Assert.Null(deserializeResult.Entity); } @@ -65,7 +65,7 @@ public class BoolStringConverterTests { var deserialize = "1"; var stringEnumerator = new PacketStringEnumerator(deserialize); - var deserializeResult = _stringSerializer.Deserialize(ref stringEnumerator); + var deserializeResult = _stringSerializer.Deserialize(ref stringEnumerator, default); Assert.True(deserializeResult.IsSuccess, !deserializeResult.IsSuccess ? deserializeResult.Error.Message : string.Empty); Assert.True(deserializeResult.Entity); } @@ -78,7 +78,7 @@ public class BoolStringConverterTests { var deserialize = "0"; var stringEnumerator = new PacketStringEnumerator(deserialize); - var deserializeResult = _stringSerializer.Deserialize(ref stringEnumerator); + var deserializeResult = _stringSerializer.Deserialize(ref stringEnumerator, default); Assert.True(deserializeResult.IsSuccess, !deserializeResult.IsSuccess ? deserializeResult.Error.Message : string.Empty); Assert.False(deserializeResult.Entity); } diff --git a/Tests/NosSmooth.Packets.Tests/Converters/Basic/StringConverterTests.cs b/Tests/NosSmooth.Packets.Tests/Converters/Basic/StringConverterTests.cs index 8616fa1..fde0180 100644 --- a/Tests/NosSmooth.Packets.Tests/Converters/Basic/StringConverterTests.cs +++ b/Tests/NosSmooth.Packets.Tests/Converters/Basic/StringConverterTests.cs @@ -48,12 +48,26 @@ public class StringConverterTests /// Tests that the serializer serializes null as -. /// [Fact] - public void TestsTreatsMinusAsNull() + public void TestsTreatsMinusAsNull_IfNullEnabled() { var deserialize = "-"; var stringEnumerator = new PacketStringEnumerator(deserialize); - var deserializeResult = _stringSerializer.Deserialize(ref stringEnumerator); + var deserializeResult = _stringSerializer.Deserialize(ref stringEnumerator, DeserializeOptions.Nullable); Assert.True(deserializeResult.IsSuccess, !deserializeResult.IsSuccess ? deserializeResult.Error.Message : string.Empty); Assert.Null(deserializeResult.Entity); } + + /// + /// Tests that the serializer serializes - as -. + /// + [Fact] + public void TestsTreatsMinusAsNull_IfNullDisabled() + { + var deserialize = "-"; + var stringEnumerator = new PacketStringEnumerator(deserialize); + var deserializeResult = _stringSerializer.Deserialize(ref stringEnumerator, default); + Assert.True(deserializeResult.IsSuccess, !deserializeResult.IsSuccess ? deserializeResult.Error.Message : string.Empty); + Assert.NotNull(deserializeResult.Entity); + Assert.Equal("-", deserializeResult.Entity); + } } \ No newline at end of file diff --git a/Tests/NosSmooth.Packets.Tests/Converters/Packets/CListPacketConverterTests.cs b/Tests/NosSmooth.Packets.Tests/Converters/Packets/CListPacketConverterTests.cs index c343d5c..0d99943 100644 --- a/Tests/NosSmooth.Packets.Tests/Converters/Packets/CListPacketConverterTests.cs +++ b/Tests/NosSmooth.Packets.Tests/Converters/Packets/CListPacketConverterTests.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.DependencyInjection; using NosSmooth.Packets.Enums.Players; using NosSmooth.Packets.Server.Login; using NosSmooth.PacketSerializer; +using NosSmooth.PacketSerializer.Abstractions; using NosSmooth.PacketSerializer.Abstractions.Attributes; using NosSmooth.PacketSerializer.Extensions; using NosSmooth.PacketSerializer.Packets; @@ -68,7 +69,7 @@ public class CListPacketConverterTests string.Empty, 1, 1, - new[] + new NullableWrapper[] { new CListPetSubPacket(0, 2105), new CListPetSubPacket(0, 319), @@ -141,7 +142,7 @@ public class CListPacketConverterTests string.Empty, 1, 1, - new[] + new NullableWrapper[] { new CListPetSubPacket(0, 2105), new CListPetSubPacket(0, 319), diff --git a/Tests/NosSmooth.Packets.Tests/Converters/Packets/PinitPacketConverterTest.cs b/Tests/NosSmooth.Packets.Tests/Converters/Packets/PinitPacketConverterTest.cs index a61e26e..2db06a1 100644 --- a/Tests/NosSmooth.Packets.Tests/Converters/Packets/PinitPacketConverterTest.cs +++ b/Tests/NosSmooth.Packets.Tests/Converters/Packets/PinitPacketConverterTest.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection; using NosSmooth.Packets.Enums.Entities; +using NosSmooth.Packets.Enums.Mates; using NosSmooth.Packets.Server.Groups; using NosSmooth.PacketSerializer; using NosSmooth.PacketSerializer.Abstractions.Attributes; @@ -41,11 +42,41 @@ public class PinitPacketConverterTest [Fact] public void Converter_Serialization_SerializesCorrectly() { - var packet = new PinitPacket(2, new[] - { - new PinitSubPacket(EntityType.Npc, 345377, 0, 83, "Kliff", -1, 319, 1, 0, null, null, null), - new PinitSubPacket(EntityType.Npc, 345384, 1, 83, "@", -1, 2105, 0, 0, null, null, null) - }); + var packet = new PinitPacket + ( + 2, + new[] + { + new PinitSubPacket + ( + EntityType.Npc, + 345377, + new PinitMateSubPacket + ( + MateType.Partner, + 83, + "Kliff", + null, + 319 + ), + null + ), + new PinitSubPacket + ( + EntityType.Npc, + 345384, + new PinitMateSubPacket + ( + MateType.Pet, + 83, + "@", + null, + 2105 + ), + null + ) + } + ); var result = _packetSerializer.Serialize(packet); Assert.True(result.IsSuccess); @@ -64,10 +95,44 @@ public class PinitPacketConverterTest var actualPacket = (PinitPacket)result.Entity; - Assert.Equal(2, actualPacket.GroupSize); + Assert.Equal(2, actualPacket.SubPacketsCount); Assert.NotNull(actualPacket.PinitSubPackets); Assert.Equal(2, actualPacket.PinitSubPackets!.Count); - Assert.StrictEqual(new PinitSubPacket(EntityType.Npc, 345377, 0, 83, "Kliff", null, 319, 1, 0, null, null, null), actualPacket.PinitSubPackets[0]); - Assert.StrictEqual(new PinitSubPacket(EntityType.Npc, 345384, 1, 83, "@", null, 2105, 0, 0, null, null, null), actualPacket.PinitSubPackets[1]); + Assert.StrictEqual + ( + new PinitSubPacket + ( + EntityType.Npc, + 345377, + new PinitMateSubPacket + ( + MateType.Partner, + 83, + "Kliff", + null, + 319 + ), + null + ), + actualPacket.PinitSubPackets[0] + ); + Assert.StrictEqual + ( + new PinitSubPacket + ( + EntityType.Npc, + 345384, + new PinitMateSubPacket + ( + MateType.Pet, + 83, + "@", + null, + 2105 + ), + null + ), + actualPacket.PinitSubPackets[1] + ); } -} +} \ No newline at end of file -- 2.48.1