[ECO-4567] Updated tests to use JAssert.DeepEquals instead of JToken.DeepEquals

Author: sacOO7

src/IO.Ably.Tests.Shared/MsgPackMessageSerializerTests.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using FluentAssertions;
 using IO.Ably.MessageEncoders;
+using IO.Ably.Tests.Shared.Helpers;
 using IO.Ably.Types;
 using MessagePack;
 using Newtonsoft.Json;
@@ -700,14 +701,14 @@ public void TestMsgpackDecoding(string testName, MsgpackTestFixture fixture)
                     // For JSON objects, compare as JToken for proper equality
                     var expectedJson = JsonConvert.SerializeObject(fixture.Data);
                     var actualJson = JsonConvert.SerializeObject(decodedMsg.Data);
-                    JToken.DeepEquals(JToken.Parse(expectedJson), JToken.Parse(actualJson)).Should().BeTrue();
+                    JAssert.DeepEquals(JToken.Parse(expectedJson), JToken.Parse(actualJson), Output).Should().BeTrue();
                     break;
 
                 case "jsonArray":
                     // For JSON arrays, compare as JToken for proper equality
                     var expectedArrayJson = JsonConvert.SerializeObject(fixture.Data);
                     var actualArrayJson = JsonConvert.SerializeObject(decodedMsg.Data);
-                    JToken.DeepEquals(JToken.Parse(expectedArrayJson), JToken.Parse(actualArrayJson)).Should().BeTrue();
+                    JAssert.DeepEquals(JToken.Parse(expectedArrayJson), JToken.Parse(actualArrayJson), Output).Should().BeTrue();
                     break;
 
                 default:

src/IO.Ably.Tests.Shared/Realtime/ChannelSandboxSpecs.cs

@@ -11,6 +11,7 @@
 using IO.Ably.Realtime;
 using IO.Ably.Tests.Extensions;
 using IO.Ably.Tests.Infrastructure;
+using IO.Ably.Tests.Shared.Helpers;
 using IO.Ably.Types;
 using Newtonsoft.Json.Linq;
 using Xunit;
@@ -910,7 +911,7 @@ public async Task ShouldPublishAndReceiveFixtureData(Protocol protocol, JObject
                 }
                 else if (encoding == "json")
                 {
-                    JToken.DeepEquals((JToken)lastMessage.Data, (JToken)decodedData).Should().BeTrue("Item number {0} data does not match decoded data", count);
+                    JAssert.DeepEquals((JToken)lastMessage.Data, (JToken)decodedData, Output).Should().BeTrue("Item number {0} data does not match decoded data", count);
                 }
                 else
                 {

src/IO.Ably.Tests.Shared/Rest/ChannelSandboxSpecs.cs

@@ -11,6 +11,7 @@
 using Newtonsoft.Json.Linq;
 using Xunit;
 using Xunit.Abstractions;
+using IO.Ably.Tests.Shared.Helpers;
 
 namespace IO.Ably.Tests.Rest
 {
@@ -368,7 +369,7 @@ public async Task CanPublishAMessageAndRetrieveIt128(Protocol protocol)
                 }
                 else if (encoding == "json")
                 {
-                    JToken.DeepEquals((JToken)message.Data, (JToken)decodedData).Should().BeTrue("Item number {0} data does not match decoded data", count);
+                    JAssert.DeepEquals((JToken)message.Data, (JToken)decodedData, Output).Should().BeTrue("Item number {0} data does not match decoded data", count);
                 }
                 else
                 {
@@ -408,7 +409,7 @@ public async Task CanPublishAMessageAndRetrieveIt256(Protocol protocol)
                 }
                 else if (encoding == "json")
                 {
-                    JToken.DeepEquals((JToken)message.Data, (JToken)decodedData).Should().BeTrue("Item number {0} data does not match decoded data", count);
+                    JAssert.DeepEquals((JToken)message.Data, (JToken)decodedData, Output).Should().BeTrue("Item number {0} data does not match decoded data", count);
                 }
                 else
                 {

src/IO.Ably.Tests.Shared/Rest/PresenceSandboxSpecs.cs

@@ -1,5 +1,7 @@
 using System.Threading.Tasks;
 using FluentAssertions;
+using IO.Ably.Tests.Shared.Helpers;
+using Newtonsoft.Json.Linq;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -37,10 +39,20 @@ public async Task WithCorrectCipherParams_DecryptsMessagesCorrectly(Protocol pro
             var channel = client.Channels.Get(TestEnvironmentSettings.PresenceChannelName, new ChannelOptions(settings.CipherParams));
 
             var presence = await channel.Presence.GetAsync();
-            foreach (var message in presence.Items)
+            presence.Items.Should().HaveCount(6);
+
+            presence.Items[0].Data.Should().Be("true");
+
+            var exampleObject = new JObject
             {
-                message.Encoding.Should().BeNullOrEmpty();
-            }
+                ["example"] = new JObject { ["json"] = "Object" }
+            };
+            JAssert.DeepEquals(exampleObject, presence.Items[1].Data as JObject, Output).Should().BeTrue();
+            JAssert.DeepEquals(exampleObject, presence.Items[2].Data as JObject, Output).Should().BeTrue();
+
+            presence.Items[3].Data.Should().Be("24");
+            presence.Items[4].Data.Should().Be("{ \"test\": \"This is a JSONObject clientData payload\"}");
+            presence.Items[5].Data.Should().Be("This is a string clientData payload");
         }
     }
 }