Skip to content

Commit 865872d

Browse files
baywetbaywet
committed
chore: FA replacement additional batch
Signed-off-by: Vincent Biret <vibiret@microsoft.com>
1 parent 3ceaa12 commit 865872d

File tree

6 files changed

+53
-61
lines changed

6 files changed

+53
-61
lines changed

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

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1484,8 +1484,7 @@ public async Task SerializeSimpleDocumentWithTopLevelReferencingComponentsAsYaml
14841484

14851485
// Assert
14861486
actual = actual.MakeLineBreaksEnvironmentNeutral();
1487-
expected = expected.MakeLineBreaksEnvironmentNeutral();
1488-
actual.Should().Be(expected);
1487+
Assert.Equal(expected, actual);
14891488
}
14901489

14911490
[Fact]
@@ -1504,8 +1503,7 @@ public async Task SerializeSimpleDocumentWithTopLevelSelfReferencingComponentsAs
15041503

15051504
// Assert
15061505
actual = actual.MakeLineBreaksEnvironmentNeutral();
1507-
expected = expected.MakeLineBreaksEnvironmentNeutral();
1508-
actual.Should().Be(expected);
1506+
Assert.Equal(expected, actual);
15091507
}
15101508

15111509
[Fact]
@@ -1533,8 +1531,7 @@ public async Task SerializeSimpleDocumentWithTopLevelSelfReferencingWithOtherPro
15331531

15341532
// Assert
15351533
actual = actual.MakeLineBreaksEnvironmentNeutral();
1536-
expected = expected.MakeLineBreaksEnvironmentNeutral();
1537-
actual.Should().Be(expected);
1534+
Assert.Equal(expected, actual);
15381535
}
15391536

15401537
[Fact]
@@ -1615,8 +1612,7 @@ public async Task SerializeRelativePathAsV2JsonWorks()
16151612

16161613
// Assert
16171614
actual = actual.MakeLineBreaksEnvironmentNeutral();
1618-
expected = expected.MakeLineBreaksEnvironmentNeutral();
1619-
actual.Should().Be(expected);
1615+
Assert.Equal(expected, actual);
16201616
}
16211617

16221618
[Fact]
@@ -1646,8 +1642,7 @@ public async Task SerializeRelativePathWithHostAsV2JsonWorks()
16461642

16471643
// Assert
16481644
actual = actual.MakeLineBreaksEnvironmentNeutral();
1649-
expected = expected.MakeLineBreaksEnvironmentNeutral();
1650-
actual.Should().Be(expected);
1645+
Assert.Equal(expected, actual);
16511646
}
16521647

16531648
[Fact]
@@ -1676,8 +1671,7 @@ public async Task SerializeRelativeRootPathWithHostAsV2JsonWorks()
16761671

16771672
// Assert
16781673
actual = actual.MakeLineBreaksEnvironmentNeutral();
1679-
expected = expected.MakeLineBreaksEnvironmentNeutral();
1680-
actual.Should().Be(expected);
1674+
Assert.Equal(expected, actual);
16811675
}
16821676

16831677
[Fact]
@@ -1762,8 +1756,7 @@ public async Task SerializeV2DocumentWithNonArraySchemaTypeDoesNotWriteOutCollec
17621756

17631757
// Assert
17641758
actual = actual.MakeLineBreaksEnvironmentNeutral();
1765-
expected = expected.MakeLineBreaksEnvironmentNeutral();
1766-
actual.Should().Be(expected);
1759+
Assert.Equal(expected, actual);
17671760
}
17681761

17691762
[Fact]
@@ -1851,8 +1844,7 @@ public async Task SerializeV2DocumentWithStyleAsNullDoesNotWriteOutStyleValue()
18511844

18521845
// Assert
18531846
actual = actual.MakeLineBreaksEnvironmentNeutral();
1854-
expected = expected.MakeLineBreaksEnvironmentNeutral();
1855-
actual.Should().Be(expected);
1847+
Assert.Equal(expected, actual);
18561848
}
18571849

18581850
[Fact]

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public async Task SerializeBasicMediaTypeAsV3Works(OpenApiFormat format, string
141141
// Assert
142142
actual = actual.MakeLineBreaksEnvironmentNeutral();
143143
expected = expected.MakeLineBreaksEnvironmentNeutral();
144-
actual.Should().Be(expected);
144+
Assert.Equal(expected, actual);
145145
}
146146

