Skip to content

Commit b2371fc

Browse files
baywetCopilot
baywet
and
Copilot
committed
test(assertions): migrate from FluentAssertions
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent cad45af commit b2371fc

29 files changed

Lines changed: 243 additions & 210 deletions

‎test/Microsoft.OpenApi.Readers.Tests/DefaultSettingsFixture.cs‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

4-
using FluentAssertions;
5-
64
namespace Microsoft.OpenApi.Readers.Tests
75
{
86
/// <summary>
@@ -15,14 +13,6 @@ public class DefaultSettingsFixture
1513
/// </summary>
1614
public DefaultSettingsFixture()
1715
{
18-
// We need RespectingRuntimeTypes() to ensure equivalence test works property,
19-
// given that there are multiple types that can be used for the declared type OpenApiAny.
20-
// Without this option, properties specific to those types would not be compared.
21-
AssertionOptions.AssertEquivalencyUsing(
22-
o => o
23-
.AllowingInfiniteRecursion()
24-
.RespectingRuntimeTypes()
25-
.WithStrictOrdering());
2616
}
2717
}
2818
}

‎test/Microsoft.OpenApi.Readers.Tests/Microsoft.OpenApi.Readers.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<ItemGroup>
1919
<PackageReference Include="coverlet.MTP" Version="10.0.1" PrivateAssets="all" />
2020
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
21-
<PackageReference Include="FluentAssertions" Version="7.2.2" />
2221
<PackageReference Include="xunit.v3" Version="4.0.0" />
2322
</ItemGroup>
2423

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.IO;
55
using System.Threading.Tasks;
6-
using FluentAssertions;
76
using Microsoft.OpenApi.Reader;
7+
using Microsoft.OpenApi.Tests;
88
using Xunit;
99

1010
namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -27,8 +27,7 @@ public async Task EquivalentV2AndV3DocumentsShouldProduceEquivalentObjects(strin
2727
var result1 = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, $"{fileName}.v2.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
2828
var result2 = await OpenApiDocument.LoadAsync(Path.Join(SampleFolderPath, $"{fileName}.v3.yaml"), SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken);
2929

30-
result2.Document.Should().BeEquivalentTo(result1.Document,
31-
options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri));
30+
OpenApiTestAssert.Equivalent(result1.Document, result2.Document, "Workspace", "BaseUri");
3231

3332
Assert.Equivalent(result2.Diagnostic.Errors, result1.Diagnostic.Errors);
3433
}

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
using System.Net.Http;
88
using System.Threading;
99
using System.Threading.Tasks;
10-
using FluentAssertions;
1110
using Microsoft.OpenApi.Reader;
11+
using Microsoft.OpenApi.Tests;
1212
using Xunit;
1313

1414
namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -119,7 +119,7 @@ public async Task ShouldParseProducesInAnyOrder()
119119
Schema = new OpenApiSchemaReference("Error", result.Document)
120120
};
121121

122-
result.Document.Should().BeEquivalentTo(new OpenApiDocument
122+
OpenApiTestAssert.Equivalent(new OpenApiDocument
123123
{
124124
Info = new()
125125
{
@@ -220,7 +220,7 @@ public async Task ShouldParseProducesInAnyOrder()
220220
["Error"] = errorSchema
221221
}
222222
}
223-
}, options => options.Excluding(x => x.BaseUri));
223+
}, result.Document, "BaseUri");
224224
}
225225

226226
[Fact]

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiHeaderTests.cs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@
33

44
using System.Text.Json.Nodes;
55
using System.IO;
6-
using FluentAssertions;
7-
using FluentAssertions.Equivalency;
86
using Microsoft.OpenApi.Reader;
97
using Microsoft.OpenApi.Reader.V2;
8+
using Microsoft.OpenApi.Tests;
109
using Xunit;
1110

1211
namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -30,7 +29,7 @@ public void ParseHeaderWithDefaultShouldSucceed()
3029
var header = OpenApiV2Deserializer.LoadHeader(node, new(), new ParsingContext(new()));
3130

3231
// Assert
33-
header.Should().BeEquivalentTo(
32+
OpenApiTestAssert.Equivalent(
3433
new OpenApiHeader
3534
{
3635
Schema = new OpenApiSchema()
@@ -40,9 +39,8 @@ public void ParseHeaderWithDefaultShouldSucceed()
4039
Default = new JsonNodeExtension(5).Node
4140
}
4241
},
43-
options => options
44-
.IgnoringCyclicReferences()
45-
.Excluding(x => x.Schema.Default.Parent));
42+
header,
43+
"Parent");
4644
}
4745

4846
[Fact]
@@ -59,7 +57,7 @@ public void ParseHeaderWithEnumShouldSucceed()
5957
var header = OpenApiV2Deserializer.LoadHeader(node, new(), new ParsingContext(new()));
6058

