chore: another batch of json node deep equals

Signed-off-by: Vincent Biret <[email protected]>

Author: baywet

test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiRequestBodyGeneratorTests.cs

@@ -5,6 +5,7 @@
 
 using System;
 using System.Linq;
+using System.Text.Json.Nodes;
 using Microsoft.OData.Edm;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
@@ -106,8 +107,7 @@ public void CanSerializeAsJsonFromTheCreatedRequestBody()
 
             // Assert
             string json = requestBody.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
-
-            Assert.Equal(@"{
+            var expectedJson = @"{
   ""description"": ""Action parameters"",
   ""content"": {
     ""application/json"": {
@@ -123,7 +123,12 @@ public void CanSerializeAsJsonFromTheCreatedRequestBody()
     }
   },
   ""required"": true
-}".ChangeLineBreaks(), json);
+}";
+
+            var actualJsonNode = JsonNode.Parse(json);
+            var expectedJsonNode = JsonNode.Parse(expectedJson);
+
+            Assert.True(JsonNode.DeepEquals(actualJsonNode, expectedJsonNode));
         }
 
         [Fact]

test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiResponseGeneratorTests.cs

@@ -11,6 +11,7 @@
 using Microsoft.OpenApi.Models;
 using Xunit;
 using Microsoft.OpenApi.OData.Edm;
+using System.Text.Json.Nodes;
 
 namespace Microsoft.OpenApi.OData.Generator.Tests
 {
@@ -108,7 +109,7 @@ public void CanSerializeAsJsonFromTheCreatedResponses()
             Assert.NotNull(response);
             string json = response.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
 
-            Assert.Equal(@"{
+            var expectedJson = @"{
   ""description"": ""error"",
   ""content"": {
     ""application/json"": {
@@ -117,7 +118,10 @@ public void CanSerializeAsJsonFromTheCreatedResponses()
       }
     }
   }
-}".ChangeLineBreaks(), json);
+}";
+            var expectedJsonNode = JsonNode.Parse(expectedJson);
+            var actualJsonNode = JsonNode.Parse(json);
+            Assert.True(JsonNode.DeepEquals(expectedJsonNode, actualJsonNode));
         }
 
         [Fact]
@@ -359,7 +363,7 @@ public void CreateResponseForDeltaEdmFunctionReturnCorrectResponses(bool enableO
             Assert.NotEmpty(responses);
             if (enableOdataAnnotationRef)
             {
-                Assert.Equal(@"{
+                var expectedJson = @"{
   ""200"": {
     ""description"": ""Success"",
     ""content"": {
@@ -390,11 +394,14 @@ public void CreateResponseForDeltaEdmFunctionReturnCorrectResponses(bool enableO
   ""default"": {
     ""$ref"": ""#/components/responses/error""
   }
-}".ChangeLineBreaks(), json);
+}";
+                var expectedJsonNode = JsonNode.Parse(expectedJson);
+                var actualJsonNode = JsonNode.Parse(json);
+                Assert.True(JsonNode.DeepEquals(expectedJsonNode, actualJsonNode));
             }
             else
             {
-                Assert.Equal(@"{
+                var expectedJson = @"{
   ""200"": {
     ""description"": ""Success"",
     ""content"": {
@@ -425,7 +432,10 @@ public void CreateResponseForDeltaEdmFunctionReturnCorrectResponses(bool enableO
   ""default"": {
     ""$ref"": ""#/components/responses/error""
   }
-}".ChangeLineBreaks(), json);
+}";
+                var expectedJsonNode = JsonNode.Parse(expectedJson);
+                var actualJsonNode = JsonNode.Parse(json);
+                Assert.True(JsonNode.DeepEquals(expectedJsonNode, actualJsonNode));
             }
         }
     }

test/Microsoft.OpenAPI.OData.Reader.Tests/Generator/OpenApiSecuritySchemeGeneratorTests.cs

@@ -14,6 +14,7 @@
 using Microsoft.OpenApi.OData.Edm;
 using Microsoft.OpenApi.OData.Generator;
 using Xunit;
+using System.Text.Json.Nodes;
 
 namespace Microsoft.OpenApi.OData.Tests
 {
@@ -40,7 +41,7 @@ public void CreateSecuritySchemesWorksForAuthorizationsOnEntitySetContainer()
             Assert.Equal("http://RefreshUrl", scheme.Flows.ClientCredentials.RefreshUrl.OriginalString);
             Assert.Equal("OAuth2ClientCredentials Description", scheme.Description);
             string json = scheme.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
-            Assert.Equal(@"{
+            var expectedJson = JsonNode.Parse(@"{
   ""type"": ""oauth2"",
   ""description"": ""OAuth2ClientCredentials Description"",
   ""flows"": {
@@ -52,17 +53,19 @@ public void CreateSecuritySchemesWorksForAuthorizationsOnEntitySetContainer()
       }
     }
   }
-}".ChangeLineBreaks(), json);
+}");
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(json), expectedJson));
 
             scheme = schemes["Http Name"];
             Assert.Equal(SecuritySchemeType.Http, scheme.Type);
             json = scheme.SerializeAsJson(OpenApiSpecVersion.OpenApi3_0);
-            Assert.Equal(@"{
+            expectedJson = JsonNode.Parse(@"{
   ""type"": ""http"",
   ""description"": ""Http Description"",
   ""scheme"": ""Http Scheme"",
   ""bearerFormat"": ""Http BearerFormat""
-}".ChangeLineBreaks(), json);
+}");
+            Assert.True(JsonNode.DeepEquals(JsonNode.Parse(json), expectedJson));
         }
 
         private static IEdmModel GetEdmModel()

test/Microsoft.OpenAPI.OData.Reader.Tests/Operation/EntityDeleteOperationHandlerTests.cs

@@ -14,7 +14,7 @@ namespace Microsoft.OpenApi.OData.Operation.Tests
 {
     public class EntityDeleteOperationHandlerTests
     {
-        private EntityDeleteOperationHandler _operationHandler = new EntityDeleteOperationHandler(new());
+        private readonly EntityDeleteOperationHandler _operationHandler = new EntityDeleteOperationHandler(new());
 
         [Theory]
         [InlineData(true)]