Fix unit tests

sys27 · Sep 25, 2017 · 4715ef8 · 4715ef8
1 parent 1687fa2
commit 4715ef8
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 47 deletions.
diff --git a/xFunc.Tests/Expressions/LogicalAndBitwise/AndTest.cs b/xFunc.Tests/Expressions/LogicalAndBitwise/AndTest.cs
@@ -44,15 +44,15 @@ public void ExecuteTest3()
         {
             var exp = new And(new Bool(true), new Bool(false));
 
-            Assert.Equal(false, exp.Execute());
+            Assert.False((bool)exp.Execute());
         }
 
         [Fact]
         public void ExecuteTest4()
         {
             var exp = new And(new Bool(true), new Bool(true));
 
-            Assert.Equal(true, exp.Execute());
+            Assert.True((bool)exp.Execute());
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/LogicalAndBitwise/EqualityTest.cs b/xFunc.Tests/Expressions/LogicalAndBitwise/EqualityTest.cs
@@ -28,15 +28,15 @@ public void ExecuteTest1()
         {
             var eq = new Equality(new Bool(true), new Bool(true));
 
-            Assert.Equal(true, eq.Execute());
+            Assert.True((bool)eq.Execute());
         }
 
         [Fact]
         public void ExecuteTest2()
         {
             var eq = new Equality(new Bool(true), new Bool(false));
 
-            Assert.Equal(false, eq.Execute());
+            Assert.False((bool)eq.Execute());
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/LogicalAndBitwise/ImplicationTest.cs b/xFunc.Tests/Expressions/LogicalAndBitwise/ImplicationTest.cs
@@ -27,15 +27,15 @@ public void ExecuteTest1()
         {
             var impl = new Implication(new Bool(true), new Bool(false));
 
-            Assert.Equal(false, impl.Execute());
+            Assert.False((bool)impl.Execute());
         }
 
         [Fact]
         public void ExecuteTest2()
         {
             var impl = new Implication(new Bool(true), new Bool(true));
 
-            Assert.Equal(true, impl.Execute());
+            Assert.True((bool)impl.Execute());
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/LogicalAndBitwise/NAndTest.cs b/xFunc.Tests/Expressions/LogicalAndBitwise/NAndTest.cs
@@ -28,15 +28,15 @@ public void ExecuteTest1()
         {
             var nand = new NAnd(new Bool(true), new Bool(true));
 
-            Assert.Equal(false, nand.Execute());
+            Assert.False((bool)nand.Execute());
         }
 
         [Fact]
         public void ExecuteTest2()
         {
             var nand = new NAnd(new Bool(false), new Bool(true));
 
-            Assert.Equal(true, nand.Execute());
+            Assert.True((bool)nand.Execute());
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/LogicalAndBitwise/NOrTest.cs b/xFunc.Tests/Expressions/LogicalAndBitwise/NOrTest.cs
@@ -27,15 +27,15 @@ public void ExecuteTest1()
         {
             var nor = new NOr(new Bool(false), new Bool(true));
 
-            Assert.Equal(false, nor.Execute());
+            Assert.False((bool)nor.Execute());
         }
 
         [Fact]
         public void ExecuteTest2()
         {
             var nor = new NOr(new Bool(false), new Bool(false));
 
-            Assert.Equal(true, nor.Execute());
+            Assert.True((bool)nor.Execute());
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/LogicalAndBitwise/NotTest.cs b/xFunc.Tests/Expressions/LogicalAndBitwise/NotTest.cs
@@ -44,7 +44,7 @@ public void ExecuteTest3()
         {
             var exp = new Not(new Bool(true));
 
-            Assert.Equal(false, exp.Execute());
+            Assert.False((bool)exp.Execute());
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/LogicalAndBitwise/OrTest.cs b/xFunc.Tests/Expressions/LogicalAndBitwise/OrTest.cs
@@ -44,15 +44,15 @@ public void ExecuteTest3()
         {
             var exp = new Or(new Bool(true), new Bool(false));
 
-            Assert.Equal(true, exp.Execute());
+            Assert.True((bool)exp.Execute());
         }
 
         [Fact]
         public void ExecuteTest4()
         {
             var exp = new Or(new Bool(false), new Bool(false));
 
-            Assert.Equal(false, exp.Execute());
+            Assert.False((bool)exp.Execute());
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/LogicalAndBitwise/XOrTest.cs b/xFunc.Tests/Expressions/LogicalAndBitwise/XOrTest.cs
@@ -44,15 +44,15 @@ public void ExecuteTest3()
         {
             var exp = new XOr(new Bool(true), new Bool(true));
 
-            Assert.Equal(false, exp.Execute());
+            Assert.False((bool)exp.Execute());
         }
 
         [Fact]
         public void ExecuteTest4()
         {
             var exp = new XOr(new Bool(false), new Bool(true));
 
-            Assert.Equal(true, exp.Execute());
+            Assert.True((bool)exp.Execute());
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/Programming/AndTest.cs b/xFunc.Tests/Expressions/Programming/AndTest.cs
@@ -32,7 +32,7 @@ public void CalculateAndTrueTest()
             var greaterThen = new GreaterThan(new Variable("x"), new Number(-10));
             var and = new And(lessThen, greaterThen);
 
-            Assert.Equal(true, and.Execute(parameters));
+            Assert.True((bool)and.Execute(parameters));
         }
 
         [Fact]
@@ -43,7 +43,7 @@ public void CalculateAndFalseTest()
             var greaterThen = new GreaterThan(new Variable("x"), new Number(10));
             var and = new And(lessThen, greaterThen);
 
-            Assert.Equal(false, and.Execute(parameters));
+            Assert.False((bool)and.Execute(parameters));
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/Programming/EqualTest.cs b/xFunc.Tests/Expressions/Programming/EqualTest.cs
@@ -31,7 +31,7 @@ public void NumberEqualTest()
             var equal = new Equal(new Number(10), new Number(10));
             var result = (bool)equal.Execute();
 
-            Assert.Equal(true, result);
+            Assert.True(result);
         }
 
         [Fact]
@@ -45,7 +45,7 @@ public void NumberVarEqualTest()
             var equal = new Equal(new Variable("x"), new Variable("y"));
             var result = (bool)equal.Execute(parameters);
 
-            Assert.Equal(true, result);
+            Assert.True(result);
         }
 
         [Fact]
@@ -54,7 +54,7 @@ public void BoolTrueEqualTest()
             var equal = new Equal(new Bool(true), new Bool(true));
             var result = (bool)equal.Execute();
 
-            Assert.Equal(true, result);
+            Assert.True(result);
         }
 
         [Fact]
@@ -68,7 +68,7 @@ public void BoolTrueVarEqualTest()
             var equal = new Equal(new Variable("x"), new Variable("y"));
             var result = (bool)equal.Execute(parameters);
 
-            Assert.Equal(true, result);
+            Assert.True(result);
         }
 
         [Fact]
@@ -77,7 +77,7 @@ public void BoolTrueAndFalseEqualTest()
             var equal = new Equal(new Bool(true), new Bool(false));
             var result = (bool)equal.Execute();
 
-            Assert.Equal(false, result);
+            Assert.False(result);
         }
 
         [Fact]
@@ -91,7 +91,7 @@ public void BoolTrueAndFalseVarEqualTest()
             var equal = new Equal(new Variable("x"), new Variable("y"));
             var result = (bool)equal.Execute(parameters);
 
-            Assert.Equal(false, result);
+            Assert.False(result);
         }
 
         [Fact]
@@ -100,7 +100,7 @@ public void BoolFalseEqualTest()
             var equal = new Equal(new Bool(false), new Bool(false));
             var result = (bool)equal.Execute();
 
-            Assert.Equal(true, result);
+            Assert.True(result);
         }
 
         [Fact]