147147
[Fact]
@@ -169,7 +169,7 @@ public async Task SerializeAdvanceMediaTypeAsV3JsonWorks()
169169
// Assert
170170
actual = actual.MakeLineBreaksEnvironmentNeutral();
171171
expected = expected.MakeLineBreaksEnvironmentNeutral();
172-
actual.Should().Be(expected);
172+
Assert.Equal(expected, actual);
173173
}
174174

175175
[Fact]
@@ -193,7 +193,7 @@ public async Task SerializeAdvanceMediaTypeAsV3YamlWorks()
193193
// Assert
194194
actual = actual.MakeLineBreaksEnvironmentNeutral();
195195
expected = expected.MakeLineBreaksEnvironmentNeutral();
196-
actual.Should().Be(expected);
196+
Assert.Equal(expected, actual);
197197
}
198198

199199
[Fact]
@@ -228,7 +228,7 @@ public async Task SerializeMediaTypeWithObjectExampleAsV3YamlWorks()
228228
// Assert
229229
actual = actual.MakeLineBreaksEnvironmentNeutral();
230230
expected = expected.MakeLineBreaksEnvironmentNeutral();
231-
actual.Should().Be(expected);
231+
Assert.Equal(expected, actual);
232232
}
233233

234234
[Fact]
@@ -279,7 +279,7 @@ public async Task SerializeMediaTypeWithObjectExampleAsV3JsonWorks()
279279
// Assert
280280
actual = actual.MakeLineBreaksEnvironmentNeutral();
281281
expected = expected.MakeLineBreaksEnvironmentNeutral();
282-
actual.Should().Be(expected);
282+
Assert.Equal(expected, actual);
283283
}
284284

285285
[Fact]
@@ -303,7 +303,7 @@ public async Task SerializeMediaTypeWithXmlExampleAsV3YamlWorks()
303303
// Assert
304304
actual = actual.MakeLineBreaksEnvironmentNeutral();
305305
expected = expected.MakeLineBreaksEnvironmentNeutral();
306-
actual.Should().Be(expected);
306+
Assert.Equal(expected, actual);
307307
}
308308

309309
[Fact]
@@ -331,7 +331,7 @@ public async Task SerializeMediaTypeWithXmlExampleAsV3JsonWorks()
331331
// Assert
332332
actual = actual.MakeLineBreaksEnvironmentNeutral();
333333
expected = expected.MakeLineBreaksEnvironmentNeutral();
334-
actual.Should().Be(expected);
334+
Assert.Equal(expected, actual);
335335
}
336336

337337
[Fact]
@@ -369,7 +369,7 @@ public async Task SerializeMediaTypeWithObjectExamplesAsV3YamlWorks()
369369
// Assert
370370
actual = actual.MakeLineBreaksEnvironmentNeutral();
371371
expected = expected.MakeLineBreaksEnvironmentNeutral();
372-
actual.Should().Be(expected);
372+
Assert.Equal(expected, actual);
373373
}
374374

375375
[Fact]
@@ -425,7 +425,7 @@ public async Task SerializeMediaTypeWithObjectExamplesAsV3JsonWorks()
425425
// Assert
426426
actual = actual.MakeLineBreaksEnvironmentNeutral();
427427
expected = expected.MakeLineBreaksEnvironmentNeutral();
428-
actual.Should().Be(expected);
428+
Assert.Equal(expected, actual);
429429
}
430430

431431
[Fact]

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ public async Task SerializeBasicOperationAsV3JsonWorks()
273273
// Assert
274274
actual = actual.MakeLineBreaksEnvironmentNeutral();
275275
expected = expected.MakeLineBreaksEnvironmentNeutral();
276-
actual.Should().Be(expected);
276+
Assert.Equal(expected, actual);
277277
}
278278

279279
[Fact]
@@ -345,7 +345,7 @@ public async Task SerializeOperationWithBodyAsV3JsonWorks()
345345
// Assert
346346
actual = actual.MakeLineBreaksEnvironmentNeutral();
347347
expected = expected.MakeLineBreaksEnvironmentNeutral();
348-
actual.Should().Be(expected);
348+
Assert.Equal(expected, actual);
349349
}
350350

