From d522fd77d3ceddf77ec771a254221e05bdb01e5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Mon, 29 Oct 2018 13:27:30 +0100 Subject: [PATCH] [poincare] Fix test on store --- poincare/test/store.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/poincare/test/store.cpp b/poincare/test/store.cpp index 1d63c4dff..08f7b7e5b 100644 --- a/poincare/test/store.cpp +++ b/poincare/test/store.cpp @@ -15,8 +15,8 @@ QUIZ_CASE(poincare_store_evaluate) { } QUIZ_CASE(poincare_store_simplify) { - assert_parsed_expression_simplify_to("1+2>A", "A"); - assert_parsed_expression_simplify_to("1+2>x", "x"); + assert_parsed_expression_simplify_to("1+2>A", "3"); + assert_parsed_expression_simplify_to("1+2>x", "3"); // Clean the storage for other tests Ion::Storage::sharedStorage()->recordNamed("A.exp").destroy(); @@ -25,32 +25,32 @@ QUIZ_CASE(poincare_store_simplify) { QUIZ_CASE(poincare_store_user_variable) { // Fill variable - assert_parsed_expression_simplify_to("1+2>Adadas", "Adadas"); + assert_parsed_expression_simplify_to("1+2>Adadas", "3"); assert_parsed_expression_simplify_to("Adadas", "3"); // Fill f1 - assert_parsed_expression_simplify_to("1+x>f1(x)", "f1(x)"); + assert_parsed_expression_simplify_to("1+x>f1(x)", "1+?"); assert_parsed_expression_simplify_to("f1(4)", "5"); assert_parsed_expression_simplify_to("f1(Adadas)", "4"); // Fill f2 - assert_parsed_expression_simplify_to("x-1>f2(x)", "f2(x)"); + assert_parsed_expression_simplify_to("x-1>f2(x)", "(-1)+?"); assert_parsed_expression_simplify_to("f2(4)", "3"); assert_parsed_expression_simplify_to("f2(Adadas)", "2"); - // Define funcBoth with f1 and f2 - assert_parsed_expression_simplify_to("f1(x)+f2(x)>funcBoth(x)", "funcBoth(x)"); - assert_parsed_expression_simplify_to("funcBoth(4)", "4"); - assert_parsed_expression_simplify_to("funcBoth(Adadas)", "3"); + // Define fBoth with f1 and f2 + assert_parsed_expression_simplify_to("f1(x)+f2(x)>fBoth(x)", "f1(?)+f2(?)"); + assert_parsed_expression_simplify_to("fBoth(4)", "8"); + assert_parsed_expression_simplify_to("fBoth(Adadas)", "6"); // Change f2 - assert_parsed_expression_simplify_to("x>f2(x)", "f2(x)"); + assert_parsed_expression_simplify_to("x>f2(x)", "?"); assert_parsed_expression_simplify_to("f2(4)", "4"); assert_parsed_expression_simplify_to("f2(Adadas)", "3"); - // Make sure funcBoth has changed - assert_parsed_expression_simplify_to("funcBoth(4)", "5"); - assert_parsed_expression_simplify_to("funcBoth(Adadas)", "4"); + // Make sure fBoth has changed + assert_parsed_expression_simplify_to("fBoth(4)", "9"); + assert_parsed_expression_simplify_to("fBoth(Adadas)", "7"); // Clean the storage for other tests Ion::Storage::sharedStorage()->recordNamed("Adadas.exp").destroy();