chore: additional FA replacement batch

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

Author: baywet

test/Microsoft.OpenApi.Tests/Models/OpenApiDocumentTests.cs

@@ -6,7 +6,6 @@
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
-using FluentAssertions;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;

test/Microsoft.OpenApi.Tests/Validations/OpenApiParameterValidationTests.cs

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text.Json.Nodes;
-using FluentAssertions;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Properties;
@@ -29,11 +28,11 @@ public void ValidateFieldIsRequiredInParameter()
 
             // Assert
             Assert.NotEmpty(errors);
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
+            Assert.Equivalent(new[]
             {
                 nameError,
                 inError
-            });
+            }, errors.Select(e => e.Message));
         }
 
         [Fact]
@@ -54,10 +53,10 @@ public void ValidateRequiredIsTrueWhenInIsPathInParameter()
             var errors = validator.Errors;
             // Assert
             Assert.NotEmpty(errors);
-            errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
+            Assert.Equivalent(new[]
             {
                 "\"required\" must be true when parameter location is \"path\""
-            });
+            }, errors.Select(e => e.Message));
         }
 
         [Fact]
@@ -183,14 +182,14 @@ public void PathParameterNotInThePathShouldReturnAnError()
 
             // Assert
             Assert.True(result);
-            errors.OfType<OpenApiValidatorError>().Select(e => e.RuleName).Should().BeEquivalentTo(new[]
+            Assert.Equivalent(new[]
             {
                 "PathParameterShouldBeInThePath"
-            });
-            errors.Select(e => e.Pointer).Should().BeEquivalentTo(new[]
+            }, errors.OfType<OpenApiValidatorError>().Select(e => e.RuleName));
+            Assert.Equivalent(new[]
             {
                 "#/in"
-            });
+            }, errors.Select(e => e.Pointer));
         }
 
         [Fact]

test/Microsoft.OpenApi.Tests/Validations/OpenApiPathsValidationTests.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using FluentAssertions;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Properties;
@@ -24,7 +23,7 @@ public void ValidatePathsMustBeginWithSlash()
 
             // Assert
             Assert.NotEmpty(errors);
-            errors.Select(e => e.Message).Should().BeEquivalentTo(error);
+            Assert.Equivalent(new string[] {error}, errors.Select(e => e.Message).ToArray());
         }
 
         [Fact]
@@ -43,7 +42,7 @@ public void ValidatePathsAreUnique()
 
             // Assert
             Assert.NotEmpty(errors);
-            errors.Select(e => e.Message).Should().BeEquivalentTo(error);
+            Assert.Equivalent(new string[] {error}, errors.Select(e => e.Message).ToArray());
         }
         [Fact]
         public void ValidatePathsAreUniqueDoesNotConsiderMultiParametersAsIdentical()

test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs

@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using FluentAssertions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
@@ -23,12 +22,12 @@ public void LocateTopLevelObjects()
             var walker = new OpenApiWalker(locator);
             walker.Walk(doc);
 
-            locator.Locations.Should().BeEquivalentTo(new List<string> {
+            Assert.Equivalent(new List<string> {
                 "#/info",
                 "#/servers",
                 "#/paths",
                 "#/tags"
-            });
+            }, locator.Locations);
         }
 
         [Fact]
@@ -51,15 +50,15 @@ public void LocateTopLevelArrayItems()
             var walker = new OpenApiWalker(locator);
             walker.Walk(doc);
 
-            locator.Locations.Should().BeEquivalentTo(new List<string> {
+            Assert.Equivalent(new List<string> {
                 "#/info",
                 "#/servers",
                 "#/servers/0",
                 "#/servers/1",
                 "#/paths",
                 "#/tags",
                 "#/tags/0"
-            });
+            }, locator.Locations);
         }
 
         [Fact]
@@ -96,7 +95,7 @@ public void LocatePathOperationContentSchema()
             var walker = new OpenApiWalker(locator);
             walker.Walk(doc);
 
-            locator.Locations.Should().BeEquivalentTo(new List<string> {
+            Assert.Equivalent(new List<string> {
                 "#/info",
                 "#/servers",
                 "#/paths",
@@ -110,9 +109,9 @@ public void LocatePathOperationContentSchema()
                 "#/paths/~1test/get/tags",
                 "#/tags",
 
-            });
+            }, locator.Locations);
 
-            locator.Keys.Should().BeEquivalentTo(new List<string> { "/test", "Get", "200", "application/json" });
+            Assert.Equivalent(new List<string> { "/test", "Get", "200", "application/json" }, locator.Keys);
         }
 
         [Fact]
@@ -144,15 +143,15 @@ public void WalkDOMWithCycles()
             var walker = new OpenApiWalker(locator);
             walker.Walk(doc);
 
-            locator.Locations.Should().BeEquivalentTo(new List<string> {
+            Assert.Equivalent(new List<string> {
                 "#/info",
                 "#/servers",
                 "#/paths",
                 "#/components",
                 "#/components/schemas/loopy",
                 "#/components/schemas/loopy/properties/name",
                 "#/tags"
-            });
+            }, locator.Locations);
         }
 
         /// <summary>
@@ -237,13 +236,13 @@ public void LocateReferences()
             var walker = new OpenApiWalker(locator);
             walker.Walk(doc);
 
-            locator.Locations.Where(l => l.StartsWith("referenceAt:")).Should().BeEquivalentTo(new List<string> {
+            Assert.Equivalent(new List<string> {
                 "referenceAt: #/paths/~1/get/responses/200/content/application~1json/schema",
                 "referenceAt: #/paths/~1/get/responses/200/headers/test-header/schema",
                 "referenceAt: #/components/schemas/derived/anyOf/0",
                 "referenceAt: #/components/securitySchemes/test-secScheme",
                 "referenceAt: #/components/headers/test-header/schema"
-            });
+            }, locator.Locations.Where(l => l.StartsWith("referenceAt:")));
         }
     }
 
@@ -278,7 +277,7 @@ public override void Visit(OpenApiPathItem pathItem)
             Locations.Add(this.PathString);
         }
 
-        public override void Visit(OpenApiResponses responses)
+        public override void Visit(OpenApiResponses response)
         {
             Locations.Add(this.PathString);
         }