Skip to content

Commit 19d7935

Browse files
baywetbaywet
committed
chore: additional FA replacement batch
Signed-off-by: Vincent Biret <[email protected]>
1 parent c3a1fab commit 19d7935

19 files changed

+102
-113
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public async Task EquivalentV2AndV3DocumentsShouldProduceEquivalentObjects(strin
3030
result2.Document.Should().BeEquivalentTo(result1.Document,
3131
options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri));
3232

33-
result1.Diagnostic.Errors.Should().BeEquivalentTo(result2.Diagnostic.Errors);
33+
Assert.Equivalent(result2.Diagnostic.Errors, result1.Diagnostic.Errors);
3434
}
3535
}
3636
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,11 +280,11 @@ public async Task ShouldAssignSchemaToAllResponses()
280280

281281
var json = response.Value.Content["application/json"];
282282
Assert.NotNull(json);
283-
json.Schema.Should().BeEquivalentTo(targetSchema);
283+
Assert.Equivalent(targetSchema, json.Schema);
284284

285285
var xml = response.Value.Content["application/xml"];
286286
Assert.NotNull(xml);
287-
xml.Schema.Should().BeEquivalentTo(targetSchema);
287+
Assert.Equivalent(targetSchema, xml.Schema);
288288
}
289289
}
290290

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Collections.Generic;
66
using System.IO;
77
using System.Linq;
8-
using FluentAssertions;
98
using Microsoft.OpenApi.Models;
109
using Microsoft.OpenApi.Reader.ParseNodes;
1110
using Microsoft.OpenApi.Reader.V2;
@@ -260,7 +259,7 @@ public void ParseBasicPathItemWithFormDataShouldSucceed()
260259
var pathItem = OpenApiV2Deserializer.LoadPathItem(node);
261260

262261
// Assert
263-
pathItem.Should().BeEquivalentTo(_basicPathItemWithFormData);
262+
Assert.Equivalent(_basicPathItemWithFormData, pathItem);
264263
}
265264

266265
[Fact]

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System;
55
using System.IO;
66
using System.Linq;
7-
using FluentAssertions;
87
using Microsoft.OpenApi.Models;
98
using Microsoft.OpenApi.Reader;
109
using Microsoft.OpenApi.Reader.ParseNodes;
@@ -36,12 +35,12 @@ public void ParseHttpSecuritySchemeShouldSucceed()
3635
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
3736

3837
// Assert
39-
securityScheme.Should().BeEquivalentTo(
38+
Assert.Equivalent(
4039
new OpenApiSecurityScheme
4140
{
4241
Type = SecuritySchemeType.Http,
4342
Scheme = OpenApiConstants.Basic
44-
});
43+
}, securityScheme);
4544
}
4645

4746
[Fact]
@@ -61,13 +60,13 @@ public void ParseApiKeySecuritySchemeShouldSucceed()
6160
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
6261

6362
// Assert
64-
securityScheme.Should().BeEquivalentTo(
63+
Assert.Equivalent(
6564
new OpenApiSecurityScheme
6665
{
6766
Type = SecuritySchemeType.ApiKey,
6867
Name = "api_key",
6968
In = ParameterLocation.Header
70-
});
69+
}, securityScheme);
7170
}
7271

7372
[Fact]
@@ -86,7 +85,7 @@ public void ParseOAuth2ImplicitSecuritySchemeShouldSucceed()
8685
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
8786

8887
// Assert
89-
securityScheme.Should().BeEquivalentTo(
88+
Assert.Equivalent(
9089
new OpenApiSecurityScheme
9190
{
9291
Type = SecuritySchemeType.OAuth2,
@@ -102,7 +101,7 @@ public void ParseOAuth2ImplicitSecuritySchemeShouldSucceed()
102101
}
103102
}
104103
}
105-
});
104+
}, securityScheme);
106105
}
107106

108107
[Fact]
@@ -121,7 +120,7 @@ public void ParseOAuth2PasswordSecuritySchemeShouldSucceed()
121120
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
122121

123122
// Assert
124-
securityScheme.Should().BeEquivalentTo(
123+
Assert.Equivalent(
125124
new OpenApiSecurityScheme
126125
{
127126
Type = SecuritySchemeType.OAuth2,
@@ -137,7 +136,7 @@ public void ParseOAuth2PasswordSecuritySchemeShouldSucceed()
137136
}
138137
}
139138
}
140-
});
139+
}, securityScheme);
141140
}
142141

143142
[Fact]
@@ -156,7 +155,7 @@ public void ParseOAuth2ApplicationSecuritySchemeShouldSucceed()
156155
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
157156

158157
// Assert
159-
securityScheme.Should().BeEquivalentTo(
158+
Assert.Equivalent(
160159
new OpenApiSecurityScheme
161160
{
162161
Type = SecuritySchemeType.OAuth2,
@@ -172,7 +171,7 @@ public void ParseOAuth2ApplicationSecuritySchemeShouldSucceed()
172171
}
173172
}
174173
}
175-
});
174+
}, securityScheme);
176175
}
177176

