assertComparativeEqual -> assertComparativeEquivalent

Author: ianfixes

CHANGELOG.md

@@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Environment variable to run a custom initialization script during CI testing: `CUSTOM_INIT_SCRIPT`
 - Environment variable to run from a subdirectory during CI testing: `USE_SUBDIR`
-- `assertComparativeEqual()` and `assertComparativeNotEqual()` to evaluate equality on an `a - b == 0` basis (and/or `!(a > b) && !(a < b)`)
+- `assertComparativeEquivalent()` and `assertComparativeNotEquivalent()` to evaluate equality on an `a - b == 0` basis (and/or `!(a > b) && !(a < b)`)
 - `assertEqualFloat()` and `assertNotEqualFloat()` for comparing floats with epsilon
 - `assertInfinity()` and `assertNotInfinity()` for comparing floats to infinity
 - `assertNAN()` and `assertNotNAN()` for comparing floats to `NaN`

REFERENCE.md

@@ -211,8 +211,8 @@ The following assertion functions are available in unit tests.
 ```c++
 assertEqual(expected, actual);               // a == b
 assertNotEqual(unwanted, actual);            // a != b
-assertComparativeEqual(expected, actual);    // abs(a - b) == 0 or (!(a > b) && !(a < b))
-assertComparativeNotEqual(unwanted, actual); // abs(a - b) > 0  or ((a > b) || (a < b))
+assertComparativeEquivalent(expected, actual);    // abs(a - b) == 0 or (!(a > b) && !(a < b))
+assertComparativeNotEquivalent(unwanted, actual); // abs(a - b) > 0  or ((a > b) || (a < b))
 assertLess(upperBound, actual);              // a < b
 assertMore(lowerBound, actual);              // a > b
 assertLessOrEqual(upperBound, actual);       // a <= b

SampleProjects/DoSomething/test/bad-errormessages.cpp

@@ -9,8 +9,8 @@ unittest(check_that_assertion_error_messages_are_comprehensible)
 {
   assertEqual(1, 2);
   assertNotEqual(2, 2);
-  assertComparativeEqual(1, 2);
-  assertComparativeNotEqual(2, 2);
+  assertComparativeEquivalent(1, 2);
+  assertComparativeNotEquivalent(2, 2);
   assertLess(2, 1);
   assertMore(1, 2);
   assertLessOrEqual(2, 1);

cpp/unittest/Assertion.h

@@ -40,18 +40,18 @@
 
 
 /** macro generates optional output and calls fail() but does not return if false. */
-#define assertTrue(arg)                      testBehaviorExp(false, "assertTrue " #arg, (arg))
-#define assertFalse(arg)                     testBehaviorExp(false, "assertFalse " #arg, !(arg))
-#define assertNull(arg)                      testBehaviorExp(false, "assertNull " #arg, ((void*)NULL == (void*)(arg)))
-#define assertNotNull(arg)                   testBehaviorExp(false, "assertNotNull " #arg, ((void*)NULL != (void*)(arg)))
-#define assertEqual(arg1,arg2)               assertOp("assertEqual","expected",arg1,evaluateDoubleEqual,"==","actual",arg2)
-#define assertNotEqual(arg1,arg2)            assertOp("assertNotEqual","unwanted",arg1,evaluateNotEqual,"!=","actual",arg2)
-#define assertComparativeEqual(arg1,arg2)    assertOp("assertEqual","expected",arg1,compareEqual,"!<>","actual",arg2)
-#define assertComparativeNotEqual(arg1,arg2) assertOp("assertEqual","unwanted",arg1,compareNotEqual,"<>","actual",arg2)
-#define assertLess(arg1,arg2)                assertOp("assertLess","lowerBound",arg1,compareLess,"<","actual",arg2)
-#define assertMore(arg1,arg2)                assertOp("assertMore","upperBound",arg1,compareMore,">","actual",arg2)
-#define assertLessOrEqual(arg1,arg2)         assertOp("assertLessOrEqual","lowerBound",arg1,compareLessOrEqual,"<=","actual",arg2)
-#define assertMoreOrEqual(arg1,arg2)         assertOp("assertMoreOrEqual","upperBound",arg1,compareMoreOrEqual,">=","actual",arg2)
+#define assertTrue(arg)                           testBehaviorExp(false, "assertTrue " #arg, (arg))
+#define assertFalse(arg)                          testBehaviorExp(false, "assertFalse " #arg, !(arg))
+#define assertNull(arg)                           testBehaviorExp(false, "assertNull " #arg, ((void*)NULL == (void*)(arg)))
+#define assertNotNull(arg)                        testBehaviorExp(false, "assertNotNull " #arg, ((void*)NULL != (void*)(arg)))
+#define assertEqual(arg1,arg2)                    assertOp("assertEqual","expected",arg1,evaluateDoubleEqual,"==","actual",arg2)
+#define assertNotEqual(arg1,arg2)                 assertOp("assertNotEqual","unwanted",arg1,evaluateNotEqual,"!=","actual",arg2)
+#define assertComparativeEquivalent(arg1,arg2)    assertOp("assertComparativeEquivalent","expected",arg1,compareEqual,"!<>","actual",arg2)
+#define assertComparativeNotEquivalent(arg1,arg2) assertOp("assertComparativeNotEquivalent","unwanted",arg1,compareNotEqual,"<>","actual",arg2)
+#define assertLess(arg1,arg2)                     assertOp("assertLess","lowerBound",arg1,compareLess,"<","actual",arg2)
+#define assertMore(arg1,arg2)                     assertOp("assertMore","upperBound",arg1,compareMore,">","actual",arg2)
+#define assertLessOrEqual(arg1,arg2)              assertOp("assertLessOrEqual","lowerBound",arg1,compareLessOrEqual,"<=","actual",arg2)
+#define assertMoreOrEqual(arg1,arg2)              assertOp("assertMoreOrEqual","upperBound",arg1,compareMoreOrEqual,">=","actual",arg2)
 
 #define assertEqualFloat(arg1, arg2, arg3)    assertOp("assertEqualFloat", "epsilon", arg3, compareMoreOrEqual, ">=", "actualDifference", fabs(arg1 - arg2))
 #define assertNotEqualFloat(arg1, arg2, arg3) assertOp("assertNotEqualFloat", "epsilon", arg3, compareLessOrEqual, "<=", "insufficientDifference", fabs(arg1 - arg2))
@@ -62,18 +62,18 @@
 
 
 /** macro generates optional output and calls fail() followed by a return if false. */
-#define assureTrue(arg)                      testBehaviorExp(true, "assertTrue " #arg, (arg))
-#define assureFalse(arg)                     testBehaviorExp(true, "assertFalse " #arg, !(arg))
-#define assureNull(arg)                      testBehaviorExp(true, "assertNull " #arg, ((void*)NULL == (void*)(arg)))
-#define assureNotNull(arg)                   testBehaviorExp(true, "assertNotNull " #arg, ((void*)NULL != (void*)(arg)))
-#define assureEqual(arg1,arg2)               assureOp("assureEqual","expected",arg1,evaluateDoubleEqual,"==","actual",arg2)
-#define assureNotEqual(arg1,arg2)            assureOp("assureNotEqual","unwanted",arg1,evaluateNotEqual,"!=","actual",arg2)
-#define assureComparativeEqual(arg1,arg2)    assertOp("assureEqual","expected",arg1,compareEqual,"!<>","actual",arg2)
-#define assureComparativeNotEqual(arg1,arg2) assertOp("assertEqual","unwanted",arg1,compareNotEqual,"<>","actual",arg2)
-#define assureLess(arg1,arg2)                assureOp("assureLess","lowerBound",arg1,compareLess,"<","actual",arg2)
-#define assureMore(arg1,arg2)                assureOp("assureMore","upperBound",arg1,compareMore,">","actual",arg2)
-#define assureLessOrEqual(arg1,arg2)         assureOp("assureLessOrEqual","lowerBound",arg1,compareLessOrEqual,"<=","actual",arg2)
-#define assureMoreOrEqual(arg1,arg2)         assureOp("assureMoreOrEqual","upperBound",arg1,compareMoreOrEqual,">=","actual",arg2)
+#define assureTrue(arg)                           testBehaviorExp(true, "assertTrue " #arg, (arg))
+#define assureFalse(arg)                          testBehaviorExp(true, "assertFalse " #arg, !(arg))
+#define assureNull(arg)                           testBehaviorExp(true, "assertNull " #arg, ((void*)NULL == (void*)(arg)))
+#define assureNotNull(arg)                        testBehaviorExp(true, "assertNotNull " #arg, ((void*)NULL != (void*)(arg)))
+#define assureEqual(arg1,arg2)                    assureOp("assureEqual","expected",arg1,evaluateDoubleEqual,"==","actual",arg2)
+#define assureNotEqual(arg1,arg2)                 assureOp("assureNotEqual","unwanted",arg1,evaluateNotEqual,"!=","actual",arg2)
+#define assureComparativeEquivalent(arg1,arg2)    assertOp("assureComparativeEquivalent","expected",arg1,compareEqual,"!<>","actual",arg2)
+#define assureComparativeNotEquivalent(arg1,arg2) assertOp("assureComparativeNotEquivalent","unwanted",arg1,compareNotEqual,"<>","actual",arg2)
+#define assureLess(arg1,arg2)                     assureOp("assureLess","lowerBound",arg1,compareLess,"<","actual",arg2)
+#define assureMore(arg1,arg2)                     assureOp("assureMore","upperBound",arg1,compareMore,">","actual",arg2)
+#define assureLessOrEqual(arg1,arg2)              assureOp("assureLessOrEqual","lowerBound",arg1,compareLessOrEqual,"<=","actual",arg2)
+#define assureMoreOrEqual(arg1,arg2)              assureOp("assureMoreOrEqual","upperBound",arg1,compareMoreOrEqual,">=","actual",arg2)
 
 #define assureEqualFloat(arg1, arg2, arg3)    assureOp("assureEqualFloat", "epsilon", arg3, compareMoreOrEqual, ">=", "actualDifference", fabs(arg1 - arg2))
 #define assureNotEqualFloat(arg1, arg2, arg3) assureOp("assureNotEqualFloat", "epsilon", arg3, compareLessOrEqual, "<=", "insufficientDifference", fabs(arg1 - arg2))