Update tests

irvinesunday · irvinesunday · commit 276e5eeba6b8 · 2024-03-28T16:36:06.000+03:00
diff --git a/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs b/test/Microsoft.OpenApi.Readers.Tests/OpenApiWorkspaceTests/OpenApiWorkspaceStreamTests.cs
@@ -1,4 +1,4 @@
-using System;
+﻿using System;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
@@ -60,7 +60,7 @@ public async Task LoadDocumentWithExternalReferenceShouldLoadBothDocumentsIntoWo
                 LoadExternalRefs = true,
                 CustomExternalLoader = new ResourceLoader(),
                 BaseUrl = new("file://c:\\"),
-            });
+            };
 
             ReadResult result;
             result = await OpenApiDocument.LoadAsync("V3Tests/Samples/OpenApiWorkspace/TodoMain.yaml", settings);            
diff --git a/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs b/test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.cs
@@ -162,38 +162,36 @@ public void ShouldAssignSchemaToAllResponses()
             var successSchema = new JsonSchemaBuilder()
                 .Type(SchemaValueType.Array)
                 .Items(new JsonSchemaBuilder()
-                    .Ref("#/definitions/Item")
-                    .Properties(("id", new JsonSchemaBuilder().Type(SchemaValueType.String).Description("Item identifier."))))
-                .Build();
+                    .Properties(("id", new JsonSchemaBuilder().Type(SchemaValueType.String).Description("Item identifier."))));
 
             var errorSchema = new JsonSchemaBuilder()
