From ad33e7ffa4b19fc7bcb293d8db7ca7e2b9bae0ae Mon Sep 17 00:00:00 2001
From: Felix Raimundo <felix.raimundo@numworks.com>
Date: Fri, 22 Apr 2016 14:34:44 +0200
Subject: [PATCH] Make the tests more verbose if needed.

Change-Id: I37f2456f5c31ea4e1057b58774bc70f7728508a6
---
 poincare/test/simplify_utils.cpp | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/poincare/test/simplify_utils.cpp b/poincare/test/simplify_utils.cpp
index 24187fd0e..f573e765e 100644
--- a/poincare/test/simplify_utils.cpp
+++ b/poincare/test/simplify_utils.cpp
@@ -43,6 +43,10 @@ bool simplifies_to(const char * input_string, const char * expected_string) {
 }
 
 bool identical_to(const char * input_string, const char * expected_string) {
+#if POINCARE_TESTS_PRINT_EXPRESSIONS
+  cout << "---- Identical Run ----"  << endl;
+  cout << input_string << " -> " << expected_string << endl;
+#endif
   Expression * input = Expression::parse(input_string);
   assert(input != nullptr);
 #if POINCARE_TESTS_PRINT_EXPRESSIONS
@@ -66,6 +70,10 @@ bool identical_to(const char * input_string, const char * expected_string) {
 }
 
 bool equivalent_to(const char * input_string, const char * expected_string) {
+#if POINCARE_TESTS_PRINT_EXPRESSIONS
+  cout << "---- Equivalence Run ----"  << endl;
+  cout << input_string << " -> " << expected_string << endl;
+#endif
   Expression * input = Expression::parse(input_string);
   assert(input != nullptr);
 #if POINCARE_TESTS_PRINT_EXPRESSIONS
@@ -80,10 +88,25 @@ bool equivalent_to(const char * input_string, const char * expected_string) {
   print_expression(expected);
 #endif
 
-  bool isEquivalent = input->isEquivalentTo(expected);
+  Expression * simplified_input = input->simplify();
+  assert(simplified_input != nullptr);
+#if POINCARE_TESTS_PRINT_EXPRESSIONS
+  cout << "Simplified Input = " << endl;
+  print_expression(simplified_input);
+#endif
+
+  Expression * simplified_expected = Expression::parse(expected_string);
+  assert(simplified_expected != nullptr);
+#if POINCARE_TESTS_PRINT_EXPRESSIONS
+  cout << "Simplified Expected = " << endl;
+  print_expression(simplified_expected);
+#endif
+  bool isEquivalent = simplified_input->isIdenticalTo(simplified_expected);
 
   delete expected;
   delete input;
+  delete simplified_expected;
+  delete simplified_input;
 
   return isEquivalent;
 }