test: fix unit test errors

alirezanet · May 25, 2024 · 4f78769 · 4f78769
1 parent 05f8512
commit 4f78769
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/test/Gridify.Elasticsearch.Tests/Gridify.Elasticsearch.Tests.csproj b/test/Gridify.Elasticsearch.Tests/Gridify.Elasticsearch.Tests.csproj
@@ -9,6 +9,7 @@
 
    <ItemGroup>
       <PackageReference Include="AutoBogus" Version="2.13.1" />
+      <PackageReference Include="FluentAssertions.Json" Version="6.1.0" />
       <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
       <PackageReference Include="xunit" Version="2.6.1" />
       <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">

diff --git a/test/Gridify.Elasticsearch.Tests/GridifyExtensionsTests.cs b/test/Gridify.Elasticsearch.Tests/GridifyExtensionsTests.cs
@@ -1,7 +1,10 @@
 using System;
 using System.Globalization;
 using Elastic.Clients.Elasticsearch;
+using Elastic.Transport;
 using Elastic.Transport.Extensions;
+using FluentAssertions.Json;
+using Newtonsoft.Json.Linq;
 using Xunit;
 
 namespace Gridify.Elasticsearch.Tests;
@@ -792,22 +795,22 @@ private void AssertFilter(string filter, string expected, IGridifyMapper<TestCla
       var gridifyQuery = new GridifyQuery { Filter = filter };
       var result = gridifyQuery.ToElasticsearchQuery(mapper);
 
-      var jsonQuery = _client.RequestResponseSerializer.SerializeToString(result);
-      Assert.Equal(expected, jsonQuery);
+      var jsonQuery = JToken.Parse(_client.RequestResponseSerializer.SerializeToString(result, SerializationFormatting.None));
+      jsonQuery.Should().BeEquivalentTo(JToken.Parse(expected));
    }
 
    private void AssertOrdering(string ordering, string expected, IGridifyMapper<TestClass>? mapper = null)
    {
       var gridifyQuery = new GridifyQuery { OrderBy = ordering };
       var result = gridifyQuery.ToElasticsearchSortOptions(mapper);
 
-      var jsonQuery = _client.RequestResponseSerializer.SerializeToString(result);
-      Assert.Equal(expected, jsonQuery);
+      var jsonQuery = JToken.Parse(_client.RequestResponseSerializer.SerializeToString(result, SerializationFormatting.None));
+      jsonQuery.Should().BeEquivalentTo(JToken.Parse(expected));
    }
 
    private void AssertDescriptor<T>(SearchRequestDescriptor<T> descriptor, string expected)
    {
-      var jsonQuery = _client.RequestResponseSerializer.SerializeToString(descriptor);
-      Assert.Equal(expected, jsonQuery);
+      var jsonQuery = JToken.Parse(_client.RequestResponseSerializer.SerializeToString(descriptor, SerializationFormatting.None));
+      jsonQuery.Should().BeEquivalentTo(JToken.Parse(expected));
    }
 }