Skip to content

Commit b15de7a

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

13 files changed

+51
-62
lines changed

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public void ParseSchemaWithExamplesShouldSucceed()
277277
var schema = OpenApiModelFactory.Parse<OpenApiSchema>(input, OpenApiSpecVersion.OpenApi3_1, out _, "yaml");
278278

279279
// Assert
280-
schema.Examples.Should().HaveCount(2);
280+
Assert.Equal(2, schema.Examples.Count);
281281
}
282282

283283
[Fact]
@@ -319,7 +319,7 @@ public async Task SerializeV31SchemaWithMultipleTypesAsV3Works()
319319
schema.SerializeAsV3(new OpenApiYamlWriter(writer));
320320
var schema1String = writer.ToString();
321321

322-
schema1String.MakeLineBreaksEnvironmentNeutral().Should().Be(expected.MakeLineBreaksEnvironmentNeutral());
322+
Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schema1String.MakeLineBreaksEnvironmentNeutral());
323323
}
324324

325325
[Fact]
@@ -338,7 +338,7 @@ public async Task SerializeV31SchemaWithMultipleTypesAsV2Works()
338338
schema.SerializeAsV2(new OpenApiYamlWriter(writer));
339339
var schema1String = writer.ToString();
340340

341-
schema1String.MakeLineBreaksEnvironmentNeutral().Should().Be(expected.MakeLineBreaksEnvironmentNeutral());
341+
Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schema1String.MakeLineBreaksEnvironmentNeutral());
342342
}
343343

344344
[Fact]
@@ -358,7 +358,7 @@ public async Task SerializeV3SchemaWithNullableAsV31Works()
358358
schema.SerializeAsV31(new OpenApiYamlWriter(writer));
359359
var schemaString = writer.ToString();
360360

361-
schemaString.MakeLineBreaksEnvironmentNeutral().Should().Be(expected.MakeLineBreaksEnvironmentNeutral());
361+
Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
362362
}
363363

364364
[Fact]
@@ -379,7 +379,7 @@ public async Task SerializeV2SchemaWithNullableExtensionAsV31Works()
379379
schema.SerializeAsV31(new OpenApiYamlWriter(writer));
380380
var schemaString = writer.ToString();
381381

382-
schemaString.MakeLineBreaksEnvironmentNeutral().Should().Be(expected.MakeLineBreaksEnvironmentNeutral());
382+
Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
383383
}
384384

385385
[Fact]
@@ -398,7 +398,7 @@ public void SerializeSchemaWithTypeArrayAndNullableDoesntEmitType()
398398
schema.SerializeAsV2(new OpenApiYamlWriter(writer));
399399
var schemaString = writer.ToString();
400400

401-
schemaString.MakeLineBreaksEnvironmentNeutral().Should().Be(expected.MakeLineBreaksEnvironmentNeutral());
401+
Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
402402
}
403403

404404
[Theory]
@@ -413,7 +413,7 @@ public async Task LoadSchemaWithNullableExtensionAsV31Works(string filePath)
413413
var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_1);
414414

415415
// Assert
416-
schema.Type.Should().Be(JsonSchemaType.String | JsonSchemaType.Null);
416+
Assert.Equal(JsonSchemaType.String | JsonSchemaType.Null, schema.Type);
417417
}
418418

419419
[Fact]
@@ -458,8 +458,8 @@ public async Task SerializeSchemaWithJsonSchemaKeywordsWorks()
458458
var schemaString = writer.ToString();
459459

460460
// Assert
461-
schema.Vocabulary.Keys.Count.Should().Be(5);
462-
schemaString.MakeLineBreaksEnvironmentNeutral().Should().Be(expected.MakeLineBreaksEnvironmentNeutral());
461+
Assert.Equal(5, schema.Vocabulary.Keys.Count);
462+
Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
463463
}
464464

465465
[Fact]
@@ -495,14 +495,14 @@ public async Task ParseSchemaWithConstWorks()
495495

496496
// Act
497497
var schema = await OpenApiModelFactory.LoadAsync<OpenApiSchema>(path, OpenApiSpecVersion.OpenApi3_1);
498-
schema.Properties["status"].Const.Should().Be("active");
499-
schema.Properties["user"].Properties["role"].Const.Should().Be("admin");
498+
Assert.Equal("active", schema.Properties["status"].Const);
499+
Assert.Equal("admin", schema.Properties["user"].Properties["role"].Const);
500500

