Skip to content

Commit 670f641

Browse files
MaggieKimani1MaggieKimani1
committed
Fix failing tests
1 parent d99ffd6 commit 670f641

9 files changed

+45
-79
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

44
using System.Globalization;
@@ -7,6 +7,7 @@
77
using Json.Schema;
88
using Microsoft.OpenApi.Expressions;
99
using Microsoft.OpenApi.Models;
10+
using Microsoft.OpenApi.Models.References;
1011
using Microsoft.OpenApi.Writers;
1112
using VerifyXunit;
1213
using Xunit;
@@ -52,13 +53,10 @@ public class OpenApiCallbackTests
5253
}
5354
};
5455

56+
public static OpenApiCallbackReference CallbackProxy = new(ReferencedCallback, "simpleHook");
57+
5558
public static OpenApiCallback ReferencedCallback = new()
5659
{
57-
Reference = new()
58-
{
59-
Type = ReferenceType.Callback,
60-
Id = "simpleHook",
61-
},
6260
PathItems =
6361
{
6462
[RuntimeExpression.Build("$request.body#/url")]
@@ -119,7 +117,7 @@ public async Task SerializeReferencedCallbackAsV3JsonWorks(bool produceTerseOutp
119117
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
120118

121119
// Act
122-
ReferencedCallback.SerializeAsV3(writer);
120+
CallbackProxy.SerializeAsV3(writer);
123121
writer.Flush();
124122

125123
// Assert

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
using System.Threading.Tasks;
1111
using Microsoft.OpenApi.Any;
1212
using Microsoft.OpenApi.Models;
13+
using Microsoft.OpenApi.Models.References;
1314
using Microsoft.OpenApi.Writers;
1415
using VerifyXunit;
1516
using Xunit;
@@ -58,13 +59,9 @@ public class OpenApiExampleTests
5859
})
5960
};
6061

