Skip to content

Commit ea68427

Browse files
committed
fix: build passes
Signed-off-by: Vincent Biret <[email protected]>
1 parent 1bd2624 commit ea68427

File tree

5 files changed

+12
-55
lines changed

5 files changed

+12
-55
lines changed

test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ public async Task LoadSecuritySchemeReference()
5656
var reference = new OpenApiSecuritySchemeReference("api_key_sample", result.Document);
5757

5858
// Assert
59-
reference.Should().BeEquivalentTo(
59+
Assert.Equivalent(
6060
new OpenApiSecurityScheme
6161
{
6262
Type = SecuritySchemeType.ApiKey,
6363
Name = "api_key",
6464
In = ParameterLocation.Header
65-
}, options => options.Excluding(x => x.Reference)
65+
}, reference
6666
);
6767
}
6868

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

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ public async Task ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed()
664664
}
665665
},
666666
},
667-
SecuritySchemes = new Dictionary<string, OpenApiSecurityScheme>
667+
SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
668668
{
669669
["securitySchemeName1"] = new OpenApiSecurityScheme
670670
{
@@ -700,21 +700,11 @@ public async Task ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed()
700700

701701
var tagReference2 = new OpenApiTagReference("tagName2", null);
702702

703-
var securityScheme1 = await CloneSecuritySchemeAsync(components.SecuritySchemes["securitySchemeName1"]);
703+
var securityScheme1Cast = Assert.IsType<OpenApiSecurityScheme>(components.SecuritySchemes["securitySchemeName1"]);
704+
var securityScheme1 = await CloneSecuritySchemeAsync(securityScheme1Cast);
704705

705-
securityScheme1.Reference = new OpenApiReference
706-
{
707-
Id = "securitySchemeName1",
708-
Type = ReferenceType.SecurityScheme
709-
};
710-
711-
var securityScheme2 = await CloneSecuritySchemeAsync(components.SecuritySchemes["securitySchemeName2"]);
712-
713-
securityScheme2.Reference = new OpenApiReference
714-
{
715-
Id = "securitySchemeName2",
716-
Type = ReferenceType.SecurityScheme
717-
};
706+
var securityScheme2Cast = Assert.IsType<OpenApiSecurityScheme>(components.SecuritySchemes["securitySchemeName2"]);
707+
var securityScheme2 = await CloneSecuritySchemeAsync(securityScheme2Cast);
718708

719709
var expected = new OpenApiDocument
720710
{
@@ -1098,8 +1088,7 @@ public async Task GlobalSecurityRequirementShouldReferenceSecurityScheme()
10981088

10991089
var securityRequirement = result.Document.SecurityRequirements[0];
11001090

1101-
securityRequirement.Keys.First().Should().BeEquivalentTo(result.Document.Components.SecuritySchemes.First().Value,
1102-
options => options.Excluding(x => x.Reference));
1091+
Assert.Equivalent(result.Document.Components.SecuritySchemes.First().Value, securityRequirement.Keys.First());
11031092
}
11041093

11051094
[Fact]
@@ -1176,7 +1165,6 @@ public async Task ParseDocumentWithReferencedSecuritySchemeWorks()
11761165
var securityScheme = result.Document.Components.SecuritySchemes["OAuth2"];
11771166

11781167
// Assert
1179-
Assert.False(securityScheme.UnresolvedReference);
11801168
Assert.NotNull(securityScheme.Flows);
11811169
}
11821170

test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ public async Task OperationWithSecurityRequirementShouldReferenceSecurityScheme(
2727
var result = await OpenApiDocument.LoadAsync(Path.Combine(SampleFolderPath, "securedOperation.yaml"));
2828

2929
var securityScheme = result.Document.Paths["/"].Operations[OperationType.Get].Security[0].Keys.First();
30-
securityScheme.Should().BeEquivalentTo(result.Document.Components.SecuritySchemes.First().Value,
31-
options => options.Excluding(x => x.Reference));
30+
Assert.Equivalent(result.Document.Components.SecuritySchemes.First().Value, securityScheme);
3231
}
3332

3433
[Fact]

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

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,9 @@ public class OpenApiComponentsTests
8989
}
9090
},
9191
},
92-
SecuritySchemes = new Dictionary<string, OpenApiSecurityScheme>
92+
SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
9393
{
94-
["securityScheme1"] = new()
94+
["securityScheme1"] = new OpenApiSecurityScheme()
9595
{
9696
Description = "description1",
9797
Type = SecuritySchemeType.OAuth2,
@@ -107,23 +107,13 @@ public class OpenApiComponentsTests
107107
AuthorizationUrl = new("https://example.com/api/oauth")
108108
}
109109
},
110-
Reference = new()
111-
{
112-
Type = ReferenceType.SecurityScheme,
113-
Id = "securityScheme1"
114-
}
115110
},
116-
["securityScheme2"] = new()
111+
["securityScheme2"] = new OpenApiSecurityScheme()
117112
{
118113
Description = "description1",
119114
Type = SecuritySchemeType.OpenIdConnect,
120115
Scheme = OpenApiConstants.Bearer,
121116
OpenIdConnectUrl = new("https://example.com/openIdConnect"),
122-
Reference = new()
123-
{
124-
Type = ReferenceType.SecurityScheme,
125-
Id = "securityScheme2"
126-
}
127117
}
128118
}
129119
};

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -223,46 +223,26 @@ public void SchemesShouldConsiderOnlyReferenceIdForEquality()
223223
Type = SecuritySchemeType.ApiKey,
224224
Name = "apiKeyName1",
225225
In = ParameterLocation.Header,
226-
Reference = new()
227-
{
228-
Id = "securityScheme1",
229-
Type = ReferenceType.SecurityScheme
230-
}
231226
};
232227

233228
var securityScheme2 = new OpenApiSecurityScheme
234229
{
235230
Type = SecuritySchemeType.OpenIdConnect,
236231
OpenIdConnectUrl = new("http://example.com"),
237-
Reference = new()
238-
{
239-
Id = "securityScheme2",
240-
Type = ReferenceType.SecurityScheme
241-
}
242232
};
243233

244234
var securityScheme1Duplicate = new OpenApiSecurityScheme
245235
{
246236
Type = SecuritySchemeType.ApiKey,
247237
Name = "apiKeyName1",
248238
In = ParameterLocation.Header,
249-
Reference = new()
250-
{
251-
Id = "securityScheme1",
252-
Type = ReferenceType.SecurityScheme
253-
}
254239
};
255240

256241
var securityScheme1WithDifferentProperties = new OpenApiSecurityScheme
257242
{
258243
Type = SecuritySchemeType.ApiKey,
259244
Name = "apiKeyName2",
260245
In = ParameterLocation.Query,
261-
Reference = new()
262-
{
263-
Id = "securityScheme1",
264-
Type = ReferenceType.SecurityScheme
265-
}
266246
};
267247

268248
// Act

0 commit comments

Comments
 (0)