Resolve bugs from resolving merge conflicts

Author: MaggieKimani1

src/Microsoft.OpenApi/Reader/ParseNodes/ListNode.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;
@@ -8,6 +8,7 @@
 using System.Text.Json.Nodes;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Exceptions;
+using Microsoft.OpenApi.Models;
 
 namespace Microsoft.OpenApi.Reader.ParseNodes
 {

src/Microsoft.OpenApi/Reader/V3/OpenApiDiscriminatorDeserializer.cs

@@ -27,7 +27,7 @@ internal static partial class OpenApiV3Deserializer
 
         private static readonly PatternFieldMap<OpenApiDiscriminator> _discriminatorPatternFields = new();
 
-        public static OpenApiDiscriminator LoadDiscriminator(ParseNode node)
+        public static OpenApiDiscriminator LoadDiscriminator(ParseNode node, OpenApiDocument hostDocument = null)
         {
             var mapNode = node.CheckMapNode("discriminator");
 

test/Microsoft.OpenApi.Readers.Tests/V2Tests/OpenApiDocumentTests.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;
@@ -189,10 +189,10 @@ public void ShouldAssignSchemaToAllResponses()
         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 = doc.ResolveJsonSchemaReference(schema.GetRef()) ?? schema;
+            schema = actual.ResolveJsonSchemaReference(schema.GetRef()) ?? schema;
 
             // Assert
             if (schema.Keywords.Count.Equals(1) && schema.GetRef() != null)

test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiDocumentTests.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.IO;
@@ -8,7 +8,6 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Models.References;
 using Microsoft.OpenApi.Reader;
-using Microsoft.OpenApi.Readers.V3;
 using Xunit;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
@@ -27,9 +26,9 @@ public void OperationWithSecurityRequirementShouldReferenceSecurityScheme()
         {
             var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "securedOperation.yaml"));
 
-            var securityScheme = openApiDoc.Paths["/"].Operations[OperationType.Get].Security.First().Keys.First();
+            var securityScheme = result.OpenApiDocument.Paths["/"].Operations[OperationType.Get].Security.First().Keys.First();
 
-            securityScheme.Should().BeEquivalentTo(openApiDoc.Components.SecuritySchemes.First().Value, 
+            securityScheme.Should().BeEquivalentTo(result.OpenApiDocument.Components.SecuritySchemes.First().Value, 
                 options => options.Excluding(x => x.Reference.HostDocument));
         }
 
@@ -38,9 +37,7 @@ public void ParseOperationWithParameterWithNoLocationShouldSucceed()
         {
             // Act
             var operation = OpenApiModelFactory.Load<OpenApiOperation>(Path.Combine(SampleFolderPath, "operationWithParameterWithNoLocation.json"), OpenApiSpecVersion.OpenApi3_0, out _);
-
-            // Assert
-            operation.Should().BeEquivalentTo(new OpenApiOperation
+            var expectedOp = new OpenApiOperation
             {
                 Tags =
                 {
@@ -70,6 +67,7 @@ public void ParseOperationWithParameterWithNoLocationShouldSucceed()
                     }
                 }
             };
+
             // Assert
             expectedOp.Should().BeEquivalentTo(operation, 
                 options => options.Excluding(x => x.Tags[0].Reference.HostDocument)

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

@@ -10,6 +10,7 @@
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Reader;
 using Xunit;
+using Microsoft.OpenApi.Reader.V3;
 
 namespace Microsoft.OpenApi.Readers.Tests.V3Tests
 {

test/Microsoft.OpenApi.Readers.Tests/V3Tests/OpenApiParameterTests.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.IO;
@@ -25,9 +25,9 @@ public void ResponseWithReferencedHeaderShouldReferenceComponent()
         {
             var result = OpenApiDocument.Load(Path.Combine(SampleFolderPath, "responseWithHeaderReference.yaml"));
 
-            var response = openApiDoc.Components.Responses["Test"];
+            var response = result.OpenApiDocument.Components.Responses["Test"];
             var expected = response.Headers.First().Value;
-            var actual = openApiDoc.Components.Headers.First().Value;
+            var actual = result.OpenApiDocument.Components.Headers.First().Value;
 
             actual.Description.Should().BeEquivalentTo(expected.Description);
         }

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

@@ -29,10 +29,10 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Models\Samples\sampleDocument.yaml">
-    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
     <EmbeddedResource Include="Models\Samples\sampleDocumentWithWhiteSpaces.yaml">
-        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </EmbeddedResource>
   </ItemGroup>