From 5be2ea6e235c7a70f4acc4b55c2281bf66d18cdd Mon Sep 17 00:00:00 2001
From: Jim <112640460+0xJ1M@users.noreply.github.com>
Date: Thu, 7 Sep 2023 22:56:36 +0100
Subject: [PATCH] Updated unit test coverage

---
 .../Parser Tests/TokenIserTests.cs            | 65 -------------------
 .../Parser/Parser/ExpressionTree.cs           |  3 +-
 .../MathEngine/Parser/Tokeniser/Token.cs      | 18 ++---
 3 files changed, 10 insertions(+), 76 deletions(-)
 delete mode 100644 MathEngine/EngineTests/Parser Tests/TokenIserTests.cs

diff --git a/MathEngine/EngineTests/Parser Tests/TokenIserTests.cs b/MathEngine/EngineTests/Parser Tests/TokenIserTests.cs
deleted file mode 100644
index e0c2911..0000000
--- a/MathEngine/EngineTests/Parser Tests/TokenIserTests.cs	
+++ /dev/null
@@ -1,65 +0,0 @@
-using MathEngine.Parser.Tokeniser;
-
-namespace EngineTests
-{
-    /// <summary>
-    /// Class for testing the Tokeniser
-    /// </summary>
-    [TestClass]
-    public class TokeniserTests
-    {
-        /// <summary>
-        /// Test the tokeniser on a basic string
-        /// </summary>
-        [TestMethod]
-        public void TestTokeniseBasicString()
-        {
-            //Arrange
-            string testString = "1+1";
-            Token one = new("1", Token.Type.Numeric, Token.NumericType.Decimal, 0);
-            List<Token> expectedValue = new()
-            {
-                one,
-                Token.Plus,
-                one
-            };
-            //Act
-            List<Token> returnedValue = Tokeniser.Tokenise(testString);
-            //Assert
-            Assert.IsTrue(expectedValue.SequenceEqual(returnedValue));
-        }
-
-        /// <summary>
-        /// Test the tokeniser on a basic string, but with significant ammounts of whitespace
-        /// </summary>
-        [TestMethod]
-        public void TestTokeniseBasicStringWithWhiteSpace()
-        {
-            //Arrange
-            string testString = "  1   +   1              ";
-            Token one = new("1", Token.Type.Numeric, Token.NumericType.Decimal, 0);
-            List<Token> expectedValue = new()
-            {
-                one,
-                Token.Plus,
-                one
-            };
-            //Act
-            List<Token> returnedValue = Tokeniser.Tokenise(testString);
-            //Assert
-            Assert.IsTrue(expectedValue.SequenceEqual(returnedValue));
-        }
-
-        /// <summary>
-        /// Test the tokeniser on a string which contains a number which is not formatted correctly
-        /// </summary>
-        [TestMethod]
-        public void TestTokeniseStringWithInvalidNumbr()
-        {
-            //Arrange
-            string testString = "1+11.2.5";
-            //Act and Assert
-            Assert.ThrowsException<Exception>(() => Tokeniser.Tokenise(testString));            
-        }
-    }
-}
\ No newline at end of file
diff --git a/MathEngine/MathEngine/Parser/Parser/ExpressionTree.cs b/MathEngine/MathEngine/Parser/Parser/ExpressionTree.cs
index 8c11965..5246586 100644
--- a/MathEngine/MathEngine/Parser/Parser/ExpressionTree.cs
+++ b/MathEngine/MathEngine/Parser/Parser/ExpressionTree.cs
@@ -1,5 +1,4 @@
-using MathEngine.Parser.Parser.Node;
-using MathEngine.Parser.Tokeniser;
+using MathEngine.Parser.Tokeniser;
 namespace MathEngine.Parser.Parser
 {
     /// <summary>
diff --git a/MathEngine/MathEngine/Parser/Tokeniser/Token.cs b/MathEngine/MathEngine/Parser/Tokeniser/Token.cs
index 0e05502..52ae344 100644
--- a/MathEngine/MathEngine/Parser/Tokeniser/Token.cs
+++ b/MathEngine/MathEngine/Parser/Tokeniser/Token.cs
@@ -179,23 +179,23 @@
         /// <returns>Returns true if the two Tokens are not equal and false otherwise</returns>
         public static bool operator !=(Token X, Token Y)
         {
-            if (X.TokenValue == Y.TokenValue)
+            if (X.TokenValue != Y.TokenValue)
             {
-                return false;
+                return true;
             }
-            if (X.TokenType == Y.TokenType)
+            if (X.TokenType != Y.TokenType)
             {
-                return false;
+                return true;
             }
-            if (X.NumericalType == Y.NumericalType)
+            if (X.NumericalType != Y.NumericalType)
             {
-                return false;
+                return true;
             }
-            if (X.Arity == Y.Arity)
+            if (X.Arity != Y.Arity)
             {
-                return false;
+                return true;
             }
-            return true;
+            return false;
         }
 
         /// <summary>