Clean up test

Author: MaggieKimani1

src/Microsoft.OpenApi/Models/OpenApiDocument.cs

@@ -3,7 +3,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
+using System.Runtime.Serialization.Formatters.Binary;
+using System.Security.Cryptography;
+using System.Text;
 using Microsoft.OpenApi.Exceptions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Services;
@@ -62,6 +66,8 @@ public class OpenApiDocument : IOpenApiSerializable, IOpenApiExtensible
         /// </summary>
         public IDictionary<string, IOpenApiExtension> Extensions { get; set; } = new Dictionary<string, IOpenApiExtension>();
 
+        private static readonly object locker = new();
+
         /// <summary>
         /// Parameter-less constructor
         /// </summary>
@@ -375,26 +381,42 @@ public IOpenApiReferenceable ResolveReference(OpenApiReference reference)
             return ResolveReference(reference, false);
         }
 
-        /// <summary>
-        /// Computes the hash code for an OpenApiDocument and its property values.
-        /// </summary>
-        /// <returns> The hash code.</returns>
-        public override int GetHashCode()
+        ///// <summary>
+        ///// Computes the hash code for an OpenApiDocument and its property values.
+        ///// </summary>
+        ///// <returns> The hash code.</returns>
+        //public override int GetHashCode()
+        //{
+        //    // select two random prime numbers e.g 1 and 3 and use them to compute hash codes
+        //    int hash = 1;
+        //    hash = hash * 3 + (Workspace == null ? 0 : Workspace.GetHashCode());
+        //    hash = hash * 3 + (Info == null ? 0 : Info.GetHashCode());
+        //    hash = hash * 3 + (Servers == null ? 0 : Servers.GetHashCode());
+        //    hash = hash * 3 + (Paths == null ? 0 : Paths.GetHashCode());
+        //    hash = hash * 3 + (Components == null ? 0 : Components.GetHashCode());
+        //    hash = hash * 3 + (SecurityRequirements == null ? 0 : SecurityRequirements.GetHashCode());
+        //    hash = hash * 3 + (Tags == null ? 0 : Tags.GetHashCode());
+        //    hash = hash * 3 + (ExternalDocs == null ? 0 : ExternalDocs.GetHashCode());
+        //    hash = hash * 3 + (Extensions == null ? 0 : Extensions.GetHashCode());
+
+        //    return hash;
+        //}
+
+        public static string GenerateHashValue(Stream input)
         {
-            // select two random prime numbers e.g 1 and 3 and use them to compute hash codes
-            int hash = 1;
-            hash = hash * 3 + (Workspace == null ? 0 : Workspace.GetHashCode());
-            hash = hash * 3 + (Info == null ? 0 : Info.GetHashCode());
-            hash = hash * 3 + (Servers == null ? 0 : Servers.GetHashCode());
-            hash = hash * 3 + (Paths == null ? 0 : Paths.GetHashCode());
-            hash = hash * 3 + (Components == null ? 0 : Components.GetHashCode());
-            hash = hash * 3 + (SecurityRequirements == null ? 0 : SecurityRequirements.GetHashCode());
-            hash = hash * 3 + (Tags == null ? 0 : Tags.GetHashCode());
-            hash = hash * 3 + (ExternalDocs == null ? 0 : ExternalDocs.GetHashCode());
-            hash = hash * 3 + (Extensions == null ? 0 : Extensions.GetHashCode());
-
-            return hash;
-        }        
+            HashAlgorithm sha = SHA512.Create();
+            byte[] result = sha.ComputeHash(input);
+
+            // Build the final string by converting each byte
+            // into hex and appending it to a StringBuilder
+            StringBuilder sb = new StringBuilder();
+            for (int i = 0; i < result.Length; i++)
+            {
+                sb.Append(result[i].ToString("X2"));
+            }
+
+            return sb.ToString();
+        }
 
         /// <summary>
         /// Load the referenced <see cref="IOpenApiReferenceable"/> object from a <see cref="OpenApiReference"/> object

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

@@ -9,13 +9,11 @@
 using System.Threading;
 using FluentAssertions;
 using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Extensions;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Validations;
 using Microsoft.OpenApi.Validations.Rules;
 using Microsoft.OpenApi.Writers;
-using Newtonsoft.Json;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -275,17 +273,8 @@ And reading in similar documents but one has a whitespace yields the same hash c
             var openApiDoc3 = new OpenApiStreamReader().Read(stream3, out var diagnostic3);
 
             // Assert
-            /* The assumption is, if doc1.Equals(doc2), then doc1.GetHashCode().Equals(doc2.GetHashCode())*/
-            if (openApiDoc1.Equals(openApiDoc2) && openApiDoc2.Equals(openApiDoc3))
-            {
-                Assert.Equal(diagnostic1.HashCode, diagnostic2.HashCode);
-                Assert.Equal(diagnostic2.HashCode, diagnostic3.HashCode);
-            }
-
-            /*Adding a server object to the original doc to check whether the hash code changes*/
-            openApiDoc1.Servers = new List<OpenApiServer>();
-            var hash = openApiDoc1.GetHashCode();
-            Assert.NotEqual(diagnostic1.HashCode, hash);
+            Assert.Equal(diagnostic1.HashCode, diagnostic2.HashCode);
+            Assert.Equal(diagnostic2.HashCode, diagnostic3.HashCode);
         }        
 
         [Fact]