From 9c5a46bd72c4c9ba485c6101c9b82a81cb829306 Mon Sep 17 00:00:00 2001 From: darrelmiller Date: Sun, 5 Jan 2020 18:08:16 -0500 Subject: [PATCH] Updated referenced packages --- .../Microsoft.OpenApi.Readers.csproj | 2 +- .../Microsoft.OpenApi.Readers.Tests.csproj | 14 +++--- .../ParseNodeTests.cs | 2 +- .../ParseNodes/OpenApiAnyConverterTests.cs | 8 ++-- .../ParseNodes/OpenApiAnyTests.cs | 8 ++-- .../TryLoadReferenceV2Tests.cs | 10 ++-- .../V2Tests/ComparisonTests.cs | 4 +- .../V2Tests/OpenApiDocumentTests.cs | 14 +++--- .../V2Tests/OpenApiHeaderTests.cs | 4 +- .../V2Tests/OpenApiOperationTests.cs | 14 +++--- .../V2Tests/OpenApiParameterTests.cs | 20 ++++---- .../V2Tests/OpenApiPathItemTests.cs | 2 +- .../V2Tests/OpenApiSchemaTests.cs | 6 +-- .../V2Tests/OpenApiSecuritySchemeTests.cs | 12 ++--- .../V2Tests/OpenApiServerTests.cs | 2 +- .../V3Tests/OpenApiCallbackTests.cs | 16 +++---- .../V3Tests/OpenApiDiscriminatorTests.cs | 2 +- .../V3Tests/OpenApiDocumentTests.cs | 34 ++++++------- .../V3Tests/OpenApiEncodingTests.cs | 4 +- .../V3Tests/OpenApiExampleTests.cs | 2 +- .../V3Tests/OpenApiInfoTests.cs | 6 +-- .../V3Tests/OpenApiMediaTypeTests.cs | 4 +- .../V3Tests/OpenApiOperationTests.cs | 2 +- .../V3Tests/OpenApiParameterTests.cs | 20 ++++---- .../V3Tests/OpenApiSchemaTests.cs | 48 +++++++++---------- .../V3Tests/OpenApiSecuritySchemeTests.cs | 10 ++-- .../V3Tests/OpenApiXmlTests.cs | 2 +- .../Microsoft.OpenApi.SmokeTests.csproj | 11 +++-- .../Expressions/RuntimeExpressionTests.cs | 6 +-- .../Microsoft.OpenApi.Tests.csproj | 14 +++--- .../Models/OpenApiSecurityRequirementTests.cs | 6 +-- .../Services/OpenApiComparerTests.cs | 4 +- .../Services/OpenApiComponentsTests.cs | 4 +- .../Services/OpenApiEncodingComparerTests.cs | 4 +- .../Services/OpenApiExampleComparerTests.cs | 4 +- .../Services/OpenApiInfoComparerTests.cs | 4 +- .../Services/OpenApiParameterComparerTests.cs | 4 +- .../OpenApiParametersComparerTests.cs | 4 +- .../OpenApiRequestBodyComparerTests.cs | 4 +- .../Services/OpenApiResponsesComparerTests.cs | 4 +- ...OpenApiSecurityRequirementComparerTests.cs | 4 +- .../OpenApiSecuritySchemeComparerTests.cs | 4 +- .../OpenApiServerVariableComparerTests.cs | 4 +- .../Services/OpenApiServersComparerTests.cs | 4 +- .../Services/OpenApiTagComparerTests.cs | 4 +- .../Services/OpenApiValidatorTests.cs | 6 +-- .../OpenApiSchemaValidationTests.cs | 2 +- .../Walkers/WalkerLocationTests.cs | 12 ++--- .../Writers/OpenApiJsonWriterTests.cs | 4 +- 49 files changed, 198 insertions(+), 191 deletions(-) diff --git a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj index 6aec18722..d3b8cc01e 100644 --- a/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj +++ b/src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj @@ -26,7 +26,7 @@ - + diff --git a/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj index facc416a8..7866a1d63 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj +++ b/test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj @@ -237,16 +237,18 @@ - - + + - + - + - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs index a6a8e124c..04a400b40 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs @@ -25,7 +25,7 @@ public void BrokenSimpleList() var reader = new OpenApiStringReader(); reader.Read(input, out var diagnostic); - diagnostic.Errors.ShouldBeEquivalentTo(new List() { + diagnostic.Errors.Should().BeEquivalentTo(new List() { new OpenApiError(new OpenApiReaderException("Expected a value.") { Pointer = "#line=4" }) diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs index a97c1fb56..7ee8c3439 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs @@ -74,7 +74,7 @@ public void ParseObjectAsAnyShouldSucceed() diagnostic.Errors.Should().BeEmpty(); - anyMap.ShouldBeEquivalentTo( + anyMap.Should().BeEquivalentTo( new OpenApiObject { ["aString"] = new OpenApiString("fooBar"), @@ -214,7 +214,7 @@ public void ParseNestedObjectAsAnyShouldSucceed() diagnostic.Errors.Should().BeEmpty(); - anyMap.ShouldBeEquivalentTo( + anyMap.Should().BeEquivalentTo( new OpenApiObject { ["aString"] = new OpenApiString("fooBar"), @@ -370,7 +370,7 @@ public void ParseNestedObjectAsAnyWithPartialSchemaShouldSucceed() diagnostic.Errors.Should().BeEmpty(); - anyMap.ShouldBeEquivalentTo( + anyMap.Should().BeEquivalentTo( new OpenApiObject { ["aString"] = new OpenApiString("fooBar"), @@ -463,7 +463,7 @@ public void ParseNestedObjectAsAnyWithoutUsingSchemaShouldSucceed() diagnostic.Errors.Should().BeEmpty(); - anyMap.ShouldBeEquivalentTo( + anyMap.Should().BeEquivalentTo( new OpenApiObject { ["aString"] = new OpenApiString("fooBar"), diff --git a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs b/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs index 9cc961b38..7df225015 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs @@ -36,7 +36,7 @@ public void ParseMapAsAnyShouldSucceed() diagnostic.Errors.Should().BeEmpty(); - anyMap.ShouldBeEquivalentTo( + anyMap.Should().BeEquivalentTo( new OpenApiObject { ["aString"] = new OpenApiString("fooBar"), @@ -68,7 +68,7 @@ public void ParseListAsAnyShouldSucceed() diagnostic.Errors.Should().BeEmpty(); - any.ShouldBeEquivalentTo( + any.Should().BeEquivalentTo( new OpenApiArray { new OpenApiString("fooBar"), @@ -97,7 +97,7 @@ public void ParseScalarIntegerAsAnyShouldSucceed() diagnostic.Errors.Should().BeEmpty(); - any.ShouldBeEquivalentTo( + any.Should().BeEquivalentTo( new OpenApiString("10") ); } @@ -121,7 +121,7 @@ public void ParseScalarDateTimeAsAnyShouldSucceed() diagnostic.Errors.Should().BeEmpty(); - any.ShouldBeEquivalentTo( + any.Should().BeEquivalentTo( new OpenApiString("2012-07-23T12:33:00") ); } diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs index d47f7dddc..cfe6226d5 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs @@ -41,7 +41,7 @@ public void LoadSchemaReference() var referencedObject = document.ResolveReference(reference); // Assert - referencedObject.ShouldBeEquivalentTo( + referencedObject.Should().BeEquivalentTo( new OpenApiSchema { Required = @@ -96,7 +96,7 @@ public void LoadParameterReference() var referencedObject = document.ResolveReference(reference); // Assert - referencedObject.ShouldBeEquivalentTo( + referencedObject.Should().BeEquivalentTo( new OpenApiParameter { Name = "skip", @@ -139,7 +139,7 @@ public void LoadSecuritySchemeReference() var referencedObject = document.ResolveReference(reference); // Assert - referencedObject.ShouldBeEquivalentTo( + referencedObject.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.ApiKey, @@ -176,7 +176,7 @@ public void LoadResponseReference() var referencedObject = document.ResolveReference(reference); // Assert - referencedObject.ShouldBeEquivalentTo( + referencedObject.Should().BeEquivalentTo( new OpenApiResponse { Description = "Entity not found.", @@ -215,7 +215,7 @@ public void LoadResponseAndSchemaReference() var referencedObject = document.ResolveReference(reference); // Assert - referencedObject.ShouldBeEquivalentTo( + referencedObject.Should().BeEquivalentTo( new OpenApiResponse { Description = "General Error", diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs index 6e5538723..3e16e7819 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs @@ -24,9 +24,9 @@ public void EquivalentV2AndV3DocumentsShouldProductEquivalentObjects(string file var openApiDocV2 = new OpenApiStreamReader().Read(streamV2, out var diagnosticV2); var openApiDocV3 = new OpenApiStreamReader().Read(streamV3, out var diagnosticV3 ); - openApiDocV3.ShouldBeEquivalentTo(openApiDocV2); + openApiDocV3.Should().BeEquivalentTo(openApiDocV2); - diagnosticV2.Errors.ShouldBeEquivalentTo(diagnosticV3.Errors); + diagnosticV2.Errors.Should().BeEquivalentTo(diagnosticV3.Errors); } } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs index 36b129b2f..2eacc216e 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs @@ -38,7 +38,7 @@ public void ShouldThrowWhenReferenceTypeIsInvalid() var reader = new OpenApiStringReader(); var doc = reader.Read(input, out var diagnostic); - diagnostic.Errors.ShouldBeEquivalentTo(new List { + diagnostic.Errors.Should().BeEquivalentTo(new List { new OpenApiError( new OpenApiException("Unknown reference type 'defi888nition'")) }); doc.Should().NotBeNull(); } @@ -66,7 +66,7 @@ public void ShouldThrowWhenReferenceDoesNotExist() var doc = reader.Read(input, out var diagnostic); - diagnostic.Errors.ShouldBeEquivalentTo(new List { + diagnostic.Errors.Should().BeEquivalentTo(new List { new OpenApiError( new OpenApiException("Invalid Reference identifier 'doesnotexist'.")) }); doc.Should().NotBeNull(); } @@ -102,7 +102,7 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture) paths: {}", out var context); - openApiDoc.ShouldBeEquivalentTo( + openApiDoc.Should().BeEquivalentTo( new OpenApiDocument { Info = new OpenApiInfo @@ -143,7 +143,7 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture) Paths = new OpenApiPaths() }); - context.ShouldBeEquivalentTo( + context.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi2_0 }); } @@ -242,7 +242,7 @@ public void ShouldParseProducesInAnyOrder() Schema = errorSchema }; - doc.ShouldBeEquivalentTo(new OpenApiDocument + doc.Should().BeEquivalentTo(new OpenApiDocument { Info = new OpenApiInfo { @@ -412,11 +412,11 @@ public void ShouldAssignSchemaToAllResponses() var json = response.Value.Content["application/json"]; Assert.NotNull(json); - json.Schema.ShouldBeEquivalentTo(targetSchema); + json.Schema.Should().BeEquivalentTo(targetSchema); var xml = response.Value.Content["application/xml"]; Assert.NotNull(xml); - xml.Schema.ShouldBeEquivalentTo(targetSchema); + xml.Schema.Should().BeEquivalentTo(targetSchema); } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs index 010d763e4..c3924406d 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs @@ -31,7 +31,7 @@ public void ParseHeaderWithDefaultShouldSucceed() var header = OpenApiV2Deserializer.LoadHeader(node); // Assert - header.ShouldBeEquivalentTo( + header.Should().BeEquivalentTo( new OpenApiHeader { Schema = new OpenApiSchema() @@ -57,7 +57,7 @@ public void ParseHeaderWithEnumShouldSucceed() var header = OpenApiV2Deserializer.LoadHeader(node); // Assert - header.ShouldBeEquivalentTo( + header.Should().BeEquivalentTo( new OpenApiHeader { Schema = new OpenApiSchema() diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs index 00387d2ab..cb9607639 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs @@ -220,7 +220,7 @@ public void ParseBasicOperationShouldSucceed() var operation = OpenApiV2Deserializer.LoadOperation(node); // Assert - operation.ShouldBeEquivalentTo(_basicOperation); + operation.Should().BeEquivalentTo(_basicOperation); } [Fact] @@ -238,7 +238,7 @@ public void ParseBasicOperationTwiceShouldYieldSameObject() var operation = OpenApiV2Deserializer.LoadOperation(node); // Assert - operation.ShouldBeEquivalentTo(_basicOperation); + operation.Should().BeEquivalentTo(_basicOperation); } [Fact] @@ -255,7 +255,7 @@ public void ParseOperationWithFormDataShouldSucceed() var operation = OpenApiV2Deserializer.LoadOperation(node); // Assert - operation.ShouldBeEquivalentTo(_operationWithFormData); + operation.Should().BeEquivalentTo(_operationWithFormData); } [Fact] @@ -273,7 +273,7 @@ public void ParseOperationWithFormDataTwiceShouldYieldSameObject() var operation = OpenApiV2Deserializer.LoadOperation(node); // Assert - operation.ShouldBeEquivalentTo(_operationWithFormData); + operation.Should().BeEquivalentTo(_operationWithFormData); } [Fact] @@ -290,7 +290,7 @@ public void ParseOperationWithBodyShouldSucceed() var operation = OpenApiV2Deserializer.LoadOperation(node); // Assert - operation.ShouldBeEquivalentTo(_operationWithBody); + operation.Should().BeEquivalentTo(_operationWithBody); } [Fact] @@ -308,7 +308,7 @@ public void ParseOperationWithBodyTwiceShouldYieldSameObject() var operation = OpenApiV2Deserializer.LoadOperation(node); // Assert - operation.ShouldBeEquivalentTo(_operationWithBody); + operation.Should().BeEquivalentTo(_operationWithBody); } [Fact] @@ -325,7 +325,7 @@ public void ParseOperationWithResponseExamplesShouldSucceed() var operation = OpenApiV2Deserializer.LoadOperation(node); // Assert - operation.ShouldBeEquivalentTo( + operation.Should().BeEquivalentTo( new OpenApiOperation() { Responses = new OpenApiResponses() diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs index cebe8af1e..4f6fa18da 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs @@ -50,7 +50,7 @@ public void ParsePathParameterShouldSucceed() var parameter = OpenApiV2Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Path, @@ -78,7 +78,7 @@ public void ParseQueryParameterShouldSucceed() var parameter = OpenApiV2Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Query, @@ -131,7 +131,7 @@ public void ParseHeaderParameterShouldSucceed() var parameter = OpenApiV2Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Header, @@ -183,7 +183,7 @@ public void ParseHeaderParameterWithIncorrectDataTypeShouldSucceed() var parameter = OpenApiV2Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Header, @@ -235,7 +235,7 @@ public void ParseParameterWithNullLocationShouldSucceed() var parameter = OpenApiV2Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = null, @@ -263,7 +263,7 @@ public void ParseParameterWithNoLocationShouldSucceed() var parameter = OpenApiV2Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = null, @@ -291,7 +291,7 @@ public void ParseParameterWithNoSchemaShouldSucceed() var parameter = OpenApiV2Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = null, @@ -315,7 +315,7 @@ public void ParseParameterWithUnknownLocationShouldSucceed() var parameter = OpenApiV2Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = null, @@ -343,7 +343,7 @@ public void ParseParameterWithDefaultShouldSucceed() var parameter = OpenApiV2Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Path, @@ -373,7 +373,7 @@ public void ParseParameterWithEnumShouldSucceed() var parameter = OpenApiV2Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Path, diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs index 7f0d0f02d..9ec8701f8 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiPathItemTests.cs @@ -256,7 +256,7 @@ public void ParseBasicPathItemWithFormDataShouldSucceed() var operation = OpenApiV2Deserializer.LoadPathItem(node); // Assert - operation.ShouldBeEquivalentTo(_basicPathItemWithFormData); + operation.Should().BeEquivalentTo(_basicPathItemWithFormData); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs index f82db3b82..07d025064 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs @@ -31,7 +31,7 @@ public void ParseSchemaWithDefaultShouldSucceed() var schema = OpenApiV2Deserializer.LoadSchema(node); // Assert - schema.ShouldBeEquivalentTo( + schema.Should().BeEquivalentTo( new OpenApiSchema { Type = "number", @@ -54,7 +54,7 @@ public void ParseSchemaWithExampleShouldSucceed() var schema = OpenApiV2Deserializer.LoadSchema(node); // Assert - schema.ShouldBeEquivalentTo( + schema.Should().BeEquivalentTo( new OpenApiSchema { Type = "number", @@ -77,7 +77,7 @@ public void ParseSchemaWithEnumShouldSucceed() var schema = OpenApiV2Deserializer.LoadSchema(node); // Assert - schema.ShouldBeEquivalentTo( + schema.Should().BeEquivalentTo( new OpenApiSchema { Type = "number", diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs index 90f015a40..69093df4d 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSecuritySchemeTests.cs @@ -34,7 +34,7 @@ public void ParseHttpSecuritySchemeShouldSucceed() var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.Http, @@ -58,7 +58,7 @@ public void ParseApiKeySecuritySchemeShouldSucceed() var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.ApiKey, @@ -83,7 +83,7 @@ public void ParseOAuth2ImplicitSecuritySchemeShouldSucceed() var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.OAuth2, @@ -118,7 +118,7 @@ public void ParseOAuth2PasswordSecuritySchemeShouldSucceed() var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.OAuth2, @@ -153,7 +153,7 @@ public void ParseOAuth2ApplicationSecuritySchemeShouldSucceed() var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.OAuth2, @@ -189,7 +189,7 @@ public void ParseOAuth2AccessCodeSecuritySchemeShouldSucceed() var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.OAuth2, diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs index 292bc716f..d77b537ef 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiServerTests.cs @@ -279,7 +279,7 @@ public void InvalidHostShouldYieldError() var doc = reader.Read(input, out var diagnostic); doc.Servers.Count.Should().Be(0); - diagnostic.ShouldBeEquivalentTo( + diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic { Errors = diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs index ad99520c7..493087111 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs @@ -37,9 +37,9 @@ public void ParseBasicCallbackShouldSucceed() var callback = OpenApiV3Deserializer.LoadCallback(node); // Assert - diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic()); + diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic()); - callback.ShouldBeEquivalentTo( + callback.Should().BeEquivalentTo( new OpenApiCallback { PathItems = @@ -88,10 +88,10 @@ public void ParseCallbackWithReferenceShouldSucceed() var callback = subscribeOperation.Callbacks["simpleHook"]; - diagnostic.ShouldBeEquivalentTo( + diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); - callback.ShouldBeEquivalentTo( + callback.Should().BeEquivalentTo( new OpenApiCallback { PathItems = @@ -144,12 +144,12 @@ public void ParseMultipleCallbacksWithReferenceShouldSucceed() var path = openApiDoc.Paths.First().Value; var subscribeOperation = path.Operations[OperationType.Post]; - diagnostic.ShouldBeEquivalentTo( + diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); var callback1 = subscribeOperation.Callbacks["simpleHook"]; - callback1.ShouldBeEquivalentTo( + callback1.Should().BeEquivalentTo( new OpenApiCallback { PathItems = @@ -189,7 +189,7 @@ public void ParseMultipleCallbacksWithReferenceShouldSucceed() }); var callback2 = subscribeOperation.Callbacks["callback2"]; - callback2.ShouldBeEquivalentTo( + callback2.Should().BeEquivalentTo( new OpenApiCallback { PathItems = @@ -225,7 +225,7 @@ public void ParseMultipleCallbacksWithReferenceShouldSucceed() }); var callback3 = subscribeOperation.Callbacks["callback3"]; - callback3.ShouldBeEquivalentTo( + callback3.Should().BeEquivalentTo( new OpenApiCallback { PathItems = diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs index fcec9fe6f..2425fada9 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDiscriminatorTests.cs @@ -35,7 +35,7 @@ public void ParseBasicDiscriminatorShouldSucceed() var discriminator = OpenApiV3Deserializer.LoadDiscriminator(node); // Assert - discriminator.ShouldBeEquivalentTo( + discriminator.Should().BeEquivalentTo( new OpenApiDiscriminator { PropertyName = "pet_type", diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs index ce940e2d7..e05543a77 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs @@ -42,7 +42,7 @@ public void ParseDocumentFromInlineStringShouldSucceed() paths: {}", out var context); - openApiDoc.ShouldBeEquivalentTo( + openApiDoc.Should().BeEquivalentTo( new OpenApiDocument { Info = new OpenApiInfo @@ -53,7 +53,7 @@ public void ParseDocumentFromInlineStringShouldSucceed() Paths = new OpenApiPaths() }); - context.ShouldBeEquivalentTo( + context.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); } @@ -88,7 +88,7 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture) paths: {}", out var context); - openApiDoc.ShouldBeEquivalentTo( + openApiDoc.Should().BeEquivalentTo( new OpenApiDocument { Info = new OpenApiInfo @@ -125,7 +125,7 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture) Paths = new OpenApiPaths() }); - context.ShouldBeEquivalentTo( + context.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); } @@ -136,10 +136,10 @@ public void ParseBasicDocumentWithMultipleServersShouldSucceed() { var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic); - diagnostic.ShouldBeEquivalentTo( + diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); - openApiDoc.ShouldBeEquivalentTo( + openApiDoc.Should().BeEquivalentTo( new OpenApiDocument { Info = new OpenApiInfo @@ -172,7 +172,7 @@ public void ParseBrokenMinimalDocumentShouldYieldExpectedDiagnostic() { var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic); - openApiDoc.ShouldBeEquivalentTo( + openApiDoc.Should().BeEquivalentTo( new OpenApiDocument { Info = new OpenApiInfo @@ -182,7 +182,7 @@ public void ParseBrokenMinimalDocumentShouldYieldExpectedDiagnostic() Paths = new OpenApiPaths() }); - diagnostic.ShouldBeEquivalentTo( + diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic { Errors = @@ -201,7 +201,7 @@ public void ParseMinimalDocumentShouldSucceed() { var openApiDoc = new OpenApiStreamReader().Read(stream, out var diagnostic); - openApiDoc.ShouldBeEquivalentTo( + openApiDoc.Should().BeEquivalentTo( new OpenApiDocument { Info = new OpenApiInfo @@ -212,7 +212,7 @@ public void ParseMinimalDocumentShouldSucceed() Paths = new OpenApiPaths() }); - diagnostic.ShouldBeEquivalentTo( + diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); } } @@ -637,10 +637,10 @@ public void ParseStandardPetStoreDocumentShouldSucceed() Components = components }; - actual.ShouldBeEquivalentTo(expected); + actual.Should().BeEquivalentTo(expected); } - context.ShouldBeEquivalentTo( + context.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); } @@ -1170,10 +1170,10 @@ public void ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed() } }; - actual.ShouldBeEquivalentTo(expected); + actual.Should().BeEquivalentTo(expected); } - context.ShouldBeEquivalentTo( + context.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); } @@ -1189,7 +1189,7 @@ public void ParsePetStoreExpandedShouldSucceed() // TODO: Create the object in memory and compare with the one read from YAML file. } - context.ShouldBeEquivalentTo( + context.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); } @@ -1215,7 +1215,7 @@ public void HeaderParameterShouldAllowExample() var exampleHeader = openApiDoc.Components?.Headers?["example-header"]; Assert.NotNull(exampleHeader); - exampleHeader.ShouldBeEquivalentTo( + exampleHeader.Should().BeEquivalentTo( new OpenApiHeader() { Description = "Test header with example", @@ -1240,7 +1240,7 @@ public void HeaderParameterShouldAllowExample() var examplesHeader = openApiDoc.Components?.Headers?["examples-header"]; Assert.NotNull(examplesHeader); - examplesHeader.ShouldBeEquivalentTo( + examplesHeader.Should().BeEquivalentTo( new OpenApiHeader() { Description = "Test header with example", diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs index e9326d125..047dc8332 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiEncodingTests.cs @@ -35,7 +35,7 @@ public void ParseBasicEncodingShouldSucceed() var encoding = OpenApiV3Deserializer.LoadEncoding(node); // Assert - encoding.ShouldBeEquivalentTo( + encoding.Should().BeEquivalentTo( new OpenApiEncoding { ContentType = "application/xml; charset=utf-8" @@ -61,7 +61,7 @@ public void ParseAdvancedEncodingShouldSucceed() var encoding = OpenApiV3Deserializer.LoadEncoding(node); // Assert - encoding.ShouldBeEquivalentTo( + encoding.Should().BeEquivalentTo( new OpenApiEncoding { ContentType = "image/png, image/jpeg", diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs index da6a45036..3e98316ac 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiExampleTests.cs @@ -36,7 +36,7 @@ public void ParseAdvancedExampleShouldSucceed() diagnostic.Errors.Should().BeEmpty(); - example.ShouldBeEquivalentTo( + example.Should().BeEquivalentTo( new OpenApiExample { Value = new OpenApiObject diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs index bf5c2cc1f..ff9fb46fd 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiInfoTests.cs @@ -37,7 +37,7 @@ public void ParseAdvancedInfoShouldSucceed() var openApiInfo = OpenApiV3Deserializer.LoadInfo(node); // Assert - openApiInfo.ShouldBeEquivalentTo( + openApiInfo.Should().BeEquivalentTo( new OpenApiInfo { Title = "Advanced Info", @@ -97,7 +97,7 @@ public void ParseBasicInfoShouldSucceed() var openApiInfo = OpenApiV3Deserializer.LoadInfo(node); // Assert - openApiInfo.ShouldBeEquivalentTo( + openApiInfo.Should().BeEquivalentTo( new OpenApiInfo { Title = "Basic Info", @@ -137,7 +137,7 @@ public void ParseMinimalInfoShouldSucceed() var openApiInfo = OpenApiV3Deserializer.LoadInfo(node); // Assert - openApiInfo.ShouldBeEquivalentTo( + openApiInfo.Should().BeEquivalentTo( new OpenApiInfo { Title = "Minimal Info", diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs index c3ad268fb..ef3eac152 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiMediaTypeTests.cs @@ -30,7 +30,7 @@ public void ParseMediaTypeWithExampleShouldSucceed() var mediaType = OpenApiV3Deserializer.LoadMediaType(node); // Assert - mediaType.ShouldBeEquivalentTo( + mediaType.Should().BeEquivalentTo( new OpenApiMediaType { Example = new OpenApiFloat(5), @@ -56,7 +56,7 @@ public void ParseMediaTypeWithExamplesShouldSucceed() var mediaType = OpenApiV3Deserializer.LoadMediaType(node); // Assert - mediaType.ShouldBeEquivalentTo( + mediaType.Should().BeEquivalentTo( new OpenApiMediaType { Examples = diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs index 564692c66..479155026 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs @@ -42,7 +42,7 @@ public void ParseOperationWithParameterWithNoLocationShouldSucceed() var operation = OpenApiV3Deserializer.LoadOperation(node); // Assert - operation.ShouldBeEquivalentTo(new OpenApiOperation() + operation.Should().BeEquivalentTo(new OpenApiOperation() { Tags = { diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs index 2c65a6e3c..e74e4d866 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.cs @@ -30,7 +30,7 @@ public void ParsePathParameterShouldSucceed() var parameter = OpenApiV3Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Path, @@ -58,7 +58,7 @@ public void ParseQueryParameterShouldSucceed() var parameter = OpenApiV3Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Query, @@ -92,7 +92,7 @@ public void ParseQueryParameterWithObjectTypeShouldSucceed() var parameter = OpenApiV3Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Query, @@ -123,7 +123,7 @@ public void ParseQueryParameterWithObjectTypeAndContentShouldSucceed() var parameter = OpenApiV3Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Query, @@ -171,7 +171,7 @@ public void ParseHeaderParameterShouldSucceed() var parameter = OpenApiV3Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = ParameterLocation.Header, @@ -206,7 +206,7 @@ public void ParseParameterWithNullLocationShouldSucceed() var parameter = OpenApiV3Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = null, @@ -234,7 +234,7 @@ public void ParseParameterWithNoLocationShouldSucceed() var parameter = OpenApiV3Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = null, @@ -262,7 +262,7 @@ public void ParseParameterWithUnknownLocationShouldSucceed() var parameter = OpenApiV3Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = null, @@ -290,7 +290,7 @@ public void ParseParameterWithExampleShouldSucceed() var parameter = OpenApiV3Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = null, @@ -320,7 +320,7 @@ public void ParseParameterWithExamplesShouldSucceed() var parameter = OpenApiV3Deserializer.LoadParameter(node); // Assert - parameter.ShouldBeEquivalentTo( + parameter.Should().BeEquivalentTo( new OpenApiParameter { In = null, diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs index c56c0d184..13c0f9f47 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSchemaTests.cs @@ -37,9 +37,9 @@ public void ParsePrimitiveSchemaShouldSucceed() var schema = OpenApiV3Deserializer.LoadSchema(node); // Assert - diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic()); + diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic()); - schema.ShouldBeEquivalentTo( + schema.Should().BeEquivalentTo( new OpenApiSchema { Type = "string", @@ -60,9 +60,9 @@ public void ParsePrimitiveSchemaFragmentShouldSucceed() var schema = reader.ReadFragment(stream, OpenApiSpecVersion.OpenApi3_0, out diagnostic); // Assert - diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic()); + diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic()); - schema.ShouldBeEquivalentTo( + schema.Should().BeEquivalentTo( new OpenApiSchema { Type = "string", @@ -87,9 +87,9 @@ public void ParsePrimitiveStringSchemaFragmentShouldSucceed() var schema = reader.ReadFragment(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic); // Assert - diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic()); + diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic()); - schema.ShouldBeEquivalentTo( + schema.Should().BeEquivalentTo( new OpenApiSchema { Type = "integer", @@ -113,9 +113,9 @@ public void ParseExampleStringFragmentShouldSucceed() var openApiAny = reader.ReadFragment(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic); // Assert - diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic()); + diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic()); - openApiAny.ShouldBeEquivalentTo( + openApiAny.Should().BeEquivalentTo( new OpenApiObject { ["foo"] = new OpenApiString("bar"), @@ -141,9 +141,9 @@ public void ParseEnumFragmentShouldSucceed() var openApiAny = reader.ReadFragment(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic); // Assert - diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic()); + diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic()); - openApiAny.ShouldBeEquivalentTo( + openApiAny.Should().BeEquivalentTo( new OpenApiArray { new OpenApiString("foo"), @@ -169,9 +169,9 @@ public void ParseSimpleSchemaShouldSucceed() var schema = OpenApiV3Deserializer.LoadSchema(node); // Assert - diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic()); + diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic()); - schema.ShouldBeEquivalentTo( + schema.Should().BeEquivalentTo( new OpenApiSchema { Type = "object", @@ -218,9 +218,9 @@ public void ParsePathFragmentShouldSucceed() var openApiAny = reader.ReadFragment(input, OpenApiSpecVersion.OpenApi3_0, out diagnostic); // Assert - diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic()); + diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic()); - openApiAny.ShouldBeEquivalentTo( + openApiAny.Should().BeEquivalentTo( new OpenApiPathItem { Summary = "externally referenced path item", @@ -258,9 +258,9 @@ public void ParseDictionarySchemaShouldSucceed() var schema = OpenApiV3Deserializer.LoadSchema(node); // Assert - diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic()); + diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic()); - schema.ShouldBeEquivalentTo( + schema.Should().BeEquivalentTo( new OpenApiSchema { Type = "object", @@ -290,9 +290,9 @@ public void ParseBasicSchemaWithExampleShouldSucceed() var schema = OpenApiV3Deserializer.LoadSchema(node); // Assert - diagnostic.ShouldBeEquivalentTo(new OpenApiDiagnostic()); + diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic()); - schema.ShouldBeEquivalentTo( + schema.Should().BeEquivalentTo( new OpenApiSchema { Type = "object", @@ -332,10 +332,10 @@ public void ParseBasicSchemaWithReferenceShouldSucceed() // Assert var components = openApiDoc.Components; - diagnostic.ShouldBeEquivalentTo( + diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); - components.ShouldBeEquivalentTo( + components.Should().BeEquivalentTo( new OpenApiComponents { Schemas = @@ -435,10 +435,10 @@ public void ParseAdvancedSchemaWithReferenceShouldSucceed() // Assert var components = openApiDoc.Components; - diagnostic.ShouldBeEquivalentTo( + diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); - components.ShouldBeEquivalentTo( + components.Should().BeEquivalentTo( new OpenApiComponents { Schemas = @@ -611,7 +611,7 @@ public void ParseSelfReferencingSchemaShouldNotStackOverflow() // Assert var components = openApiDoc.Components; - diagnostic.ShouldBeEquivalentTo( + diagnostic.Should().BeEquivalentTo( new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }); var schemaExtension = new OpenApiSchema() @@ -643,7 +643,7 @@ public void ParseSelfReferencingSchemaShouldNotStackOverflow() schemaExtension.AllOf[0].Properties["child"] = schemaExtension; - components.Schemas["microsoft.graph.schemaExtension"].ShouldBeEquivalentTo(components.Schemas["microsoft.graph.schemaExtension"].AllOf[0].Properties["child"]); + components.Schemas["microsoft.graph.schemaExtension"].Should().BeEquivalentTo(components.Schemas["microsoft.graph.schemaExtension"].AllOf[0].Properties["child"]); } } } diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs index 8267c28ef..d9443b0fd 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiSecuritySchemeTests.cs @@ -36,7 +36,7 @@ public void ParseHttpSecuritySchemeShouldSucceed() var securityScheme = OpenApiV3Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.Http, @@ -63,7 +63,7 @@ public void ParseApiKeySecuritySchemeShouldSucceed() var securityScheme = OpenApiV3Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.ApiKey, @@ -91,7 +91,7 @@ public void ParseBearerSecuritySchemeShouldSucceed() var securityScheme = OpenApiV3Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.Http, @@ -119,7 +119,7 @@ public void ParseOAuth2SecuritySchemeShouldSucceed() var securityScheme = OpenApiV3Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.OAuth2, @@ -157,7 +157,7 @@ public void ParseOpenIdConnectSecuritySchemeShouldSucceed() var securityScheme = OpenApiV3Deserializer.LoadSecurityScheme(node); // Assert - securityScheme.ShouldBeEquivalentTo( + securityScheme.Should().BeEquivalentTo( new OpenApiSecurityScheme { Type = SecuritySchemeType.OpenIdConnect, diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs index b11aae2aa..439054354 100644 --- a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs +++ b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiXmlTests.cs @@ -36,7 +36,7 @@ public void ParseBasicXmlShouldSucceed() var xml = OpenApiV3Deserializer.LoadXml(node); // Assert - xml.ShouldBeEquivalentTo( + xml.Should().BeEquivalentTo( new OpenApiXml { Name = "name1", diff --git a/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj b/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj index d62be8960..f9565bb64 100644 --- a/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj +++ b/test/Microsoft.OpenApi.SmokeTests/Microsoft.OpenApi.SmokeTests.csproj @@ -9,10 +9,13 @@ - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs b/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs index a1b861ded..e7e794cb5 100644 --- a/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs +++ b/test/Microsoft.OpenApi.Tests/Expressions/RuntimeExpressionTests.cs @@ -188,7 +188,7 @@ public void CompositeRuntimeExpressionContainsMultipleExpressions() var compositeExpression = runtimeExpression as CompositeExpression; Assert.Equal(2,compositeExpression.ContainedExpressions.Count); - compositeExpression.ContainedExpressions.ShouldBeEquivalentTo(new List() + compositeExpression.ContainedExpressions.Should().BeEquivalentTo(new List() { new UrlExpression(), new RequestExpression(new HeaderExpression("foo")) @@ -232,7 +232,7 @@ public void CompositeRuntimeExpressionWithMultipleRuntimeExpressionsAndFakeBrace response.Expression.Should().Be(expression); var compositeExpression = runtimeExpression as CompositeExpression; - compositeExpression.ContainedExpressions.ShouldBeEquivalentTo(new List() + compositeExpression.ContainedExpressions.Should().BeEquivalentTo(new List() { new UrlExpression(), new RequestExpression(new HeaderExpression("foo")) @@ -248,7 +248,7 @@ public void CompositeRuntimeExpressionWithInvalidRuntimeExpressions(string expre Action test = () => RuntimeExpression.Build(expression); // Assert - test.ShouldThrow().WithMessage(String.Format(SRResource.RuntimeExpressionHasInvalidFormat, invalidExpression)); + test.Should().Throw().WithMessage(String.Format(SRResource.RuntimeExpressionHasInvalidFormat, invalidExpression)); } [Theory] diff --git a/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj b/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj index 943d58c63..bcf61dda2 100644 --- a/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj +++ b/test/Microsoft.OpenApi.Tests/Microsoft.OpenApi.Tests.csproj @@ -14,16 +14,18 @@ - - + + - + - + - + - + + all + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs index 134526ebb..f27efc40c 100644 --- a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs +++ b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs @@ -265,12 +265,12 @@ 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.ShouldThrow(); - addSecurityScheme1WithDifferentProperties.ShouldThrow(); + addSecurityScheme1Duplicate.Should().Throw(); + addSecurityScheme1WithDifferentProperties.Should().Throw(); securityRequirement.Should().HaveCount(2); - securityRequirement.ShouldBeEquivalentTo( + securityRequirement.Should().BeEquivalentTo( new OpenApiSecurityRequirement { // This should work with any security scheme object diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTests.cs index 6266827f9..cab0642fb 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiComparerTests.cs @@ -74,9 +74,9 @@ public void OpenApiComparerShouldSucceed( new OpenApiExampleComparer().Compare(AdvancedExample, AdvancedExample, new ComparisonContext(new OpenApiComparerFactory(), new OpenApiDocument(), new OpenApiDocument())); var differences = OpenApiComparer.Compare(source, target).ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiComponentsTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiComponentsTests.cs index 06e5d0caa..23223a60d 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiComponentsTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiComponentsTests.cs @@ -900,9 +900,9 @@ public void OpenApiComponentsComparerShouldSucceed( var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiEncodingComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiEncodingComparerTests.cs index 323c9019b..467ac5e72 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiEncodingComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiEncodingComparerTests.cs @@ -352,9 +352,9 @@ public void OpenApiEncodingComparerShouldSucceed( comparer.Compare(source, target, comparisonContext); var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiExampleComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiExampleComparerTests.cs index 472c609f5..5d089a4ac 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiExampleComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiExampleComparerTests.cs @@ -453,9 +453,9 @@ public void OpenApiExampleComparerShouldSucceed( comparer.Compare(source, target, comparisonContext); var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiInfoComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiInfoComparerTests.cs index 5ab9c4ae2..8e2daf371 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiInfoComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiInfoComparerTests.cs @@ -289,9 +289,9 @@ public void OpenApiInfoComparerShouldSucceed( comparer.Compare(source, target, comparisonContext); var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiParameterComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiParameterComparerTests.cs index c5460f886..bd881d7f6 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiParameterComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiParameterComparerTests.cs @@ -469,9 +469,9 @@ public void OpenApiParameterComparerShouldSucceed( comparer.Compare(source, target, comparisonContext); var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiParametersComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiParametersComparerTests.cs index 78aa6e512..be325f28b 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiParametersComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiParametersComparerTests.cs @@ -424,9 +424,9 @@ public void OpenApiParametersComparerShouldSucceed( comparer.Compare(source, target, comparisonContext); var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiRequestBodyComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiRequestBodyComparerTests.cs index 1748dc82c..3e8bdf8b8 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiRequestBodyComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiRequestBodyComparerTests.cs @@ -579,9 +579,9 @@ public void OpenApiRequestBodyComparerShouldSucceed( var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiResponsesComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiResponsesComparerTests.cs index c55897eb9..9f55e16de 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiResponsesComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiResponsesComparerTests.cs @@ -810,9 +810,9 @@ public void OpenApiResponsesComparerShouldSucceed( var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiSecurityRequirementComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiSecurityRequirementComparerTests.cs index 0c1d6f8a0..9d216f473 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiSecurityRequirementComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiSecurityRequirementComparerTests.cs @@ -281,9 +281,9 @@ public void OpenApiSecurityRequirementComparerShouldSucceed( var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiSecuritySchemeComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiSecuritySchemeComparerTests.cs index fd0251315..62a351dea 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiSecuritySchemeComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiSecuritySchemeComparerTests.cs @@ -300,9 +300,9 @@ public void OpenApiSecuritySchemeComparerShouldSucceed( var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiServerVariableComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiServerVariableComparerTests.cs index 0f689dca7..2ab4e87b4 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiServerVariableComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiServerVariableComparerTests.cs @@ -279,9 +279,9 @@ public void OpenApiServerVariableComparerShouldSucceed( comparer.Compare(source, target, comparisonContext); var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiServersComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiServersComparerTests.cs index 9acfadb46..23a2e6eea 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiServersComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiServersComparerTests.cs @@ -509,9 +509,9 @@ public void OpenApiServersComparerShouldSucceed( comparer.Compare(source, target, comparisonContext); var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiTagComparerTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiTagComparerTests.cs index 08e61a98e..71b42e52e 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiTagComparerTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiTagComparerTests.cs @@ -296,9 +296,9 @@ public void OpenApiTagServerVariableComparerShouldSucceed( comparer.Compare(source, target, comparisonContext); var differences = comparisonContext.OpenApiDifferences.ToList(); - differences.Count().ShouldBeEquivalentTo(expectedDifferences.Count); + differences.Count().Should().Be(expectedDifferences.Count); - differences.ShouldBeEquivalentTo(expectedDifferences); + differences.Should().BeEquivalentTo(expectedDifferences); } } } \ No newline at end of file diff --git a/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs b/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs index fba3965cf..f6f8ab5f2 100644 --- a/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs +++ b/test/Microsoft.OpenApi.Tests/Services/OpenApiValidatorTests.cs @@ -56,7 +56,7 @@ public void ResponseMustHaveADescription() var walker = new OpenApiWalker(validator); walker.Walk(openApiDocument); - validator.Errors.ShouldBeEquivalentTo( + validator.Errors.Should().BeEquivalentTo( new List { new OpenApiValidatorError(nameof(OpenApiResponseRules.ResponseRequiredFields),"#/paths/~1test/get/responses/200/description", @@ -91,7 +91,7 @@ public void ServersShouldBeReferencedByIndex() var walker = new OpenApiWalker(validator); walker.Walk(openApiDocument); - validator.Errors.ShouldBeEquivalentTo( + validator.Errors.Should().BeEquivalentTo( new List { new OpenApiValidatorError(nameof(OpenApiServerRules.ServerRequiredFields), "#/servers/1/url", @@ -137,7 +137,7 @@ public void ValidateCustomExtension() var walker = new OpenApiWalker(validator); walker.Walk(openApiDocument); - validator.Errors.ShouldBeEquivalentTo( + validator.Errors.Should().BeEquivalentTo( new List { new OpenApiValidatorError("FooExtensionRule", "#/info/x-foo", "Don't say hey") diff --git a/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs b/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs index 1a93739f2..91b1643fa 100644 --- a/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Validations/OpenApiSchemaValidationTests.cs @@ -261,7 +261,7 @@ public void ValidateSchemaRequiredFieldListMustContainThePropertySpecifiedInTheD // Assert result.Should().BeFalse(); - errors.ShouldAllBeEquivalentTo(new List + errors.Should().BeEquivalentTo(new List { new OpenApiValidatorError(nameof(OpenApiSchemaRules.ValidateSchemaDiscriminator),"#/schemas/schema1/discriminator", string.Format(SRResource.Validation_SchemaRequiredFieldListMustContainThePropertySpecifiedInTheDiscriminator, diff --git a/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs b/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs index 725eacdaf..0a1193e90 100644 --- a/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs +++ b/test/Microsoft.OpenApi.Tests/Walkers/WalkerLocationTests.cs @@ -23,7 +23,7 @@ public void LocateTopLevelObjects() var walker = new OpenApiWalker(locator); walker.Walk(doc); - locator.Locations.ShouldBeEquivalentTo(new List { + locator.Locations.Should().BeEquivalentTo(new List { "#/servers", "#/tags" }); @@ -49,7 +49,7 @@ public void LocateTopLevelArrayItems() var walker = new OpenApiWalker(locator); walker.Walk(doc); - locator.Locations.ShouldBeEquivalentTo(new List { + locator.Locations.Should().BeEquivalentTo(new List { "#/servers", "#/servers/0", "#/servers/1", @@ -96,7 +96,7 @@ public void LocatePathOperationContentSchema() var walker = new OpenApiWalker(locator); walker.Walk(doc); - locator.Locations.ShouldBeEquivalentTo(new List { + locator.Locations.Should().BeEquivalentTo(new List { "#/servers", "#/paths", "#/paths/~1test", @@ -111,7 +111,7 @@ public void LocatePathOperationContentSchema() }); - locator.Keys.ShouldBeEquivalentTo(new List { "/test", "Get", "200", "application/json" }); + locator.Keys.Should().BeEquivalentTo(new List { "/test", "Get", "200", "application/json" }); } [Fact] @@ -144,7 +144,7 @@ public void WalkDOMWithCycles() var walker = new OpenApiWalker(locator); walker.Walk(doc); - locator.Locations.ShouldBeEquivalentTo(new List { + locator.Locations.Should().BeEquivalentTo(new List { "#/servers", "#/paths", "#/components", @@ -241,7 +241,7 @@ public void LocateReferences() var walker = new OpenApiWalker(locator); walker.Walk(doc); - locator.Locations.Where(l => l.StartsWith("referenceAt:")).ShouldBeEquivalentTo(new List { + locator.Locations.Where(l => l.StartsWith("referenceAt:")).Should().BeEquivalentTo(new List { "referenceAt: #/paths/~1/get/responses/200/content/application~1json/schema", "referenceAt: #/paths/~1/get/responses/200/headers/test-header", "referenceAt: #/components/schemas/derived/anyOf/0", diff --git a/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs b/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs index d8f827341..d9d2e9124 100644 --- a/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs +++ b/test/Microsoft.OpenApi.Tests/Writers/OpenApiJsonWriterTests.cs @@ -70,7 +70,7 @@ public void WriteStringListAsJsonShouldMatchExpected(string[] stringValues) JsonConvert.DeserializeObject(JsonConvert.SerializeObject(new List(stringValues))); // Assert - parsedObject.ShouldBeEquivalentTo(expectedObject); + parsedObject.Should().BeEquivalentTo(expectedObject); } public static IEnumerable WriteMapAsJsonShouldMatchExpectedTestCasesSimple() @@ -246,7 +246,7 @@ public void WriteMapAsJsonShouldMatchExpected(IDictionary inputM var expectedObject = JsonConvert.DeserializeObject(JsonConvert.SerializeObject(inputMap)); // Assert - parsedObject.ShouldBeEquivalentTo(expectedObject); + parsedObject.Should().BeEquivalentTo(expectedObject); } public static IEnumerable WriteDateTimeAsJsonTestCases()