501501
// serialization
502502
var writer = new StringWriter();
503503
schema.SerializeAsV31(new OpenApiJsonWriter(writer));
504504
var schemaString = writer.ToString();
505-
schemaString.MakeLineBreaksEnvironmentNeutral().Should().Be(expected.MakeLineBreaksEnvironmentNeutral());
505+
Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), schemaString.MakeLineBreaksEnvironmentNeutral());
506506
}
507507

508508
[Fact]
@@ -517,7 +517,7 @@ public void ParseSchemaWithUnrecognizedKeywordsWorks()
517517
}
518518
";
519519
var schema = OpenApiModelFactory.Parse<OpenApiSchema>(input, OpenApiSpecVersion.OpenApi3_1, out _, "json");
520-
schema.UnrecognizedKeywords.Should().HaveCount(2);
520+
Assert.Equal(2, schema.UnrecognizedKeywords.Count);
521521
}
522522

523523
}

‎test/Microsoft.OpenApi.Tests/Models/OpenApiContactTests.cs

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

44
using System.Collections.Generic;
55
using System.Threading.Tasks;
6-
using FluentAssertions;
76
using Microsoft.OpenApi.Any;
87
using Microsoft.OpenApi.Extensions;
98
using Microsoft.OpenApi.Interfaces;
@@ -44,7 +43,7 @@ public async Task SerializeBasicContactWorks(
4443
// Assert
4544
actual = actual.MakeLineBreaksEnvironmentNeutral();
4645
expected = expected.MakeLineBreaksEnvironmentNeutral();
47-
actual.Should().Be(expected);
46+
Assert.Equal(expected, actual);
4847
}
4948

5049
[Theory]
@@ -69,7 +68,7 @@ public async Task SerializeAdvanceContactAsJsonWorks(OpenApiSpecVersion version)
6968
// Assert
7069
actual = actual.MakeLineBreaksEnvironmentNeutral();
7170
expected = expected.MakeLineBreaksEnvironmentNeutral();
72-
actual.Should().Be(expected);
71+
Assert.Equal(expected, actual);
7372
}
7473

7574
[Theory]
@@ -92,7 +91,7 @@ public async Task SerializeAdvanceContactAsYamlWorks(OpenApiSpecVersion version)
9291
// Assert
9392
actual = actual.MakeLineBreaksEnvironmentNeutral();
9493
expected = expected.MakeLineBreaksEnvironmentNeutral();
95-
actual.Should().Be(expected);
94+
Assert.Equal(expected, actual);
9695
}
9796
}
9897
}

‎test/Microsoft.OpenApi.Tests/Models/OpenApiInfoTests.cs

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

44
using System.Collections.Generic;
55
using System.Threading.Tasks;
6-
using FluentAssertions;
76
using Microsoft.OpenApi.Any;
87
using Microsoft.OpenApi.Extensions;
98
using Microsoft.OpenApi.Interfaces;
@@ -71,7 +70,7 @@ public async Task SerializeBasicInfoAsJsonWorks(OpenApiSpecVersion version, stri
7170
// Assert
7271
actual = actual.MakeLineBreaksEnvironmentNeutral();
7372
expected = expected.MakeLineBreaksEnvironmentNeutral();
74-
actual.Should().Be(expected);
73+
Assert.Equal(expected, actual);
7574
}
7675

7776
public static IEnumerable<object[]> BasicInfoYamlExpected()
@@ -100,7 +99,7 @@ public async Task SerializeBasicInfoAsYamlWorks(OpenApiSpecVersion version, stri
10099
// Assert
101100
actual = actual.MakeLineBreaksEnvironmentNeutral();
102101
expected = expected.MakeLineBreaksEnvironmentNeutral();
103-
actual.Should().Be(expected);
102+
Assert.Equal(expected, actual);
104103
}
105104

106105
public static IEnumerable<object[]> AdvanceInfoJsonExpect()
@@ -145,7 +144,7 @@ public async Task SerializeAdvanceInfoAsJsonWorks(OpenApiSpecVersion version, st
145144
// Assert
146145
actual = actual.MakeLineBreaksEnvironmentNeutral();
147146
expected = expected.MakeLineBreaksEnvironmentNeutral();
148-
actual.Should().Be(expected);
147+
Assert.Equal(expected, actual);
149148
}
150149

151150
public static IEnumerable<object[]> AdvanceInfoYamlExpect()
@@ -186,7 +185,7 @@ public async Task SerializeAdvanceInfoAsYamlWorks(OpenApiSpecVersion version, st
186185
// Assert
187186
actual = actual.MakeLineBreaksEnvironmentNeutral();
188187
expected = expected.MakeLineBreaksEnvironmentNeutral();
189-
actual.Should().Be(expected);
188+
Assert.Equal(expected, actual);
190189
}
191190

