Skip to content

Commit 00e0913

Browse files
MaggieKimani1MaggieKimani1
committed
chore: fix failing tests
1 parent 0a65a54 commit 00e0913

13 files changed

+65
-63
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ public void ParseHeaderWithEnumShouldSucceed()
6868
Type = JsonSchemaType.Number,
6969
Format = "float",
7070
Enum =
71-
{
71+
[
7272
new OpenApiAny(7).Node,
7373
new OpenApiAny(8).Node,
7474
new OpenApiAny(9).Node
75-
}
75+
]
7676
}
7777
}, options => options.IgnoringCyclicReferences()
7878
.Excluding((IMemberInfo memberInfo) =>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -543,7 +543,7 @@ public async Task SerializesBodyReferencesWorks()
543543
openApiDocument.AddComponent("UserSchema", new OpenApiSchema
544544
{
545545
Type = JsonSchemaType.Object,
546-
Properties =
546+
Properties = new Dictionary<string, IOpenApiSchema>
547547
{
548548
["name"] = new OpenApiSchema
549549
{

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,11 @@ public void ParseParameterWithEnumShouldSucceed()
265265
Type = JsonSchemaType.Number,
266266
Format = "float",
267267
Enum =
268-
{
269-
new OpenApiAny(7).Node,
270-
new OpenApiAny(8).Node,
271-
new OpenApiAny(9).Node
272-
}
268+
[
269+
new OpenApiAny(7).Node,
270+
new OpenApiAny(8).Node,
271+
new OpenApiAny(9).Node
272+
]
273273
}
274274
};
275275

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
using System.Linq;
88
using System.Net.Http;
99
using Microsoft.OpenApi.Models;
10+
using Microsoft.OpenApi.Models.Interfaces;
1011
using Microsoft.OpenApi.Reader.ParseNodes;
1112
using Microsoft.OpenApi.Reader.V2;
13+
using Microsoft.OpenApi.Writers;
1214
using Xunit;
1315

1416
namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -69,7 +71,7 @@ public class OpenApiPathItemTests
6971
Schema = new OpenApiSchema()
7072
{
7173
Type = JsonSchemaType.Object,
72-
Properties =
74+
Properties = new Dictionary<string, IOpenApiSchema>
7375
{
7476
["name"] = new OpenApiSchema()
7577
{
@@ -93,7 +95,7 @@ public class OpenApiPathItemTests
9395
Schema = new OpenApiSchema()
9496
{
9597
Type = JsonSchemaType.Object,
96-
Properties =
98+
Properties = new Dictionary<string, IOpenApiSchema>
9799
{
98100
["name"] = new OpenApiSchema()
99101
{
@@ -175,7 +177,7 @@ public class OpenApiPathItemTests
175177
Schema = new OpenApiSchema()
176178
{
177179
Type = JsonSchemaType.Object,
178-
Properties =
180+
Properties = new Dictionary<string, IOpenApiSchema>
179181
{
180182
["name"] = new OpenApiSchema()
181183
{
@@ -204,7 +206,7 @@ public class OpenApiPathItemTests
204206
Schema = new OpenApiSchema()
205207
{
206208
Type = JsonSchemaType.Object,
207-
Properties =
209+
Properties = new Dictionary<string, IOpenApiSchema>
208210
{
209211
["name"] = new OpenApiSchema()
210212
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,7 @@ public async Task SerializesDoubleHopeReferences()
12471247
{
12481248
Type = JsonSchemaType.Object,
12491249
Description = "A pet",
1250-
Properties =
1250+
Properties = new Dictionary<string, IOpenApiSchema>
12511251
{
12521252
["id"] = new OpenApiSchema
12531253
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,12 @@ public async Task ParseQueryParameterWithObjectTypeAndContentShouldSucceed()
117117
Schema = new OpenApiSchema()
118118
{
119119
Type = JsonSchemaType.Object,
120-
Required =
120+
Required = new HashSet<string>
121121
{
122122
"lat",
123123
"long"
124124
},
125-
Properties =
125+
Properties = new Dictionary<string, IOpenApiSchema>
126126
{
127127
["lat"] = new OpenApiSchema()
128128
{

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

Lines changed: 31 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using System.Threading.Tasks;
1919
using System.Net.Http;
2020
using Microsoft.OpenApi.YamlReader;
21+
using Microsoft.OpenApi.Models.Interfaces;
2122

2223
namespace Microsoft.OpenApi.Readers.Tests.V3Tests
2324
{
@@ -194,7 +195,7 @@ public void ParseBasicSchemaWithExampleShouldSucceed()
194195
new OpenApiSchema
195196
{
196197
Type = JsonSchemaType.Object,
197-
Properties =
198+
Properties = new Dictionary<string, IOpenApiSchema>
198199
{
199200
["id"] = new OpenApiSchema()
200201
{
@@ -206,7 +207,7 @@ public void ParseBasicSchemaWithExampleShouldSucceed()
206207
Type = JsonSchemaType.String
207208
}
208209
},
209-
Required =
210+
Required = new HashSet<string>
210211
{
211212
"name"
212213
},
@@ -245,7 +246,7 @@ public async Task ParseBasicSchemaWithReferenceShouldSucceed()
245246
["ErrorModel"] = new OpenApiSchema()
246247
{
247248
Type = JsonSchemaType.Object,
248-
Properties =
249+
Properties = new Dictionary<string, IOpenApiSchema>
249250
{
250251
["code"] = new OpenApiSchema()
251252
{
@@ -258,7 +259,7 @@ public async Task ParseBasicSchemaWithReferenceShouldSucceed()
258259
Type = JsonSchemaType.String
259260
}
260261
},
261-
Required =
262+
Required = new HashSet<string>
262263
{
263264
"message",
264265
"code"
@@ -267,21 +268,21 @@ public async Task ParseBasicSchemaWithReferenceShouldSucceed()
267268
["ExtendedErrorModel"] = new OpenApiSchema()
268269
{
269270
AllOf =
270-
{
271+
[
271272
new OpenApiSchemaReference("ErrorModel", result.Document),
272273
new OpenApiSchema
273274
{
274275
Type = JsonSchemaType.Object,
275-
Required = {"rootCause"},
276-
Properties =
276+
Required = new HashSet<string> {"rootCause"},
277+
Properties = new Dictionary<string, IOpenApiSchema>
277278
{
278279
["rootCause"] = new OpenApiSchema()
279280
{
280281
Type = JsonSchemaType.String
281282
}
282283
}
283284
}
284-
}
285+
]
285286
}
286287
}
287288
};
@@ -306,7 +307,7 @@ public async Task ParseAdvancedSchemaWithReferenceShouldSucceed()
306307
{
307308
PropertyName = "petType"
308309
},
309-
Properties =
310+
Properties = new Dictionary<string, IOpenApiSchema>
310311
{
311312
["name"] = new OpenApiSchema()
312313
{
@@ -317,7 +318,7 @@ public async Task ParseAdvancedSchemaWithReferenceShouldSucceed()
317318
Type = JsonSchemaType.String
318319
}
319320
},
320-
Required =
321+
Required = new HashSet<string>
321322
{
322323
"name",
323324
"petType"
@@ -327,41 +328,41 @@ public async Task ParseAdvancedSchemaWithReferenceShouldSucceed()
327328
{
328329
Description = "A representation of a cat",
329330
AllOf =
330-
{
331+
[
331332
new OpenApiSchemaReference("Pet", result.Document),
332333
new OpenApiSchema
333334
{
334335
Type = JsonSchemaType.Object,
335-
Required = {"huntingSkill"},
336-
Properties =
336+
Required = new HashSet<string>{"huntingSkill"},
337+
Properties = new Dictionary<string, IOpenApiSchema>
337338
{
338339
["huntingSkill"] = new OpenApiSchema()
339340
{
340341
Type = JsonSchemaType.String,
341342
Description = "The measured skill for hunting",
342343
Enum =
343-
{
344+
[
344345
"clueless",
345346
"lazy",
346347
"adventurous",
347348
"aggressive"
348-
}
349+
]
349350
}
350351
}
351352
}
352-
}
353+
]
353354
},
354355
["Dog"] = new OpenApiSchema()
355356
{
356357
Description = "A representation of a dog",
357358
AllOf =
358-
{
359+
[
359360
new OpenApiSchemaReference("Pet", result.Document),
360361
new OpenApiSchema
361362
{
362363
Type = JsonSchemaType.Object,
363-
Required = {"packSize"},
364-
Properties =
364+
Required = new HashSet<string>{"packSize"},
365+
Properties = new Dictionary<string, IOpenApiSchema>
365366
{
366367
["packSize"] = new OpenApiSchema()
367368
{
@@ -373,7 +374,7 @@ public async Task ParseAdvancedSchemaWithReferenceShouldSucceed()
373374
}
374375
}
375376
}
376-
}
377+
]
377378
}
378379
}
379380
};
@@ -408,37 +409,37 @@ public async Task ParseExternalReferenceSchemaShouldSucceed()
408409
["RelativePathModel"] = new OpenApiSchema()
409410
{
410411
AllOf =
411-
{
412+
[
412413
new OpenApiSchemaReference("ExternalRelativePathModel", result.Document, "./FirstLevel/SecondLevel/ThridLevel/File.json")
413-
}
414+
]
414415
},
415416
["SimpleRelativePathModel"] = new OpenApiSchema()
416417
{
417418
AllOf =
418-
{
419+
[
419420
new OpenApiSchemaReference("ExternalSimpleRelativePathModel", result.Document, "File.json")
420-
}
421+
]
421422
},
422423
["AbsoluteWindowsPathModel"] = new OpenApiSchema()
423424
{
424425
AllOf =
425-
{
426+
[
426427
new OpenApiSchemaReference("ExternalAbsWindowsPathModel", result.Document, @"A:\Dir\File.json")
427-
}
428+
]
428429
},
429430
["AbsoluteUnixPathModel"] = new OpenApiSchema()
430431
{
431432
AllOf =
432-
{
433+
[
433434
new OpenApiSchemaReference("ExternalAbsUnixPathModel", result.Document, "/Dir/File.json")
434-
}
435+
]
435436
},
436437
["HttpsUrlModel"] = new OpenApiSchema()
437438
{
438439
AllOf =
439-
{
440+
[
440441
new OpenApiSchemaReference("ExternalHttpsModel", result.Document, "https://host.lan:1234/path/to/file/resource.json")
441-
}
442+
]
442443
}
443444
}
444445
};

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public class OpenApiComponentsTests
157157
["schema2"] = new OpenApiSchema()
158158
{
159159
Type = JsonSchemaType.Object,
160-
Properties =
160+
Properties = new Dictionary<string, IOpenApiSchema>
161161
{
162162
["property1"] = new OpenApiSchema()
163163
{
@@ -175,7 +175,7 @@ public class OpenApiComponentsTests
175175
["schema1"] = new OpenApiSchema()
176176
{
177177
Type = JsonSchemaType.Object,
178-
Properties =
178+
Properties = new Dictionary<string, IOpenApiSchema>
179179
{
180180
["property1"] = new OpenApiSchema()
181181
{
@@ -186,7 +186,7 @@ public class OpenApiComponentsTests
186186
["schema2"] = new OpenApiSchema()
187187
{
188188
Type = JsonSchemaType.Object,
189-
Properties =
189+
Properties = new Dictionary<string, IOpenApiSchema>
190190
{
191191
["property1"] = new OpenApiSchema()
192192
{

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
using Microsoft.OpenApi.Models;
1414
using Microsoft.OpenApi.Models.Interfaces;
1515
using Microsoft.OpenApi.Models.References;
16-
using Microsoft.OpenApi.Reader;
1716
using Microsoft.OpenApi.Writers;
18-
using Microsoft.OpenApi.YamlReader;
1917
using Microsoft.VisualBasic;
2018
using VerifyXunit;
2119
using Xunit;
@@ -33,7 +31,7 @@ public class OpenApiDocumentTests
3331
["schema2"] = new OpenApiSchema()
3432
{
3533
Type = JsonSchemaType.Object,
36-
Properties =
34+
Properties = new Dictionary<string, IOpenApiSchema>
3735
{
3836
["property1"] = new OpenApiSchema()
3937
{
@@ -52,7 +50,7 @@ public class OpenApiDocumentTests
5250
["schema1"] = new OpenApiSchema()
5351
{
5452
Type = JsonSchemaType.Object,
55-
Properties =
53+
Properties = new Dictionary<string, IOpenApiSchema>
5654
{
5755
["property1"] = new OpenApiSchema()
5856
{
@@ -65,7 +63,7 @@ public class OpenApiDocumentTests
6563
["schema2"] = new OpenApiSchema()
6664
{
6765
Type = JsonSchemaType.Object,
68-
Properties =
66+
Properties = new Dictionary<string, IOpenApiSchema>
6967
{
7068
["property1"] = new OpenApiSchema()
7169
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ private static OpenApiDocument __advancedOperationWithTagsAndSecurity_supporting
228228
{
229229
Schema = new OpenApiSchema()
230230
{
231-
Properties =
231+
Properties = new Dictionary<string, IOpenApiSchema>
232232
{
233233
["name"] = new OpenApiSchema()
234234
{
@@ -251,7 +251,7 @@ private static OpenApiDocument __advancedOperationWithTagsAndSecurity_supporting
251251
{
252252
Schema = new OpenApiSchema()
253253
{
254-
Properties =
254+
Properties = new Dictionary<string, IOpenApiSchema>
255255
{
256256
["name"] = new OpenApiSchema()
257257
{

0 commit comments

Comments
 (0)