351351
[Fact]
@@ -429,7 +429,7 @@ public async Task SerializeAdvancedOperationWithTagAndSecurityAsV3JsonWorks()
429429
// Assert
430430
actual = actual.MakeLineBreaksEnvironmentNeutral();
431431
expected = expected.MakeLineBreaksEnvironmentNeutral();
432-
actual.Should().Be(expected);
432+
Assert.Equal(expected, actual);
433433
}
434434

435435
[Fact]
@@ -449,7 +449,7 @@ public async Task SerializeBasicOperationAsV2JsonWorks()
449449
// Assert
450450
actual = actual.MakeLineBreaksEnvironmentNeutral();
451451
expected = expected.MakeLineBreaksEnvironmentNeutral();
452-
actual.Should().Be(expected);
452+
Assert.Equal(expected, actual);
453453
}
454454

455455
[Fact]
@@ -528,7 +528,7 @@ public async Task SerializeOperationWithFormDataAsV3JsonWorks()
528528
// Assert
529529
actual = actual.MakeLineBreaksEnvironmentNeutral();
530530
expected = expected.MakeLineBreaksEnvironmentNeutral();
531-
actual.Should().Be(expected);
531+
Assert.Equal(expected, actual);
532532
}
533533

534534
[Fact]
@@ -584,7 +584,7 @@ public async Task SerializeOperationWithFormDataAsV2JsonWorks()
584584
// Assert
585585
actual = actual.MakeLineBreaksEnvironmentNeutral();
586586
expected = expected.MakeLineBreaksEnvironmentNeutral();
587-
actual.Should().Be(expected);
587+
Assert.Equal(expected, actual);
588588
}
589589

590590
[Fact]
@@ -653,7 +653,7 @@ public async Task SerializeOperationWithBodyAsV2JsonWorks()
653653
// Assert
654654
actual = actual.MakeLineBreaksEnvironmentNeutral();
655655
expected = expected.MakeLineBreaksEnvironmentNeutral();
656-
actual.Should().Be(expected);
656+
Assert.Equal(expected, actual);
657657
}
658658

659659
[Fact]
@@ -734,7 +734,7 @@ public async Task SerializeAdvancedOperationWithTagAndSecurityAsV2JsonWorks()
734734
// Assert
735735
actual = actual.MakeLineBreaksEnvironmentNeutral();
736736
expected = expected.MakeLineBreaksEnvironmentNeutral();
737-
actual.Should().Be(expected);
737+
Assert.Equal(expected, actual);
738738
}
739739

740740
[Fact]
@@ -759,7 +759,7 @@ public async Task SerializeOperationWithNullCollectionAsV2JsonWorks()
759759
// Assert
760760
actual = actual.MakeLineBreaksEnvironmentNeutral();
761761
expected = expected.MakeLineBreaksEnvironmentNeutral();
762-
actual.Should().Be(expected);
762+
Assert.Equal(expected, actual);
763763
}
764764

765765
[Fact]
@@ -822,7 +822,7 @@ public async Task EnsureOpenApiOperationCopyConstructor_SerializationResultsInSa
822822
var actual = await openApiOperation.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_0);
823823

824824
// Assert
825-
actual.Should().Be(expected);
825+
Assert.Equal(expected, actual);
826826
}
827827
}
828828

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public void SettingInternalReferenceForComponentsStyleReferenceShouldSucceed(
3030

3131
// Assert
3232
Assert.Null(reference.ExternalResource);
33-
reference.Type.Should().Be(type);
34-
reference.Id.Should().Be(id);
33+
Assert.Equal(type, reference.Type);
34+
Assert.Equal(id, reference.Id);
3535

36-
reference.ReferenceV3.Should().Be(input);
37-
reference.ReferenceV2.Should().Be(input.Replace("schemas", "definitions").Replace("/components", ""));
36+
Assert.Equal(input, reference.ReferenceV3);
37+
Assert.Equal(input.Replace("schemas", "definitions").Replace("/components", ""), reference.ReferenceV2);
3838
}
3939

4040
[Theory]
@@ -55,10 +55,10 @@ public void SettingExternalReferenceV3ShouldSucceed(string expected, string exte
5555
};
5656

