Skip to content

Commit 82ea7b7

Browse files
MaggieKimani1MaggieKimani1
committed
Fix failing tests
1 parent 49a9435 commit 82ea7b7

File tree

27 files changed

+658
-671
lines changed

27 files changed

+658
-671
lines changed

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

Lines changed: 21 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
using System.Linq;
88
using System.Threading;
99
using FluentAssertions;
10+
using FluentAssertions.Equivalency;
1011
using Microsoft.OpenApi.Any;
11-
using Microsoft.OpenApi.Exceptions;
1212
using Microsoft.OpenApi.Models;
13+
using Microsoft.OpenApi.Models.References;
1314
using Microsoft.OpenApi.Reader;
1415
using Xunit;
1516

@@ -24,59 +25,6 @@ public OpenApiDocumentTests()
2425
OpenApiReaderRegistry.RegisterReader("yaml", new OpenApiYamlReader());
2526
}
2627

27-
[Fact]
28-
public void ShouldThrowWhenReferenceTypeIsInvalid()
29-
{
30-
var input =
31-
"""
32-
swagger: 2.0
33-
info:
34-
title: test
35-
version: 1.0.0
36-
paths:
37-
'/':
38-
get:
39-
responses:
40-
'200':
41-
description: ok
42-
schema:
43-
$ref: '#/defi888nition/does/notexist'
44-
""";
45-
46-
var result = OpenApiDocument.Parse(input, "yaml");
47-
48-
result.OpenApiDiagnostic.Errors.Should().BeEquivalentTo(new List<OpenApiError> {
49-
new( new OpenApiException("Unknown reference type 'defi888nition'")) });
50-
result.OpenApiDocument.Should().NotBeNull();
51-
}
52-
53-
[Fact]
54-
public void ShouldThrowWhenReferenceDoesNotExist()
55-
{
56-
var input =
57-
"""
58-
swagger: 2.0
59-
info:
60-
title: test
61-
version: 1.0.0
62-
paths:
63-
'/':
64-
get:
65-
produces: ['application/json']
66-
responses:
67-
'200':
68-
description: ok
69-
schema:
70-
$ref: '#/definitions/doesnotexist'
71-
""";
72-
73-
var result = OpenApiDocument.Parse(input, "yaml");
74-
75-
result.OpenApiDiagnostic.Errors.Should().BeEquivalentTo(new List<OpenApiError> {
76-
new( new OpenApiException("Invalid Reference identifier 'doesnotexist'.")) });
77-
result.OpenApiDocument.Should().NotBeNull();
78-
}
79-
8028
[Theory]
8129
[InlineData("en-US")]
8230
[InlineData("hi-IN")]
@@ -138,20 +86,26 @@ public void ParseDocumentWithDifferentCultureShouldSucceed(string culture)
13886
ExclusiveMaximum = true,
13987
ExclusiveMinimum = false
14088
}
141-
},
142-
Reference = new()
143-
{
144-
Id = "sampleSchema",
145-
Type = ReferenceType.Schema
14689
}
14790
}
14891
}
14992
},
15093
Paths = new()
151-
});
94+
}, options => options
95+
.Excluding(x=> x.BaseUri)
96+
.Excluding((IMemberInfo memberInfo) =>
97+
memberInfo.Path.EndsWith("Parent"))
98+
.Excluding((IMemberInfo memberInfo) =>
99+
memberInfo.Path.EndsWith("Root")));
152100

153101
result.OpenApiDiagnostic.Should().BeEquivalentTo(
154-
new OpenApiDiagnostic { SpecificationVersion = OpenApiSpecVersion.OpenApi2_0 });
102+
new OpenApiDiagnostic {
103+
SpecificationVersion = OpenApiSpecVersion.OpenApi2_0,
104+
Errors = new List<OpenApiError>()
105+
{
106+
new OpenApiError("", "Paths is a REQUIRED field at #/")
107+
}
108+
});
155109
}
156110

