From 4715ef8d22336f4e1b6fa970df5b8d28381faf0b Mon Sep 17 00:00:00 2001 From: sys_27 Date: Mon, 25 Sep 2017 13:06:39 +0300 Subject: [PATCH] Fix unit tests --- .../Expressions/LogicalAndBitwise/AndTest.cs | 4 ++-- .../LogicalAndBitwise/EqualityTest.cs | 4 ++-- .../LogicalAndBitwise/ImplicationTest.cs | 4 ++-- .../Expressions/LogicalAndBitwise/NAndTest.cs | 4 ++-- .../Expressions/LogicalAndBitwise/NOrTest.cs | 4 ++-- .../Expressions/LogicalAndBitwise/NotTest.cs | 2 +- .../Expressions/LogicalAndBitwise/OrTest.cs | 4 ++-- .../Expressions/LogicalAndBitwise/XOrTest.cs | 4 ++-- xFunc.Tests/Expressions/Programming/AndTest.cs | 4 ++-- .../Expressions/Programming/EqualTest.cs | 16 ++++++++-------- .../Programming/GreaterOrEqualTest.cs | 6 +++--- .../Expressions/Programming/GreaterTest.cs | 4 ++-- .../Expressions/Programming/LessOrEqualTest.cs | 6 +++--- .../Expressions/Programming/LessThanTest.cs | 4 ++-- .../Expressions/Programming/NotEqualTest.cs | 18 +++++++++--------- xFunc.Tests/Expressions/Programming/OrTest.cs | 4 ++-- xFunc.Tests/Results/BooleanResultTest.cs | 2 +- 17 files changed, 47 insertions(+), 47 deletions(-) diff --git a/xFunc.Tests/Expressions/LogicalAndBitwise/AndTest.cs b/xFunc.Tests/Expressions/LogicalAndBitwise/AndTest.cs index 8ab826a34..002ef1a6e 100644 --- a/xFunc.Tests/Expressions/LogicalAndBitwise/AndTest.cs +++ b/xFunc.Tests/Expressions/LogicalAndBitwise/AndTest.cs @@ -44,7 +44,7 @@ public void ExecuteTest3() { var exp = new And(new Bool(true), new Bool(false)); - Assert.Equal(false, exp.Execute()); + Assert.False((bool)exp.Execute()); } [Fact] @@ -52,7 +52,7 @@ 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 index 92aa7fdb1..f08e464eb 100644 --- a/xFunc.Tests/Expressions/LogicalAndBitwise/EqualityTest.cs +++ b/xFunc.Tests/Expressions/LogicalAndBitwise/EqualityTest.cs @@ -28,7 +28,7 @@ public void ExecuteTest1() { var eq = new Equality(new Bool(true), new Bool(true)); - Assert.Equal(true, eq.Execute()); + Assert.True((bool)eq.Execute()); } [Fact] @@ -36,7 +36,7 @@ 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 index 6459d68c0..cca940139 100644 --- a/xFunc.Tests/Expressions/LogicalAndBitwise/ImplicationTest.cs +++ b/xFunc.Tests/Expressions/LogicalAndBitwise/ImplicationTest.cs @@ -27,7 +27,7 @@ public void ExecuteTest1() { var impl = new Implication(new Bool(true), new Bool(false)); - Assert.Equal(false, impl.Execute()); + Assert.False((bool)impl.Execute()); } [Fact] @@ -35,7 +35,7 @@ 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 index 255b93703..a120d6293 100644 --- a/xFunc.Tests/Expressions/LogicalAndBitwise/NAndTest.cs +++ b/xFunc.Tests/Expressions/LogicalAndBitwise/NAndTest.cs @@ -28,7 +28,7 @@ public void ExecuteTest1() { var nand = new NAnd(new Bool(true), new Bool(true)); - Assert.Equal(false, nand.Execute()); + Assert.False((bool)nand.Execute()); } [Fact] @@ -36,7 +36,7 @@ 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 index 795c4927a..d924da53a 100644 --- a/xFunc.Tests/Expressions/LogicalAndBitwise/NOrTest.cs +++ b/xFunc.Tests/Expressions/LogicalAndBitwise/NOrTest.cs @@ -27,7 +27,7 @@ public void ExecuteTest1() { var nor = new NOr(new Bool(false), new Bool(true)); - Assert.Equal(false, nor.Execute()); + Assert.False((bool)nor.Execute()); } [Fact] @@ -35,7 +35,7 @@ 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 index 663c38a62..808b3a004 100644 --- 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 index cfa5f030d..d3d39e2a3 100644 --- a/xFunc.Tests/Expressions/LogicalAndBitwise/OrTest.cs +++ b/xFunc.Tests/Expressions/LogicalAndBitwise/OrTest.cs @@ -44,7 +44,7 @@ public void ExecuteTest3() { var exp = new Or(new Bool(true), new Bool(false)); - Assert.Equal(true, exp.Execute()); + Assert.True((bool)exp.Execute()); } [Fact] @@ -52,7 +52,7 @@ 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 index 5ca362785..9c7eb60f1 100644 --- a/xFunc.Tests/Expressions/LogicalAndBitwise/XOrTest.cs +++ b/xFunc.Tests/Expressions/LogicalAndBitwise/XOrTest.cs @@ -44,7 +44,7 @@ public void ExecuteTest3() { var exp = new XOr(new Bool(true), new Bool(true)); - Assert.Equal(false, exp.Execute()); + Assert.False((bool)exp.Execute()); } [Fact] @@ -52,7 +52,7 @@ 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 index f79a65dc4..46d285fcf 100644 --- 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 index 383e2a73b..e494425a8 100644 --- 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 index e3135893e..d66244404 100644 --- 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 index 00934804a..72b37158a 100644 --- 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 index da7a8951a..94ad2a3ec 100644 --- 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 index e0f54ad3a..f5828f6f2 100644 --- 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 index 44254fbe1..15f4dc277 100644 --- 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(() => (bool)equal.Execute(parameters)); + Assert.Throws(() => 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] diff --git a/xFunc.Tests/Expressions/Programming/OrTest.cs b/xFunc.Tests/Expressions/Programming/OrTest.cs index 9a9bf4007..185c0c8ce 100644 --- a/xFunc.Tests/Expressions/Programming/OrTest.cs +++ b/xFunc.Tests/Expressions/Programming/OrTest.cs @@ -32,7 +32,7 @@ public void CalculateOrTrueTest1() var greaterThen = new GreaterThan(new Variable("x"), new Number(-10)); var or = new Or(lessThen, greaterThen); - Assert.Equal(true, or.Execute(parameters)); + Assert.True((bool)or.Execute(parameters)); } [Fact] @@ -43,7 +43,7 @@ public void CalculateOrTrueTest2() var greaterThen = new GreaterThan(new Variable("x"), new Number(-10)); var or = new Or(lessThen, greaterThen); - Assert.Equal(true, or.Execute(parameters)); + Assert.True((bool)or.Execute(parameters)); } [Fact] diff --git a/xFunc.Tests/Results/BooleanResultTest.cs b/xFunc.Tests/Results/BooleanResultTest.cs index 259cd3f8c..422a0a2c6 100644 --- a/xFunc.Tests/Results/BooleanResultTest.cs +++ b/xFunc.Tests/Results/BooleanResultTest.cs @@ -35,7 +35,7 @@ public void IResultTest() { var result = new BooleanResult(true) as IResult; - Assert.Equal(true, result.Result); + Assert.True((bool)result.Result); } [Fact]