192191
[Fact]
@@ -211,7 +210,7 @@ public async Task InfoVersionShouldAcceptDateStyledAsVersions()
211210
// Assert
212211
actual = actual.MakeLineBreaksEnvironmentNeutral();
213212
expected = expected.MakeLineBreaksEnvironmentNeutral();
214-
actual.Should().Be(expected);
213+
Assert.Equal(expected, actual);
215214
}
216215

217216
[Fact]

‎test/Microsoft.OpenApi.Tests/Models/OpenApiLicenseTests.cs

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

44
using System.Collections.Generic;
55
using System.Threading.Tasks;
6-
using FluentAssertions;
76
using Microsoft.OpenApi.Any;
87
using Microsoft.OpenApi.Extensions;
98
using Microsoft.OpenApi.Interfaces;
@@ -55,7 +54,7 @@ public async Task SerializeBasicLicenseAsJsonWorks(OpenApiSpecVersion version)
5554
// Assert
5655
actual = actual.MakeLineBreaksEnvironmentNeutral();
5756
expected = expected.MakeLineBreaksEnvironmentNeutral();
58-
actual.Should().Be(expected);
57+
Assert.Equal(expected, actual);
5958
}
6059

6160
[Theory]
@@ -72,7 +71,7 @@ public async Task SerializeBasicLicenseAsYamlWorks(OpenApiSpecVersion version)
7271
// Assert
7372
actual = actual.MakeLineBreaksEnvironmentNeutral();
7473
expected = expected.MakeLineBreaksEnvironmentNeutral();
75-
actual.Should().Be(expected);
74+
Assert.Equal(expected, actual);
7675
}
7776

7877
[Theory]
@@ -96,7 +95,7 @@ public async Task SerializeAdvanceLicenseAsJsonWorks(OpenApiSpecVersion version)
9695
// Assert
9796
actual = actual.MakeLineBreaksEnvironmentNeutral();
9897
expected = expected.MakeLineBreaksEnvironmentNeutral();
99-
actual.Should().Be(expected);
98+
Assert.Equal(expected, actual);
10099
}
101100

102101
[Theory]
@@ -118,7 +117,7 @@ public async Task SerializeAdvanceLicenseAsYamlWorks(OpenApiSpecVersion version)
118117
// Assert
119118
actual = actual.MakeLineBreaksEnvironmentNeutral();
120119
expected = expected.MakeLineBreaksEnvironmentNeutral();
121-
actual.Should().Be(expected);
120+
Assert.Equal(expected, actual);
122121
}
123122

124123
[Fact]

‎test/Microsoft.OpenApi.Tests/Models/OpenApiOperationTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
using System.Collections.Generic;
55
using System.Threading.Tasks;
6-
using FluentAssertions;
76
using Microsoft.OpenApi.Extensions;
87
using Microsoft.OpenApi.Models;
98
using Microsoft.OpenApi.Models.References;

‎test/Microsoft.OpenApi.Tests/Models/OpenApiReferenceTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Licensed under the MIT license.
33

44
using System.Threading.Tasks;
5-
using FluentAssertions;
65
using Microsoft.OpenApi.Extensions;
76
using Microsoft.OpenApi.Models;
87
using Xunit;

‎test/Microsoft.OpenApi.Tests/Models/OpenApiResponseTests.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Globalization;
66
using System.IO;
77
using System.Threading.Tasks;
8-
using FluentAssertions;
98
using Microsoft.OpenApi.Any;
109
using Microsoft.OpenApi.Extensions;
1110
using Microsoft.OpenApi.Interfaces;
@@ -201,7 +200,7 @@ public async Task SerializeBasicResponseWorks(
201200
// Assert
202201
actual = actual.MakeLineBreaksEnvironmentNeutral();
203202
expected = expected.MakeLineBreaksEnvironmentNeutral();
204-
actual.Should().Be(expected);
203+
Assert.Equal(expected, actual);
205204
}
206205

207206
[Fact]
@@ -244,7 +243,7 @@ public async Task SerializeAdvancedResponseAsV3JsonWorks()
244243
// Assert
245244
actual = actual.MakeLineBreaksEnvironmentNeutral();
246245
expected = expected.MakeLineBreaksEnvironmentNeutral();
247-
actual.Should().Be(expected);
246+
Assert.Equal(expected, actual);
248247
}
249248

250249
[Fact]
@@ -277,7 +276,7 @@ public async Task SerializeAdvancedResponseAsV3YamlWorks()
277276
// Assert
278277
actual = actual.MakeLineBreaksEnvironmentNeutral();
279278
expected = expected.MakeLineBreaksEnvironmentNeutral();
280-
actual.Should().Be(expected);
279+
Assert.Equal(expected, actual);
281280
}
282281

