Fixed some issues introduced by code cleanup.

Tape-Worm · Jan 4, 2025 · c003b99 · c003b99
1 parent 6c6dd25
commit c003b99
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Gorgon/Gorgon.Core/IO/GorgonFileExtension.cs b/Gorgon/Gorgon.Core/IO/GorgonFileExtension.cs
@@ -247,7 +247,12 @@ public string FullExtension
     /// <returns>
     ///   <b>true</b> if the specified <see cref="object" /> is equal to this instance; otherwise, <b>false</b>.
     /// </returns>
-    public override bool Equals(object? obj) => obj is GorgonFileExtension ext ? ext.Equals(this) : base.Equals(obj);
+    public override bool Equals(object? obj) => obj switch
+    {
+        GorgonFileExtension ext => Equals(ext),
+        string str => Equals(str),
+        _ => base.Equals(obj),
+    };
 
     /// <summary>
     /// Returns a hash code for this instance.

diff --git a/Test/Gorgon.Core.Tests/GorgonFileExtensionTests.cs b/Test/Gorgon.Core.Tests/GorgonFileExtensionTests.cs
@@ -94,14 +94,18 @@ public void OperatorGreaterThanOrEqualShouldReturnTrueWhenLeftIsGreaterThanOrEqu
     public void OperatorEqualsShouldReturnTrueWhenExtensionEqualsString()
     {
         GorgonFileExtension fileExtension = new(".txt", "Text File");
-        Assert.AreEqual(".txt", fileExtension);
+#pragma warning disable MSTEST0037 // Use proper 'Assert' methods
+        Assert.IsTrue(".txt" == fileExtension);
+#pragma warning restore MSTEST0037 // Use proper 'Assert' methods
     }
 
     [TestMethod]
     public void OperatorNotEqualsShouldReturnFalseWhenExtensionEqualsString()
     {
-        GorgonFileExtension fileExtension = new(".txt", "Text File");
-        Assert.AreEqual(".txt", fileExtension);
+        GorgonFileExtension fileExtension = new(".txt1", "Text File");
+#pragma warning disable MSTEST0037 // Use proper 'Assert' methods
+        Assert.IsTrue(".txt" != fileExtension);
+#pragma warning restore MSTEST0037 // Use proper 'Assert' methods
     }
 
     [TestMethod]