5757
// Assert
58-
reference.ExternalResource.Should().Be(externalResource);
59-
reference.Id.Should().Be(id);
58+
Assert.Equal(externalResource, reference.ExternalResource);
59+
Assert.Equal(id, reference.Id);
6060

61-
reference.ReferenceV3.Should().Be(expected);
61+
Assert.Equal(expected, reference.ReferenceV3);
6262
}
6363

6464
[Theory]
@@ -79,10 +79,10 @@ public void SettingExternalReferenceV2ShouldSucceed(string expected, string exte
7979
};
8080

8181
// Assert
82-
reference.ExternalResource.Should().Be(externalResource);
83-
reference.Id.Should().Be(id);
82+
Assert.Equal(externalResource, reference.ExternalResource);
83+
Assert.Equal(id, reference.Id);
8484

85-
reference.ReferenceV2.Should().Be(expected);
85+
Assert.Equal(expected, reference.ReferenceV2);
8686
}
8787

8888
[Fact]
@@ -103,7 +103,7 @@ public async Task SerializeSchemaReferenceAsJsonV3Works()
103103
actual = actual.MakeLineBreaksEnvironmentNeutral();
104104

105105
// Assert
106-
actual.Should().Be(expected);
106+
Assert.Equal(expected, actual);
107107
}
108108

109109
[Fact]
@@ -122,7 +122,7 @@ public async Task SerializeSchemaReferenceAsYamlV3Works()
122122
var actual = await reference.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0);
123123

124124
// Assert
125-
actual.Should().Be(expected);
125+
Assert.Equal(expected, actual);
126126
}
127127

128128
[Fact]
@@ -146,7 +146,7 @@ public async Task SerializeSchemaReferenceAsJsonV2Works()
146146
var actual = await reference.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi2_0);
147147

148148
// Assert
149-
actual.MakeLineBreaksEnvironmentNeutral().Should().Be(expected);
149+
Assert.Equal(expected, actual.MakeLineBreaksEnvironmentNeutral());
150150
}
151151

152152
[Fact]
@@ -164,7 +164,7 @@ public async Task SerializeSchemaReferenceAsYamlV2Works()
164164
var actual = await reference.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0);
165165

166166
// Assert
167-
actual.Should().Be(expected);
167+
Assert.Equal(expected, actual);
168168
}
169169

170170
[Fact]
@@ -191,7 +191,7 @@ public async Task SerializeExternalReferenceAsJsonV2Works()
191191
actual = actual.MakeLineBreaksEnvironmentNeutral();
192192

193193
// Assert
194-
actual.Should().Be(expected);
194+
Assert.Equal(expected, actual);
195195
}
196196

197197
[Fact]
@@ -210,7 +210,7 @@ public async Task SerializeExternalReferenceAsYamlV2Works()
210210
var actual = await reference.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi2_0);
211211

212212
// Assert
213-
actual.Should().Be(expected);
213+
Assert.Equal(expected, actual);
214214
}
215215

216216
[Fact]
@@ -232,7 +232,7 @@ public async Task SerializeExternalReferenceAsJsonV3Works()
232232
actual = actual.MakeLineBreaksEnvironmentNeutral();
233233

234234
// Assert
235-
actual.Should().Be(expected);
235+
Assert.Equal(expected, actual);
236236
}
237237

238238
[Fact]
@@ -246,7 +246,7 @@ public async Task SerializeExternalReferenceAsYamlV3Works()
246246
var actual = await reference.SerializeAsYamlAsync(OpenApiSpecVersion.OpenApi3_0);
247247

248248
// Assert
249-
actual.Should().Be(expected);
249+
Assert.Equal(expected, actual);
250250
}
251251
}
252252
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -627,7 +627,7 @@ public async Task SerializeSchemaWithUnrecognizedPropertiesWorks()
627627
var actual = await schema.SerializeAsJsonAsync(OpenApiSpecVersion.OpenApi3_1);
628628

629629
// Assert
630-
Assert.Equal(expected, actual);
630+
Assert.Equal(expected.MakeLineBreaksEnvironmentNeutral(), actual.MakeLineBreaksEnvironmentNeutral());
631631
}
632632

633633
internal class SchemaVisitor : OpenApiVisitorBase

0 commit comments

Comments
 (0)