fix: build passes

Signed-off-by: Vincent Biret <vibiret@microsoft.com>
microsoft · Jan 29, 2025 · ea68427 · ea68427
1 parent 1bd2624
commit ea68427
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 55 deletions.
diff --git a/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs b/test/Microsoft.OpenApi.Readers.Tests/ReferenceService/TryLoadReferenceV2Tests.cs
@@ -56,13 +56,13 @@ public async Task LoadSecuritySchemeReference()
             var reference = new OpenApiSecuritySchemeReference("api_key_sample", result.Document);
 
             // Assert
-            reference.Should().BeEquivalentTo(
+            Assert.Equivalent(
                 new OpenApiSecurityScheme
                 {
                     Type = SecuritySchemeType.ApiKey,
                     Name = "api_key",
                     In = ParameterLocation.Header
-                }, options => options.Excluding(x => x.Reference)
+                }, reference
             );
         }
 

diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.cs
@@ -664,7 +664,7 @@ public async Task ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed()
                         }
                     },
                 },
-                SecuritySchemes = new Dictionary<string, OpenApiSecurityScheme>
+                SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
                 {
                     ["securitySchemeName1"] = new OpenApiSecurityScheme
                     {
@@ -700,21 +700,11 @@ public async Task ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed()
 
             var tagReference2 = new OpenApiTagReference("tagName2", null);
 
-            var securityScheme1 = await CloneSecuritySchemeAsync(components.SecuritySchemes["securitySchemeName1"]);
+            var securityScheme1Cast = Assert.IsType<OpenApiSecurityScheme>(components.SecuritySchemes["securitySchemeName1"]);
+            var securityScheme1 = await CloneSecuritySchemeAsync(securityScheme1Cast);
 
-            securityScheme1.Reference = new OpenApiReference
-            {
-                Id = "securitySchemeName1",
-                Type = ReferenceType.SecurityScheme
-            };
-
-            var securityScheme2 = await CloneSecuritySchemeAsync(components.SecuritySchemes["securitySchemeName2"]);
-
-            securityScheme2.Reference = new OpenApiReference
-            {
-                Id = "securitySchemeName2",
-                Type = ReferenceType.SecurityScheme
-            };
+            var securityScheme2Cast = Assert.IsType<OpenApiSecurityScheme>(components.SecuritySchemes["securitySchemeName2"]);
+            var securityScheme2 = await CloneSecuritySchemeAsync(securityScheme2Cast);
 
             var expected = new OpenApiDocument
             {
@@ -1098,8 +1088,7 @@ public async Task GlobalSecurityRequirementShouldReferenceSecurityScheme()
 
             var securityRequirement = result.Document.SecurityRequirements[0];
 
-            securityRequirement.Keys.First().Should().BeEquivalentTo(result.Document.Components.SecuritySchemes.First().Value,
-                options => options.Excluding(x => x.Reference));
+            Assert.Equivalent(result.Document.Components.SecuritySchemes.First().Value, securityRequirement.Keys.First());
         }
 
         [Fact]
@@ -1176,7 +1165,6 @@ public async Task ParseDocumentWithReferencedSecuritySchemeWorks()
             var securityScheme = result.Document.Components.SecuritySchemes["OAuth2"];
 
             // Assert
-            Assert.False(securityScheme.UnresolvedReference);
             Assert.NotNull(securityScheme.Flows);
         }
 

diff --git a/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiOperationTests.cs
@@ -27,8 +27,7 @@ public async Task OperationWithSecurityRequirementShouldReferenceSecurityScheme(
             var result = await OpenApiDocument.LoadAsync(Path.Combine(SampleFolderPath, "securedOperation.yaml"));
 
             var securityScheme = result.Document.Paths["/"].Operations[OperationType.Get].Security[0].Keys.First();
-            securityScheme.Should().BeEquivalentTo(result.Document.Components.SecuritySchemes.First().Value, 
-                options => options.Excluding(x => x.Reference));
+            Assert.Equivalent(result.Document.Components.SecuritySchemes.First().Value, securityScheme);
         }
 
         [Fact]

diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiComponentsTests.cs
@@ -89,9 +89,9 @@ public class OpenApiComponentsTests
                     }
                 },
             },
-            SecuritySchemes = new Dictionary<string, OpenApiSecurityScheme>
+            SecuritySchemes = new Dictionary<string, IOpenApiSecurityScheme>
             {
-                ["securityScheme1"] = new()
+                ["securityScheme1"] = new OpenApiSecurityScheme()
                 {
                     Description = "description1",
                     Type = SecuritySchemeType.OAuth2,
@@ -107,23 +107,13 @@ public class OpenApiComponentsTests
                             AuthorizationUrl = new("https://example.com/api/oauth")
                         }
                     },
-                    Reference = new()
-                    {
-                        Type = ReferenceType.SecurityScheme,
-                        Id = "securityScheme1"
-                    }
                 },
-                ["securityScheme2"] = new()
+                ["securityScheme2"] = new OpenApiSecurityScheme()
                 {
                     Description = "description1",
                     Type = SecuritySchemeType.OpenIdConnect,
                     Scheme = OpenApiConstants.Bearer,
                     OpenIdConnectUrl = new("https://example.com/openIdConnect"),
-                    Reference = new()
-                    {
-                        Type = ReferenceType.SecurityScheme,
-                        Id = "securityScheme2"
-                    }
                 }
             }
         };

diff --git a/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs b/test/Microsoft.OpenApi.Tests/Models/OpenApiSecurityRequirementTests.cs
@@ -223,46 +223,26 @@ public void SchemesShouldConsiderOnlyReferenceIdForEquality()
                 Type = SecuritySchemeType.ApiKey,
                 Name = "apiKeyName1",
                 In = ParameterLocation.Header,
-                Reference = new()
-                {
-                    Id = "securityScheme1",
-                    Type = ReferenceType.SecurityScheme
-                }
             };
 
             var securityScheme2 = new OpenApiSecurityScheme
             {
                 Type = SecuritySchemeType.OpenIdConnect,
                 OpenIdConnectUrl = new("http://example.com"),
-                Reference = new()
-                {
-                    Id = "securityScheme2",
-                    Type = ReferenceType.SecurityScheme
-                }
             };
 
             var securityScheme1Duplicate = new OpenApiSecurityScheme
             {
                 Type = SecuritySchemeType.ApiKey,
                 Name = "apiKeyName1",
                 In = ParameterLocation.Header,
-                Reference = new()
-                {
-                    Id = "securityScheme1",
-                    Type = ReferenceType.SecurityScheme
-                }
             };
 
             var securityScheme1WithDifferentProperties = new OpenApiSecurityScheme
             {
                 Type = SecuritySchemeType.ApiKey,
                 Name = "apiKeyName2",
                 In = ParameterLocation.Query,
-                Reference = new()
-                {
-                    Id = "securityScheme1",
-                    Type = ReferenceType.SecurityScheme
-                }
             };
 
             // Act