178177
[Fact]
@@ -192,7 +191,7 @@ public void ParseOAuth2AccessCodeSecuritySchemeShouldSucceed()
192191
var securityScheme = OpenApiV2Deserializer.LoadSecurityScheme(node);
193192

194193
// Assert
195-
securityScheme.Should().BeEquivalentTo(
194+
Assert.Equivalent(
196195
new OpenApiSecurityScheme
197196
{
198197
Type = SecuritySchemeType.OAuth2,
@@ -208,7 +207,7 @@ public void ParseOAuth2AccessCodeSecuritySchemeShouldSucceed()
208207
}
209208
}
210209
}
211-
});
210+
}, securityScheme);
212211
}
213212

214213
static YamlDocument LoadYamlDocument(Stream input)

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using System.Linq;
2-
using FluentAssertions;
32
using Microsoft.OpenApi.Models;
43
using Microsoft.OpenApi.Reader;
54
using Xunit;
@@ -305,15 +304,15 @@ public void InvalidHostShouldYieldError()
305304

306305
var result = OpenApiDocument.Parse(input, "yaml", settings);
307306
Assert.Empty(result.Document.Servers);
308-
result.Diagnostic.Should().BeEquivalentTo(
307+
Assert.Equivalent(
309308
new OpenApiDiagnostic
310309
{
311310
Errors =
312311
{
313312
new OpenApiError("#/", "Invalid host")
314313
},
315314
SpecificationVersion = OpenApiSpecVersion.OpenApi2_0
316-
});
315+
}, result.Diagnostic);
317316
}
318317
}
319318
}

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Microsoft.OpenApi.Writers;
1212
using Xunit;
1313
using VerifyXunit;
14+
using VerifyTests;
1415

1516
namespace Microsoft.OpenApi.Readers.Tests.V31Tests
1617
{
@@ -198,7 +199,7 @@ public async Task ParseDocumentWithWebhooksShouldSucceed()
198199
};
199200

200201
// Assert
201-
actual.Diagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 });
202+
Assert.Equivalent(new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 }, actual.Diagnostic);
202203
actual.Document.Should().BeEquivalentTo(expected, options => options.Excluding(x => x.Workspace).Excluding(y => y.BaseUri));
203204
}
204205

@@ -389,8 +390,8 @@ public async Task ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
389390
.Excluding(x => x.Webhooks["pets"].Reference)
390391
.Excluding(x => x.Workspace)
391392
.Excluding(y => y.BaseUri));
392-
actual.Diagnostic.Should().BeEquivalentTo(
393-
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 });
393+
Assert.Equivalent(
394+
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 }, actual.Diagnostic);
394395
}
395396

396397
[Fact]
@@ -461,7 +462,7 @@ public async Task ParseDocumentWithPatternPropertiesInSchemaWorks()
461462
var actualMediaType = await mediaType.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_1);
462463

463464
// Assert
464-
actualSchema.Should().BeEquivalentTo(expectedSchema);
465+
Assert.Equivalent(expectedSchema, actualSchema);
465466
actualMediaType.MakeLineBreaksEnvironmentNeutral().Should().BeEquivalentTo(expectedMediaType.MakeLineBreaksEnvironmentNeutral());
466467
}
467468

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using System;
22
using System.IO;
33
using System.Linq;
4-
using FluentAssertions;
54
using Microsoft.OpenApi.Models;
65
using Microsoft.OpenApi.Reader;
76
using Microsoft.OpenApi.Reader.ParseNodes;
@@ -33,7 +32,7 @@ public void ParseBasicInfoShouldSucceed()
3332
var openApiInfo = OpenApiV31Deserializer.LoadInfo(node);
3433

3534
// Assert
36-
openApiInfo.Should().BeEquivalentTo(
35+
Assert.Equivalent(
3736
new OpenApiInfo
3837
{
3938
Title = "Basic Info",
@@ -52,7 +51,7 @@ public void ParseBasicInfoShouldSucceed()
5251
Name = "Apache 2.0",
5352
Url = new Uri("http://www.apache.org/licenses/LICENSE-2.0.html")
5453
}
55-
});
54+
}, openApiInfo);
5655
}
5756
}
5857
}

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

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

44
using System.IO;
55
using System.Linq;
6-
using FluentAssertions;
76
using Microsoft.OpenApi.Models;
87
using Microsoft.OpenApi.Reader;
98
using Microsoft.OpenApi.Reader.ParseNodes;
@@ -36,12 +35,12 @@ public void ParseLicenseWithSpdxIdentifierShouldSucceed()
3635
var license = OpenApiV31Deserializer.LoadLicense(node);
3736

3837
// Assert
39-
license.Should().BeEquivalentTo(
38+
Assert.Equivalent(
4039
new OpenApiLicense
4140
{
4241
Name = "Apache 2.0",
4342
Identifier = "Apache-2.0"
44-
});
43+
}, license);
4544
}
4645
}
4746
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ public async Task ParseBasicV31SchemaShouldSucceed()
8686

