From fb1f396e7e6e432a5f40deb01d4b7ac51afa3075 Mon Sep 17 00:00:00 2001 From: fintarin Date: Thu, 28 Mar 2024 00:19:29 +0300 Subject: [PATCH] Refactor tests --- tests/src/expressions/ExpressionTests.cpp | 10 +++++----- tests/src/expressions/FunctionExpressionTests.cpp | 4 +++- tests/src/expressions/unary/AbsExprTests.cpp | 5 ++++- tests/src/functions/arithmetic/AbsTests.cpp | 9 +++------ tests/src/functions/arithmetic/AddTests.cpp | 11 +++-------- tests/src/functions/arithmetic/DivTests.cpp | 11 +++-------- tests/src/functions/arithmetic/FracMixedTests.cpp | 9 +++------ tests/src/functions/arithmetic/FracTests.cpp | 9 +++------ tests/src/functions/arithmetic/MulTests.cpp | 11 +++-------- tests/src/functions/arithmetic/NegTests.cpp | 11 +++-------- tests/src/functions/arithmetic/SignTests.cpp | 9 +++------ tests/src/functions/arithmetic/SubTests.cpp | 11 +++-------- tests/src/functions/arithmetic/UnaryPlusTests.cpp | 11 +++-------- tests/src/functions/calculus/DerivativeTests.cpp | 9 +++------ tests/src/functions/calculus/IntegralTests.cpp | 9 +++------ tests/src/functions/calculus/MaxTests.cpp | 9 +++------ tests/src/functions/calculus/MinTests.cpp | 9 +++------ tests/src/functions/comparison/EqvTests.cpp | 11 +++-------- tests/src/functions/comparison/LessEqvTests.cpp | 11 +++-------- tests/src/functions/comparison/LessTests.cpp | 11 +++-------- tests/src/functions/comparison/MoreEqvTests.cpp | 11 +++-------- tests/src/functions/comparison/MoreTests.cpp | 11 +++-------- tests/src/functions/comparison/NeqvTests.cpp | 11 +++-------- tests/src/functions/hyperbolic/AcoshTests.cpp | 9 +++------ tests/src/functions/hyperbolic/AcothTests.cpp | 9 +++------ tests/src/functions/hyperbolic/AcschTests.cpp | 9 +++------ tests/src/functions/hyperbolic/AsechTests.cpp | 9 +++------ tests/src/functions/hyperbolic/AsinhTests.cpp | 9 +++------ tests/src/functions/hyperbolic/AtanhTests.cpp | 9 +++------ tests/src/functions/hyperbolic/CoshTests.cpp | 9 +++------ tests/src/functions/hyperbolic/CothTests.cpp | 9 +++------ tests/src/functions/hyperbolic/CschTests.cpp | 9 +++------ tests/src/functions/hyperbolic/SechTests.cpp | 9 +++------ tests/src/functions/hyperbolic/SinhTests.cpp | 9 +++------ tests/src/functions/hyperbolic/TanhTests.cpp | 9 +++------ tests/src/functions/logarithms/LbTests.cpp | 9 +++------ tests/src/functions/logarithms/LgTests.cpp | 9 +++------ tests/src/functions/logarithms/LnTests.cpp | 9 +++------ tests/src/functions/logarithms/LogTests.cpp | 9 +++------ tests/src/functions/logic/AndTests.cpp | 11 +++-------- tests/src/functions/logic/EquivTests.cpp | 11 +++-------- tests/src/functions/logic/ImplTests.cpp | 11 +++-------- tests/src/functions/logic/NequivTests.cpp | 11 +++-------- tests/src/functions/logic/NotTests.cpp | 11 +++-------- tests/src/functions/logic/OrTests.cpp | 11 +++-------- tests/src/functions/ntheory/CeilTests.cpp | 9 +++------ tests/src/functions/ntheory/FloorTests.cpp | 9 +++------ tests/src/functions/ntheory/ModTests.cpp | 11 +++-------- tests/src/functions/other/CommaTests.cpp | 11 +++-------- tests/src/functions/other/DegTests.cpp | 11 +++-------- tests/src/functions/other/FactorialTests.cpp | 15 +++++---------- tests/src/functions/other/IndexTests.cpp | 11 +++-------- tests/src/functions/other/PercentTests.cpp | 11 +++-------- tests/src/functions/powers/ExpTests.cpp | 9 +++------ tests/src/functions/powers/PowFunctionTests.cpp | 9 +++------ tests/src/functions/powers/PowTests.cpp | 11 +++-------- tests/src/functions/powers/RootTests.cpp | 9 +++------ tests/src/functions/powers/SqrTests.cpp | 9 +++------ tests/src/functions/powers/SqrtTests.cpp | 9 +++------ tests/src/functions/trigonometry/AcosTests.cpp | 9 +++------ tests/src/functions/trigonometry/AcotTests.cpp | 9 +++------ tests/src/functions/trigonometry/AcscTests.cpp | 9 +++------ tests/src/functions/trigonometry/AsecTests.cpp | 9 +++------ tests/src/functions/trigonometry/AsinTests.cpp | 9 +++------ tests/src/functions/trigonometry/AtanTests.cpp | 9 +++------ tests/src/functions/trigonometry/CosTests.cpp | 9 +++------ tests/src/functions/trigonometry/CotTests.cpp | 9 +++------ tests/src/functions/trigonometry/CscTests.cpp | 9 +++------ tests/src/functions/trigonometry/SecTests.cpp | 9 +++------ tests/src/functions/trigonometry/SinTests.cpp | 9 +++------ tests/src/functions/trigonometry/TanTests.cpp | 9 +++------ tests/src/literals/ILiteralTests.cpp | 1 + tests/src/literals/VariableTests.cpp | 4 ++-- tests/src/literals/constants/ComplexInfTests.cpp | 4 ++-- tests/src/literals/constants/ETests.cpp | 4 ++-- tests/src/literals/constants/FalseTests.cpp | 4 ++-- tests/src/literals/constants/IConstantTests.cpp | 1 + tests/src/literals/constants/ITests.cpp | 4 ++-- tests/src/literals/constants/InfTests.cpp | 4 ++-- tests/src/literals/constants/NegInfTests.cpp | 4 ++-- tests/src/literals/constants/PiTests.cpp | 4 ++-- tests/src/literals/constants/TrueTests.cpp | 4 ++-- tests/src/literals/constants/UndefinedTests.cpp | 4 ++-- tests/src/numbers/ComplexTests.cpp | 4 ++-- tests/src/numbers/IntegerTests.cpp | 4 ++-- tests/src/numbers/RationalTests.cpp | 4 ++-- tests/src/numbers/RealTests.cpp | 4 ++-- 87 files changed, 248 insertions(+), 495 deletions(-) diff --git a/tests/src/expressions/ExpressionTests.cpp b/tests/src/expressions/ExpressionTests.cpp index d620f58be..87f045446 100644 --- a/tests/src/expressions/ExpressionTests.cpp +++ b/tests/src/expressions/ExpressionTests.cpp @@ -97,11 +97,6 @@ TEST(ExpressionTests, equalsTest) { // TODO: implement more tests } -TEST(ExpressionTests, getClassTest) { - EXPECT_EQ(Expression::getClassStatic(), MathObjectClass("Expression")); - EXPECT_EQ(Expression::getClassStatic().getParent(), IExpression::getClassStatic()); -} - TEST(ExpressionTests, variableVariablePlusOperatorTest) { EXPECT_EQ(Variable("a") + Variable("a"), Expression("2a")); EXPECT_EQ(Variable("a") + Variable("b"), Expression("a+b")); @@ -161,3 +156,8 @@ TEST(ExpressionTests, expressionVariableDivideOperatorTest) { EXPECT_EQ(Expression("a/b") / Variable("a"), Expression("1/b")); EXPECT_EQ(Expression("b/c") / Variable("a"), Expression("b/c/a")); } + +TEST(ExpressionTests, getClassTest) { + EXPECT_EQ(Expression().getClass(), MathObjectClass("Expression")); + EXPECT_EQ(Expression().getClassStatic().getParent(), IExpression::getClassStatic()); +} diff --git a/tests/src/expressions/FunctionExpressionTests.cpp b/tests/src/expressions/FunctionExpressionTests.cpp index 733989e57..b64ced571 100644 --- a/tests/src/expressions/FunctionExpressionTests.cpp +++ b/tests/src/expressions/FunctionExpressionTests.cpp @@ -126,5 +126,7 @@ TEST(FunctionExpressionTests, stringConstructorTest) { } TEST(FunctionExpressionTests, getClassTest) { - EXPECT_EQ(makeExpr(TestBinaryOperator(), Integer(0), Integer(0))->getClass(), MathObjectClass("FunctionExpression")); + auto expr = makeExpr(TestBinaryOperator(), Integer(0), Integer(0)); + EXPECT_EQ(expr->getClass(), MathObjectClass("FunctionExpression")); + EXPECT_EQ(expr->getClass().getParent(), IExpression::getClassStatic()); } diff --git a/tests/src/expressions/unary/AbsExprTests.cpp b/tests/src/expressions/unary/AbsExprTests.cpp index 2f8717073..dd46d577c 100644 --- a/tests/src/expressions/unary/AbsExprTests.cpp +++ b/tests/src/expressions/unary/AbsExprTests.cpp @@ -7,5 +7,8 @@ using namespace fintamath; TEST(AbsExprTests, getClassTest) { - EXPECT_EQ(absExpr(Integer(0).clone())->getClass(), MathObjectClass("AbsExpr")); + const auto expr = absExpr(Integer(0).clone()); + + EXPECT_EQ(expr->getClass(), MathObjectClass("AbsExpr")); + EXPECT_EQ(expr->getClass().getParent(), IUnaryExpression::getClassStatic()); } diff --git a/tests/src/functions/arithmetic/AbsTests.cpp b/tests/src/functions/arithmetic/AbsTests.cpp index 1aca686dc..989209f6c 100644 --- a/tests/src/functions/arithmetic/AbsTests.cpp +++ b/tests/src/functions/arithmetic/AbsTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Abs; -const F f; +const Abs f; TEST(AbsTests, toStringTest) { EXPECT_EQ(f.toString(), "abs"); @@ -26,12 +25,10 @@ TEST(AbsTests, getReturnClassTest) { } TEST(AbsTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AbsTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -72,6 +69,6 @@ TEST(AbsTests, exprTest) { } TEST(AbsTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Abs")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Abs")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/arithmetic/AddTests.cpp b/tests/src/functions/arithmetic/AddTests.cpp index 7f535a8c1..c2e92eb43 100644 --- a/tests/src/functions/arithmetic/AddTests.cpp +++ b/tests/src/functions/arithmetic/AddTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Add; -const F f; +const Add f; TEST(AddTests, toStringTest) { EXPECT_EQ(f.toString(), "+"); @@ -25,22 +24,18 @@ TEST(AddTests, getReturnClassTest) { } TEST(AddTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AddTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(AddTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Addition); EXPECT_EQ(f.getPriority(), IOperator::Priority::Addition); } TEST(AddTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -64,6 +59,6 @@ TEST(AddTests, exprTest) { } TEST(AddTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Add")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Add")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/arithmetic/DivTests.cpp b/tests/src/functions/arithmetic/DivTests.cpp index 0177fcdb7..c3ba19656 100644 --- a/tests/src/functions/arithmetic/DivTests.cpp +++ b/tests/src/functions/arithmetic/DivTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Div; -const F f; +const Div f; TEST(DivTests, toStringTest) { EXPECT_EQ(f.toString(), "/"); @@ -25,22 +24,18 @@ TEST(DivTests, getReturnClassTest) { } TEST(DivTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(DivTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(DivTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Multiplication); EXPECT_EQ(f.getPriority(), IOperator::Priority::Multiplication); } TEST(DivTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -66,6 +61,6 @@ TEST(DivTests, exprTest) { } TEST(DivTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Div")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Div")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/arithmetic/FracMixedTests.cpp b/tests/src/functions/arithmetic/FracMixedTests.cpp index 1b4ecbe2f..b97969f3e 100644 --- a/tests/src/functions/arithmetic/FracMixedTests.cpp +++ b/tests/src/functions/arithmetic/FracMixedTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = FracMixed; -const F f; +const FracMixed f; TEST(FracMixedTests, toStringTest) { EXPECT_EQ(f.toString(), "frac"); @@ -25,12 +24,10 @@ TEST(FracMixedTests, getReturnClassTest) { } TEST(FracMixedTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(FracMixedTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -56,6 +53,6 @@ TEST(FracMixedTests, callTest) { } TEST(FracMixedTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("FracMixed")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("FracMixed")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/arithmetic/FracTests.cpp b/tests/src/functions/arithmetic/FracTests.cpp index ee6c7bb2d..c0d99be83 100644 --- a/tests/src/functions/arithmetic/FracTests.cpp +++ b/tests/src/functions/arithmetic/FracTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Frac; -const F f; +const Frac f; TEST(FracTests, toStringTest) { EXPECT_EQ(f.toString(), "frac"); @@ -25,12 +24,10 @@ TEST(FracTests, getReturnClassTest) { } TEST(FracTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(FracTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -49,6 +46,6 @@ TEST(FracTests, callTest) { } TEST(FracTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Frac")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Frac")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/arithmetic/MulTests.cpp b/tests/src/functions/arithmetic/MulTests.cpp index c0c5c3b9b..330e18c33 100644 --- a/tests/src/functions/arithmetic/MulTests.cpp +++ b/tests/src/functions/arithmetic/MulTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Mul; -const F f; +const Mul f; TEST(MulTests, toStringTest) { EXPECT_EQ(f.toString(), "*"); @@ -24,22 +23,18 @@ TEST(MulTests, getReturnClassTest) { } TEST(MulTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(MulTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(MulTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Multiplication); EXPECT_EQ(f.getPriority(), IOperator::Priority::Multiplication); } TEST(MulTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -62,6 +57,6 @@ TEST(MulTests, exprTest) { } TEST(MulTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Mul")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Mul")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/arithmetic/NegTests.cpp b/tests/src/functions/arithmetic/NegTests.cpp index 5d856c788..4e9626656 100644 --- a/tests/src/functions/arithmetic/NegTests.cpp +++ b/tests/src/functions/arithmetic/NegTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Neg; -const F f; +const Neg f; TEST(NegTests, toStringTest) { EXPECT_EQ(f.toString(), "-"); @@ -24,22 +23,18 @@ TEST(NegTests, getReturnClassTest) { } TEST(NegTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(NegTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(NegTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::PrefixUnary); EXPECT_EQ(f.getPriority(), IOperator::Priority::PrefixUnary); } TEST(NegTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -60,6 +55,6 @@ TEST(NegTests, exprTest) { } TEST(NegTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Neg")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Neg")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/arithmetic/SignTests.cpp b/tests/src/functions/arithmetic/SignTests.cpp index 5a302da02..488f81fa9 100644 --- a/tests/src/functions/arithmetic/SignTests.cpp +++ b/tests/src/functions/arithmetic/SignTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Sign; -const F f; +const Sign f; TEST(SignTests, toStringTest) { EXPECT_EQ(f.toString(), "sign"); @@ -26,12 +25,10 @@ TEST(SignTests, getReturnClassTest) { } TEST(SignTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(SignTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -70,6 +67,6 @@ TEST(SignTests, exprTest) { } TEST(SignTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Sign")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Sign")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/arithmetic/SubTests.cpp b/tests/src/functions/arithmetic/SubTests.cpp index 535821191..98b923f28 100644 --- a/tests/src/functions/arithmetic/SubTests.cpp +++ b/tests/src/functions/arithmetic/SubTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Sub; -const F f; +const Sub f; TEST(SubTests, toStringTest) { EXPECT_EQ(f.toString(), "-"); @@ -25,22 +24,18 @@ TEST(SubTests, getReturnClassTest) { } TEST(SubTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(SubTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(SubTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Addition); EXPECT_EQ(f.getPriority(), IOperator::Priority::Addition); } TEST(SubTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -64,6 +59,6 @@ TEST(SubTests, exprTest) { } TEST(SubTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Sub")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Sub")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/arithmetic/UnaryPlusTests.cpp b/tests/src/functions/arithmetic/UnaryPlusTests.cpp index d554b5fb7..d7c70bbb5 100644 --- a/tests/src/functions/arithmetic/UnaryPlusTests.cpp +++ b/tests/src/functions/arithmetic/UnaryPlusTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = UnaryPlus; -const F f; +const UnaryPlus f; TEST(UnaryPlusTests, toStringTest) { EXPECT_EQ(f.toString(), "+"); @@ -25,22 +24,18 @@ TEST(UnaryPlusTests, getReturnClassTest) { } TEST(UnaryPlusTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(UnaryPlusTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(UnaryPlusTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::PrefixUnary); EXPECT_EQ(f.getPriority(), IOperator::Priority::PrefixUnary); } TEST(UnaryPlusTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -57,6 +52,6 @@ TEST(UnaryPlusTests, callTest) { } TEST(UnaryPlusTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("UnaryPlus")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("UnaryPlus")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/calculus/DerivativeTests.cpp b/tests/src/functions/calculus/DerivativeTests.cpp index 853b80f01..eb50a9f4b 100644 --- a/tests/src/functions/calculus/DerivativeTests.cpp +++ b/tests/src/functions/calculus/DerivativeTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Derivative; -const F f; +const Derivative f; namespace { @@ -69,12 +68,10 @@ TEST(DerivativeTests, getReturnClassTest) { } TEST(DerivativeTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(DerivativeTests, isEvaluatableTest) { - EXPECT_FALSE(F::isEvaluatableStatic()); EXPECT_FALSE(f.isEvaluatable()); } @@ -100,6 +97,6 @@ TEST(DerivativeTests, exprTest) { } TEST(DerivativeTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Derivative")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Derivative")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/calculus/IntegralTests.cpp b/tests/src/functions/calculus/IntegralTests.cpp index fa9493ac6..faf41044a 100644 --- a/tests/src/functions/calculus/IntegralTests.cpp +++ b/tests/src/functions/calculus/IntegralTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Integral; -const F f; +const Integral f; TEST(IntegralTests, toStringTest) { EXPECT_EQ(f.toString(), "integral"); @@ -26,12 +25,10 @@ TEST(IntegralTests, getReturnClassTest) { } TEST(IntegralTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(IntegralTests, isEvaluatableTest) { - EXPECT_FALSE(F::isEvaluatableStatic()); EXPECT_FALSE(f.isEvaluatable()); } @@ -56,6 +53,6 @@ TEST(IntegralTests, exprTest) { } TEST(IntegralTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Integral")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Integral")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/calculus/MaxTests.cpp b/tests/src/functions/calculus/MaxTests.cpp index d9cc608a5..29021aad4 100644 --- a/tests/src/functions/calculus/MaxTests.cpp +++ b/tests/src/functions/calculus/MaxTests.cpp @@ -11,8 +11,7 @@ using namespace fintamath; -using F = Max; -const F f; +const Max f; TEST(MaxTests, toStringTest) { EXPECT_EQ(f.toString(), "max"); @@ -27,12 +26,10 @@ TEST(MaxTests, getReturnClassTest) { } TEST(MaxTests, isVariadicTest) { - EXPECT_TRUE(F::isVariadicStatic()); EXPECT_TRUE(f.isVariadic()); } TEST(MaxTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -61,6 +58,6 @@ TEST(MaxTests, exprTest) { } TEST(MaxTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Max")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Max")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/calculus/MinTests.cpp b/tests/src/functions/calculus/MinTests.cpp index 10e47aa6b..ece74398b 100644 --- a/tests/src/functions/calculus/MinTests.cpp +++ b/tests/src/functions/calculus/MinTests.cpp @@ -11,8 +11,7 @@ using namespace fintamath; -using F = Min; -const F f; +const Min f; TEST(MinTests, toStringTest) { EXPECT_EQ(f.toString(), "min"); @@ -27,12 +26,10 @@ TEST(MinTests, getReturnClassTest) { } TEST(MinTests, isVariadicTest) { - EXPECT_TRUE(F::isVariadicStatic()); EXPECT_TRUE(f.isVariadic()); } TEST(MinTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -61,6 +58,6 @@ TEST(MinTests, exprTest) { } TEST(MinTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Min")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Min")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/comparison/EqvTests.cpp b/tests/src/functions/comparison/EqvTests.cpp index 24ad4f56c..e395c5689 100644 --- a/tests/src/functions/comparison/EqvTests.cpp +++ b/tests/src/functions/comparison/EqvTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Eqv; -const F f; +const Eqv f; TEST(EqvTests, toStringTest) { EXPECT_EQ(f.toString(), "="); @@ -25,22 +24,18 @@ TEST(EqvTests, getReturnClassTest) { } TEST(EqvTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(EqvTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(EqvTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Comparison); EXPECT_EQ(f.getPriority(), IOperator::Priority::Comparison); } TEST(EqvTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -70,6 +65,6 @@ TEST(EqvTests, exprTest) { } TEST(EqvTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Eqv")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Eqv")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/comparison/LessEqvTests.cpp b/tests/src/functions/comparison/LessEqvTests.cpp index 4d1958435..167da7eba 100644 --- a/tests/src/functions/comparison/LessEqvTests.cpp +++ b/tests/src/functions/comparison/LessEqvTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = LessEqv; -const F f; +const LessEqv f; TEST(LessEqvTests, toStringTest) { EXPECT_EQ(f.toString(), "<="); @@ -25,22 +24,18 @@ TEST(LessEqvTests, getReturnClassTest) { } TEST(LessEqvTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(LessEqvTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(LessEqvTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Comparison); EXPECT_EQ(f.getPriority(), IOperator::Priority::Comparison); } TEST(LessEqvTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -70,6 +65,6 @@ TEST(LessEqvTests, exprTest) { } TEST(LessEqvTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("LessEqv")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("LessEqv")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/comparison/LessTests.cpp b/tests/src/functions/comparison/LessTests.cpp index 5d41ea705..284453ee9 100644 --- a/tests/src/functions/comparison/LessTests.cpp +++ b/tests/src/functions/comparison/LessTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Less; -const F f; +const Less f; TEST(LessTests, toStringTest) { EXPECT_EQ(f.toString(), "<"); @@ -25,22 +24,18 @@ TEST(LessTests, getReturnClassTest) { } TEST(LessTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(LessTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(LessTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Comparison); EXPECT_EQ(f.getPriority(), IOperator::Priority::Comparison); } TEST(LessTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -70,6 +65,6 @@ TEST(LessTests, exprTest) { } TEST(LessTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Less")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Less")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/comparison/MoreEqvTests.cpp b/tests/src/functions/comparison/MoreEqvTests.cpp index f0d6e9ca8..eed084eaf 100644 --- a/tests/src/functions/comparison/MoreEqvTests.cpp +++ b/tests/src/functions/comparison/MoreEqvTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = MoreEqv; -const F f; +const MoreEqv f; TEST(MoreEqvTests, toStringTest) { EXPECT_EQ(f.toString(), ">="); @@ -25,22 +24,18 @@ TEST(MoreEqvTests, getReturnClassTest) { } TEST(MoreEqvTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(MoreEqvTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(MoreEqvTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Comparison); EXPECT_EQ(f.getPriority(), IOperator::Priority::Comparison); } TEST(MoreEqvTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -70,6 +65,6 @@ TEST(MoreEqvTests, exprTest) { } TEST(MoreEqvTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("MoreEqv")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("MoreEqv")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/comparison/MoreTests.cpp b/tests/src/functions/comparison/MoreTests.cpp index 158f0c77b..8db533f21 100644 --- a/tests/src/functions/comparison/MoreTests.cpp +++ b/tests/src/functions/comparison/MoreTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = More; -const F f; +const More f; TEST(MoreTests, toStringTest) { EXPECT_EQ(f.toString(), ">"); @@ -25,22 +24,18 @@ TEST(MoreTests, getReturnClassTest) { } TEST(MoreTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(MoreTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(MoreTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Comparison); EXPECT_EQ(f.getPriority(), IOperator::Priority::Comparison); } TEST(MoreTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -70,6 +65,6 @@ TEST(MoreTests, exprTest) { } TEST(MoreTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("More")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("More")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/comparison/NeqvTests.cpp b/tests/src/functions/comparison/NeqvTests.cpp index 1ba7ddb82..8658f175b 100644 --- a/tests/src/functions/comparison/NeqvTests.cpp +++ b/tests/src/functions/comparison/NeqvTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Neqv; -const F f; +const Neqv f; TEST(NeqvTests, toStringTest) { EXPECT_EQ(f.toString(), "!="); @@ -25,22 +24,18 @@ TEST(NeqvTests, getReturnClassTest) { } TEST(NeqvTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(NeqvTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(NeqvTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Comparison); EXPECT_EQ(f.getPriority(), IOperator::Priority::Comparison); } TEST(NeqvTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -70,6 +65,6 @@ TEST(NeqvTests, exprTest) { } TEST(NeqvTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Neqv")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Neqv")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/AcoshTests.cpp b/tests/src/functions/hyperbolic/AcoshTests.cpp index 542eb6e4c..edd446c64 100644 --- a/tests/src/functions/hyperbolic/AcoshTests.cpp +++ b/tests/src/functions/hyperbolic/AcoshTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Acosh; -const F f; +const Acosh f; TEST(AcoshTests, toStringTest) { EXPECT_EQ(f.toString(), "acosh"); @@ -26,12 +25,10 @@ TEST(AcoshTests, getReturnClassTest) { } TEST(AcoshTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AcoshTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -60,6 +57,6 @@ TEST(AcoshTests, exprTest) { } TEST(AcoshTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Acosh")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Acosh")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/AcothTests.cpp b/tests/src/functions/hyperbolic/AcothTests.cpp index d4cbbc230..61670637b 100644 --- a/tests/src/functions/hyperbolic/AcothTests.cpp +++ b/tests/src/functions/hyperbolic/AcothTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Acoth; -const F f; +const Acoth f; TEST(AcothTests, toStringTest) { EXPECT_EQ(f.toString(), "acoth"); @@ -26,12 +25,10 @@ TEST(AcothTests, getReturnClassTest) { } TEST(AcothTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AcothTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -60,6 +57,6 @@ TEST(AcothTests, exprTest) { } TEST(AcothTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Acoth")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Acoth")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/AcschTests.cpp b/tests/src/functions/hyperbolic/AcschTests.cpp index 766a8561f..e7c42eedc 100644 --- a/tests/src/functions/hyperbolic/AcschTests.cpp +++ b/tests/src/functions/hyperbolic/AcschTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Acsch; -const F f; +const Acsch f; TEST(AcschTests, toStringTest) { EXPECT_EQ(f.toString(), "acsch"); @@ -26,12 +25,10 @@ TEST(AcschTests, getReturnClassTest) { } TEST(AcschTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AcschTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -59,6 +56,6 @@ TEST(AcschTests, exprTest) { } TEST(AcschTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Acsch")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Acsch")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/AsechTests.cpp b/tests/src/functions/hyperbolic/AsechTests.cpp index 4c26d8d42..86572daac 100644 --- a/tests/src/functions/hyperbolic/AsechTests.cpp +++ b/tests/src/functions/hyperbolic/AsechTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Asech; -const F f; +const Asech f; TEST(AsechTests, toStringTest) { EXPECT_EQ(f.toString(), "asech"); @@ -26,12 +25,10 @@ TEST(AsechTests, getReturnClassTest) { } TEST(AsechTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AsechTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -60,6 +57,6 @@ TEST(AsechTests, exprTest) { } TEST(AsechTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Asech")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Asech")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/AsinhTests.cpp b/tests/src/functions/hyperbolic/AsinhTests.cpp index 8ffd3dabd..d98130ea5 100644 --- a/tests/src/functions/hyperbolic/AsinhTests.cpp +++ b/tests/src/functions/hyperbolic/AsinhTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Asinh; -const F f; +const Asinh f; TEST(AsinhTests, toStringTest) { EXPECT_EQ(f.toString(), "asinh"); @@ -26,12 +25,10 @@ TEST(AsinhTests, getReturnClassTest) { } TEST(AsinhTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AsinhTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -57,6 +54,6 @@ TEST(AsinhTests, exprTest) { } TEST(AsinhTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Asinh")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Asinh")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/AtanhTests.cpp b/tests/src/functions/hyperbolic/AtanhTests.cpp index c85195f65..5e03e874e 100644 --- a/tests/src/functions/hyperbolic/AtanhTests.cpp +++ b/tests/src/functions/hyperbolic/AtanhTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Atanh; -const F f; +const Atanh f; TEST(AtanhTests, toStringTest) { EXPECT_EQ(f.toString(), "atanh"); @@ -26,12 +25,10 @@ TEST(AtanhTests, getReturnClassTest) { } TEST(AtanhTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AtanhTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -60,6 +57,6 @@ TEST(AtanhTests, exprTest) { } TEST(AtanhTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Atanh")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Atanh")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/CoshTests.cpp b/tests/src/functions/hyperbolic/CoshTests.cpp index 6565c9ad9..0e20c1fe1 100644 --- a/tests/src/functions/hyperbolic/CoshTests.cpp +++ b/tests/src/functions/hyperbolic/CoshTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Cosh; -const F f; +const Cosh f; TEST(CoshTests, toStringTest) { EXPECT_EQ(f.toString(), "cosh"); @@ -26,12 +25,10 @@ TEST(CoshTests, getReturnClassTest) { } TEST(CoshTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(CoshTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -57,6 +54,6 @@ TEST(CoshTests, exprTest) { } TEST(CoshTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Cosh")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Cosh")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/CothTests.cpp b/tests/src/functions/hyperbolic/CothTests.cpp index 4d2e18e70..8cab1c1ce 100644 --- a/tests/src/functions/hyperbolic/CothTests.cpp +++ b/tests/src/functions/hyperbolic/CothTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Coth; -const F f; +const Coth f; TEST(CothTests, toStringTest) { EXPECT_EQ(f.toString(), "coth"); @@ -26,12 +25,10 @@ TEST(CothTests, getReturnClassTest) { } TEST(CothTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(CothTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -58,6 +55,6 @@ TEST(CothTests, exprTest) { } TEST(CothTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Coth")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Coth")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/CschTests.cpp b/tests/src/functions/hyperbolic/CschTests.cpp index 076eb1f89..869ba2604 100644 --- a/tests/src/functions/hyperbolic/CschTests.cpp +++ b/tests/src/functions/hyperbolic/CschTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Csch; -const F f; +const Csch f; TEST(CschTests, toStringTest) { EXPECT_EQ(f.toString(), "csch"); @@ -26,12 +25,10 @@ TEST(CschTests, getReturnClassTest) { } TEST(CschTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(CschTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -57,6 +54,6 @@ TEST(CschTests, exprTest) { } TEST(CschTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Csch")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Csch")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/SechTests.cpp b/tests/src/functions/hyperbolic/SechTests.cpp index fdc886686..994a3af29 100644 --- a/tests/src/functions/hyperbolic/SechTests.cpp +++ b/tests/src/functions/hyperbolic/SechTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Sech; -const F f; +const Sech f; TEST(SechTests, toStringTest) { EXPECT_EQ(f.toString(), "sech"); @@ -26,12 +25,10 @@ TEST(SechTests, getReturnClassTest) { } TEST(SechTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(SechTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -58,6 +55,6 @@ TEST(SechTests, exprTest) { } TEST(SechTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Sech")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Sech")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/SinhTests.cpp b/tests/src/functions/hyperbolic/SinhTests.cpp index ad6eb6cf0..be95b8943 100644 --- a/tests/src/functions/hyperbolic/SinhTests.cpp +++ b/tests/src/functions/hyperbolic/SinhTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Sinh; -const F f; +const Sinh f; TEST(SinhTests, toStringTest) { EXPECT_EQ(f.toString(), "sinh"); @@ -26,12 +25,10 @@ TEST(SinhTests, getReturnClassTest) { } TEST(SinhTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(SinhTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -57,6 +54,6 @@ TEST(SinhTests, exprTest) { } TEST(SinhTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Sinh")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Sinh")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/hyperbolic/TanhTests.cpp b/tests/src/functions/hyperbolic/TanhTests.cpp index bfbd7ad1c..893a162c1 100644 --- a/tests/src/functions/hyperbolic/TanhTests.cpp +++ b/tests/src/functions/hyperbolic/TanhTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Tanh; -const F f; +const Tanh f; TEST(TanhTests, toStringTest) { EXPECT_EQ(f.toString(), "tanh"); @@ -26,12 +25,10 @@ TEST(TanhTests, getReturnClassTest) { } TEST(TanhTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(TanhTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -57,6 +54,6 @@ TEST(TanhTests, exprTest) { } TEST(TanhTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Tanh")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Tanh")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/logarithms/LbTests.cpp b/tests/src/functions/logarithms/LbTests.cpp index 114528724..40b7c50df 100644 --- a/tests/src/functions/logarithms/LbTests.cpp +++ b/tests/src/functions/logarithms/LbTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Lb; -const F f; +const Lb f; TEST(LbTests, toStringTest) { EXPECT_EQ(f.toString(), "lb"); @@ -24,12 +23,10 @@ TEST(LbTests, getReturnClassTest) { } TEST(LbTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(LbTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -53,6 +50,6 @@ TEST(LbTests, exprTest) { } TEST(LbTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Lb")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Lb")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/logarithms/LgTests.cpp b/tests/src/functions/logarithms/LgTests.cpp index 259faa4b6..4b2aa8ef7 100644 --- a/tests/src/functions/logarithms/LgTests.cpp +++ b/tests/src/functions/logarithms/LgTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Lg; -const F f; +const Lg f; TEST(LgTests, toStringTest) { EXPECT_EQ(f.toString(), "lg"); @@ -24,12 +23,10 @@ TEST(LgTests, getReturnClassTest) { } TEST(LgTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(LgTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -53,6 +50,6 @@ TEST(LgTests, exprTest) { } TEST(LgTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Lg")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Lg")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/logarithms/LnTests.cpp b/tests/src/functions/logarithms/LnTests.cpp index 2484bc035..507007b09 100644 --- a/tests/src/functions/logarithms/LnTests.cpp +++ b/tests/src/functions/logarithms/LnTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Ln; -const F f; +const Ln f; TEST(LnTests, toStringTest) { EXPECT_EQ(f.toString(), "ln"); @@ -26,12 +25,10 @@ TEST(LnTests, getReturnClassTest) { } TEST(LnTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(LnTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -55,6 +52,6 @@ TEST(LnTests, exprTest) { } TEST(LnTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Ln")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Ln")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/logarithms/LogTests.cpp b/tests/src/functions/logarithms/LogTests.cpp index e22127545..d3e402ebf 100644 --- a/tests/src/functions/logarithms/LogTests.cpp +++ b/tests/src/functions/logarithms/LogTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Log; -const F f; +const Log f; TEST(LogTests, toStringTest) { EXPECT_EQ(f.toString(), "log"); @@ -25,12 +24,10 @@ TEST(LogTests, getReturnClassTest) { } TEST(LogTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(LogTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -135,6 +132,6 @@ TEST(LogTests, exprTest) { } TEST(LogTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Log")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Log")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/logic/AndTests.cpp b/tests/src/functions/logic/AndTests.cpp index f0c4aee4b..b8655b9cc 100644 --- a/tests/src/functions/logic/AndTests.cpp +++ b/tests/src/functions/logic/AndTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = And; -const F f; +const And f; TEST(AndTests, toStringTest) { EXPECT_EQ(f.toString(), "&"); @@ -24,22 +23,18 @@ TEST(AndTests, getReturnClassTest) { } TEST(AndTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AndTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(AndTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Conjunction); EXPECT_EQ(f.getPriority(), IOperator::Priority::Conjunction); } TEST(AndTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -61,6 +56,6 @@ TEST(AndTests, exprTest) { } TEST(AndTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("And")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("And")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/logic/EquivTests.cpp b/tests/src/functions/logic/EquivTests.cpp index 99d620f39..547663e0f 100644 --- a/tests/src/functions/logic/EquivTests.cpp +++ b/tests/src/functions/logic/EquivTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Equiv; -const F f; +const Equiv f; TEST(EquivTests, toStringTest) { EXPECT_EQ(f.toString(), "<->"); @@ -24,22 +23,18 @@ TEST(EquivTests, getReturnClassTest) { } TEST(EquivTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(EquivTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(EquivTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Equivalence); EXPECT_EQ(f.getPriority(), IOperator::Priority::Equivalence); } TEST(EquivTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -61,6 +56,6 @@ TEST(EquivTests, exprTest) { } TEST(EquivTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Equiv")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Equiv")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/logic/ImplTests.cpp b/tests/src/functions/logic/ImplTests.cpp index 3fad5eb04..2db8b0533 100644 --- a/tests/src/functions/logic/ImplTests.cpp +++ b/tests/src/functions/logic/ImplTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Impl; -const F f; +const Impl f; TEST(ImplTests, toStringTest) { EXPECT_EQ(f.toString(), "->"); @@ -24,22 +23,18 @@ TEST(ImplTests, getReturnClassTest) { } TEST(ImplTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(ImplTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(ImplTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Implication); EXPECT_EQ(f.getPriority(), IOperator::Priority::Implication); } TEST(ImplTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -61,6 +56,6 @@ TEST(ImplTests, exprTest) { } TEST(ImplTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Impl")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Impl")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/logic/NequivTests.cpp b/tests/src/functions/logic/NequivTests.cpp index eacbb400c..3c04227c1 100644 --- a/tests/src/functions/logic/NequivTests.cpp +++ b/tests/src/functions/logic/NequivTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Nequiv; -const F f; +const Nequiv f; TEST(NequivTests, toStringTest) { EXPECT_EQ(f.toString(), "!<->"); @@ -24,22 +23,18 @@ TEST(NequivTests, getReturnClassTest) { } TEST(NequivTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(NequivTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(NequivTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Equivalence); EXPECT_EQ(f.getPriority(), IOperator::Priority::Equivalence); } TEST(NequivTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -61,6 +56,6 @@ TEST(NequivTests, exprTest) { } TEST(NequivTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Nequiv")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Nequiv")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/logic/NotTests.cpp b/tests/src/functions/logic/NotTests.cpp index 4796c91ff..45f46368e 100644 --- a/tests/src/functions/logic/NotTests.cpp +++ b/tests/src/functions/logic/NotTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Not; -const F f; +const Not f; TEST(NotTests, toStringTest) { EXPECT_EQ(f.toString(), "~"); @@ -24,22 +23,18 @@ TEST(NotTests, getReturnClassTest) { } TEST(NotTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(NotTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(NotTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::PrefixUnary); EXPECT_EQ(f.getPriority(), IOperator::Priority::PrefixUnary); } TEST(NotTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -59,6 +54,6 @@ TEST(NotTests, exprTest) { } TEST(NotTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Not")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Not")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/logic/OrTests.cpp b/tests/src/functions/logic/OrTests.cpp index e3f903a10..b469d5d70 100644 --- a/tests/src/functions/logic/OrTests.cpp +++ b/tests/src/functions/logic/OrTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Or; -const F f; +const Or f; TEST(OrTests, toStringTest) { EXPECT_EQ(f.toString(), "|"); @@ -24,22 +23,18 @@ TEST(OrTests, getReturnClassTest) { } TEST(OrTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(OrTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(OrTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Disjunction); EXPECT_EQ(f.getPriority(), IOperator::Priority::Disjunction); } TEST(OrTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -61,6 +56,6 @@ TEST(OrTests, exprTest) { } TEST(OrTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Or")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Or")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/ntheory/CeilTests.cpp b/tests/src/functions/ntheory/CeilTests.cpp index 0a979df42..4b2c7ef16 100644 --- a/tests/src/functions/ntheory/CeilTests.cpp +++ b/tests/src/functions/ntheory/CeilTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Ceil; -const F f; +const Ceil f; TEST(CeilTests, toStringTest) { EXPECT_EQ(f.toString(), "ceil"); @@ -26,12 +25,10 @@ TEST(CeilTests, getReturnClassTest) { } TEST(CeilTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(CeilTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -83,6 +80,6 @@ TEST(CeilTests, exprTest) { } TEST(CeilTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Ceil")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Ceil")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/ntheory/FloorTests.cpp b/tests/src/functions/ntheory/FloorTests.cpp index 4e772d1bb..bb2f678c6 100644 --- a/tests/src/functions/ntheory/FloorTests.cpp +++ b/tests/src/functions/ntheory/FloorTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Floor; -const F f; +const Floor f; TEST(FloorTests, toStringTest) { EXPECT_EQ(f.toString(), "floor"); @@ -26,12 +25,10 @@ TEST(FloorTests, getReturnClassTest) { } TEST(FloorTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(FloorTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -83,6 +80,6 @@ TEST(FloorTests, exprTest) { } TEST(FloorTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Floor")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Floor")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/ntheory/ModTests.cpp b/tests/src/functions/ntheory/ModTests.cpp index 2fe0fc11d..60beb28cb 100644 --- a/tests/src/functions/ntheory/ModTests.cpp +++ b/tests/src/functions/ntheory/ModTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Mod; -const F f; +const Mod f; TEST(ModTests, toStringTest) { EXPECT_EQ(f.toString(), "mod"); @@ -25,22 +24,18 @@ TEST(ModTests, getReturnClassTest) { } TEST(ModTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(ModTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(ModTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Modulo); EXPECT_EQ(f.getPriority(), IOperator::Priority::Modulo); } TEST(ModTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -104,6 +99,6 @@ TEST(ModTests, exprTest) { } TEST(ModTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Mod")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Mod")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/other/CommaTests.cpp b/tests/src/functions/other/CommaTests.cpp index f9cfea216..d0a770d3e 100644 --- a/tests/src/functions/other/CommaTests.cpp +++ b/tests/src/functions/other/CommaTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Comma; -const F f; +const Comma f; TEST(CommaTests, toStringTest) { EXPECT_EQ(f.toString(), ","); @@ -25,22 +24,18 @@ TEST(CommaTests, getReturnClassTest) { } TEST(CommaTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(CommaTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(CommaTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Comma); EXPECT_EQ(f.getPriority(), IOperator::Priority::Comma); } TEST(CommaTests, isAssociativeTest) { - EXPECT_TRUE(F::isAssociativeStatic()); EXPECT_TRUE(f.isAssociative()); } @@ -56,6 +51,6 @@ TEST(CommaTests, exprTest) { } TEST(CommaTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Comma")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Comma")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/other/DegTests.cpp b/tests/src/functions/other/DegTests.cpp index c4d78862d..b61eb4f2a 100644 --- a/tests/src/functions/other/DegTests.cpp +++ b/tests/src/functions/other/DegTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Deg; -const F f; +const Deg f; TEST(DegTests, toStringTest) { EXPECT_EQ(f.toString(), "deg"); @@ -24,22 +23,18 @@ TEST(DegTests, getReturnClassTest) { } TEST(DegTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(DegTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(DegTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::PostfixUnary); EXPECT_EQ(f.getPriority(), IOperator::Priority::PostfixUnary); } TEST(DegTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -61,6 +56,6 @@ TEST(DegTests, degTest) { } TEST(DegTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Deg")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Deg")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/other/FactorialTests.cpp b/tests/src/functions/other/FactorialTests.cpp index a3e9bc8ed..83cc4f5fd 100644 --- a/tests/src/functions/other/FactorialTests.cpp +++ b/tests/src/functions/other/FactorialTests.cpp @@ -10,10 +10,9 @@ using namespace fintamath; -using F = Factorial; -const F f; -const F f2(2); -const F f3(3); +const Factorial f; +const Factorial f2(2); +const Factorial f3(3); TEST(FactorialTests, toStringTest) { EXPECT_EQ(f.toString(), "!"); @@ -28,22 +27,18 @@ TEST(FactorialTests, getReturnClassTest) { } TEST(FactorialTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(FactorialTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(FactorialTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::PostfixUnary); EXPECT_EQ(f.getPriority(), IOperator::Priority::PostfixUnary); } TEST(FactorialTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -143,6 +138,6 @@ TEST(FactorialTests, exprTest) { } TEST(FactorialTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Factorial")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Factorial")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/other/IndexTests.cpp b/tests/src/functions/other/IndexTests.cpp index 782aa75f5..3f147c0cd 100644 --- a/tests/src/functions/other/IndexTests.cpp +++ b/tests/src/functions/other/IndexTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Index; -const F f; +const Index f; TEST(IndexTests, toStringTest) { EXPECT_EQ(f.toString(), "_"); @@ -25,22 +24,18 @@ TEST(IndexTests, getReturnClassTest) { } TEST(IndexTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(IndexTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(IndexTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Exponentiation); EXPECT_EQ(f.getPriority(), IOperator::Priority::Exponentiation); } TEST(IndexTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -68,6 +63,6 @@ TEST(IndexTests, exprTest) { } TEST(IndexTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Index")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Index")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/other/PercentTests.cpp b/tests/src/functions/other/PercentTests.cpp index 41d1d9433..c59b87b0f 100644 --- a/tests/src/functions/other/PercentTests.cpp +++ b/tests/src/functions/other/PercentTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Percent; -const F f; +const Percent f; TEST(PercentTests, toStringTest) { EXPECT_EQ(f.toString(), "%"); @@ -24,22 +23,18 @@ TEST(PercentTests, getReturnClassTest) { } TEST(PercentTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(PercentTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(PercentTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::PostfixUnary); EXPECT_EQ(f.getPriority(), IOperator::Priority::PostfixUnary); } TEST(PercentTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -60,6 +55,6 @@ TEST(PercentTests, degTest) { } TEST(PercentTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Percent")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Percent")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/powers/ExpTests.cpp b/tests/src/functions/powers/ExpTests.cpp index c858d2f40..536fcf0df 100644 --- a/tests/src/functions/powers/ExpTests.cpp +++ b/tests/src/functions/powers/ExpTests.cpp @@ -8,8 +8,7 @@ using namespace fintamath; -using F = Exp; -const F f; +const Exp f; TEST(ExpTests, toStringTest) { EXPECT_EQ(f.toString(), "exp"); @@ -24,12 +23,10 @@ TEST(ExpTests, getReturnClassTest) { } TEST(ExpTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(ExpTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -49,6 +46,6 @@ TEST(ExpTests, exprTest) { } TEST(ExpTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Exp")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Exp")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/powers/PowFunctionTests.cpp b/tests/src/functions/powers/PowFunctionTests.cpp index 8fc345bda..e6f552b12 100644 --- a/tests/src/functions/powers/PowFunctionTests.cpp +++ b/tests/src/functions/powers/PowFunctionTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = PowFunction; -const F f; +const PowFunction f; TEST(PowFunctionTests, toStringTest) { EXPECT_EQ(f.toString(), "pow"); @@ -25,12 +24,10 @@ TEST(PowFunctionTests, getReturnClassTest) { } TEST(PowFunctionTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(PowFunctionTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -49,6 +46,6 @@ TEST(PowFunctionTests, callTest) { } TEST(PowFunctionTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("PowFunction")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("PowFunction")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/powers/PowTests.cpp b/tests/src/functions/powers/PowTests.cpp index 0ec202346..fb4d409e5 100644 --- a/tests/src/functions/powers/PowTests.cpp +++ b/tests/src/functions/powers/PowTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Pow; -const F f; +const Pow f; TEST(PowTests, toStringTest) { EXPECT_EQ(f.toString(), "^"); @@ -26,22 +25,18 @@ TEST(PowTests, getReturnClassTest) { } TEST(PowTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(PowTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } TEST(PowTests, getPriorityTest) { - EXPECT_EQ(F::getPriorityStatic(), IOperator::Priority::Exponentiation); EXPECT_EQ(f.getPriority(), IOperator::Priority::Exponentiation); } TEST(PowTests, isAssociativeTest) { - EXPECT_FALSE(F::isAssociativeStatic()); EXPECT_FALSE(f.isAssociative()); } @@ -174,6 +169,6 @@ TEST(PowTests, exprTest) { } TEST(PowTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Pow")); - EXPECT_EQ(F::getClassStatic().getParent(), IOperator::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Pow")); + EXPECT_EQ(f.getClass().getParent(), IOperator::getClassStatic()); } diff --git a/tests/src/functions/powers/RootTests.cpp b/tests/src/functions/powers/RootTests.cpp index 3b1020926..2682dcfe8 100644 --- a/tests/src/functions/powers/RootTests.cpp +++ b/tests/src/functions/powers/RootTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Root; -const F f; +const Root f; TEST(RootTests, toStringTest) { EXPECT_EQ(f.toString(), "root"); @@ -25,12 +24,10 @@ TEST(RootTests, getReturnClassTest) { } TEST(RootTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(RootTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -185,6 +182,6 @@ TEST(RootTests, exprTest) { } TEST(RootTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Root")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Root")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/powers/SqrTests.cpp b/tests/src/functions/powers/SqrTests.cpp index cf2485729..1989ccbd0 100644 --- a/tests/src/functions/powers/SqrTests.cpp +++ b/tests/src/functions/powers/SqrTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Sqr; -const F f; +const Sqr f; TEST(SqrTests, toStringTest) { EXPECT_EQ(f.toString(), "sqr"); @@ -25,12 +24,10 @@ TEST(SqrTests, getReturnClassTest) { } TEST(SqrTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(SqrTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -54,6 +51,6 @@ TEST(SqrTests, exprTest) { } TEST(SqrTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Sqr")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Sqr")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/powers/SqrtTests.cpp b/tests/src/functions/powers/SqrtTests.cpp index 6c5e63c90..834bfd96a 100644 --- a/tests/src/functions/powers/SqrtTests.cpp +++ b/tests/src/functions/powers/SqrtTests.cpp @@ -9,8 +9,7 @@ using namespace fintamath; -using F = Sqrt; -const F f; +const Sqrt f; TEST(SqrtTests, toStringTest) { EXPECT_EQ(f.toString(), "sqrt"); @@ -25,12 +24,10 @@ TEST(SqrtTests, getReturnClassTest) { } TEST(SqrtTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(SqrtTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -73,6 +70,6 @@ TEST(SqrtTests, exprTest) { } TEST(SqrtTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Sqrt")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Sqrt")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/AcosTests.cpp b/tests/src/functions/trigonometry/AcosTests.cpp index 61858e853..d20784e40 100644 --- a/tests/src/functions/trigonometry/AcosTests.cpp +++ b/tests/src/functions/trigonometry/AcosTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Acos; -const F f; +const Acos f; TEST(AcosTests, toStringTest) { EXPECT_EQ(f.toString(), "acos"); @@ -26,12 +25,10 @@ TEST(AcosTests, getReturnClassTest) { } TEST(AcosTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AcosTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -60,6 +57,6 @@ TEST(AcosTests, exprTest) { } TEST(AcosTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Acos")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Acos")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/AcotTests.cpp b/tests/src/functions/trigonometry/AcotTests.cpp index e9e930664..9fb5dea39 100644 --- a/tests/src/functions/trigonometry/AcotTests.cpp +++ b/tests/src/functions/trigonometry/AcotTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Acot; -const F f; +const Acot f; TEST(AcotTests, toStringTest) { EXPECT_EQ(f.toString(), "acot"); @@ -26,12 +25,10 @@ TEST(AcotTests, getReturnClassTest) { } TEST(AcotTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AcotTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -60,6 +57,6 @@ TEST(AcotTests, exprTest) { } TEST(AcotTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Acot")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Acot")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/AcscTests.cpp b/tests/src/functions/trigonometry/AcscTests.cpp index 9e42be876..c07382cf3 100644 --- a/tests/src/functions/trigonometry/AcscTests.cpp +++ b/tests/src/functions/trigonometry/AcscTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Acsc; -const F f; +const Acsc f; TEST(AcscTests, toStringTest) { EXPECT_EQ(f.toString(), "acsc"); @@ -26,12 +25,10 @@ TEST(AcscTests, getReturnClassTest) { } TEST(AcscTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AcscTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -61,6 +58,6 @@ TEST(AcscTests, exprTest) { } TEST(AcscTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Acsc")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Acsc")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/AsecTests.cpp b/tests/src/functions/trigonometry/AsecTests.cpp index 85b5a3afb..761bf6f0e 100644 --- a/tests/src/functions/trigonometry/AsecTests.cpp +++ b/tests/src/functions/trigonometry/AsecTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Asec; -const F f; +const Asec f; TEST(AsecTests, toStringTest) { EXPECT_EQ(f.toString(), "asec"); @@ -26,12 +25,10 @@ TEST(AsecTests, getReturnClassTest) { } TEST(AsecTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AsecTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -61,6 +58,6 @@ TEST(AsecTests, exprTest) { } TEST(AsecTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Asec")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Asec")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/AsinTests.cpp b/tests/src/functions/trigonometry/AsinTests.cpp index a05985e54..70ee6b802 100644 --- a/tests/src/functions/trigonometry/AsinTests.cpp +++ b/tests/src/functions/trigonometry/AsinTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Asin; -const F f; +const Asin f; TEST(AsinTests, toStringTest) { EXPECT_EQ(f.toString(), "asin"); @@ -26,12 +25,10 @@ TEST(AsinTests, getReturnClassTest) { } TEST(AsinTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AsinTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -60,6 +57,6 @@ TEST(AsinTests, exprTest) { } TEST(AsinTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Asin")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Asin")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/AtanTests.cpp b/tests/src/functions/trigonometry/AtanTests.cpp index 46e6122b0..daecb8475 100644 --- a/tests/src/functions/trigonometry/AtanTests.cpp +++ b/tests/src/functions/trigonometry/AtanTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Atan; -const F f; +const Atan f; TEST(AtanTests, toStringTest) { EXPECT_EQ(f.toString(), "atan"); @@ -26,12 +25,10 @@ TEST(AtanTests, getReturnClassTest) { } TEST(AtanTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(AtanTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -60,6 +57,6 @@ TEST(AtanTests, exprTest) { } TEST(AtanTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Atan")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Atan")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/CosTests.cpp b/tests/src/functions/trigonometry/CosTests.cpp index 9d09804b6..00390d60b 100644 --- a/tests/src/functions/trigonometry/CosTests.cpp +++ b/tests/src/functions/trigonometry/CosTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Cos; -const F f; +const Cos f; TEST(CosTests, toStringTest) { EXPECT_EQ(f.toString(), "cos"); @@ -26,12 +25,10 @@ TEST(CosTests, getReturnClassTest) { } TEST(CosTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(CosTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -57,6 +54,6 @@ TEST(CosTests, exprTest) { } TEST(CosTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Cos")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Cos")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/CotTests.cpp b/tests/src/functions/trigonometry/CotTests.cpp index 806305355..1b59d95bb 100644 --- a/tests/src/functions/trigonometry/CotTests.cpp +++ b/tests/src/functions/trigonometry/CotTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Cot; -const F f; +const Cot f; TEST(CotTests, toStringTest) { EXPECT_EQ(f.toString(), "cot"); @@ -26,12 +25,10 @@ TEST(CotTests, getReturnClassTest) { } TEST(CotTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(CotTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -58,6 +55,6 @@ TEST(CotTests, exprTest) { } TEST(CotTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Cot")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Cot")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/CscTests.cpp b/tests/src/functions/trigonometry/CscTests.cpp index 643955e75..448ae0d1a 100644 --- a/tests/src/functions/trigonometry/CscTests.cpp +++ b/tests/src/functions/trigonometry/CscTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Csc; -const F f; +const Csc f; TEST(CscTests, toStringTest) { EXPECT_EQ(f.toString(), "csc"); @@ -26,12 +25,10 @@ TEST(CscTests, getReturnClassTest) { } TEST(CscTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(CscTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -57,6 +54,6 @@ TEST(CscTests, exprTest) { } TEST(CscTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Csc")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Csc")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/SecTests.cpp b/tests/src/functions/trigonometry/SecTests.cpp index 05f8ac784..7c829d22e 100644 --- a/tests/src/functions/trigonometry/SecTests.cpp +++ b/tests/src/functions/trigonometry/SecTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Sec; -const F f; +const Sec f; TEST(SecTests, toStringTest) { EXPECT_EQ(f.toString(), "sec"); @@ -26,12 +25,10 @@ TEST(SecTests, getReturnClassTest) { } TEST(SecTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(SecTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -57,6 +54,6 @@ TEST(SecTests, exprTest) { } TEST(SecTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Sec")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Sec")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/SinTests.cpp b/tests/src/functions/trigonometry/SinTests.cpp index a0ea6d3da..3f12fb12e 100644 --- a/tests/src/functions/trigonometry/SinTests.cpp +++ b/tests/src/functions/trigonometry/SinTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Sin; -const F f; +const Sin f; TEST(SinTests, toStringTest) { EXPECT_EQ(f.toString(), "sin"); @@ -26,12 +25,10 @@ TEST(SinTests, getReturnClassTest) { } TEST(SinTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(SinTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -57,6 +54,6 @@ TEST(SinTests, exprTest) { } TEST(SinTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Sin")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Sin")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/functions/trigonometry/TanTests.cpp b/tests/src/functions/trigonometry/TanTests.cpp index 97d2eb8d9..4436c13df 100644 --- a/tests/src/functions/trigonometry/TanTests.cpp +++ b/tests/src/functions/trigonometry/TanTests.cpp @@ -10,8 +10,7 @@ using namespace fintamath; -using F = Tan; -const F f; +const Tan f; TEST(TanTests, toStringTest) { EXPECT_EQ(f.toString(), "tan"); @@ -26,12 +25,10 @@ TEST(TanTests, getReturnClassTest) { } TEST(TanTests, isVariadicTest) { - EXPECT_FALSE(F::isVariadicStatic()); EXPECT_FALSE(f.isVariadic()); } TEST(TanTests, isEvaluatableTest) { - EXPECT_TRUE(F::isEvaluatableStatic()); EXPECT_TRUE(f.isEvaluatable()); } @@ -58,6 +55,6 @@ TEST(TanTests, exprTest) { } TEST(TanTests, getClassTest) { - EXPECT_EQ(F::getClassStatic(), MathObjectClass("Tan")); - EXPECT_EQ(F::getClassStatic().getParent(), IFunction::getClassStatic()); + EXPECT_EQ(f.getClass(), MathObjectClass("Tan")); + EXPECT_EQ(f.getClass().getParent(), IFunction::getClassStatic()); } diff --git a/tests/src/literals/ILiteralTests.cpp b/tests/src/literals/ILiteralTests.cpp index 688a2a23b..e3b0ea6f2 100644 --- a/tests/src/literals/ILiteralTests.cpp +++ b/tests/src/literals/ILiteralTests.cpp @@ -47,4 +47,5 @@ TEST(ILiteralTests, equalsTest) { TEST(ILiteralTests, getClassTest) { EXPECT_EQ(ILiteral::getClassStatic(), MathObjectClass("ILiteral")); + EXPECT_EQ(ILiteral::getClassStatic().getParent(), IMathObject::getClassStatic()); } diff --git a/tests/src/literals/VariableTests.cpp b/tests/src/literals/VariableTests.cpp index 4467d22d4..3e21e0440 100644 --- a/tests/src/literals/VariableTests.cpp +++ b/tests/src/literals/VariableTests.cpp @@ -39,6 +39,6 @@ TEST(VariableTest, stringIntegerConstructorTest) { } TEST(VariableTest, getClassTest) { - EXPECT_EQ(Variable::getClassStatic(), MathObjectClass("Variable")); - EXPECT_EQ(Variable::getClassStatic().getParent(), ILiteral::getClassStatic()); + EXPECT_EQ(Variable("a").getClass(), MathObjectClass("Variable")); + EXPECT_EQ(Variable("a").getClass().getParent(), ILiteral::getClassStatic()); } diff --git a/tests/src/literals/constants/ComplexInfTests.cpp b/tests/src/literals/constants/ComplexInfTests.cpp index e12a144d6..2016ba46a 100644 --- a/tests/src/literals/constants/ComplexInfTests.cpp +++ b/tests/src/literals/constants/ComplexInfTests.cpp @@ -16,6 +16,6 @@ TEST(ComplexInfTests, callTest) { } TEST(ComplexInfTests, getClassTest) { - EXPECT_EQ(ComplexInf::getClassStatic(), MathObjectClass("ComplexInf")); - EXPECT_EQ(ComplexInf::getClassStatic().getParent(), IConstant::getClassStatic()); + EXPECT_EQ(c.getClass(), MathObjectClass("ComplexInf")); + EXPECT_EQ(c.getClass().getParent(), IConstant::getClassStatic()); } diff --git a/tests/src/literals/constants/ETests.cpp b/tests/src/literals/constants/ETests.cpp index 8b8d43dbe..c6426cb87 100644 --- a/tests/src/literals/constants/ETests.cpp +++ b/tests/src/literals/constants/ETests.cpp @@ -16,6 +16,6 @@ TEST(ETests, callTest) { } TEST(ETests, getClassTest) { - EXPECT_EQ(E::getClassStatic(), MathObjectClass("E")); - EXPECT_EQ(E::getClassStatic().getParent(), IConstant::getClassStatic()); + EXPECT_EQ(c.getClass(), MathObjectClass("E")); + EXPECT_EQ(c.getClass().getParent(), IConstant::getClassStatic()); } diff --git a/tests/src/literals/constants/FalseTests.cpp b/tests/src/literals/constants/FalseTests.cpp index 7998c1d5b..4e15beeb4 100644 --- a/tests/src/literals/constants/FalseTests.cpp +++ b/tests/src/literals/constants/FalseTests.cpp @@ -18,6 +18,6 @@ TEST(FalseTests, callTest) { } TEST(FalseTests, getClassTest) { - EXPECT_EQ(False::getClassStatic(), MathObjectClass("False")); - EXPECT_EQ(False::getClassStatic().getParent(), IConstant::getClassStatic()); + EXPECT_EQ(c.getClass(), MathObjectClass("False")); + EXPECT_EQ(c.getClass().getParent(), IConstant::getClassStatic()); } diff --git a/tests/src/literals/constants/IConstantTests.cpp b/tests/src/literals/constants/IConstantTests.cpp index 4723395e8..ca95f4b01 100644 --- a/tests/src/literals/constants/IConstantTests.cpp +++ b/tests/src/literals/constants/IConstantTests.cpp @@ -39,4 +39,5 @@ TEST(IConstantTests, callTest) { TEST(IConstantTests, getClassTest) { EXPECT_EQ(IConstant::getClassStatic(), MathObjectClass("IConstant")); + EXPECT_EQ(IConstant::getClassStatic().getParent(), ILiteral::getClassStatic()); } diff --git a/tests/src/literals/constants/ITests.cpp b/tests/src/literals/constants/ITests.cpp index 87dd68b5e..546782604 100644 --- a/tests/src/literals/constants/ITests.cpp +++ b/tests/src/literals/constants/ITests.cpp @@ -16,6 +16,6 @@ TEST(ITests, callTest) { } TEST(ITests, getClassTest) { - EXPECT_EQ(I::getClassStatic(), MathObjectClass("I")); - EXPECT_EQ(I::getClassStatic().getParent(), IConstant::getClassStatic()); + EXPECT_EQ(c.getClass(), MathObjectClass("I")); + EXPECT_EQ(c.getClass().getParent(), IConstant::getClassStatic()); } diff --git a/tests/src/literals/constants/InfTests.cpp b/tests/src/literals/constants/InfTests.cpp index 0c28080c3..701c6604b 100644 --- a/tests/src/literals/constants/InfTests.cpp +++ b/tests/src/literals/constants/InfTests.cpp @@ -16,6 +16,6 @@ TEST(InfTests, callTest) { } TEST(InfTests, getClassTest) { - EXPECT_EQ(Inf::getClassStatic(), MathObjectClass("Inf")); - EXPECT_EQ(Inf::getClassStatic().getParent(), IConstant::getClassStatic()); + EXPECT_EQ(c.getClass(), MathObjectClass("Inf")); + EXPECT_EQ(c.getClass().getParent(), IConstant::getClassStatic()); } diff --git a/tests/src/literals/constants/NegInfTests.cpp b/tests/src/literals/constants/NegInfTests.cpp index 1cf6a8602..7da6d8cd3 100644 --- a/tests/src/literals/constants/NegInfTests.cpp +++ b/tests/src/literals/constants/NegInfTests.cpp @@ -16,6 +16,6 @@ TEST(NegInfTests, callTest) { } TEST(NegInfTests, getClassTest) { - EXPECT_EQ(NegInf::getClassStatic(), MathObjectClass("NegInf")); - EXPECT_EQ(NegInf::getClassStatic().getParent(), IConstant::getClassStatic()); + EXPECT_EQ(c.getClass(), MathObjectClass("NegInf")); + EXPECT_EQ(c.getClass().getParent(), IConstant::getClassStatic()); } diff --git a/tests/src/literals/constants/PiTests.cpp b/tests/src/literals/constants/PiTests.cpp index d2bc996f8..d5eede41c 100644 --- a/tests/src/literals/constants/PiTests.cpp +++ b/tests/src/literals/constants/PiTests.cpp @@ -16,6 +16,6 @@ TEST(PiTests, callTest) { } TEST(PiTests, getClassTest) { - EXPECT_EQ(Pi::getClassStatic(), MathObjectClass("Pi")); - EXPECT_EQ(Pi::getClassStatic().getParent(), IConstant::getClassStatic()); + EXPECT_EQ(c.getClass(), MathObjectClass("Pi")); + EXPECT_EQ(c.getClass().getParent(), IConstant::getClassStatic()); } diff --git a/tests/src/literals/constants/TrueTests.cpp b/tests/src/literals/constants/TrueTests.cpp index 1a2ddb547..8312b0c14 100644 --- a/tests/src/literals/constants/TrueTests.cpp +++ b/tests/src/literals/constants/TrueTests.cpp @@ -18,6 +18,6 @@ TEST(TrueTests, callTest) { } TEST(TrueTests, getClassTest) { - EXPECT_EQ(True::getClassStatic(), MathObjectClass("True")); - EXPECT_EQ(True::getClassStatic().getParent(), IConstant::getClassStatic()); + EXPECT_EQ(c.getClass(), MathObjectClass("True")); + EXPECT_EQ(c.getClass().getParent(), IConstant::getClassStatic()); } diff --git a/tests/src/literals/constants/UndefinedTests.cpp b/tests/src/literals/constants/UndefinedTests.cpp index c78ccddd7..3a1254754 100644 --- a/tests/src/literals/constants/UndefinedTests.cpp +++ b/tests/src/literals/constants/UndefinedTests.cpp @@ -16,6 +16,6 @@ TEST(UndefinedTests, callTest) { } TEST(UndefinedTests, getClassTest) { - EXPECT_EQ(Undefined::getClassStatic(), MathObjectClass("Undefined")); - EXPECT_EQ(Undefined::getClassStatic().getParent(), IConstant::getClassStatic()); + EXPECT_EQ(c.getClass(), MathObjectClass("Undefined")); + EXPECT_EQ(c.getClass().getParent(), IConstant::getClassStatic()); } diff --git a/tests/src/numbers/ComplexTests.cpp b/tests/src/numbers/ComplexTests.cpp index c10e60759..18c66a891 100644 --- a/tests/src/numbers/ComplexTests.cpp +++ b/tests/src/numbers/ComplexTests.cpp @@ -906,6 +906,6 @@ TEST(ComplexTests, isComplexTest) { } TEST(ComplexTests, getClassTest) { - EXPECT_EQ(Complex::getClassStatic(), MathObjectClass("Complex")); - EXPECT_EQ(Complex::getClassStatic().getParent(), INumber::getClassStatic()); + EXPECT_EQ(Complex().getClass(), MathObjectClass("Complex")); + EXPECT_EQ(Complex().getClass().getParent(), INumber::getClassStatic()); } diff --git a/tests/src/numbers/IntegerTests.cpp b/tests/src/numbers/IntegerTests.cpp index cd76dceea..6bbf95218 100644 --- a/tests/src/numbers/IntegerTests.cpp +++ b/tests/src/numbers/IntegerTests.cpp @@ -609,8 +609,8 @@ TEST(IntegerTests, equalsTest) { } TEST(IntegerTests, getClassTest) { - EXPECT_EQ(Integer::getClassStatic(), MathObjectClass("Integer")); - EXPECT_EQ(Integer::getClassStatic().getParent(), IInteger::getClassStatic()); + EXPECT_EQ(Integer().getClass(), MathObjectClass("Integer")); + EXPECT_EQ(Integer().getClass().getParent(), IInteger::getClassStatic()); } TEST(IntegerTests, hashTest) { diff --git a/tests/src/numbers/RationalTests.cpp b/tests/src/numbers/RationalTests.cpp index 5d9af103b..ee5ded2f4 100644 --- a/tests/src/numbers/RationalTests.cpp +++ b/tests/src/numbers/RationalTests.cpp @@ -504,8 +504,8 @@ TEST(RationalTests, isComplexTest) { } TEST(RationalTests, getClassTest) { - EXPECT_EQ(Rational::getClassStatic(), MathObjectClass("Rational")); - EXPECT_EQ(Rational::getClassStatic().getParent(), INumber::getClassStatic()); + EXPECT_EQ(Rational().getClass(), MathObjectClass("Rational")); + EXPECT_EQ(Rational().getClass().getParent(), INumber::getClassStatic()); } TEST(RationalTests, hashTest) { diff --git a/tests/src/numbers/RealTests.cpp b/tests/src/numbers/RealTests.cpp index ea8ca98dc..c9acd2b07 100644 --- a/tests/src/numbers/RealTests.cpp +++ b/tests/src/numbers/RealTests.cpp @@ -1044,8 +1044,8 @@ TEST(RealTests, isComplexTest) { } TEST(RealTests, getClassTest) { - EXPECT_EQ(Real::getClassStatic(), MathObjectClass("Real")); - EXPECT_EQ(Real::getClassStatic().getParent(), INumber::getClassStatic()); + EXPECT_EQ(Real().getClass(), MathObjectClass("Real")); + EXPECT_EQ(Real().getClass().getParent(), INumber::getClassStatic()); } TEST(RealTests, hashTest) {