157111
[Fact]
@@ -161,12 +115,6 @@ public void ShouldParseProducesInAnyOrder()
161115

162116
var okSchema = new OpenApiSchema
163117
{
164-
Reference = new()
165-
{
166-
Type = ReferenceType.Schema,
167-
Id = "Item",
168-
HostDocument = result.OpenApiDocument
169-
},
170118
Properties = new Dictionary<string, OpenApiSchema>
171119
{
172120
{ "id", new OpenApiSchema
@@ -180,12 +128,6 @@ public void ShouldParseProducesInAnyOrder()
180128

181129
var errorSchema = new OpenApiSchema
182130
{
183-
Reference = new()
184-
{
185-
Type = ReferenceType.Schema,
186-
Id = "Error",
187-
HostDocument = result.OpenApiDocument
188-
},
189131
Properties = new Dictionary<string, OpenApiSchema>
190132
{
191133
{ "code", new OpenApiSchema
@@ -212,13 +154,13 @@ public void ShouldParseProducesInAnyOrder()
212154
Schema = new()
213155
{
214156
Type = "array",
215-
Items = okSchema
157+
Items = new OpenApiSchemaReference("Item", result.OpenApiDocument)
216158
}
217159
};
218160

219161
var errorMediaType = new OpenApiMediaType
220162
{
221-
Schema = errorSchema
163+
Schema = new OpenApiSchemaReference("Error", result.OpenApiDocument)
222164
};
223165

224166
result.OpenApiDocument.Should().BeEquivalentTo(new OpenApiDocument
@@ -322,7 +264,7 @@ public void ShouldParseProducesInAnyOrder()
322264
["Error"] = errorSchema
323265
}
324266
}
325-
});
267+
}, options => options.Excluding(x => x.BaseUri));
326268
}
327269

328270
[Fact]
@@ -336,51 +278,10 @@ public void ShouldAssignSchemaToAllResponses()
336278
var successSchema = new OpenApiSchema
337279
{
338280
Type = "array",
339-
Items = new()
340-
{
341-
Properties = {
342-
{ "id", new OpenApiSchema
343-
{
344-
Type = "string",
345-
Description = "Item identifier."
346-
}
347-
}
348-
},
349-
Reference = new()
350-
{
351-
Id = "Item",
352-
Type = ReferenceType.Schema,
353-
HostDocument = result.OpenApiDocument
354-
}
355-
}
356-
};
357-
var errorSchema = new OpenApiSchema
358-
{
359-
Properties = {
360-
{ "code", new OpenApiSchema
361-
{
362-
Type = "integer",
363-
Format = "int32"
364-
}
365-
},
366-
{ "message", new OpenApiSchema
367-
{
368-
Type = "string"
369-
}
370-
},
371-
{ "fields", new OpenApiSchema
372-
{
373-
Type = "string"
374-
}
375-
}
376-
},
377-
Reference = new()
378-
{
379-
Id = "Error",
380-
Type = ReferenceType.Schema,
381-
HostDocument = result.OpenApiDocument
382-
}
281+
Items = new OpenApiSchemaReference("Item", result.OpenApiDocument)
383282
};
283+
var errorSchema = new OpenApiSchemaReference("Error", result.OpenApiDocument);
284+
384285
var responses = result.OpenApiDocument.Paths["/items"].Operations[OperationType.Get].Responses;
385286
foreach (var response in responses)
386287
{

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

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

44
using System.IO;
55
using FluentAssertions;
6+
using FluentAssertions.Equivalency;
67
using Microsoft.OpenApi.Any;
78
using Microsoft.OpenApi.Models;
89
using Microsoft.OpenApi.Reader.ParseNodes;
@@ -41,7 +42,8 @@ public void ParseHeaderWithDefaultShouldSucceed()
4142
}
4243
},
4344
options => options
44-
.IgnoringCyclicReferences());
45+
.IgnoringCyclicReferences()
46+
.Excluding(x => x.Schema.Default.Node.Parent));
4547
}
4648