62+
public static OpenApiExampleReference OpenApiExampleReference = new(ReferencedExample, "example1");
6163
public static OpenApiExample ReferencedExample = new()
6264
{
63-
Reference = new()
64-
{
65-
Type = ReferenceType.Example,
66-
Id = "example1",
67-
},
6865
Value = new OpenApiAny(new JsonObject
6966
{
7067
["versions"] = new JsonArray
@@ -128,7 +125,7 @@ public async Task SerializeReferencedExampleAsV3JsonWorks(bool produceTerseOutpu
128125
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
129126

130127
// Act
131-
ReferencedExample.SerializeAsV3(writer);
128+
OpenApiExampleReference.SerializeAsV3(writer);
132129
writer.Flush();
133130

134131
// Assert

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

44
using System.Globalization;
55
using System.IO;
66
using System.Threading.Tasks;
77
using Json.Schema;
88
using Microsoft.OpenApi.Models;
9+
using Microsoft.OpenApi.Models.References;
910
using Microsoft.OpenApi.Writers;
1011
using VerifyXunit;
1112
using Xunit;
@@ -22,13 +23,10 @@ public class OpenApiHeaderTests
2223
Schema = new JsonSchemaBuilder().Type(SchemaValueType.Integer).Format("int32").Build()
2324
};
2425

26+
public static OpenApiHeaderReference OpenApiHeaderReference = new(ReferencedHeader, "example1");
27+
2528
public static OpenApiHeader ReferencedHeader = new()
2629
{
27-
Reference = new()
28-
{
29-
Type = ReferenceType.Header,
30-
Id = "example1",
31-
},
3230
Description = "sampleHeader",
3331
Schema = new JsonSchemaBuilder().Type(SchemaValueType.Integer).Format("int32").Build()
3432
};
@@ -60,7 +58,7 @@ public async Task SerializeReferencedHeaderAsV3JsonWorks(bool produceTerseOutput
6058
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
6159

6260
// Act
63-
ReferencedHeader.SerializeAsV3(writer);
61+
OpenApiHeaderReference.SerializeAsV3(writer);
6462
writer.Flush();
6563

6664
// Assert
@@ -79,7 +77,6 @@ public async Task SerializeReferencedHeaderAsV3JsonWithoutReferenceWorks(bool pr
7977
// Act
8078
ReferencedHeader.SerializeAsV3WithoutReference(writer);
8179
writer.Flush();
82-
var actual = outputStringWriter.GetStringBuilder().ToString();
8380

8481
// Assert
8582
await Verifier.Verify(outputStringWriter).UseParameters(produceTerseOutput);
@@ -112,7 +109,7 @@ public async Task SerializeReferencedHeaderAsV2JsonWorks(bool produceTerseOutput
112109
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
113110

114111
// Act
115-
ReferencedHeader.SerializeAsV2(writer);
112+
OpenApiHeaderReference.SerializeAsV2(writer);
116113
writer.Flush();
117114

118115
// Assert

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using Microsoft.OpenApi.Any;
99
using Microsoft.OpenApi.Expressions;
1010
using Microsoft.OpenApi.Models;
11+
using Microsoft.OpenApi.Models.References;
1112
using Microsoft.OpenApi.Writers;
1213
using VerifyXunit;
1314
using Xunit;
@@ -42,6 +43,7 @@ public class OpenApiLinkTests
4243
}
4344
};
4445

46+
public static readonly OpenApiLinkReference LinkReference = new(ReferencedLink, "example1");
4547
public static readonly OpenApiLink ReferencedLink = new()
4648
{
4749
Reference = new()
@@ -98,7 +100,7 @@ public async Task SerializeReferencedLinkAsV3JsonWorksAsync(bool produceTerseOut
98100
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
99101

100102
// Act
101-
ReferencedLink.SerializeAsV3(writer);
103+
LinkReference.SerializeAsV3(writer);
102104
writer.Flush();
103105

104106
// Assert

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

44
using System.Collections.Generic;
@@ -11,6 +11,7 @@
1111
using Microsoft.OpenApi.Any;
1212
using Microsoft.OpenApi.Extensions;
1313
using Microsoft.OpenApi.Models;
14+
using Microsoft.OpenApi.Models.References;
1415
using Microsoft.OpenApi.Writers;
1516
using VerifyXunit;
1617
using Xunit;
@@ -27,15 +28,11 @@ public class OpenApiParameterTests
2728
In = ParameterLocation.Path
2829
};
2930

31+
public static OpenApiParameterReference OpenApiParameterReference = new(ReferencedParameter, "example1");
3032
public static OpenApiParameter ReferencedParameter = new()
3133
{
3234
Name = "name1",
33-
In = ParameterLocation.Path,
34-
Reference = new()
35-
{
36-
Type = ReferenceType.Parameter,
37-
Id = "example1"
38-
}
35+
In = ParameterLocation.Path
3936
};
4037

4138
public static OpenApiParameter AdvancedPathParameterWithSchema = new()
@@ -319,7 +316,7 @@ public async Task SerializeReferencedParameterAsV3JsonWorksAsync(bool produceTer
319316
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
320317

321318
// Act
322-
ReferencedParameter.SerializeAsV3(writer);
319+
OpenApiParameterReference.SerializeAsV3(writer);
323320
writer.Flush();
324321

325322
// Assert
@@ -353,7 +350,7 @@ public async Task SerializeReferencedParameterAsV2JsonWorksAsync(bool produceTer
353350
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
354351

355352
// Act
356-
ReferencedParameter.SerializeAsV2(writer);
353+
OpenApiParameterReference.SerializeAsV2(writer);
357354
writer.Flush();
358355

359356
// Assert

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license.
33

44
using System.Globalization;
55
using System.IO;
66
using System.Threading.Tasks;
77
using Json.Schema;
88
using Microsoft.OpenApi.Models;
9+
using Microsoft.OpenApi.Models.References;
910
using Microsoft.OpenApi.Writers;
1011
using VerifyXunit;
1112
using Xunit;
@@ -29,13 +30,9 @@ public class OpenApiRequestBodyTests
2930
}
3031
};
3132

33+
public static OpenApiRequestBodyReference OpenApiRequestBodyReference = new(ReferencedRequestBody, "example1");
3234
public static OpenApiRequestBody ReferencedRequestBody = new()
3335
{
34-
Reference = new()
35-
{
36-
Type = ReferenceType.RequestBody,
37-
Id = "example1",
38-
},
3936
Description = "description",
4037
Required = true,
4138
Content =
@@ -74,7 +71,7 @@ public async Task SerializeReferencedRequestBodyAsV3JsonWorksAsync(bool produceT
7471
var writer = new OpenApiJsonWriter(outputStringWriter, new() { Terse = produceTerseOutput });
7572

7673
// Act
77-
ReferencedRequestBody.SerializeAsV3(writer);
74+
OpenApiRequestBodyReference.SerializeAsV3(writer);
7875
writer.Flush();
7976

8077
// Assert

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

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
using Microsoft.OpenApi.Extensions;
1212
using Microsoft.OpenApi.Interfaces;
1313
using Microsoft.OpenApi.Models;
14+
using Microsoft.OpenApi.Models.References;
1415
using Microsoft.OpenApi.Writers;
1516
using VerifyXunit;
1617
using Xunit;
@@ -86,13 +87,10 @@ public class OpenApiResponseTests
8687
},
8788
}
8889
};
90+
91+
public static OpenApiResponseReference V2OpenApiResponseReference = new OpenApiResponseReference("example1", ReferencedV2Response);
8992
public static OpenApiResponse ReferencedV2Response = new OpenApiResponse
9093
{
91-
Reference = new OpenApiReference
92-
{
93-
Type = ReferenceType.Response,
94-
Id = "example1"
95-
},
9694
Description = "A complex object array response",
9795
Content =
9896
{
@@ -117,13 +115,10 @@ public class OpenApiResponseTests
117115
},
118116
}
119117
};
118+
public static OpenApiResponseReference V3OpenApiResponseReference = new OpenApiResponseReference("example1", ReferencedV3Response);
119+
120120
public static OpenApiResponse ReferencedV3Response = new OpenApiResponse
121121
{
122-
Reference = new OpenApiReference
123-
{
124-
Type = ReferenceType.Response,
125-
Id = "example1"
126-
},
127122
Description = "A complex object array response",
128123
Content =
129124
{
@@ -332,7 +327,7 @@ public async Task SerializeReferencedResponseAsV3JsonWorksAsync(bool produceTers
332327
var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
333328

334329
// Act
335-
ReferencedV3Response.SerializeAsV3(writer);
330+
V3OpenApiResponseReference.SerializeAsV3(writer);
336331
writer.Flush();
337332

338333
// Assert
@@ -366,7 +361,7 @@ public async Task SerializeReferencedResponseAsV2JsonWorksAsync(bool produceTers
366361
var writer = new OpenApiJsonWriter(outputStringWriter, new OpenApiJsonWriterSettings { Terse = produceTerseOutput });
367362

368363
// Act
369-
ReferencedV2Response.SerializeAsV2(writer);
364+
V2OpenApiResponseReference.SerializeAsV2(writer);
370365
writer.Flush();
371366

372367
// Assert

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

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
using FluentAssertions;
77
using Microsoft.OpenApi.Extensions;
88
using Microsoft.OpenApi.Models;
9+
using Microsoft.OpenApi.Models.References;
910
using Xunit;
1011

1112
namespace Microsoft.OpenApi.Tests.Models
@@ -19,42 +20,30 @@ public class OpenApiSecurityRequirementTests
1920
new()
2021
{
2122
[
22-
new()
23-
{
24-
Reference = new() { Type = ReferenceType.SecurityScheme, Id = "scheme1" }
25-
}
23+
new OpenApiSecuritySchemeReference("scheme1", hostDocument: null)
2624
] = new List<string>
2725
{
2826
"scope1",
2927
"scope2",
3028
"scope3",
3129
},
3230
[
33-
new()
34-
{
35-
Reference = new() { Type = ReferenceType.SecurityScheme, Id = "scheme2" }
36-
}
31+
new OpenApiSecuritySchemeReference("scheme2", hostDocument: null)
3732
] = new List<string>
3833
{
3934
"scope4",
4035
"scope5",
4136
},
4237
[
43-
new()
44-
{
45-
Reference = new() { Type = ReferenceType.SecurityScheme, Id = "scheme3" }
46-
}
38+
new OpenApiSecuritySchemeReference("scheme3", hostDocument: null)
4739
] = new List<string>()
4840
};
4941

5042
public static OpenApiSecurityRequirement SecurityRequirementWithUnreferencedSecurityScheme =
5143
new()
5244
{
5345
[
54-
new()
55-
{
56-
Reference = new() { Type = ReferenceType.SecurityScheme, Id = "scheme1" }
57-
}
46+
new OpenApiSecuritySchemeReference("scheme1", hostDocument: null)
5847
] = new List<string>
5948
{
6049
"scope1",
@@ -73,10 +62,7 @@ public class OpenApiSecurityRequirementTests
7362
"scope5",
7463
},
7564
[
76-
new()
77-
{
78-
Reference = new() { Type = ReferenceType.SecurityScheme, Id = "scheme3" }
79-
}
65+
new OpenApiSecuritySchemeReference("scheme3", hostDocument: null)
8066
] = new List<string>()
8167
};
8268

0 commit comments

Comments
 (0)