diff --git a/poincare/test/parsing.cpp b/poincare/test/parsing.cpp index b5e6678ca..af3f00858 100644 --- a/poincare/test/parsing.cpp +++ b/poincare/test/parsing.cpp @@ -419,31 +419,15 @@ QUIZ_CASE(poincare_parsing_parse_store) { Expression m0[] = {Symbol::Builder('x')}; assert_parsed_expression_is("[[x]]→f(x)", Store::Builder(BuildMatrix(1,1,m0), Function::Builder("f", 1, Symbol::Builder('x')))); assert_text_not_parsable("a→b→c"); - assert_text_not_parsable("1→2"); assert_text_not_parsable("1→"); assert_text_not_parsable("→2"); assert_text_not_parsable("(1→a)"); - assert_text_not_parsable("1→u(n)"); - assert_text_not_parsable("1→u(n+1)"); - assert_text_not_parsable("1→v(n)"); - assert_text_not_parsable("1→v(n+1)"); - assert_text_not_parsable("1→u_{n}"); - assert_text_not_parsable("1→u_{n+1}"); - assert_text_not_parsable("1→v_{n}"); - assert_text_not_parsable("1→v_{n+1}"); - assert_text_not_parsable("1→inf"); - assert_text_not_parsable("1→undef"); - assert_text_not_parsable("1→π"); - assert_text_not_parsable("1→𝐢"); - assert_text_not_parsable("1→ℯ"); assert_text_not_parsable("1→\1"); // UnknownX assert_text_not_parsable("1→\2"); // UnknownN assert_text_not_parsable("1→acos"); assert_text_not_parsable("1→f(2)"); assert_text_not_parsable("1→f(f)"); assert_text_not_parsable("3→f(g(4))"); - assert_text_not_parsable("1→ans"); - assert_text_not_parsable("ans→ans"); } QUIZ_CASE(poincare_parsing_parse_unit_convert) { @@ -452,7 +436,6 @@ QUIZ_CASE(poincare_parsing_parse_unit_convert) { Expression kilometer = Expression::Parse("_km", nullptr); assert_parsed_expression_is("1→_m/_km", UnitConvert::Builder(BasedInteger::Builder(1), Division::Builder(meter, kilometer))); - assert_text_not_parsable("1→3_m"); assert_simplify("_m→a", Radian, Real); assert_simplify("_m→b", Radian, Real); assert_text_not_parsable("1_km→a×b"); diff --git a/poincare/test/simplification.cpp b/poincare/test/simplification.cpp index 0428f49df..33245cda3 100644 --- a/poincare/test/simplification.cpp +++ b/poincare/test/simplification.cpp @@ -915,13 +915,31 @@ QUIZ_CASE(poincare_simplification_store_matrix) { } QUIZ_CASE(poincare_simplification_unit_convert) { - assert_parsed_expression_simplify_to("10_m/_s→_km/_hour", "36×_km/_hour"); - assert_parsed_expression_simplify_to("2_m→_km×_m/_m", "0.002×_km×_m/_m"); + assert_parsed_expression_simplify_to("10_m/_s→_km/_hour", "36×_km×_hour^\x12-1\x13"); + assert_parsed_expression_simplify_to("2_m→_km×_m/_m", "0.002×_km"); assert_parsed_expression_simplify_to("10_m/_s→_km", Undefined::Name()); - assert_parsed_expression_simplify_to("10_m/_s→_km/_hour", "36×_km/_hour"); - assert_parsed_expression_simplify_to("10_m^2→_mm×_km", "10×_mm×_km"); + assert_parsed_expression_simplify_to("10_m/_s→_km/_hour", "36×_km×_hour^\x12-1\x13"); + assert_parsed_expression_simplify_to("10_m^2→_mm×_km", "10×_km×_mm"); assert_parsed_expression_simplify_to("2_hour+2_min→_s", "7320×_s"); assert_parsed_expression_simplify_to("2×_kg×_m^2×_s^(-2)→_J", "2×_J"); + + assert_parsed_expression_simplify_to("1→2", Undefined::Name()); + assert_parsed_expression_simplify_to("1→u(n)", Undefined::Name()); + assert_parsed_expression_simplify_to("1→u(n+1)", Undefined::Name()); + assert_parsed_expression_simplify_to("1→v(n)", Undefined::Name()); + assert_parsed_expression_simplify_to("1→v(n+1)", Undefined::Name()); + assert_parsed_expression_simplify_to("1→u_{n}", Undefined::Name()); + assert_parsed_expression_simplify_to("1→u_{n+1}", Undefined::Name()); + assert_parsed_expression_simplify_to("1→v_{n}", Undefined::Name()); + assert_parsed_expression_simplify_to("1→v_{n+1}", Undefined::Name()); + assert_parsed_expression_simplify_to("1→inf", Undefined::Name()); + assert_parsed_expression_simplify_to("1→undef", Undefined::Name()); + assert_parsed_expression_simplify_to("1→π", Undefined::Name()); + assert_parsed_expression_simplify_to("1→𝐢", Undefined::Name()); + assert_parsed_expression_simplify_to("1→ℯ", Undefined::Name()); + assert_parsed_expression_simplify_to("1→ans", Undefined::Name()); + assert_parsed_expression_simplify_to("ans→ans", Undefined::Name()); + assert_parsed_expression_simplify_to("1→3_m", Undefined::Name()); } QUIZ_CASE(poincare_simplification_complex_format) {