Update tests

Author: irvinesunday

test/Microsoft.OpenApi.Readers.Tests/V2Tests/ComparisonTests.cs

@@ -4,6 +4,7 @@
 using System.IO;
 using FluentAssertions;
 using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Reader;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -17,14 +18,16 @@ public class ComparisonTests
         [InlineData("minimal")]
         [InlineData("basic")]
         //[InlineData("definitions")]  //Currently broken due to V3 references not behaving the same as V2
-        public void EquivalentV2AndV3DocumentsShouldProductEquivalentObjects(string fileName)
+        public void EquivalentV2AndV3DocumentsShouldProduceEquivalentObjects(string fileName)
         {
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
             using var streamV2 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v2.yaml"));
             using var streamV3 = Resources.GetStream(Path.Combine(SampleFolderPath, $"{fileName}.v3.yaml"));
             var result1 = OpenApiDocument.Load(Path.Combine(SampleFolderPath, $"{fileName}.v2.yaml"));
             var result2 = OpenApiDocument.Load(Path.Combine(SampleFolderPath, $"{fileName}.v3.yaml"));
 
-            result2.OpenApiDocument.Should().BeEquivalentTo(result1.OpenApiDocument);
+            result2.OpenApiDocument.Should().BeEquivalentTo(result1.OpenApiDocument,
+                options => options.Excluding(x => x.Workspace));
 
             result1.OpenApiDiagnostic.Errors.Should().BeEquivalentTo(result2.OpenApiDiagnostic.Errors);
         }

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

@@ -2,12 +2,15 @@
 // Licensed under the MIT license.
 
 using System;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using FluentAssertions;
 using Json.Schema;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader;
+using Microsoft.OpenApi.Writers;
+using VerifyXunit;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V2Tests
@@ -147,7 +150,8 @@ public void ShouldParseProducesInAnyOrder()
                             ["Error"] = errorSchema
                         }
                 }
-            });
+            }, options => options.Excluding(x => x.Workspace));
+
         }
 
 

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

@@ -17,6 +17,11 @@ public class OpenApiDocumentTests
     {
         private const string SampleFolderPath = "V31Tests/Samples/OpenApiDocument/";
 
+        public OpenApiDocumentTests()
+        {
+            OpenApiReaderRegistry.RegisterReader(OpenApiConstants.Yaml, new OpenApiYamlReader());
+        }
+
         public static T Clone<T>(T element) where T : IOpenApiSerializable
         {
             using var stream = new MemoryStream();
@@ -179,7 +184,7 @@ public void ParseDocumentWithWebhooksShouldSucceed()
             // Assert
             var schema = actual.OpenApiDocument.Webhooks["/pets"].Operations[OperationType.Get].Responses["200"].Content["application/json"].Schema;
             actual.OpenApiDiagnostic.Should().BeEquivalentTo(new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 });
-            actual.OpenApiDocument.Should().BeEquivalentTo(expected);
+            actual.OpenApiDocument.Should().BeEquivalentTo(expected, options => options.Excluding(x => x.Workspace));
         }
 
         [Fact]
@@ -320,24 +325,11 @@ public void ParseDocumentsWithReusablePathItemInWebhooksSucceeds()
             };
 
             // Assert
-            actual.OpenApiDocument.Should().BeEquivalentTo(expected);
+            actual.OpenApiDocument.Should().BeEquivalentTo(expected, options => options.Excluding(x => x.Workspace));
             actual.OpenApiDiagnostic.Should().BeEquivalentTo(
     new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_1 });
         }
 
-        [Fact]
-        public void ParseDocumentWithDescriptionInDollarRefsShouldSucceed()
-        {
-            // Arrange
-            var actual = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "documentWithSummaryAndDescriptionInReference.yaml"));
-
-            // Act
-            var header = actual.OpenApiDocument.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*/
-        }
-
         [Fact]
         public void ParseDocumentWithExampleInSchemaShouldSucceed()
         {

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

@@ -94,7 +94,7 @@ public void ParseDocumentFromInlineStringShouldSucceed()
                         Version = "0.9.1"
                     },
                     Paths = new OpenApiPaths()
-                });
+                }, options => options.Excluding(x => x.Workspace));
 
             result.OpenApiDiagnostic.Should().BeEquivalentTo(
                 new OpenApiDiagnostic()
@@ -145,7 +145,7 @@ public void ParseBasicDocumentWithMultipleServersShouldSucceed()
                         }
                     },
                     Paths = new OpenApiPaths()
-                });
+                }, options => options.Excluding(x => x.Workspace));
         }
         [Fact]
         public void ParseBrokenMinimalDocumentShouldYieldExpectedDiagnostic()
@@ -161,7 +161,7 @@ public void ParseBrokenMinimalDocumentShouldYieldExpectedDiagnostic()
                         Version = "0.9"
                     },
                     Paths = new OpenApiPaths()
-                });
+                }, options => options.Excluding(x => x.Workspace));
 
             result.OpenApiDiagnostic.Should().BeEquivalentTo(
                 new OpenApiDiagnostic
@@ -189,7 +189,7 @@ public void ParseMinimalDocumentShouldSucceed()
                         Version = "0.9.1"
                     },
                     Paths = new OpenApiPaths()
-                });
+                }, options => options.Excluding(x => x.Workspace));
 
             result.OpenApiDiagnostic.Should().BeEquivalentTo(
                 new OpenApiDiagnostic()
@@ -510,7 +510,7 @@ public void ParseStandardPetStoreDocumentShouldSucceed()
                 Components = components
             };
 
-            result.OpenApiDocument.Should().BeEquivalentTo(expectedDoc);
+            result.OpenApiDocument.Should().BeEquivalentTo(expectedDoc, options => options.Excluding(x => x.Workspace));
 
             result.OpenApiDiagnostic.Should().BeEquivalentTo(
                 new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });
@@ -943,7 +943,8 @@ public void ParseModifiedPetStoreDocumentWithTagAndSecurityShouldSucceed()
                     }
             };
 
-            actual.OpenApiDocument.Should().BeEquivalentTo(expected, options => options.Excluding(m => m.Name == "HostDocument"));
+            actual.OpenApiDocument.Should().BeEquivalentTo(expected, options => options.Excluding(m => m.Name == "HostDocument")
+            .Excluding(x => x.Workspace));
 
             actual.OpenApiDiagnostic.Should().BeEquivalentTo(
                     new OpenApiDiagnostic() { SpecificationVersion = OpenApiSpecVersion.OpenApi3_0 });