Publish

Fix tests

Author: mtanksl

mtanksl.OpenTibia.Build/Program.cs

@@ -523,7 +523,10 @@ private static void DirectoryDelete(string directoryName)
         {
             directoryName = Path.Combine(GetBaseDirectory(), directoryName);
 
-            Directory.Delete(directoryName, true);
+            if (Directory.Exists(directoryName) )
+            {
+                Directory.Delete(directoryName, true);
+            }
         }
 
         private static void DirectoryCopy(string sourceDirectoryName, string destinationDirectoryName)

mtanksl.OpenTibia.GameData/data/dlls/mtanksl.OpenTibia.Plugins/mtanksl.OpenTibia.Plugins.dll

@@ -19,6 +19,8 @@ private EnterGameIncomingPacket CreatePacket()
 
                 ProtocolVersion = 860,
 
+                ClientVersion = 860,
+
                 TibiaDat = 1277983123,
 
                 TibiaPic = 1256571859,
@@ -42,7 +44,7 @@ public void CantLoginWithOtherVersion()
                 {
                     var packet = CreatePacket();
 
-                    packet.ProtocolVersion = 772;
+                    packet.ClientVersion = 772;
 
                     a.Execute(new ParseEnterGameCommand(a.Connection, packet) )
                      .ExpectSuccess(false)

mtanksl.OpenTibia.Tests/2. Game tests/1. Incoming commands/ParseEnterGameCommandTests.cs

@@ -19,6 +19,8 @@ private SelectedCharacterIncomingPacket CreatePacket()
 
                 ProtocolVersion = 860,
 
+                ClientVersion = 860,
+
                 Keys = new uint[] { 0, 0, 0, 0 },
 
                 Gamemaster = true,
@@ -44,7 +46,7 @@ public void CantLoginWithOtherVersion()
                 {
                     var packet = CreatePacket();
 
-                    packet.ProtocolVersion = 772;
+                    packet.ClientVersion = 772;
 
                     a.Execute(new ParseSelectedCharacterCommand(a.Connection, packet) )
                      .ExpectSuccess(false)
@@ -69,14 +71,15 @@ public void CanLoginWhileDownForMaintenance()
                     a.Execute(new ParseSelectedCharacterCommand(a.Connection, packet) )
                      .ExpectSuccess()
                      .Observe(o => o
-                         .ExpectPacket(9)
+                         .ExpectPacket(10)
                          .ExpectPacket<SendInfoOutgoingPacket>(1)
                          .ExpectPacket<SendTilesOutgoingPacket>(1)
-                         .ExpectPacket<SetEnvironmentLightOutgoingPacket>(1)
+                         .ExpectPacket<SlotAddOutgoingPacket>(1)
                          .ExpectPacket<SendStatusOutgoingPacket>(1)
                          .ExpectPacket<SendSkillsOutgoingPacket>(1)
                          .ExpectPacket<SetSpecialConditionOutgoingPacket>(1)
-                         .ExpectPacket<SlotAddOutgoingPacket>(1)
+                         .ExpectPacket<SetEnvironmentLightOutgoingPacket>(1)
+                         .ExpectPacket<SetLightOutgoingPacket>(1)
                          .ExpectPacket<ShowMagicEffectOutgoingPacket>(1)
                          .ExpectPacket<ShowWindowTextOutgoingPacket>(1)
                          .ExpectConnected() );
@@ -173,14 +176,15 @@ public void Success()
                     a.Execute(new ParseSelectedCharacterCommand(a.Connection, packet) )
                      .ExpectSuccess()
                      .Observe(o => o
-                         .ExpectPacket(9)
+                         .ExpectPacket(10)
                          .ExpectPacket<SendInfoOutgoingPacket>(1)
                          .ExpectPacket<SendTilesOutgoingPacket>(1)
-                         .ExpectPacket<SetEnvironmentLightOutgoingPacket>(1)
+                         .ExpectPacket<SlotAddOutgoingPacket>(1)
                          .ExpectPacket<SendStatusOutgoingPacket>(1)
                          .ExpectPacket<SendSkillsOutgoingPacket>(1)
                          .ExpectPacket<SetSpecialConditionOutgoingPacket>(1)
-                         .ExpectPacket<SlotAddOutgoingPacket>(1)
+                         .ExpectPacket<SetEnvironmentLightOutgoingPacket>(1)
+                         .ExpectPacket<SetLightOutgoingPacket>(1)
                          .ExpectPacket<ShowMagicEffectOutgoingPacket>(1)
                          .ExpectPacket<ShowWindowTextOutgoingPacket>(1)
                          .ExpectConnected() );

mtanksl.OpenTibia.Tests/2. Game tests/1. Incoming commands/ParseSelectedCharacterCommandTests.cs

@@ -57,7 +57,7 @@ public Player Login(string account, string password, string character)
             var builder = 
 
                 Using("127.0.0.1", a => a
-                    .Execute(new ParseSelectedCharacterCommand(a.Connection, new SelectedCharacterIncomingPacket() { OperatingSystem = Common.Structures.OperatingSystem.Windows, ProtocolVersion = 860, Keys = new uint[] { 0, 0, 0, 0 }, Gamemaster = true, Account = account, Password = password, Character = character, Timestamp = 0, Random = 0 } ) )
+                    .Execute(new ParseSelectedCharacterCommand(a.Connection, new SelectedCharacterIncomingPacket() { OperatingSystem = Common.Structures.OperatingSystem.Windows, ProtocolVersion = 860, ClientVersion = 860, Keys = new uint[] { 0, 0, 0, 0 }, Gamemaster = true, Account = account, Password = password, Character = character, Timestamp = 0, Random = 0 } ) )
                     .ExpectSuccess()
                     .Observe(o => o
                         .ExpectConnected() ) );