From 9f776b2f6f84a739b57d41be011aa1bb96fa7708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9a=20Saviot?= Date: Thu, 28 Mar 2019 11:51:17 +0100 Subject: [PATCH] [test] Fix tests for no symbolic computation --- apps/calculation/test/calculation_store.cpp | 4 ++-- poincare/test/store.cpp | 3 ++- poincare/test/user_variable.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/calculation/test/calculation_store.cpp b/apps/calculation/test/calculation_store.cpp index e241fc4b5..84fb766dc 100644 --- a/apps/calculation/test/calculation_store.cpp +++ b/apps/calculation/test/calculation_store.cpp @@ -93,9 +93,9 @@ QUIZ_CASE(calculation_display_exact_approximate) { assertCalculationDisplay("1/2", false, false, ::Calculation::Calculation::EqualSign::Equal, nullptr, nullptr, &globalContext, &store); assertCalculationDisplay("1/3", false, false, ::Calculation::Calculation::EqualSign::Approximation, nullptr, nullptr, &globalContext, &store); assertCalculationDisplay("1/0", true, false, ::Calculation::Calculation::EqualSign::Unknown, "undef", "undef", &globalContext, &store); - assertCalculationDisplay("2x-x", true, false, ::Calculation::Calculation::EqualSign::Unknown, "x", "undef", &globalContext, &store); + assertCalculationDisplay("2x-x", true, false, ::Calculation::Calculation::EqualSign::Unknown, "undef", "undef", &globalContext, &store); assertCalculationDisplay("[[1,2,3]]", false, true, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, &globalContext, &store); - assertCalculationDisplay("[[1,x,3]]", false, true, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, &globalContext, &store); + assertCalculationDisplay("[[1,x,3]]", false, true, ::Calculation::Calculation::EqualSign::Unknown, nullptr, "[[1,undef,3]]", &globalContext, &store); assertCalculationDisplay("28^7", false, false, ::Calculation::Calculation::EqualSign::Unknown, nullptr, nullptr, &globalContext, &store); assertCalculationDisplay("3+√(2)→a", false, false, ::Calculation::Calculation::EqualSign::Approximation, "√(2)+3", nullptr, &globalContext, &store); Ion::Storage::sharedStorage()->recordNamed("a.exp").destroy(); diff --git a/poincare/test/store.cpp b/poincare/test/store.cpp index 17a447621..6c4cbee5a 100644 --- a/poincare/test/store.cpp +++ b/poincare/test/store.cpp @@ -54,7 +54,8 @@ QUIZ_CASE(poincare_store_overwrite) { QUIZ_CASE(poincare_store_do_not_overwrite) { assert_parsed_expression_simplify_to("-1→g(x)", "-1"); - assert_parsed_expression_simplify_to("1+g(x)→f(x)", "0"); + assert_parsed_expression_simplify_to("1+g(x)→f(x)", "g(x)+1"); + assert_parsed_expression_evaluates_to("f(1)", "0"); assert_parsed_expression_simplify_to("2→g", Undefined::Name()); assert_parsed_expression_evaluates_to("g(4)", "-1"); assert_parsed_expression_evaluates_to("f(4)", "0"); diff --git a/poincare/test/user_variable.cpp b/poincare/test/user_variable.cpp index f22fdd477..ea66cbf23 100644 --- a/poincare/test/user_variable.cpp +++ b/poincare/test/user_variable.cpp @@ -23,7 +23,7 @@ QUIZ_CASE(poincare_user_variable_simple) { assert_parsed_expression_simplify_to("f2(Adadas)", "2"); // Define fBoth with f1 and f2 - assert_parsed_expression_simplify_to("f1(x)+f2(x)→fBoth(x)", "2×x"); + assert_parsed_expression_simplify_to("f1(x)+f2(x)→fBoth(x)", "f1(x)+f2(x)"); assert_parsed_expression_simplify_to("fBoth(4)", "8"); assert_parsed_expression_simplify_to("fBoth(Adadas)", "6");