From d44d61cf7d8fcbbf769cb64fcb1cb0a48f937c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20Boh=C3=A1=C4=8Dek?=
 <fandabohacek@gmail.com>
Date: Sun, 5 Feb 2023 19:08:49 +0100
Subject: [PATCH] tests: adapt Game tests to new features

---
 .../Modules/SkillsTests.cs                    |  6 ++--
 .../NosSmooth.Game.Tests/PacketFileClient.cs  | 29 ++-----------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/Tests/NosSmooth.Game.Tests/Modules/SkillsTests.cs b/Tests/NosSmooth.Game.Tests/Modules/SkillsTests.cs
index 05c6ef3..b450d08 100644
--- a/Tests/NosSmooth.Game.Tests/Modules/SkillsTests.cs
+++ b/Tests/NosSmooth.Game.Tests/Modules/SkillsTests.cs
@@ -41,7 +41,7 @@ public class SkillsTests
         data.Game.Skills.PrimarySkill.SkillVNum.ShouldBe(240);
         data.Game.Skills.SecondarySkill.SkillVNum.ShouldBe(241);
         data.Game.Skills.OtherSkills.ShouldNotBeEmpty();
-        data.Game.Skills.OtherSkills.Count.ShouldBe(3);
+        data.Game.Skills.OtherSkills.Count.ShouldBe(1);
         data.Game.Skills.OtherSkills.Last().SkillVNum.ShouldBe(236);
 
         await data.Client.ExecuteUntilLabelAsync("AFTER_MORPH");
@@ -49,7 +49,7 @@ public class SkillsTests
         data.Game.Skills.ShouldNotBeNull();
         data.Game.Skills.PrimarySkill.SkillVNum.ShouldBe(922);
         data.Game.Skills.SecondarySkill.SkillVNum.ShouldBe(922);
-        data.Game.Skills.OtherSkills.Count.ShouldBe(11);
+        data.Game.Skills.OtherSkills.Count.ShouldBe(10);
         data.Game.Skills.OtherSkills.ShouldAllBe(x => x.SkillVNum > 921 && x.SkillVNum < 933);
 
         await data.Client.ExecuteUntilLabelAsync("AFTER_MORPH_OFF");
@@ -58,7 +58,7 @@ public class SkillsTests
         data.Game.Skills.PrimarySkill.SkillVNum.ShouldBe(240);
         data.Game.Skills.SecondarySkill.SkillVNum.ShouldBe(241);
         data.Game.Skills.OtherSkills.ShouldNotBeEmpty();
-        data.Game.Skills.OtherSkills.Count.ShouldBe(3);
+        data.Game.Skills.OtherSkills.Count.ShouldBe(1);
         data.Game.Skills.OtherSkills.Last().SkillVNum.ShouldBe(236);
 
         await data.Client.ExecuteUntilLabelAsync("AFTER_SKILL_USED");
diff --git a/Tests/NosSmooth.Game.Tests/PacketFileClient.cs b/Tests/NosSmooth.Game.Tests/PacketFileClient.cs
index 8c2c0d5..4ede0ef 100644
--- a/Tests/NosSmooth.Game.Tests/PacketFileClient.cs
+++ b/Tests/NosSmooth.Game.Tests/PacketFileClient.cs
@@ -37,8 +37,7 @@ public class PacketFileClient : BaseNostaleClient, IDisposable
 
     private readonly FileStream _stream;
     private readonly StreamReader _reader;
-    private readonly IPacketSerializer _packetSerializer;
-    private readonly PacketHandler _packetHandler;
+    private readonly IPacketHandler _packetHandler;
     private readonly ILogger<PacketFileClient> _logger;
     private string? _nextLabel;
     private bool _skip;
@@ -123,16 +122,14 @@ public class PacketFileClient : BaseNostaleClient, IDisposable
     public PacketFileClient
     (
         FileStream stream,
-        IPacketSerializer packetSerializer,
         CommandProcessor commandProcessor,
-        PacketHandler packetHandler,
+        IPacketHandler packetHandler,
         ILogger<PacketFileClient> logger
     )
-        : base(commandProcessor, packetSerializer)
+        : base(commandProcessor)
     {
         _stream = stream;
         _reader = new StreamReader(_stream);
-        _packetSerializer = packetSerializer;
         _packetHandler = packetHandler;
         _logger = logger;
     }
@@ -232,12 +229,10 @@ public class PacketFileClient : BaseNostaleClient, IDisposable
             var packetStr = packetMatch.Groups[2].Value;
 
             var source = type == "Recv" ? PacketSource.Server : PacketSource.Client;
-            var packet = CreatePacket(packetStr, source);
             Result result = await _packetHandler.HandlePacketAsync
             (
                 this,
                 source,
-                packet,
                 packetStr,
                 stopRequested
             );
@@ -257,7 +252,6 @@ public class PacketFileClient : BaseNostaleClient, IDisposable
         (
             this,
             PacketSource.Client,
-            CreatePacket(packetString, PacketSource.Client),
             packetString,
             ct
         );
@@ -270,28 +264,11 @@ public class PacketFileClient : BaseNostaleClient, IDisposable
         (
             this,
             PacketSource.Server,
-            CreatePacket(packetString, PacketSource.Server),
             packetString,
             ct
         );
     }
 
-    private IPacket CreatePacket(string packetStr, PacketSource source)
-    {
-        var packetResult = _packetSerializer.Deserialize(packetStr, source);
-        if (!packetResult.IsSuccess)
-        {
-            if (packetResult.Error is PacketConverterNotFoundError err)
-            {
-                return new UnresolvedPacket(err.Header, packetStr);
-            }
-
-            return new ParsingFailedPacket(packetResult, packetStr);
-        }
-
-        return packetResult.Entity;
-    }
-
     /// <inheritdoc />
     public void Dispose()
     {
-- 
2.49.0