From 092fe44dd728dbe35b15eedbedeb90b2e846e58e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Fri, 2 Aug 2019 14:51:25 +0200 Subject: [PATCH] [poincare] Fix text with new Addition and Multiplication --- poincare/test/parsing.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/poincare/test/parsing.cpp b/poincare/test/parsing.cpp index 4376967a7..f4f55d2c2 100644 --- a/poincare/test/parsing.cpp +++ b/poincare/test/parsing.cpp @@ -155,10 +155,13 @@ QUIZ_CASE(poincare_parsing_parse) { assert_parsed_expression_is("1+2", Addition::Builder(Rational::Builder(1),Rational::Builder(2))); assert_parsed_expression_is("(1)+2", Addition::Builder(Parenthesis::Builder(Rational::Builder(1)),Rational::Builder(2))); assert_parsed_expression_is("(1+2)", Parenthesis::Builder(Addition::Builder(Rational::Builder(1),Rational::Builder(2)))); - assert_parsed_expression_is("1+2+3", Addition::Builder(Addition::Builder(Rational::Builder(1),Rational::Builder(2)),Rational::Builder(3))); - assert_parsed_expression_is("1+2+(3+4)", Addition::Builder(Addition::Builder(Rational::Builder(1),Rational::Builder(2)),Parenthesis::Builder(Addition::Builder(Rational::Builder(3),Rational::Builder(4))))); + Expression nAryChildren[] = {Rational::Builder(1),Rational::Builder(2),Rational::Builder(3)}; + assert_parsed_expression_is("1+2+3", Addition::Builder(nAryChildren, 3)); + nAryChildren[2] = Parenthesis::Builder(Addition::Builder(Rational::Builder(3),Rational::Builder(4))); + assert_parsed_expression_is("1+2+(3+4)", Addition::Builder(nAryChildren, 3)); assert_parsed_expression_is("1×2", MultiplicationExplicit::Builder(Rational::Builder(1),Rational::Builder(2))); - assert_parsed_expression_is("1×2×3", MultiplicationExplicit::Builder(MultiplicationExplicit::Builder(Rational::Builder(1),Rational::Builder(2)),Rational::Builder(3))); + nAryChildren[2] = Rational::Builder(3); + assert_parsed_expression_is("1×2×3", MultiplicationExplicit::Builder(nAryChildren, 3)); assert_parsed_expression_is("1+2×3", Addition::Builder(Rational::Builder(1), MultiplicationExplicit::Builder(Rational::Builder(2), Rational::Builder(3)))); assert_parsed_expression_is("1/2", Division::Builder(Rational::Builder(1),Rational::Builder(2))); assert_parsed_expression_is("(1/2)", Parenthesis::Builder(Division::Builder(Rational::Builder(1),Rational::Builder(2))));