Fixed CHECK_EQUAL

Author: basvodde

include/CppUTest/UtestMacros.h

@@ -116,7 +116,13 @@
   CHECK_EQUAL_LOCATION(expected, actual, __FILE__, __LINE__)
 
 #define CHECK_EQUAL_LOCATION(expected,actual, file, line)\
-  { UtestShell::getCurrent()->assertEquals(((expected) != (actual)), StringFrom(expected).asCharString(), StringFrom(actual).asCharString(), file, line); }
+  { if ((expected) != (actual)) { \
+	  if ((actual) != (actual)) \
+	  	  UtestShell::getCurrent()->print("WARNING:\n\tThe \"Actual Parameter\" parameter is evaluated multiple times resulting in different values.\n\tThus the value in the error message is probably incorrect.", file, line); \
+	  if ((expected) != (expected)) \
+	  	  UtestShell::getCurrent()->print("WARNING:\n\tThe \"Expected Parameter\" parameter is evaluated multiple times resulting in different values.\n\tThus the value in the error message is probably incorrect.", file, line); \
+	  UtestShell::getCurrent()->assertEquals(true, StringFrom(expected).asCharString(), StringFrom(actual).asCharString(), file, line); \
+  } }
 
 //This check checks for char* string equality using strcmp.
 //This makes up for the fact that CHECK_EQUAL only compares the pointers to char*'s

tests/TestUTestMacro.cpp

@@ -191,6 +191,48 @@ TEST(UnitTestMacros, FailureWithCHECK_EQUAL)
 	CHECK_TEST_FAILS_PROPER_WITH_TEXT("expected <1>");
 }
 
+static int countInCountingMethod;
+static int _countingMethod()
+{
+	return countInCountingMethod++;
+}
+
+TEST(UnitTestMacros, passingCheckEqualWillNotBeEvaluatedMultipleTimesWithCHECK_EQUAL)
+{
+	countInCountingMethod = 0;
+	CHECK_EQUAL(0, _countingMethod());
+
+	LONGS_EQUAL(1, countInCountingMethod);
+}
+
+static void _failing_CHECK_EQUAL_WithActualBeingEvaluatesMultipleTimesWillGiveAWarning()
+{
+	CHECK_EQUAL(12345, _countingMethod());
+}
+
+TEST(UnitTestMacros, failing_CHECK_EQUAL_WithActualBeingEvaluatesMultipleTimesWillGiveAWarning)
+{
+	runTestWithMethod(_failing_CHECK_EQUAL_WithActualBeingEvaluatesMultipleTimesWillGiveAWarning);
+	CHECK_TEST_FAILS_PROPER_WITH_TEXT("WARNING:\n\tThe \"Actual Parameter\" parameter is evaluated multiple times resulting in different values.\n\tThus the value in the error message is probably incorrect.");
+}
+
+static void _failing_CHECK_EQUAL_WithExpectedBeingEvaluatesMultipleTimesWillGiveAWarning()
+{
+	CHECK_EQUAL(_countingMethod(), 12345);
+}
+
+TEST(UnitTestMacros, failing_CHECK_EQUAL_WithExpectedBeingEvaluatesMultipleTimesWillGiveAWarning)
+{
+	runTestWithMethod(_failing_CHECK_EQUAL_WithExpectedBeingEvaluatesMultipleTimesWillGiveAWarning);
+	CHECK_TEST_FAILS_PROPER_WITH_TEXT("WARNING:\n\tThe \"Expected Parameter\" parameter is evaluated multiple times resulting in different values.\n\tThus the value in the error message is probably incorrect.");
+}
+
+TEST(UnitTestMacros, failing_CHECK_EQUAL_withParamatersThatDontChangeWillNotGiveAnyWarning)
+{
+	runTestWithMethod(_failingTestMethodWithCHECK_EQUAL);
+	CHECK( ! fixture.output_->getOutput().contains("WARNING"));
+}
+
 TEST(UnitTestMacros, CHECK_EQUALBehavesAsProperMacro)
 {
 	if (this == 0) CHECK_EQUAL(1, 2)