4749
[Fact]
@@ -73,7 +75,8 @@ public void ParseHeaderWithEnumShouldSucceed()
7375
}
7476
}
7577
}, options => options.IgnoringCyclicReferences()
76-
);
78+
.Excluding((IMemberInfo memberInfo) =>
79+
memberInfo.Path.EndsWith("Parent")));
7780
}
7881
}
7982
}

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

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

44
using System.IO;
55
using FluentAssertions;
6+
using FluentAssertions.Equivalency;
67
using Microsoft.OpenApi.Any;
78
using Microsoft.OpenApi.Models;
89
using Microsoft.OpenApi.Reader.ParseNodes;
@@ -232,7 +233,7 @@ public void ParseParameterWithDefaultShouldSucceed()
232233
Format = "float",
233234
Default = new OpenApiAny(5)
234235
}
235-
}, options => options.IgnoringCyclicReferences());
236+
}, options => options.IgnoringCyclicReferences().Excluding(x => x.Schema.Default.Node.Parent));
236237
}
237238

238239
[Fact]
@@ -247,27 +248,30 @@ public void ParseParameterWithEnumShouldSucceed()
247248

248249
// Act
249250
var parameter = OpenApiV2Deserializer.LoadParameter(node);
250-
251-
// Assert
252-
parameter.Should().BeEquivalentTo(
253-
new OpenApiParameter
251+
var expected = new OpenApiParameter
252+
{
253+
In = ParameterLocation.Path,
254+
Name = "username",
255+
Description = "username to fetch",
256+
Required = true,
257+
Schema = new()
254258
{
255-
In = ParameterLocation.Path,
256-
Name = "username",
257-
Description = "username to fetch",
258-
Required = true,
259-
Schema = new()
260-
{
261-
Type = "number",
262-
Format = "float",
263-
Enum =
259+
Type = "number",
260+
Format = "float",
261+
Enum =
264262
{
265263
new OpenApiAny(7).Node,
266264
new OpenApiAny(8).Node,
267265
new OpenApiAny(9).Node
268266
}
269-
}
270-
}, options => options.IgnoringCyclicReferences());
267+
}
268+
};
269+
270+
// Assert
271+
parameter.Should().BeEquivalentTo(expected, options => options
272+
.IgnoringCyclicReferences()
273+
.Excluding((IMemberInfo memberInfo) =>
274+
memberInfo.Path.EndsWith("Parent")));
271275
}
272276
}
273277
}

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using Microsoft.OpenApi.Any;
1111
using System.Text.Json.Nodes;
1212
using System.Collections.Generic;
13+
using FluentAssertions.Equivalency;
1314

1415
namespace Microsoft.OpenApi.Readers.Tests.V2Tests
1516
{
@@ -37,7 +38,7 @@ public void ParseSchemaWithDefaultShouldSucceed()
3738
Type = "number",
3839
Format = "float",
3940
Default = new OpenApiAny(5)
40-
});
41+
}, options => options.IgnoringCyclicReferences().Excluding(x => x.Default.Node.Parent));
4142
}
4243

4344
[Fact]
@@ -60,7 +61,7 @@ public void ParseSchemaWithExampleShouldSucceed()
6061
Type = "number",
6162
Format = "float",
6263
Example = new OpenApiAny(5)
63-
});
64+
}, options => options.IgnoringCyclicReferences().Excluding(x => x.Example.Node.Parent));
6465
}
6566

6667
[Fact]
@@ -88,8 +89,11 @@ public void ParseSchemaWithEnumShouldSucceed()
8889
new OpenApiAny(9).Node
8990
}
9091
};
91-
schema.Should().BeEquivalentTo(expected,
92-
options => options.IgnoringCyclicReferences());
92+
93+
schema.Should().BeEquivalentTo(expected, options =>
94+
options.IgnoringCyclicReferences()
95+
.Excluding((IMemberInfo memberInfo) =>
96+
memberInfo.Path.EndsWith("Parent")));
9397
}
9498
}
9599
}

0 commit comments

Comments
 (0)