chore: additional batch of FA replacement

baywet · baywet · commit 4ecf8a4123c6 · 2025-01-15T11:00:14.000-05:00
Signed-off-by: Vincent Biret &lt;vibiret@microsoft.com&gt;
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs
@@ -499,7 +499,7 @@ public async Task ExternalDocumentDereferenceToOpenApiDocumentUsingJsonPointerWo
 
             // Assert
             result.Document.Workspace.Contains("./externalResource.yaml");
-            responseSchema.Properties.Count.Should().Be(2); // reference has been resolved
+            Assert.Equal(2, responseSchema.Properties.Count); // reference has been resolved
         }
 
         [Fact]
@@ -522,7 +522,7 @@ public async Task ParseExternalDocumentDereferenceToOpenApiDocumentByIdWorks()
             result.Document.Workspace.RegisterComponents(doc2);
 
             // Assert
-            requestBodySchema.Properties.Count.Should().Be(2); // reference has been resolved
+            Assert.Equal(2, requestBodySchema.Properties.Count); // reference has been resolved
         }
 
         [Fact]
diff --git a/test/Microsoft.OpenApi.Tests/Extensions/OpenApiServerExtensionsTests.cs b/test/Microsoft.OpenApi.Tests/Extensions/OpenApiServerExtensionsTests.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using FluentAssertions;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Xunit;
diff --git a/test/Microsoft.OpenApi.Tests/Extensions/OpenApiTypeMapperTests.cs b/test/Microsoft.OpenApi.Tests/Extensions/OpenApiTypeMapperTests.cs
@@ -77,7 +77,7 @@ public void MapOpenApiSchemaTypeToSimpleTypeShouldSucceed(OpenApiSchema schema,
             var actual = OpenApiTypeMapper.MapOpenApiPrimitiveTypeToSimpleType(schema);
 
             // Assert
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiEncodingTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiEncodingTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System.Threading.Tasks;
-using FluentAssertions;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Xunit;
@@ -33,7 +32,7 @@ public async Task SerializeBasicEncodingAsV3Works(OpenApiFormat format, string e
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
@@ -56,7 +55,7 @@ public async Task SerializeAdvanceEncodingAsV3JsonWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
@@ -77,7 +76,7 @@ public async Task SerializeAdvanceEncodingAsV3YamlWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiExternalDocsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiExternalDocsTests.cs
@@ -2,7 +2,6 @@
 // Licensed under the MIT license.
 
 using System.Threading.Tasks;
-using FluentAssertions;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Xunit;
@@ -33,7 +32,7 @@ public async Task SerializeBasicExternalDocsAsV3Works(OpenApiFormat format, stri
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
@@ -54,7 +53,7 @@ public async Task SerializeAdvanceExDocsAsV3JsonWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
@@ -73,7 +72,7 @@ public async Task SerializeAdvanceExDocsAsV3YamlWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         #endregion
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiMediaTypeTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiMediaTypeTests.cs
@@ -441,7 +441,7 @@ public void MediaTypeCopyConstructorWorks()
 
             // Assert
             MediaTypeWithObjectExamples.Examples.Should().NotBeEquivalentTo(clone.Examples);
-            MediaTypeWithObjectExamples.Example.Should().Be(null);
+            Assert.Null(MediaTypeWithObjectExamples.Example);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiOAuthFlowTests.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using FluentAssertions;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
 using Xunit;
@@ -54,7 +53,7 @@ public async Task SerializeBasicOAuthFlowAsV3JsonWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
@@ -70,7 +69,7 @@ public async Task SerializeBasicOAuthFlowAsV3YamlWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
@@ -94,7 +93,7 @@ public async Task SerializePartialOAuthFlowAsV3JsonWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
@@ -120,7 +119,7 @@ public async Task SerializeCompleteOAuthFlowAsV3JsonWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
     }
 }
diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiParameterTests.cs
@@ -5,7 +5,6 @@
 using System.Globalization;
 using System.IO;
 using System.Threading.Tasks;
-using FluentAssertions;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Models;
@@ -184,7 +183,7 @@ public void WhenStyleIsFormTheDefaultValueOfExplodeShouldBeTrueOtherwiseFalse(Pa
             };
 
             // Act & Assert
-            parameter.Explode.Should().Be(expectedExplode);
+            Assert.Equal(expectedExplode, parameter.Explode);
         }
 
         [Theory]
@@ -208,7 +207,7 @@ public async Task WhenStyleAndInIsNullTheDefaultValueOfStyleShouldBeSimple(Param
             parameter.SerializeAsV3(writer);
             await writer.FlushAsync();
 
-            parameter.Style.Should().Be(expectedStyle);
+            Assert.Equal(expectedStyle, parameter.Style);
         }
 
         [Fact]
@@ -226,7 +225,7 @@ public async Task SerializeQueryParameterWithMissingStyleSucceeds()
             var actual = await QueryParameterWithMissingStyle.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0);
 
             // Assert