6159
// Assert
62-
header.Should().BeEquivalentTo(
60+
OpenApiTestAssert.Equivalent(
6361
new OpenApiHeader
6462
{
6563
Schema = new OpenApiSchema()
@@ -73,9 +71,7 @@ public void ParseHeaderWithEnumShouldSucceed()
7371
new JsonNodeExtension(9).Node
7472
]
7573
}
76-
}, options => options.IgnoringCyclicReferences()
77-
.Excluding((IMemberInfo memberInfo) =>
78-
memberInfo.Path.EndsWith("Parent")));
74+
}, header, "Parent");
7975
}
8076
}
8177
}

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiOperationTests.cs‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Text;
88
using System.Text.Json.Nodes;
99
using System.Threading.Tasks;
10-
using FluentAssertions;
1110
using Microsoft.OpenApi.Reader;
1211
using Microsoft.OpenApi.Reader.V2;
1312
using Microsoft.OpenApi.Reader.V3;
@@ -165,7 +164,7 @@ public void ParseOperationWithBodyShouldSucceed()
165164
var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
166165

167166
// Assert
168-
operation.Should().BeEquivalentTo(_operationWithBody, options => options.IgnoringCyclicReferences());
167+
OpenApiTestAssert.Equivalent(_operationWithBody, operation);
169168
}
170169

171170
[Fact]
@@ -183,7 +182,7 @@ public async Task ParseOperationWithBodyTwiceShouldYieldSameObject()
183182
var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
184183

185184
// Assert
186-
operation.Should().BeEquivalentTo(_operationWithBody, options => options.IgnoringCyclicReferences());
185+
OpenApiTestAssert.Equivalent(_operationWithBody, operation);
187186
}
188187

189188
[Fact]
@@ -200,7 +199,7 @@ public void ParseOperationWithResponseExamplesShouldSucceed()
200199
var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
201200

202201
// Assert
203-
operation.Should().BeEquivalentTo(
202+
OpenApiTestAssert.Equivalent(
204203
new OpenApiOperation()
205204
{
206205
Responses = new OpenApiResponses()
@@ -243,13 +242,7 @@ public void ParseOperationWithResponseExamplesShouldSucceed()
243242
}
244243
}}
245244
}
246-
}, options => options.IgnoringCyclicReferences()
247-
.Excluding(o => o.Responses["200"].Content["application/json"].Example[0].Parent)
248-
.Excluding(o => o.Responses["200"].Content["application/json"].Example[0].Root)
249-
.Excluding(o => o.Responses["200"].Content["application/json"].Example[1].Parent)
250-
.Excluding(o => o.Responses["200"].Content["application/json"].Example[1].Root)
251-
.Excluding(o => o.Responses["200"].Content["application/json"].Example[2].Parent)
252-
.Excluding(o => o.Responses["200"].Content["application/json"].Example[2].Root));
245+
}, operation, "Parent", "Root");
253246
}
254247

255248
[Fact]
@@ -300,7 +293,7 @@ public void ParseOperationWithBodyAndEmptyConsumesSetsRequestBodySchemaIfExists(
300293
var operation = OpenApiV2Deserializer.LoadOperation(node, new(), new ParsingContext(new()));
301294

302295
// Assert
303-
operation.Should().BeEquivalentTo(_operationWithBody, options => options.IgnoringCyclicReferences());
296+
OpenApiTestAssert.Equivalent(_operationWithBody, operation);
304297
}
305298

306299
[Fact]

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiParameterTests.cs‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
// Licensed under the MIT license.
44

55
using System.IO;
6-
using FluentAssertions;
7-
using FluentAssertions.Equivalency;
86
using Microsoft.OpenApi.Reader;
97
using Microsoft.OpenApi.Reader.V2;
108
using Microsoft.OpenApi.Tests;
@@ -226,7 +224,7 @@ public void ParseParameterWithDefaultShouldSucceed()
226224
var parameter = OpenApiV2Deserializer.LoadParameter(node, new(), new ParsingContext(new()));
227225

228226
// Assert
229-
parameter.Should().BeEquivalentTo(
227+
OpenApiTestAssert.Equivalent(
230228
new OpenApiParameter
231229
{
232230
In = ParameterLocation.Path,
@@ -239,7 +237,7 @@ public void ParseParameterWithDefaultShouldSucceed()
239237
Format = "float",
240238
Default = new JsonNodeExtension(5).Node
241239
}
242-
}, options => options.IgnoringCyclicReferences().Excluding(x => x.Schema.Default.Parent));
240+
}, parameter, "Parent");
243241
}
244242

245243
[Fact]
@@ -274,10 +272,7 @@ public void ParseParameterWithEnumShouldSucceed()
274272
};
275273