@@ -114,7 +114,7 @@ public void BoolFalseVarEqualTest()
             var equal = new Equal(new Variable("x"), new Variable("y"));
             var result = (bool)equal.Execute(parameters);
 
-            Assert.Equal(true, result);
+            Assert.True(result);
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/Programming/GreaterOrEqualTest.cs b/xFunc.Tests/Expressions/Programming/GreaterOrEqualTest.cs
@@ -30,7 +30,7 @@ public void CalculateGreaterTrueTest1()
             var parameters = new ParameterCollection() { new Parameter("x", 463) };
             var lessThen = new GreaterOrEqual(new Variable("x"), new Number(10));
 
-            Assert.Equal(true, lessThen.Execute(parameters));
+            Assert.True((bool)lessThen.Execute(parameters));
         }
 
         [Fact]
@@ -39,7 +39,7 @@ public void CalculateGreaterTrueTest2()
             var parameters = new ParameterCollection() { new Parameter("x", 10) };
             var lessThen = new GreaterOrEqual(new Variable("x"), new Number(10));
 
-            Assert.Equal(true, lessThen.Execute(parameters));
+            Assert.True((bool)lessThen.Execute(parameters));
         }
 
         [Fact]
@@ -48,7 +48,7 @@ public void CalculateGreaterFalseTest()
             var parameters = new ParameterCollection() { new Parameter("x", 0) };
             var lessThen = new GreaterOrEqual(new Variable("x"), new Number(10));
 
-            Assert.Equal(false, lessThen.Execute(parameters));
+            Assert.False((bool)lessThen.Execute(parameters));
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/Programming/GreaterTest.cs b/xFunc.Tests/Expressions/Programming/GreaterTest.cs
@@ -30,7 +30,7 @@ public void CalculateGreaterTrueTest()
             var parameters = new ParameterCollection() { new Parameter("x", 463) };
             var greaterThen = new GreaterThan(new Variable("x"), new Number(10));
 
-            Assert.Equal(true, greaterThen.Execute(parameters));
+            Assert.True((bool)greaterThen.Execute(parameters));
         }
 
         [Fact]
@@ -39,7 +39,7 @@ public void CalculateGreaterFalseTest()
             var parameters = new ParameterCollection() { new Parameter("x", 0) };
             var lessThen = new GreaterThan(new Variable("x"), new Number(10));
 