-                    .Ref("#/definitions/Error")
                     .Properties(("code", new JsonSchemaBuilder().Type(SchemaValueType.Integer).Format("int32")),
                         ("message", new JsonSchemaBuilder().Type(SchemaValueType.String)),
-                        ("fields", new JsonSchemaBuilder().Type(SchemaValueType.String)))
-                    .Build();
+                        ("fields", new JsonSchemaBuilder().Type(SchemaValueType.String)));
 
             var responses = result.OpenApiDocument.Paths["/items"].Operations[OperationType.Get].Responses;
             foreach (var response in responses)
             {
-                var targetSchema = response.Key == "200" ? successSchema : errorSchema;
+                var targetSchema = response.Key == "200" ? successSchema.Build() : errorSchema.Build();
 
                 var json = response.Value.Content["application/json"];
                 Assert.NotNull(json);
-                json.Schema.Should().BeEquivalentTo(targetSchema);
+                Assert.Equal(json.Schema.Keywords.Count, targetSchema.Keywords.Count);
 
                 var xml = response.Value.Content["application/xml"];
                 Assert.NotNull(xml);
-                xml.Schema.Should().BeEquivalentTo(targetSchema);
+                Assert.Equal(xml.Schema.Keywords.Count, targetSchema.Keywords.Count);
             }
         }
 
         [Fact]
         public void ShouldAllowComponentsThatJustContainAReference()
         {
             // Act
-            var actual = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "ComponentRootReference.json"));
-            JsonSchema schema = actual.OpenApiDocument.Components.Schemas["AllPets"];
+            var actual = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "ComponentRootReference.json")).OpenApiDocument;
+            JsonSchema schema = actual.Components.Schemas["AllPets"];
+
+            schema = actual.ResolveJsonSchemaReference(schema.GetRef()) ?? schema;
 
             // Assert
             if (schema.Keywords.Count.Equals(1) && schema.GetRef() != null)
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiCallbackReferenceTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Globalization;
@@ -133,10 +133,10 @@ public class OpenApiCallbackReferenceTests
 
         public OpenApiCallbackReferenceTests()
         {
-            var reader = new OpenApiStringReader();
-            OpenApiDocument openApiDoc = reader.Read(OpenApi, out _);
-            OpenApiDocument openApiDoc_2 = reader.Read(OpenApi_2, out _);
-            openApiDoc.Workspace.AddDocument(openApiDoc_2);
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+            OpenApiDocument openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument;
+            OpenApiDocument openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument;
+            openApiDoc.Workspace.AddDocument("https://myserver.com/beta", openApiDoc_2);
             _externalCallbackReference = new("callbackEvent", openApiDoc, "https://myserver.com/beta");
             _localCallbackReference = new("callbackEvent", openApiDoc_2);
         }
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiExampleReferenceTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Globalization;
@@ -112,10 +112,10 @@ public class OpenApiExampleReferenceTests
 
         public OpenApiExampleReferenceTests()
         {
-            var reader = new OpenApiStringReader();
-            _openApiDoc = reader.Read(OpenApi, out _);
-            _openApiDoc_2 = reader.Read(OpenApi_2, out _);
-            _openApiDoc.Workspace.AddDocument(_openApiDoc_2);
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc.Workspace.AddDocument("https://myserver.com/beta", _openApiDoc_2);
 
             _localExampleReference = new OpenApiExampleReference("UserExample", _openApiDoc_2)
             {
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiHeaderReferenceTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Globalization;
@@ -82,10 +82,10 @@ public class OpenApiHeaderReferenceTests
 
         public OpenApiHeaderReferenceTests()
         {
-            var reader = new OpenApiStringReader();
-            _openApiDoc = reader.Read(OpenApi, out _);
-            _openApiDoc_2 = reader.Read(OpenApi_2, out _);
-            _openApiDoc.Workspace.AddDocument( _openApiDoc_2);
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc.Workspace.AddDocument("https://myserver.com/beta", _openApiDoc_2);
 
             _localHeaderReference = new OpenApiHeaderReference("LocationHeader", _openApiDoc_2)
             {
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiLinkReferenceTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Globalization;
@@ -116,10 +116,10 @@ public class OpenApiLinkReferenceTests
 
         public OpenApiLinkReferenceTests()
         {
-            var reader = new OpenApiStringReader();
-            _openApiDoc = reader.Read(OpenApi, out _);
-            _openApiDoc_2 = reader.Read(OpenApi_2, out _);
-            _openApiDoc.Workspace.AddDocument( _openApiDoc_2);
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc.Workspace.AddDocument("https://myserver.com/beta", _openApiDoc_2);
 
             _localLinkReference = new("GetUserByUserId", _openApiDoc_2)
             {
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiParameterReferenceTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Globalization;
@@ -82,10 +82,10 @@ public class OpenApiParameterReferenceTests
 
         public OpenApiParameterReferenceTests()
         {
-            var reader = new OpenApiStringReader();
-            _openApiDoc = reader.Read(OpenApi, out _);
-            _openApiDoc_2 = reader.Read(OpenApi_2, out _);
-            _openApiDoc.Workspace.AddDocument(_openApiDoc_2);
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc.Workspace.AddDocument("https://myserver.com/beta", _openApiDoc_2);
 
             _localParameterReference = new("limitParam", _openApiDoc_2)
             {
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiPathItemReferenceTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Globalization;
@@ -79,10 +79,10 @@ public class OpenApiPathItemReferenceTests
 
         public OpenApiPathItemReferenceTests()
         {
-            var reader = new OpenApiStringReader();
-            _openApiDoc = reader.Read(OpenApi, out _);
-            _openApiDoc_2 = reader.Read(OpenApi_2, out _);
-            _openApiDoc.Workspace.AddDocument(_openApiDoc_2);
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc.Workspace.AddDocument("https://myserver.com/beta", _openApiDoc_2);
 
             _localPathItemReference = new OpenApiPathItemReference("userPathItem", _openApiDoc_2)
             {
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiRequestBodyReferenceTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Globalization;
@@ -89,10 +89,10 @@ public class OpenApiRequestBodyReferenceTests
 
         public OpenApiRequestBodyReferenceTests()
         {
-            var reader = new OpenApiStringReader();
-            _openApiDoc = reader.Read(OpenApi, out _);
-            _openApiDoc_2 = reader.Read(OpenApi_2, out _);
-            _openApiDoc.Workspace.AddDocument(_openApiDoc_2);
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc.Workspace.AddDocument("https://myserver.com/beta", _openApiDoc_2);
 
             _localRequestBodyReference = new("UserRequest", _openApiDoc_2)
             {
diff --git a/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs b/test/Microsoft.OpenApi.Tests/Models/References/OpenApiResponseReferenceTest.cs
@@ -1,4 +1,4 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. 
 
 using System.Globalization;
@@ -65,10 +65,10 @@ public class OpenApiResponseReferenceTest
 
         public OpenApiResponseReferenceTest()
         {
-            var reader = new OpenApiStringReader();
-            _openApiDoc = reader.Read(OpenApi, out _);
-            _openApiDoc_2 = reader.Read(OpenApi_2, out _);
-            _openApiDoc.Workspace.AddDocument(_openApiDoc_2);
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+            _openApiDoc = OpenApiDocument.Parse(OpenApi, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc_2 = OpenApiDocument.Parse(OpenApi_2, OpenApiConstants.Yaml).OpenApiDocument;
+            _openApiDoc.Workspace.AddDocument("https://myserver.com/beta", _openApiDoc_2);
 
             _localResponseReference = new("OkResponse", _openApiDoc_2)
             {
diff --git a/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiWorkspaceTests.cs b/test/Microsoft.OpenApi.Tests/Workspaces/OpenApiWorkspaceTests.cs
@@ -5,6 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Json.Schema;
+using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Services;
 using Xunit;
@@ -74,12 +75,12 @@ public void OpenApiWorkspacesCanResolveExternalReferences()
         {
             var refUri = new Uri("https://everything.json/common#/components/schemas/test");
             var workspace = new OpenApiWorkspace();
-            var externalDoc = CreateCommonDocument(refUri);
+            var externalDoc = CreateCommonDocument();
                        
-            workspace.AddDocument("https://everything.json/common", externalDoc);
-
-            workspace.TryResolveReference<JsonSchema>("https://everything.json/common#/components/schemas/test", ReferenceType.Schema, out var schema);
+            workspace.AddDocument("common", externalDoc);
 
+            var schema = workspace.ResolveReference<JsonSchema>("test", ReferenceType.Schema, externalDoc.Components);
+           
             Assert.NotNull(schema);
             Assert.Equal("The referenced one", schema.GetDescription());
         }
@@ -90,7 +91,7 @@ public void OpenApiWorkspacesAllowDocumentsToReferenceEachOther_short()
             var workspace = new OpenApiWorkspace();
 
             var doc = new OpenApiDocument();
-            var reference = "#/components/schemas/test";
+            var reference = "common#/components/schemas/test";
             doc.CreatePathItem("/", p =>
             {
                 p.Description = "Consumer";
@@ -107,7 +108,7 @@ public void OpenApiWorkspacesAllowDocumentsToReferenceEachOther_short()
 
             var refUri = new Uri("https://registry" + reference.Split('#').LastOrDefault());
             workspace.AddDocument("root", doc);
-            workspace.AddDocument("common", CreateCommonDocument(refUri));
+            workspace.AddDocument("common", CreateCommonDocument());
             var errors = doc.ResolveReferences();
             Assert.Empty(errors);
 
@@ -144,10 +145,17 @@ public void OpenApiWorkspacesCanResolveReferencesToDocumentFragments()
             // Arrange
             var workspace = new OpenApiWorkspace();
             var schemaFragment = new JsonSchemaBuilder().Type(SchemaValueType.String).Description("Schema from a fragment").Build();
-            workspace.AddSchemaFragment("fragment", schemaFragment);
+            workspace.AddSchemaFragment("common", schemaFragment);
 
             // Act
-            workspace.TryResolveReference<JsonSchema>("https://everything.json/common#/components/schemas/test", ReferenceType.Schema, out var schema);
+            var reference = new OpenApiReference()
+            {
+                ExternalResource = "common#/components/schemas/test",
+                Id = "test",
+                Type = ReferenceType.Schema
+            };
+
+            var schema = workspace.ResolveReference<JsonSchema>(reference);
 
             // Assert
             Assert.NotNull(schema);
@@ -169,7 +177,7 @@ public void OpenApiWorkspacesCanResolveReferencesToDocumentFragmentsWithJsonPoin
             workspace.AddFragment("fragment", responseFragment);
 
             // Act
-            var resolvedElement = workspace.ResolveReference(new()
+            var resolvedElement = workspace.ResolveReference<IOpenApiReferenceable>(new()
             {
                 Id = "headers/header1",
                 ExternalResource = "fragment"
@@ -180,7 +188,7 @@ public void OpenApiWorkspacesCanResolveReferencesToDocumentFragmentsWithJsonPoin
         }
 
         // Test artifacts
-        private static OpenApiDocument CreateCommonDocument(Uri refUri)
+        private static OpenApiDocument CreateCommonDocument()
         {
             var doc =  new OpenApiDocument()
             {
@@ -192,12 +200,6 @@ private static OpenApiDocument CreateCommonDocument(Uri refUri)
                 }
             };
 
-            //foreach(var schema in doc.Components.Schemas)
-            //{
-            //    SchemaRegistry.Global.Register(refUri, schema.Value);
-            //}
-
-
             return doc;
         }
     }
