From 5c96e04a6a55c7c2e66362685fa7b49b890746b2 Mon Sep 17 00:00:00 2001 From: Felix Raimundo Date: Mon, 4 Apr 2016 17:48:40 +0200 Subject: [PATCH] Add tests for the simplification rules. Change-Id: I086e18b2fcea5deb725872cf1254b6c2636a032a --- poincare/test/simplify.cpp | 20 ++++++++++---------- poincare/test/simplify_addition_integer.cpp | 11 ++++++++--- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/poincare/test/simplify.cpp b/poincare/test/simplify.cpp index c155de771..952ffd5a6 100644 --- a/poincare/test/simplify.cpp +++ b/poincare/test/simplify.cpp @@ -3,14 +3,14 @@ #include QUIZ_CASE(poincare_simplify) { - //{ - // Expression * e = Expression::parse("3*0"); - // Expression * e2 = e->simplify(); - // assert(e2->type() == Expression::Type::Integer); - //} - //{ - // Expression * e = Expression::parse("0*foo"); - // Expression * e2 = e->simplify(); - // assert(e2->type() == Expression::Type::Integer); - //} + { + Expression * e = Expression::parse("3*0"); + Expression * e2 = e->simplify(); + assert(e2->type() == Expression::Type::Integer); + } + { + Expression * e = Expression::parse("0*foo"); + Expression * e2 = e->simplify(); + assert(e2->type() == Expression::Type::Integer); + } } diff --git a/poincare/test/simplify_addition_integer.cpp b/poincare/test/simplify_addition_integer.cpp index 4587bd423..f43d26dfe 100644 --- a/poincare/test/simplify_addition_integer.cpp +++ b/poincare/test/simplify_addition_integer.cpp @@ -38,11 +38,16 @@ void assert_simplifies_to(const char * input_string, const char * expected_strin assert(simplified->isIdenticalTo(expected)); delete expected; - delete simplified; + if (simplified != input) { + delete simplified; + } delete input; } QUIZ_CASE(poincare_simplify_addition_integer) { - //assert_simplifies_to("2+2", "4"); - assert_simplifies_to("2*2*2*2*2*2", "6"); + assert_simplifies_to("1", "1"); + assert_simplifies_to("1+2", "3"); + assert_simplifies_to("1+a", "1+a"); + assert_simplifies_to("1+2+3+4+5+6+7", "28"); + assert_simplifies_to("1+2+3+4+5+a+6+7", "28+a"); }