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;
@@ -69,8 +69,8 @@ public void ParseDocumentWithWebhooksShouldSucceed()
             {
                 Schemas =
                 {
-                    ["pet1"] = petSchema,
-                    ["newPet1"] = newPetSchema
+                    ["petSchema"] = petSchema,
+                    ["newPetSchema"] = newPetSchema
                 }
             };
 

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

@@ -31,30 +31,30 @@ webhooks:
                    schema:
                        type: array
                        items:
-                         "$ref": '#/components/schemas/pet1'
+                         "$ref": '#/components/schemas/petSchema'
                application/xml:
                    schema:
                        type: array
                        items:
-                         "$ref": '#/components/schemas/pet1'
+                         "$ref": '#/components/schemas/petSchema'
       post:
         requestBody:
           description: Information about a new pet in the system
           required: true
           content:
             'application/json':
               schema:
-                "$ref": '#/components/schemas/newPet1'
+                "$ref": '#/components/schemas/newPetSchema'
         responses:
           "200":
             description: Return a 200 status to indicate that the data was received successfully
             content:
               application/json:
                 schema:
-                  $ref: '#/components/schemas/pet1'
+                  $ref: '#/components/schemas/petSchema'
 components:
   schemas:
-    pet1:
+    petSchema:
         type: object
         required:
         - id
@@ -67,7 +67,7 @@ components:
               type: string
             tag:
               type: string
-    newPet1:
+    newPetSchema:
         type: object
         required:
         - name

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

@@ -224,10 +224,9 @@ public void ParseBasicSchemaWithReferenceShouldSucceed()
                     }
                 });
 
-            components.Should().BeEquivalentTo(
-                new OpenApiComponents
-                {
-                    Schemas =
+            var expectedComponents = new OpenApiComponents
+            {
+                Schemas =
                     {
                             ["ErrorModel"] = new JsonSchemaBuilder()
                                 .Ref("#/components/schemas/ErrorModel")
@@ -240,7 +239,7 @@ public void ParseBasicSchemaWithReferenceShouldSucceed()
                                 .Ref("#/components/schemas/ExtendedErrorModel")
                                 .AllOf(
                                     new JsonSchemaBuilder()
-                                        .Ref("#/components/schemas/ExtendedErrorModel")
+                                        .Ref("#/components/schemas/ErrorModel")
                                         .Type(SchemaValueType.Object)
                                         .Properties(
                                             ("code", new JsonSchemaBuilder().Type(SchemaValueType.Integer).Minimum(100).Maximum(600)),
@@ -251,9 +250,9 @@ public void ParseBasicSchemaWithReferenceShouldSucceed()
                                         .Required("rootCause")
                                         .Properties(("rootCause", new JsonSchemaBuilder().Type(SchemaValueType.String))))
                     }
-                },
-                options => options.Excluding(m => m.Name == "HostDocument")
-                                    .IgnoringCyclicReferences());
+            };
+
+            components.Should().BeEquivalentTo(expectedComponents);
         }
 
         [Fact]

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

@@ -223,8 +223,8 @@ public void ParseStandardPetStoreDocumentShouldSucceed()
                 {
                     Schemas = new Dictionary<string, JsonSchema>
                     {
-                        ["pet"] = new JsonSchemaBuilder()
-                                    .Ref("#/components/schemas/pet")
+                        ["pet1"] = new JsonSchemaBuilder()
+                                    .Ref("#/components/schemas/pet1")
                                     .Type(SchemaValueType.Object)
                                     .Required("id", "name")
                                     .Properties(
@@ -249,7 +249,7 @@ public void ParseStandardPetStoreDocumentShouldSucceed()
                     }
                 };
 
-                var petSchema = components.Schemas["pet"];
+                var petSchema = components.Schemas["pet1"];
 
                 var newPetSchema = components.Schemas["newPet"];
 

test/Microsoft.OpenApi.Readers.Tests/V3Tests/Samples/OpenApiDocument/petStore.yaml

@@ -42,12 +42,12 @@ paths:
                 schema:
                     type: array
                     items:
-                      "$ref": '#/components/schemas/pet'
+                      "$ref": '#/components/schemas/pet1'
             application/xml:
                 schema:
                     type: array
                     items:
-                      "$ref": '#/components/schemas/pet'
+                      "$ref": '#/components/schemas/pet1'
 
         '4XX':
           description: unexpected client error
@@ -77,7 +77,7 @@ paths:
           content:
             application/json:
                 schema:
-                    "$ref": '#/components/schemas/pet'
+                    "$ref": '#/components/schemas/pet1'
         '4XX':
           description: unexpected client error
           content:
@@ -108,10 +108,10 @@ paths:
           content:
             application/json:
                 schema:
-                    "$ref": '#/components/schemas/pet'
+                    "$ref": '#/components/schemas/pet1'
             application/xml:
                 schema:
-                    "$ref": '#/components/schemas/pet'
+                    "$ref": '#/components/schemas/pet1'
         '4XX':
           description: unexpected client error
           content:
@@ -152,7 +152,7 @@ paths:
                     "$ref": '#/components/schemas/errorModel'
 components:
     schemas:
-        pet:
+        pet1:
             type: object
             required:
             - id