-            Assert.Equal(false, lessThen.Execute(parameters));
+            Assert.False((bool)lessThen.Execute(parameters));
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/Programming/LessOrEqualTest.cs b/xFunc.Tests/Expressions/Programming/LessOrEqualTest.cs
@@ -30,7 +30,7 @@ public void CalculateLessTrueTest1()
             var parameters = new ParameterCollection() { new Parameter("x", 0) };
             var lessThen = new LessOrEqual(new Variable("x"), new Number(10));
 
-            Assert.Equal(true, lessThen.Execute(parameters));
+            Assert.True((bool)lessThen.Execute(parameters));
         }
 
         [Fact]
@@ -39,7 +39,7 @@ public void CalculateLessTrueTest2()
             var parameters = new ParameterCollection() { new Parameter("x", 10) };
             var lessThen = new LessOrEqual(new Variable("x"), new Number(10));
 
-            Assert.Equal(true, lessThen.Execute(parameters));
+            Assert.True((bool)lessThen.Execute(parameters));
         }
 
         [Fact]
@@ -48,7 +48,7 @@ public void CalculateLessFalseTest()
             var parameters = new ParameterCollection() { new Parameter("x", 666) };
             var lessThen = new LessOrEqual(new Variable("x"), new Number(10));
 
-            Assert.Equal(false, lessThen.Execute(parameters));
+            Assert.False((bool)lessThen.Execute(parameters));
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/Programming/LessThanTest.cs b/xFunc.Tests/Expressions/Programming/LessThanTest.cs
@@ -30,7 +30,7 @@ public void CalculateLessTrueTest()
             var parameters = new ParameterCollection() { new Parameter("x", 0) };
             var lessThen = new LessThan(new Variable("x"), new Number(10));
 
-            Assert.Equal(true, lessThen.Execute(parameters));
+            Assert.True((bool)lessThen.Execute(parameters));
         }
 
         [Fact]
@@ -39,7 +39,7 @@ public void CalculateLessFalseTest()
             var parameters = new ParameterCollection() { new Parameter("x", 10) };
             var lessThen = new LessThan(new Variable("x"), new Number(10));
 
-            Assert.Equal(false, lessThen.Execute(parameters));
+            Assert.False((bool)lessThen.Execute(parameters));
         }
 
         [Fact]

diff --git a/xFunc.Tests/Expressions/Programming/NotEqualTest.cs b/xFunc.Tests/Expressions/Programming/NotEqualTest.cs
@@ -31,7 +31,7 @@ public void NumberEqualTest()
             var equal = new NotEqual(new Number(11), new Number(10));
             var result = (bool)equal.Execute();
 
-            Assert.Equal(true, result);
+            Assert.True(result);
         }
 
         [Fact]
@@ -45,7 +45,7 @@ public void NumberVarEqualTest()
             var equal = new NotEqual(new Variable("x"), new Variable("y"));
             var result = (bool)equal.Execute(parameters);
 
-            Assert.Equal(true, result);
+            Assert.True(result);
         }
 
         [Fact]
@@ -58,7 +58,7 @@ public void NumberAndBoolVarEqualTest()
             };
             var equal = new NotEqual(new Variable("x"), new Variable("y"));
 
-            Assert.Throws<NotSupportedException>(() => (bool)equal.Execute(parameters));
+            Assert.Throws<NotSupportedException>(() => equal.Execute(parameters));
         }
 
         [Fact]
@@ -67,7 +67,7 @@ public void BoolTrueEqualTest()
             var equal = new NotEqual(new Bool(true), new Bool(true));
             var result = (bool)equal.Execute();
 
-            Assert.Equal(false, result);
+            Assert.False(result);
         }
 
         [Fact]
@@ -81,7 +81,7 @@ public void BoolTrueVarEqualTest()
             var equal = new NotEqual(new Variable("x"), new Variable("y"));
             var result = (bool)equal.Execute(parameters);
 
-            Assert.Equal(false, result);
+            Assert.False(result);
         }
 
         [Fact]
@@ -90,7 +90,7 @@ public void BoolTrueAndFalseEqualTest()
             var equal = new NotEqual(new Bool(true), new Bool(false));
             var result = (bool)equal.Execute();
 
-            Assert.Equal(true, result);
+            Assert.True(result);
         }
 
         [Fact]
@@ -104,7 +104,7 @@ public void BoolTrueAndFalseVarEqualTest()
             var equal = new NotEqual(new Variable("x"), new Variable("y"));
             var result = (bool)equal.Execute(parameters);
 
-            Assert.Equal(true, result);
+            Assert.True(result);
         }
 
         [Fact]
@@ -113,7 +113,7 @@ public void BoolFalseEqualTest()
             var equal = new NotEqual(new Bool(false), new Bool(false));
             var result = (bool)equal.Execute();
 
-            Assert.Equal(false, result);
+            Assert.False(result);
         }
 
         [Fact]
@@ -127,7 +127,7 @@ public void BoolFalseVarEqualTest()
             var equal = new NotEqual(new Variable("x"), new Variable("y"));
             var result = (bool)equal.Execute(parameters);
 
-            Assert.Equal(false, result);
+            Assert.False(result);
         }
 
         [Fact]