Skip to content

Commit efbb8ae

Browse files
ianfixesianfixes
committed
assertComparativeEqual -> assertComparativeEquivalent
1 parent a5e648b commit efbb8ae

File tree

4 files changed

+29
-29
lines changed

4 files changed

+29
-29
lines changed

‎CHANGELOG.md

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

‎REFERENCE.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,8 @@ The following assertion functions are available in unit tests.
211211
```c++
212212
assertEqual(expected, actual); // a == b
213213
assertNotEqual(unwanted, actual); // a != b
214-
assertComparativeEqual(expected, actual); // abs(a - b) == 0 or (!(a > b) && !(a < b))
215-
assertComparativeNotEqual(unwanted, actual); // abs(a - b) > 0 or ((a > b) || (a < b))
214+
assertComparativeEquivalent(expected, actual); // abs(a - b) == 0 or (!(a > b) && !(a < b))
215+
assertComparativeNotEquivalent(unwanted, actual); // abs(a - b) > 0 or ((a > b) || (a < b))
216216
assertLess(upperBound, actual); // a < b
217217
assertMore(lowerBound, actual); // a > b
218218
assertLessOrEqual(upperBound, actual); // a <= b

‎SampleProjects/DoSomething/test/bad-errormessages.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ unittest(check_that_assertion_error_messages_are_comprehensible)
99
{
1010
assertEqual(1, 2);
1111
assertNotEqual(2, 2);
12-
assertComparativeEqual(1, 2);
13-
assertComparativeNotEqual(2, 2);
12+
assertComparativeEquivalent(1, 2);
13+
assertComparativeNotEquivalent(2, 2);
1414
assertLess(2, 1);
1515
assertMore(1, 2);
1616
assertLessOrEqual(2, 1);

‎cpp/unittest/Assertion.h

+24-24
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@
4040

4141

4242
/** macro generates optional output and calls fail() but does not return if false. */
43-
#define assertTrue(arg) testBehaviorExp(false, "assertTrue " #arg, (arg))
44-
#define assertFalse(arg) testBehaviorExp(false, "assertFalse " #arg, !(arg))
45-
#define assertNull(arg) testBehaviorExp(false, "assertNull " #arg, ((void*)NULL == (void*)(arg)))
46-
#define assertNotNull(arg) testBehaviorExp(false, "assertNotNull " #arg, ((void*)NULL != (void*)(arg)))
47-
#define assertEqual(arg1,arg2) assertOp("assertEqual","expected",arg1,evaluateDoubleEqual,"==","actual",arg2)
48-
#define assertNotEqual(arg1,arg2) assertOp("assertNotEqual","unwanted",arg1,evaluateNotEqual,"!=","actual",arg2)
49-
#define assertComparativeEqual(arg1,arg2) assertOp("assertEqual","expected",arg1,compareEqual,"!<>","actual",arg2)
50-
#define assertComparativeNotEqual(arg1,arg2) assertOp("assertEqual","unwanted",arg1,compareNotEqual,"<>","actual",arg2)
51-
#define assertLess(arg1,arg2) assertOp("assertLess","lowerBound",arg1,compareLess,"<","actual",arg2)
52-
#define assertMore(arg1,arg2) assertOp("assertMore","upperBound",arg1,compareMore,">","actual",arg2)
53-
#define assertLessOrEqual(arg1,arg2) assertOp("assertLessOrEqual","lowerBound",arg1,compareLessOrEqual,"<=","actual",arg2)
54-
#define assertMoreOrEqual(arg1,arg2) assertOp("assertMoreOrEqual","upperBound",arg1,compareMoreOrEqual,">=","actual",arg2)
43+
#define assertTrue(arg) testBehaviorExp(false, "assertTrue " #arg, (arg))
44+
#define assertFalse(arg) testBehaviorExp(false, "assertFalse " #arg, !(arg))
45+
#define assertNull(arg) testBehaviorExp(false, "assertNull " #arg, ((void*)NULL == (void*)(arg)))
46+
#define assertNotNull(arg) testBehaviorExp(false, "assertNotNull " #arg, ((void*)NULL != (void*)(arg)))
47+
#define assertEqual(arg1,arg2) assertOp("assertEqual","expected",arg1,evaluateDoubleEqual,"==","actual",arg2)
48+
#define assertNotEqual(arg1,arg2) assertOp("assertNotEqual","unwanted",arg1,evaluateNotEqual,"!=","actual",arg2)
49+
#define assertComparativeEquivalent(arg1,arg2) assertOp("assertComparativeEquivalent","expected",arg1,compareEqual,"!<>","actual",arg2)
50+
#define assertComparativeNotEquivalent(arg1,arg2) assertOp("assertComparativeNotEquivalent","unwanted",arg1,compareNotEqual,"<>","actual",arg2)
51+
#define assertLess(arg1,arg2) assertOp("assertLess","lowerBound",arg1,compareLess,"<","actual",arg2)
52+
#define assertMore(arg1,arg2) assertOp("assertMore","upperBound",arg1,compareMore,">","actual",arg2)
53+
#define assertLessOrEqual(arg1,arg2) assertOp("assertLessOrEqual","lowerBound",arg1,compareLessOrEqual,"<=","actual",arg2)
54+
#define assertMoreOrEqual(arg1,arg2) assertOp("assertMoreOrEqual","upperBound",arg1,compareMoreOrEqual,">=","actual",arg2)
5555

5656
#define assertEqualFloat(arg1, arg2, arg3) assertOp("assertEqualFloat", "epsilon", arg3, compareMoreOrEqual, ">=", "actualDifference", fabs(arg1 - arg2))
5757
#define assertNotEqualFloat(arg1, arg2, arg3) assertOp("assertNotEqualFloat", "epsilon", arg3, compareLessOrEqual, "<=", "insufficientDifference", fabs(arg1 - arg2))
@@ -62,18 +62,18 @@
6262

6363

6464
/** macro generates optional output and calls fail() followed by a return if false. */
65-
#define assureTrue(arg) testBehaviorExp(true, "assertTrue " #arg, (arg))
66-
#define assureFalse(arg) testBehaviorExp(true, "assertFalse " #arg, !(arg))
67-
#define assureNull(arg) testBehaviorExp(true, "assertNull " #arg, ((void*)NULL == (void*)(arg)))
68-
#define assureNotNull(arg) testBehaviorExp(true, "assertNotNull " #arg, ((void*)NULL != (void*)(arg)))
69-
#define assureEqual(arg1,arg2) assureOp("assureEqual","expected",arg1,evaluateDoubleEqual,"==","actual",arg2)
70-
#define assureNotEqual(arg1,arg2) assureOp("assureNotEqual","unwanted",arg1,evaluateNotEqual,"!=","actual",arg2)
71-
#define assureComparativeEqual(arg1,arg2) assertOp("assureEqual","expected",arg1,compareEqual,"!<>","actual",arg2)
72-
#define assureComparativeNotEqual(arg1,arg2) assertOp("assertEqual","unwanted",arg1,compareNotEqual,"<>","actual",arg2)
73-
#define assureLess(arg1,arg2) assureOp("assureLess","lowerBound",arg1,compareLess,"<","actual",arg2)
74-
#define assureMore(arg1,arg2) assureOp("assureMore","upperBound",arg1,compareMore,">","actual",arg2)
75-
#define assureLessOrEqual(arg1,arg2) assureOp("assureLessOrEqual","lowerBound",arg1,compareLessOrEqual,"<=","actual",arg2)
76-
#define assureMoreOrEqual(arg1,arg2) assureOp("assureMoreOrEqual","upperBound",arg1,compareMoreOrEqual,">=","actual",arg2)
65+
#define assureTrue(arg) testBehaviorExp(true, "assertTrue " #arg, (arg))
66+
#define assureFalse(arg) testBehaviorExp(true, "assertFalse " #arg, !(arg))
67+
#define assureNull(arg) testBehaviorExp(true, "assertNull " #arg, ((void*)NULL == (void*)(arg)))
68+
#define assureNotNull(arg) testBehaviorExp(true, "assertNotNull " #arg, ((void*)NULL != (void*)(arg)))
69+
#define assureEqual(arg1,arg2) assureOp("assureEqual","expected",arg1,evaluateDoubleEqual,"==","actual",arg2)
70+
#define assureNotEqual(arg1,arg2) assureOp("assureNotEqual","unwanted",arg1,evaluateNotEqual,"!=","actual",arg2)
71+
#define assureComparativeEquivalent(arg1,arg2) assertOp("assureComparativeEquivalent","expected",arg1,compareEqual,"!<>","actual",arg2)
72+
#define assureComparativeNotEquivalent(arg1,arg2) assertOp("assureComparativeNotEquivalent","unwanted",arg1,compareNotEqual,"<>","actual",arg2)
73+
#define assureLess(arg1,arg2) assureOp("assureLess","lowerBound",arg1,compareLess,"<","actual",arg2)
74+
#define assureMore(arg1,arg2) assureOp("assureMore","upperBound",arg1,compareMore,">","actual",arg2)
75+
#define assureLessOrEqual(arg1,arg2) assureOp("assureLessOrEqual","lowerBound",arg1,compareLessOrEqual,"<=","actual",arg2)
76+
#define assureMoreOrEqual(arg1,arg2) assureOp("assureMoreOrEqual","upperBound",arg1,compareMoreOrEqual,">=","actual",arg2)
7777

7878
#define assureEqualFloat(arg1, arg2, arg3) assureOp("assureEqualFloat", "epsilon", arg3, compareMoreOrEqual, ">=", "actualDifference", fabs(arg1 - arg2))
7979
#define assureNotEqualFloat(arg1, arg2, arg3) assureOp("assureNotEqualFloat", "epsilon", arg3, compareLessOrEqual, "<=", "insufficientDifference", fabs(arg1 - arg2))

0 commit comments

Comments
 (0)