276274
// Assert
277-
parameter.Should().BeEquivalentTo(expected, options => options
278-
.IgnoringCyclicReferences()
279-
.Excluding((IMemberInfo memberInfo) =>
280-
memberInfo.Path.EndsWith("Parent")));
275+
OpenApiTestAssert.Equivalent(expected, parameter, "Parent");
281276
}
282277

283278
[Fact]

‎test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiSchemaTests.cs‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
using System.IO;
66
using System.Text.Json.Nodes;
77
using System.Threading.Tasks;
8-
using FluentAssertions;
9-
using FluentAssertions.Equivalency;
108
using Microsoft.OpenApi.Reader;
119
using Microsoft.OpenApi.Reader.V2;
1210
using Microsoft.OpenApi.Tests;
@@ -35,12 +33,12 @@ public void ParseSchemaWithDefaultShouldSucceed()
3533
var schema = OpenApiV2Deserializer.LoadSchema(node, new(), new ParsingContext(new()));
3634

3735
// Assert
38-
schema.Should().BeEquivalentTo(new OpenApiSchema
36+
OpenApiTestAssert.Equivalent(new OpenApiSchema
3937
{
4038
Type = JsonSchemaType.Number,
4139
Format = "float",
4240
Default = 5
43-
}, options => options.IgnoringCyclicReferences().Excluding(x => x.Default.Parent));
41+
}, schema, "Parent");
4442
}
4543

4644
[Fact]
@@ -57,13 +55,13 @@ public void ParseSchemaWithExampleShouldSucceed()
5755
var schema = OpenApiV2Deserializer.LoadSchema(node, new(), new ParsingContext(new()));
5856

5957
// Assert
60-
schema.Should().BeEquivalentTo(
58+
OpenApiTestAssert.Equivalent(
6159
new OpenApiSchema
6260
{
6361
Type = JsonSchemaType.Number,
6462
Format = "float",
6563
Example = 5
66-
}, options => options.IgnoringCyclicReferences().Excluding(x => x.Example.Parent));
64+
}, schema, "Parent");
6765
}
6866

6967
[Fact]
@@ -92,10 +90,7 @@ public void ParseSchemaWithEnumShouldSucceed()
9290
]
9391
};
9492

95-
schema.Should().BeEquivalentTo(expected, options =>
96-
options.IgnoringCyclicReferences()
97-
.Excluding((IMemberInfo memberInfo) =>
98-
memberInfo.Path.EndsWith("Parent")));
93+
OpenApiTestAssert.Equivalent(expected, schema, "Parent");
9994
}
10095

10196
[Fact]

‎test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiDocumentTests.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Globalization;
33
using System.IO;
44
using System.Threading.Tasks;
5-
using FluentAssertions;
65
using Microsoft.OpenApi.Reader;
76
using Microsoft.OpenApi.Tests;
87
using Xunit;
@@ -244,7 +243,7 @@ public async Task ParseDocumentWithWebhooksShouldSucceed()
244243

245244
// Assert
246245
Assert.Equivalent(new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1, Format = OpenApiConstants.Yaml }, actual.Diagnostic);
247-
actual.Document.Should().BeEquivalentTo(expected, options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri));
246+
OpenApiTestAssert.Equivalent(expected, actual.Document, "Workspace", "BaseUri");
248247
}
249248

250249
[Fact]
@@ -446,9 +445,7 @@ public async Task ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
446445
};
447446

448447
// Assert
449-
actual.Document.Should().BeEquivalentTo(expected, options => options
450-
.Excluding(x => x.Workspace)
451-
.Excluding(y => y.BaseUri));
448+
OpenApiTestAssert.Equivalent(expected, actual.Document, "Workspace", "BaseUri");
452449
Assert.Equivalent(
453450
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1, Format = OpenApiConstants.Yaml }, actual.Diagnostic);
454451
}
@@ -613,7 +610,7 @@ public async Task ParseDocumentWithEmptyTagsWorks()
613610
var path = Path.Join(SampleFolderPath, "documentWithEmptyTags.json");
614611
var doc = (await OpenApiDocument.LoadAsync(path, SettingsFixture.ReaderSettings, token: TestContext.Current.CancellationToken)).Document;
615612

616-
doc.Paths["/groups"].Operations[HttpMethod.Get].Tags.Should().BeNull("Empty tags are ignored, so we should not have any tags");
613+
Assert.Null(doc.Paths["/groups"].Operations[HttpMethod.Get].Tags);
617614
}
618615
[Fact]
619616
public async Task DocumentWithSchemaResultsInWarning()

‎test/Microsoft.OpenApi.Readers.Tests/V31Tests/OpenApiHeaderTests.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Collections.Generic;
55
using System.IO;
66
using System.Threading.Tasks;
7-
using FluentAssertions;
87
using Microsoft.OpenApi.Reader;
98
using Xunit;
109

0 commit comments

Comments
 (0)