283282
[Fact]
@@ -314,7 +313,7 @@ public async Task SerializeAdvancedResponseAsV2JsonWorks()
314313
// Assert
315314
actual = actual.MakeLineBreaksEnvironmentNeutral();
316315
expected = expected.MakeLineBreaksEnvironmentNeutral();
317-
actual.Should().Be(expected);
316+
Assert.Equal(expected, actual);
318317
}
319318

320319
[Fact]
@@ -344,7 +343,7 @@ public async Task SerializeAdvancedResponseAsV2YamlWorks()
344343
// Assert
345344
actual = actual.MakeLineBreaksEnvironmentNeutral();
346345
expected = expected.MakeLineBreaksEnvironmentNeutral();
347-
actual.Should().Be(expected);
346+
Assert.Equal(expected, actual);
348347
}
349348

350349
[Theory]

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public async Task SerializeBasicSecurityRequirementAsV3JsonWorks()
8383
// Assert
8484
actual = actual.MakeLineBreaksEnvironmentNeutral();
8585
expected = expected.MakeLineBreaksEnvironmentNeutral();
86-
actual.Should().Be(expected);
86+
Assert.Equal(expected, actual);
8787
}
8888

8989
[Theory]
@@ -129,7 +129,7 @@ public async Task SerializeSecurityRequirementWithReferencedSecuritySchemeAsV3Js
129129
// Assert
130130
actual = actual.MakeLineBreaksEnvironmentNeutral();
131131
expected = expected.MakeLineBreaksEnvironmentNeutral();
132-
actual.Should().Be(expected);
132+
Assert.Equal(expected, actual);
133133
}
134134

135135
[Fact]
@@ -158,7 +158,7 @@ public async Task SerializeSecurityRequirementWithReferencedSecuritySchemeAsV2Js
158158
// Assert
159159
actual = actual.MakeLineBreaksEnvironmentNeutral();
160160
expected = expected.MakeLineBreaksEnvironmentNeutral();
161-
actual.Should().Be(expected);
161+
Assert.Equal(expected, actual);
162162
}
163163

164164
[Fact]
@@ -183,7 +183,7 @@ public async Task SerializeSecurityRequirementWithUnreferencedSecuritySchemeAsV3
183183
// Assert
184184
actual = actual.MakeLineBreaksEnvironmentNeutral();
185185
expected = expected.MakeLineBreaksEnvironmentNeutral();
186-
actual.Should().Be(expected);
186+
Assert.Equal(expected, actual);
187187
}
188188

189189
[Fact]
@@ -209,7 +209,7 @@ public async Task SerializeSecurityRequirementWithUnreferencedSecuritySchemeAsV2
209209
// Assert
210210
actual = actual.MakeLineBreaksEnvironmentNeutral();
211211
expected = expected.MakeLineBreaksEnvironmentNeutral();
212-
actual.Should().Be(expected);
212+
Assert.Equal(expected, actual);
213213
}
214214

215215
[Fact]

‎test/Microsoft.OpenApi.Tests/Models/OpenApiSecuritySchemeTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Globalization;
66
using System.IO;
77
using System.Threading.Tasks;
8-
using FluentAssertions;
98
using Microsoft.OpenApi.Extensions;
109
using Microsoft.OpenApi.Models;
1110
using Microsoft.OpenApi.Models.References;

‎test/Microsoft.OpenApi.Tests/Models/OpenApiServerTests.cs

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

44
using System.Collections.Generic;
55
using System.Threading.Tasks;
6-
using FluentAssertions;
76
using Microsoft.OpenApi.Extensions;
87
using Microsoft.OpenApi.Models;
98
using Xunit;
@@ -65,7 +64,7 @@ public async Task SerializeBasicServerAsV3JsonWorks()
6564
// Assert
6665
actual = actual.MakeLineBreaksEnvironmentNeutral();
6766
expected = expected.MakeLineBreaksEnvironmentNeutral();
68-
actual.Should().Be(expected);
67+
Assert.Equal(expected, actual);
6968
}
7069

7170
[Fact]
@@ -103,7 +102,7 @@ public async Task SerializeAdvancedServerAsV3JsonWorks()
103102
// Assert
104103
actual = actual.MakeLineBreaksEnvironmentNeutral();
105104
expected = expected.MakeLineBreaksEnvironmentNeutral();
106-
actual.Should().Be(expected);
105+
Assert.Equal(expected, actual);
107106
}
108107
}
109108
}

0 commit comments

Comments
 (0)