4 files changed, 96 insertions(+), 16 deletions(-)

M Tests/NosSmooth.Packets.Tests/Converters/Basic/BoolStringConverterTests.cs
M Tests/NosSmooth.Packets.Tests/Converters/Basic/StringConverterTests.cs
M Tests/NosSmooth.Packets.Tests/Converters/Packets/CListPacketConverterTests.cs
M Tests/NosSmooth.Packets.Tests/Converters/Packets/PinitPacketConverterTest.cs

@@ 52,7 52,7 @@ public class BoolStringConverterTests
     {
         var deserialize = "-1";
         var stringEnumerator = new PacketStringEnumerator(deserialize);
-        var deserializeResult = _stringSerializer.Deserialize<bool?>(ref stringEnumerator);
+        var deserializeResult = _stringSerializer.Deserialize<bool?>(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<bool?>(ref stringEnumerator);
+        var deserializeResult = _stringSerializer.Deserialize<bool?>(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<bool?>(ref stringEnumerator);
+        var deserializeResult = _stringSerializer.Deserialize<bool?>(ref stringEnumerator, default);
         Assert.True(deserializeResult.IsSuccess, !deserializeResult.IsSuccess ? deserializeResult.Error.Message : string.Empty);
         Assert.False(deserializeResult.Entity);
     }

@@ 48,12 48,26 @@ public class StringConverterTests
     /// Tests that the serializer serializes null as -.
     /// </summary>
     [Fact]
-    public void TestsTreatsMinusAsNull()
+    public void TestsTreatsMinusAsNull_IfNullEnabled()
     {
         var deserialize = "-";
         var stringEnumerator = new PacketStringEnumerator(deserialize);
-        var deserializeResult = _stringSerializer.Deserialize<string?>(ref stringEnumerator);
+        var deserializeResult = _stringSerializer.Deserialize<string?>(ref stringEnumerator, DeserializeOptions.Nullable);
         Assert.True(deserializeResult.IsSuccess, !deserializeResult.IsSuccess ? deserializeResult.Error.Message : string.Empty);
         Assert.Null(deserializeResult.Entity);
     }
+
+    /// <summary>
+    /// Tests that the serializer serializes - as -.
+    /// </summary>
+    [Fact]
+    public void TestsTreatsMinusAsNull_IfNullDisabled()
+    {
+        var deserialize = "-";
+        var stringEnumerator = new PacketStringEnumerator(deserialize);
+        var deserializeResult = _stringSerializer.Deserialize<string?>(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

@@ 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<CListPetSubPacket>[]
             {
                 new CListPetSubPacket(0, 2105),
                 new CListPetSubPacket(0, 319),


@@ 141,7 142,7 @@ public class CListPacketConverterTests
             string.Empty,
             1,
             1,
-            new[]
+            new NullableWrapper<CListPetSubPacket>[]
             {
                 new CListPetSubPacket(0, 2105),
                 new CListPetSubPacket(0, 319),

@@ 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