8787
// Act
8888
var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(
89-
System.IO.Path.Combine(SampleFolderPath, "jsonSchema.json"), OpenApiSpecVersion.OpenApi3_1);
89+
Path.Combine(SampleFolderPath, "jsonSchema.json"), OpenApiSpecVersion.OpenApi3_1);
9090

9191
// Assert
92-
schema.Should().BeEquivalentTo(expectedObject);
92+
Assert.Equivalent(expectedObject, schema);
9393
}
9494

9595
[Fact]
@@ -115,7 +115,7 @@ public void ParseSchemaWithTypeArrayWorks()
115115
var actual = OpenApiModelFactory.Parse<OpenApiSchema>(schema, OpenApiSpecVersion.OpenApi3_1, out _);
116116

117117
// Assert
118-
actual.Should().BeEquivalentTo(expected);
118+
Assert.Equivalent(expected, actual);
119119
}
120120

121121
[Fact]
@@ -176,7 +176,7 @@ public async Task ParseV31SchemaShouldSucceed()
176176
};
177177

178178
// Assert
179-
schema.Should().BeEquivalentTo(expectedSchema);
179+
Assert.Equivalent(expectedSchema, schema);
180180
}
181181

182182
[Fact]

‎test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiCallbackTests.cs‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.IO;
55
using System.Linq;
66
using System.Threading.Tasks;
7-
using FluentAssertions;
87
using Microsoft.OpenApi.Expressions;
98
using Microsoft.OpenApi.Models;
109
using Microsoft.OpenApi.Reader;
@@ -28,7 +27,7 @@ public async Task ParseBasicCallbackShouldSucceed()
2827
var callback = await OpenApiModelFactory.LoadAsync<OpenApiCallback>(Path.Combine(SampleFolderPath, "basicCallback.yaml"), OpenApiSpecVersion.OpenApi3_0);
2928

3029
// Assert
31-
callback.Should().BeEquivalentTo(
30+
Assert.Equivalent(
3231
new OpenApiCallback
3332
{
3433
PathItems =
@@ -59,7 +58,7 @@ public async Task ParseBasicCallbackShouldSucceed()
5958
}
6059
}
6160
}
62-
});
61+
}, callback);
6362
}
6463

6564
[Fact]
@@ -76,10 +75,10 @@ public async Task ParseCallbackWithReferenceShouldSucceed()
7675

7776
var callback = subscribeOperation.Callbacks["simpleHook"];
7877

79-
result.Diagnostic.Should().BeEquivalentTo(
80-
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
78+
Assert.Equivalent(
79+
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }, result.Diagnostic);
8180

82-
callback.Should().BeEquivalentTo(
81+
Assert.Equivalent(
8382
new OpenApiCallback
8483
{
8584
PathItems =
@@ -117,7 +116,7 @@ public async Task ParseCallbackWithReferenceShouldSucceed()
117116
Id = "simpleHook",
118117
HostDocument = result.Document
119118
}
120-
});
119+
}, callback);
121120
}
122121

123122
[Fact]
@@ -130,12 +129,12 @@ public async Task ParseMultipleCallbacksWithReferenceShouldSucceed()
130129
var path = result.Document.Paths.First().Value;
131130
var subscribeOperation = path.Operations[OperationType.Post];
132131

133-
result.Diagnostic.Should().BeEquivalentTo(
134-
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
132+
Assert.Equivalent(
133+
new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 }, result.Diagnostic);
135134

136135
var callback1 = subscribeOperation.Callbacks["simpleHook"];
137136

138-
callback1.Should().BeEquivalentTo(
137+
Assert.Equivalent(
139138
new OpenApiCallback
140139
{
141140
PathItems =
@@ -173,10 +172,10 @@ public async Task ParseMultipleCallbacksWithReferenceShouldSucceed()
173172
Id = "simpleHook",
174173
HostDocument = result.Document
175174
}
176-
});
175+
}, callback1);
177176

178177
var callback2 = subscribeOperation.Callbacks["callback2"];
179-
callback2.Should().BeEquivalentTo(
178+
Assert.Equivalent(
180179
new OpenApiCallback
181180
{
182181
PathItems =
@@ -209,10 +208,10 @@ public async Task ParseMultipleCallbacksWithReferenceShouldSucceed()
209208
},
210209
}
211210
}
212-
});
211+
}, callback2);
213212

214213
var callback3 = subscribeOperation.Callbacks["callback3"];
215-
callback3.Should().BeEquivalentTo(
214+
Assert.Equivalent(
216215
new OpenApiCallback
217216
{
218217
PathItems =
@@ -252,7 +251,7 @@ public async Task ParseMultipleCallbacksWithReferenceShouldSucceed()
252251
}
253252
}
254253
}
255-
});
254+
}, callback3);
256255
}
257256
}
258257
}

0 commit comments

Comments
 (0)