Skip to content

Updated referenced packages including SharpYaml,. Xunit, FluentAssertions #446

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
darrelmiller merged 1 commit into from
Jan 6, 2020
Merged

Updated referenced packages including SharpYaml,. Xunit, FluentAssertions #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Microsoft.OpenApi.Readers/Microsoft.OpenApi.Readers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="SharpYaml" Version="1.6.1" />
<PackageReference Include="SharpYaml" Version="1.6.5" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 8 additions & 6 deletions test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,16 +237,18 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
<PackageReference Include="FluentAssertions" Version="4.19.4">
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Include="FluentAssertions" Version="5.10.0">
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="10.0.3">
<PackageReference Include="Newtonsoft.Json" Version="12.0.3">
</PackageReference>
<PackageReference Include="SharpYaml" Version="1.6.1">
<PackageReference Include="SharpYaml" Version="1.6.5">
</PackageReference>
<PackageReference Include="xunit" Version="2.3.1">
<PackageReference Include="xunit" Version="2.4.1">
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1">
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion test/Microsoft.OpenApi.Readers.Tests/ParseNodeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public void BrokenSimpleList()
var reader = new OpenApiStringReader();
reader.Read(input, out var diagnostic);

diagnostic.Errors.ShouldBeEquivalentTo(new List<OpenApiError>() {
diagnostic.Errors.Should().BeEquivalentTo(new List<OpenApiError>() {
new OpenApiError(new OpenApiReaderException("Expected a value.") {
Pointer = "#line=4"
})
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyConverterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public void ParseObjectAsAnyShouldSucceed()

diagnostic.Errors.Should().BeEmpty();

anyMap.ShouldBeEquivalentTo(
anyMap.Should().BeEquivalentTo(
new OpenApiObject
{
["aString"] = new OpenApiString("fooBar"),
Expand Down Expand Up @@ -214,7 +214,7 @@ public void ParseNestedObjectAsAnyShouldSucceed()

diagnostic.Errors.Should().BeEmpty();

anyMap.ShouldBeEquivalentTo(
anyMap.Should().BeEquivalentTo(
new OpenApiObject
{
["aString"] = new OpenApiString("fooBar"),
Expand Down Expand Up @@ -370,7 +370,7 @@ public void ParseNestedObjectAsAnyWithPartialSchemaShouldSucceed()

diagnostic.Errors.Should().BeEmpty();

anyMap.ShouldBeEquivalentTo(
anyMap.Should().BeEquivalentTo(
new OpenApiObject
{
["aString"] = new OpenApiString("fooBar"),
Expand Down Expand Up @@ -463,7 +463,7 @@ public void ParseNestedObjectAsAnyWithoutUsingSchemaShouldSucceed()

diagnostic.Errors.Should().BeEmpty();

anyMap.ShouldBeEquivalentTo(
anyMap.Should().BeEquivalentTo(
new OpenApiObject
{
["aString"] = new OpenApiString("fooBar"),
Expand Down
8 changes: 4 additions & 4 deletions test/Microsoft.OpenApi.Readers.Tests/ParseNodes/OpenApiAnyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void ParseMapAsAnyShouldSucceed()

diagnostic.Errors.Should().BeEmpty();

anyMap.ShouldBeEquivalentTo(
anyMap.Should().BeEquivalentTo(
new OpenApiObject
{
["aString"] = new OpenApiString("fooBar"),
Expand Down Expand Up @@ -68,7 +68,7 @@ public void ParseListAsAnyShouldSucceed()

diagnostic.Errors.Should().BeEmpty();

any.ShouldBeEquivalentTo(
any.Should().BeEquivalentTo(
new OpenApiArray
{
new OpenApiString("fooBar"),
Expand Down Expand Up @@ -97,7 +97,7 @@ public void ParseScalarIntegerAsAnyShouldSucceed()

diagnostic.Errors.Should().BeEmpty();

any.ShouldBeEquivalentTo(
any.Should().BeEquivalentTo(
new OpenApiString("10")
);
}
Expand All @@ -121,7 +121,7 @@ public void ParseScalarDateTimeAsAnyShouldSucceed()

diagnostic.Errors.Should().BeEmpty();

any.ShouldBeEquivalentTo(
any.Should().BeEquivalentTo(
new OpenApiString("2012-07-23T12:33:00")
);
}
Expand Down
10 changes: 5 additions & 5 deletions test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public void LoadSchemaReference()
var referencedObject = document.ResolveReference(reference);

// Assert
referencedObject.ShouldBeEquivalentTo(
referencedObject.Should().BeEquivalentTo(
new OpenApiSchema
{
Required =
Expand Down Expand Up @@ -96,7 +96,7 @@ public void LoadParameterReference()
var referencedObject = document.ResolveReference(reference);

// Assert
referencedObject.ShouldBeEquivalentTo(
referencedObject.Should().BeEquivalentTo(
new OpenApiParameter
{
Name = "skip",
Expand Down Expand Up @@ -139,7 +139,7 @@ public void LoadSecuritySchemeReference()
var referencedObject = document.ResolveReference(reference);

// Assert
referencedObject.ShouldBeEquivalentTo(
referencedObject.Should().BeEquivalentTo(
new OpenApiSecurityScheme
{
Type = SecuritySchemeType.ApiKey,
Expand Down Expand Up @@ -176,7 +176,7 @@ public void LoadResponseReference()
var referencedObject = document.ResolveReference(reference);

// Assert
referencedObject.ShouldBeEquivalentTo(
referencedObject.Should().BeEquivalentTo(
new OpenApiResponse
{
Description = "Entity not found.",
Expand Down Expand Up @@ -215,7 +215,7 @@ public void LoadResponseAndSchemaReference()
var referencedObject = document.ResolveReference(reference);

// Assert
referencedObject.ShouldBeEquivalentTo(
referencedObject.Should().BeEquivalentTo(
new OpenApiResponse
{
Description = "General Error",
Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public void ShouldThrowWhenReferenceTypeIsInvalid()
var reader = new OpenApiStringReader();
var doc = reader.Read(input, out var diagnostic);

diagnostic.Errors.ShouldBeEquivalentTo(new List<OpenApiError> {
diagnostic.Errors.Should().BeEquivalentTo(new List<OpenApiError> {
new OpenApiError( new OpenApiException("Unknown reference type 'defi888nition'")) });
doc.Should().NotBeNull();
}
Expand Down Expand Up @@ -66,7 +66,7 @@ public void ShouldThrowWhenReferenceDoesNotExist()

var doc = reader.Read(input, out var diagnostic);

diagnostic.Errors.ShouldBeEquivalentTo(new List<OpenApiError> {
diagnostic.Errors.Should().BeEquivalentTo(new List<OpenApiError> {
new OpenApiError( new OpenApiException("Invalid Reference identifier 'doesnotexist'.")) });
doc.Should().NotBeNull();
}
Expand Down Expand Up @@ -102,7 +102,7 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
paths: {}",
out var context);

openApiDoc.ShouldBeEquivalentTo(
openApiDoc.Should().BeEquivalentTo(
new OpenApiDocument
{
Info = new OpenApiInfo
Expand Down Expand Up @@ -143,7 +143,7 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
Paths = new OpenApiPaths()
});

context.ShouldBeEquivalentTo(
context.Should().BeEquivalentTo(
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi2_0 });
}

Expand Down Expand Up @@ -242,7 +242,7 @@ public void ShouldParseProducesInAnyOrder()
Schema = errorSchema
};

doc.ShouldBeEquivalentTo(new OpenApiDocument
doc.Should().BeEquivalentTo(new OpenApiDocument
{
Info = new OpenApiInfo
{
Expand Down Expand Up @@ -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);
}
}

Expand Down
4 changes: 2 additions & 2 deletions test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void ParseHeaderWithDefaultShouldSucceed()
var header = OpenApiV2Deserializer.LoadHeader(node);

// Assert
header.ShouldBeEquivalentTo(
header.Should().BeEquivalentTo(
new OpenApiHeader
{
Schema = new OpenApiSchema()
Expand All @@ -57,7 +57,7 @@ public void ParseHeaderWithEnumShouldSucceed()
var header = OpenApiV2Deserializer.LoadHeader(node);

// Assert
header.ShouldBeEquivalentTo(
header.Should().BeEquivalentTo(
new OpenApiHeader
{
Schema = new OpenApiSchema()
Expand Down
14 changes: 7 additions & 7 deletions test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ public void ParseBasicOperationShouldSucceed()
var operation = OpenApiV2Deserializer.LoadOperation(node);

// Assert
operation.ShouldBeEquivalentTo(_basicOperation);
operation.Should().BeEquivalentTo(_basicOperation);
}

[Fact]
Expand All @@ -238,7 +238,7 @@ public void ParseBasicOperationTwiceShouldYieldSameObject()
var operation = OpenApiV2Deserializer.LoadOperation(node);

// Assert
operation.ShouldBeEquivalentTo(_basicOperation);
operation.Should().BeEquivalentTo(_basicOperation);
}

[Fact]
Expand All @@ -255,7 +255,7 @@ public void ParseOperationWithFormDataShouldSucceed()
var operation = OpenApiV2Deserializer.LoadOperation(node);

// Assert
operation.ShouldBeEquivalentTo(_operationWithFormData);
operation.Should().BeEquivalentTo(_operationWithFormData);
}

[Fact]
Expand All @@ -273,7 +273,7 @@ public void ParseOperationWithFormDataTwiceShouldYieldSameObject()
var operation = OpenApiV2Deserializer.LoadOperation(node);

// Assert
operation.ShouldBeEquivalentTo(_operationWithFormData);
operation.Should().BeEquivalentTo(_operationWithFormData);
}

[Fact]
Expand All @@ -290,7 +290,7 @@ public void ParseOperationWithBodyShouldSucceed()
var operation = OpenApiV2Deserializer.LoadOperation(node);

// Assert
operation.ShouldBeEquivalentTo(_operationWithBody);
operation.Should().BeEquivalentTo(_operationWithBody);
}

[Fact]
Expand All @@ -308,7 +308,7 @@ public void ParseOperationWithBodyTwiceShouldYieldSameObject()
var operation = OpenApiV2Deserializer.LoadOperation(node);

// Assert
operation.ShouldBeEquivalentTo(_operationWithBody);
operation.Should().BeEquivalentTo(_operationWithBody);
}

[Fact]
Expand All @@ -325,7 +325,7 @@ public void ParseOperationWithResponseExamplesShouldSucceed()
var operation = OpenApiV2Deserializer.LoadOperation(node);

// Assert
operation.ShouldBeEquivalentTo(
operation.Should().BeEquivalentTo(
new OpenApiOperation()
{
Responses = new OpenApiResponses()
Expand Down
Loading