From c71cce295755c541c80bffa14f7e582e636f991d Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Fri, 27 Mar 2020 11:48:35 +0100 Subject: [PATCH] [poincare/test] Factor assertions --- poincare/test/expression_properties.cpp | 1 - poincare/test/helper.cpp | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/poincare/test/expression_properties.cpp b/poincare/test/expression_properties.cpp index 4bfd28073..c5d9ee0c4 100644 --- a/poincare/test/expression_properties.cpp +++ b/poincare/test/expression_properties.cpp @@ -328,7 +328,6 @@ void assert_reduced_expression_has_polynomial_coefficient(const char * expressio int d = e.getPolynomialReducedCoefficients(symbolName, coefficientBuffer, &globalContext, complexFormat, Radian, symbolicComputation); for (int i = 0; i <= d; i++) { Expression f = parse_expression(coefficients[i], &globalContext, false); - quiz_assert(!f.isUninitialized()); coefficientBuffer[i] = coefficientBuffer[i].reduce(ExpressionNode::ReductionContext(&globalContext, complexFormat, angleUnit, SystemForAnalysis, symbolicComputation)); f = f.reduce(ExpressionNode::ReductionContext(&globalContext, complexFormat, angleUnit, SystemForAnalysis, symbolicComputation)); quiz_assert_print_if_failure(coefficientBuffer[i].isIdenticalTo(f), expression); diff --git a/poincare/test/helper.cpp b/poincare/test/helper.cpp index 67d035b41..3c07c656b 100644 --- a/poincare/test/helper.cpp +++ b/poincare/test/helper.cpp @@ -72,14 +72,13 @@ void assert_parsed_expression_process_to(const char * expression, const char * r Poincare::Expression parse_expression(const char * expression, Context * context, bool addParentheses) { Expression result = Expression::Parse(expression, context, addParentheses); - quiz_assert(!result.isUninitialized()); + quiz_assert_print_if_failure(!result.isUninitialized(), expression); return result; } void assert_simplify(const char * expression, Preferences::AngleUnit angleUnit, Preferences::ComplexFormat complexFormat, ExpressionNode::ReductionTarget target) { Shared::GlobalContext globalContext; Expression e = parse_expression(expression, &globalContext, false); - quiz_assert_print_if_failure(!e.isUninitialized(), expression); e = e.simplify(ExpressionNode::ReductionContext(&globalContext, complexFormat, angleUnit, target)); quiz_assert_print_if_failure(!(e.isUninitialized()), expression); }