Clean up tests

Author: MaggieKimani1

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

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using FluentAssertions;
@@ -7,7 +7,6 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Writers;
 using Xunit;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace Microsoft.OpenApi.Readers.Tests.V31Tests
 {
@@ -71,7 +70,7 @@ public void ParseDocumentWithWebhooksShouldSucceed()
                 Schemas =
                 {
                     ["pet1"] = petSchema,
-                    ["newPet"] = newPetSchema
+                    ["newPet1"] = newPetSchema
                 }
             };
 
@@ -199,7 +198,7 @@ public void ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
                                     ("id", new JsonSchemaBuilder().Type(SchemaValueType.Integer).Format("int64")),
                                     ("name", new JsonSchemaBuilder().Type(SchemaValueType.String)),
                                     ("tag", new JsonSchemaBuilder().Type(SchemaValueType.String))),
-                    ["newPet"] = new JsonSchemaBuilder()
+                    ["newPetSchema"] = new JsonSchemaBuilder()
                                 .Type(SchemaValueType.Object)
                                 .Required("name")
                                 .Properties(
@@ -211,7 +210,7 @@ public void ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
 
             // Create a clone of the schema to avoid modifying things in components.
             var petSchema = components.Schemas["petSchema"];
-            var newPetSchema = components.Schemas["newPet"];
+            var newPetSchema = components.Schemas["newPetSchema"];
 
             components.PathItems = new Dictionary<string, OpenApiPathItem>
             {
@@ -333,14 +332,10 @@ public void ParseDocumentWithDescriptionInDollarRefsShouldSucceed()
 
             // Act
             var actual = new OpenApiStreamReader().Read(stream, out var diagnostic);
-            var schema = actual.Paths["/pets"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema;
             var header = actual.Components.Responses["Test"].Headers["X-Test"];
 
             // Assert
             Assert.True(header.Description == "A referenced X-Test header"); /*response header #ref's description overrides the header's description*/
-            Assert.Null(schema.GetRef());
-            Assert.Equal(SchemaValueType.Object, schema.GetJsonType());
-            Assert.Equal("A pet in a petstore", schema.GetDescription()); /*The reference object's description overrides that of the referenced component*/
         }
 
         [Fact]

test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithReusablePaths.yaml

@@ -21,7 +21,7 @@ components:
               type: string
             tag:
               type: string
-    newPet:
+    newPetSchema:
         type: object
         required:
         - name
@@ -75,7 +75,7 @@ components:
             content:
               'application/json':
                  schema:
-                   "$ref": '#/components/schemas/newPet'
+                   "$ref": '#/components/schemas/newPetSchema'
           responses:
             "200":
               description: Return a 200 status to indicate that the data was received successfully

test/Microsoft.OpenApi.Readers.Tests/V31Tests/Samples/OpenApiDocument/documentWithWebhooks.yaml

@@ -44,7 +44,7 @@ webhooks:
           content:
             'application/json':
               schema:
-                "$ref": '#/components/schemas/newPet'
+                "$ref": '#/components/schemas/newPet1'
         responses:
           "200":
             description: Return a 200 status to indicate that the data was received successfully
@@ -67,7 +67,7 @@ components:
               type: string
             tag:
               type: string
-    newPet:
+    newPet1:
         type: object
         required:
         - name

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

@@ -249,7 +249,7 @@ public void ParseBasicSchemaWithReferenceShouldSucceed()
                                     new JsonSchemaBuilder()
                                         .Type(SchemaValueType.Object)
                                         .Required("rootCause")
-                                            .Properties(("rootCause", new JsonSchemaBuilder().Type(SchemaValueType.String))))
+                                        .Properties(("rootCause", new JsonSchemaBuilder().Type(SchemaValueType.String))))
                     }
                 },
                 options => options.Excluding(m => m.Name == "HostDocument")

test/Microsoft.OpenApi.Tests/Workspaces/OpenApiWorkspaceTests.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;
@@ -72,13 +72,14 @@ public void OpenApiWorkspacesAllowDocumentsToReferenceEachOther()
         [Fact]
         public void OpenApiWorkspacesCanResolveExternalReferences()
         {
+            var refUri = new Uri("https://everything.json/common#/components/schemas/test");
             var workspace = new OpenApiWorkspace();
-            var doc = CreateCommonDocument();
+            var doc = CreateCommonDocument(refUri);
             var location = "common";
 
             workspace.AddDocument(location, doc);
 
-            var schema = workspace.ResolveJsonSchemaReference(new Uri("https://everything.json/common#/components/schemas/test"));
+            var schema = workspace.ResolveJsonSchemaReference(refUri);
 
             Assert.NotNull(schema);
             Assert.Equal("The referenced one", schema.GetDescription());
@@ -90,6 +91,7 @@ public void OpenApiWorkspacesAllowDocumentsToReferenceEachOther_short()
             var workspace = new OpenApiWorkspace();
 
             var doc = new OpenApiDocument();
+            var reference = "#/components/schemas/test";
             doc.CreatePathItem("/", p =>
             {
                 p.Description = "Consumer";
@@ -98,14 +100,15 @@ public void OpenApiWorkspacesAllowDocumentsToReferenceEachOther_short()
                   {
                       re.Description = "Success";
                       re.CreateContent("application/json", co =>
-                          co.Schema = new JsonSchemaBuilder().Ref("test").Build()                      
+                          co.Schema = new JsonSchemaBuilder().Ref(reference).Build()                      
                       );
                   })
                 );
             });
 
+            var refUri = new Uri("https://registry" + reference.Split('#').LastOrDefault());
             workspace.AddDocument("root", doc);
-            workspace.AddDocument("common", CreateCommonDocument());
+            workspace.AddDocument("common", CreateCommonDocument(refUri));
             var errors = doc.ResolveReferences();
             Assert.Empty(errors);
 
@@ -178,9 +181,9 @@ public void OpenApiWorkspacesCanResolveReferencesToDocumentFragmentsWithJsonPoin
         }
 
         // Test artifacts
-        private static OpenApiDocument CreateCommonDocument()
+        private static OpenApiDocument CreateCommonDocument(Uri refUri)
         {
-            return new()
+            var doc =  new OpenApiDocument()
             {
                 Components = new()
                 {
@@ -189,6 +192,13 @@ private static OpenApiDocument CreateCommonDocument()
                     }
                 }
             };
+
+            foreach(var schema in doc.Components.Schemas)
+            {
+                SchemaRegistry.Global.Register(refUri, schema.Value);
+            }
+
+            return doc;
         }
     }