-            actual.MakeLineBreaksEnvironmentNeutral().Should().Be(expected.MakeLineBreaksEnvironmentNeutral());
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
         }
 
         [Fact]
@@ -247,7 +246,7 @@ public async Task SerializeBasicParameterAsV3JsonWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
@@ -291,7 +290,7 @@ public async Task SerializeAdvancedParameterAsV3JsonWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Fact]
@@ -321,7 +320,7 @@ public async Task SerializeAdvancedParameterAsV2JsonWorks()
             // Assert
             actual = actual.MakeLineBreaksEnvironmentNeutral();
             expected = expected.MakeLineBreaksEnvironmentNeutral();
-            actual.Should().Be(expected);
+            Assert.Equal(expected, actual);
         }
 
         [Theory]

Original file line number	Diff line number	Diff line change
`@@ -499,7 +499,7 @@ public async Task ExternalDocumentDereferenceToOpenApiDocumentUsingJsonPointerWo`
`499`	`499`
`500`	`500`	`// Assert`
`501`	`501`	`result.Document.Workspace.Contains("./externalResource.yaml");`
`502`		`- responseSchema.Properties.Count.Should().Be(2); // reference has been resolved`
	`502`	`+ Assert.Equal(2, responseSchema.Properties.Count); // reference has been resolved`
`503`	`503`	`}`
`504`	`504`
`505`	`505`	`[Fact]`
`@@ -522,7 +522,7 @@ public async Task ParseExternalDocumentDereferenceToOpenApiDocumentByIdWorks()`
`522`	`522`	`result.Document.Workspace.RegisterComponents(doc2);`
`523`	`523`
`524`	`524`	`// Assert`
`525`		`- requestBodySchema.Properties.Count.Should().Be(2); // reference has been resolved`
	`525`	`+ Assert.Equal(2, requestBodySchema.Properties.Count); // reference has been resolved`
`526`	`526`	`}`
`527`	`527`
`528`	`528`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ public void MapOpenApiSchemaTypeToSimpleTypeShouldSucceed(OpenApiSchema schema,`
`77`	`77`	`var actual = OpenApiTypeMapper.MapOpenApiPrimitiveTypeToSimpleType(schema);`
`78`	`78`
`79`	`79`	`// Assert`
`80`		`- actual.Should().Be(expected);`
	`80`	`+ Assert.Equal(expected, actual);`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@`
`2`	`2`	`// Licensed under the MIT license.`
`3`	`3`
`4`	`4`	`using System.Threading.Tasks;`
`5`		`-using FluentAssertions;`
`6`	`5`	`using Microsoft.OpenApi.Extensions;`
`7`	`6`	`using Microsoft.OpenApi.Models;`
`8`	`7`	`using Xunit;`
`@@ -33,7 +32,7 @@ public async Task SerializeBasicEncodingAsV3Works(OpenApiFormat format, string e`
`33`	`32`	`// Assert`
`34`	`33`	`actual = actual.MakeLineBreaksEnvironmentNeutral();`
`35`	`34`	`expected = expected.MakeLineBreaksEnvironmentNeutral();`
`36`		`- actual.Should().Be(expected);`
	`35`	`+ Assert.Equal(expected, actual);`
`37`	`36`	`}`
`38`	`37`
`39`	`38`	`[Fact]`
`@@ -56,7 +55,7 @@ public async Task SerializeAdvanceEncodingAsV3JsonWorks()`
`56`	`55`	`// Assert`
`57`	`56`	`actual = actual.MakeLineBreaksEnvironmentNeutral();`
`58`	`57`	`expected = expected.MakeLineBreaksEnvironmentNeutral();`
`59`		`- actual.Should().Be(expected);`
	`58`	`+ Assert.Equal(expected, actual);`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`[Fact]`
`@@ -77,7 +76,7 @@ public async Task SerializeAdvanceEncodingAsV3YamlWorks()`
`77`	`76`	`// Assert`
`78`	`77`	`actual = actual.MakeLineBreaksEnvironmentNeutral();`
`79`	`78`	`expected = expected.MakeLineBreaksEnvironmentNeutral();`
`80`		`- actual.Should().Be(expected);`
	`79`	`+ Assert.Equal(expected, actual);`
`81`	`80`	`}`
`82`	`81`	`}`
`83`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,7 @@ public void MediaTypeCopyConstructorWorks()`
`441`	`441`
`442`	`442`	`// Assert`
`443`	`443`	`MediaTypeWithObjectExamples.Examples.Should().NotBeEquivalentTo(clone.Examples);`
`444`		`- MediaTypeWithObjectExamples.Example.Should().Be(null);`
	`444`	`+ Assert.Null(MediaTypeWithObjectExamples.Example);`
`445`	`445`	`}`
`446`	`446`	`}`
`447`	`447`	`}`