chore: additional FA replacement batch

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

Author: baywet

test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs

@@ -110,8 +110,7 @@ public async Task ParseMediaTypeWithEmptyArrayInExamplesWorks()
             var serialized = await mediaType.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0);
 
             // Assert
-            serialized.MakeLineBreaksEnvironmentNeutral()
-                .Should().BeEquivalentTo(expected.MakeLineBreaksEnvironmentNeutral());
+            Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), serialized.MakeLineBreaksEnvironmentNeutral());
         }
     }
 }

test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs

@@ -244,7 +244,8 @@ public void CompositeRuntimeExpressionWithInvalidRuntimeExpressions(string expre
             Action test = () => RuntimeExpression.Build(expression);
 
             // Assert
-            test.Should().Throw<OpenApiException>().WithMessage(String.Format(SRResource.RuntimeExpressionHasInvalidFormat, invalidExpression));
+            var result = Assert.Throws<OpenApiException>(test);
+            Assert.Equal(result.Message, string.Format(SRResource.RuntimeExpressionHasInvalidFormat, invalidExpression));
         }
 
         [Theory]

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

@@ -1898,7 +1898,7 @@ public void SerializeExamplesDoesNotThrowNullReferenceException()
             };
 
             OpenApiJsonWriter apiWriter = new OpenApiJsonWriter(new StringWriter());
-            doc.Invoking(d => d.SerializeAsV3(apiWriter)).Should().NotThrow();
+            doc.SerializeAsV3(apiWriter);
         }
 
         [Theory]

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

@@ -277,10 +277,10 @@ public void SchemesShouldConsiderOnlyReferenceIdForEquality()
             // Assert
             // Only the first two should be added successfully since the latter two are duplicates of securityScheme1.
             // Duplicate determination only considers Reference.Id.
-            addSecurityScheme1Duplicate.Should().Throw<ArgumentException>();
-            addSecurityScheme1WithDifferentProperties.Should().Throw<ArgumentException>();
+            Assert.Throws<ArgumentException>(addSecurityScheme1Duplicate);
+            Assert.Throws<ArgumentException>(addSecurityScheme1WithDifferentProperties);
 
-            securityRequirement.Should().HaveCount(2);
+            Assert.Equal(2, securityRequirement.Count);
 
             securityRequirement.Should().BeEquivalentTo(
                 new OpenApiSecurityRequirement

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

@@ -28,7 +28,7 @@ public void ValidateFieldIsRequiredInParameter()
             var errors = parameter.Validate(ValidationRuleSet.GetDefaultRuleSet());
 
             // Assert
-            errors.Should().NotBeEmpty();
+            Assert.NotEmpty(errors);
             errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
             {
                 nameError,
@@ -53,7 +53,7 @@ public void ValidateRequiredIsTrueWhenInIsPathInParameter()
             walker.Walk(parameter);
             var errors = validator.Errors;
             // Assert
-            errors.Should().NotBeEmpty();
+            Assert.NotEmpty(errors);
             errors.Select(e => e.Message).Should().BeEquivalentTo(new[]
             {
                 "\"required\" must be true when parameter location is \"path\""

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

@@ -23,7 +23,7 @@ public void ValidatePathsMustBeginWithSlash()
             var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());
 
             // Assert
-            errors.Should().NotBeEmpty();
+            Assert.NotEmpty(errors);
             errors.Select(e => e.Message).Should().BeEquivalentTo(error);
         }
 
@@ -42,7 +42,7 @@ public void ValidatePathsAreUnique()
             var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());
 
             // Assert
-            errors.Should().NotBeEmpty();
+            Assert.NotEmpty(errors);
             errors.Select(e => e.Message).Should().BeEquivalentTo(error);
         }
         [Fact]
@@ -76,7 +76,7 @@ public void ValidatePathsAreUniqueConsidersMultiParametersAsIdentical()
             var errors = paths.Validate(ValidationRuleSet.GetDefaultRuleSet());
 
             // Assert
-            errors.Should().NotBeEmpty();
+            Assert.NotEmpty(errors);
         }
     }
 }