Skip to content

Commit 47e294a

Browse files
ianfixesianfixes
committed
Reconcile equality for strings and equivalence for float infinity
1 parent efbb8ae commit 47e294a

File tree

3 files changed

+78
-63
lines changed

3 files changed

+78
-63
lines changed

‎SampleProjects/DoSomething/test/good-assert.cpp‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,24 @@ unittest(assert_equal_without_total_ordering)
3434

3535
unittest(float_assertions)
3636
{
37+
assertEqualFloat(1.0, 1.02, 0.1);
38+
assertNotEqualFloat(1.2, 1.0, 0.01);
39+
3740
assertInfinity(exp(800));
38-
assertInfinity(0.0/0.0);
41+
assertInfinity(1.0/0.0);
3942
assertNotInfinity(42);
4043

4144
assertNAN(INFINITY - INFINITY);
4245
assertNAN(0.0/0.0);
4346
assertNotNAN(42);
47+
48+
assertComparativeEquivalent(exp(800), INFINITY);
49+
assertComparativeEquivalent(0.0/0.0, INFINITY - INFINITY);
50+
assertComparativeNotEquivalent(INFINITY, -INFINITY);
51+
52+
assertLess(0, INFINITY);
53+
assertLess(-INFINITY, 0);
54+
assertLess(-INFINITY, INFINITY);
4455
}
4556

4657
unittest_main()

‎cpp/unittest/Assertion.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@
4444
#define assertFalse(arg) testBehaviorExp(false, "assertFalse " #arg, !(arg))
4545
#define assertNull(arg) testBehaviorExp(false, "assertNull " #arg, ((void*)NULL == (void*)(arg)))
4646
#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)
47+
#define assertEqual(arg1,arg2) assertOp("assertEqual","expected",arg1,compareEqual,"==","actual",arg2)
48+
#define assertNotEqual(arg1,arg2) assertOp("assertNotEqual","unwanted",arg1,compareNotEqual,"!=","actual",arg2)
49+
#define assertComparativeEquivalent(arg1,arg2) assertOp("assertComparativeEquivalent","expected",arg1,compareEquivalent,"!<>","actual",arg2)
50+
#define assertComparativeNotEquivalent(arg1,arg2) assertOp("assertComparativeNotEquivalent","unwanted",arg1,compareNotEquivalent,"<>","actual",arg2)
5151
#define assertLess(arg1,arg2) assertOp("assertLess","lowerBound",arg1,compareLess,"<","actual",arg2)
5252
#define assertMore(arg1,arg2) assertOp("assertMore","upperBound",arg1,compareMore,">","actual",arg2)
5353
#define assertLessOrEqual(arg1,arg2) assertOp("assertLessOrEqual","lowerBound",arg1,compareLessOrEqual,"<=","actual",arg2)
@@ -66,10 +66,10 @@
6666
#define assureFalse(arg) testBehaviorExp(true, "assertFalse " #arg, !(arg))
6767
#define assureNull(arg) testBehaviorExp(true, "assertNull " #arg, ((void*)NULL == (void*)(arg)))
6868
#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)
69+
#define assureEqual(arg1,arg2) assureOp("assureEqual","expected",arg1,compareEqual,"==","actual",arg2)
70+
#define assureNotEqual(arg1,arg2) assureOp("assureNotEqual","unwanted",arg1,compareNotEqual,"!=","actual",arg2)
71+
#define assureComparativeEquivalent(arg1,arg2) assertOp("assureComparativeEquivalent","expected",arg1,compareEquivalent,"!<>","actual",arg2)
72+
#define assureComparativeNotEquivalent(arg1,arg2) assertOp("assureComparativeNotEquivalent","unwanted",arg1,compareNotEquivalent,"<>","actual",arg2)
7373
#define assureLess(arg1,arg2) assureOp("assureLess","lowerBound",arg1,compareLess,"<","actual",arg2)
7474
#define assureMore(arg1,arg2) assureOp("assureMore","upperBound",arg1,compareMore,">","actual",arg2)
7575
#define assureLessOrEqual(arg1,arg2) assureOp("assureLessOrEqual","lowerBound",arg1,compareLessOrEqual,"<=","actual",arg2)

‎cpp/unittest/Compare.h‎

Lines changed: 58 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ template < typename A, typename B > struct Compare
1010
if (b<a) return 1;
1111
return 0;
1212
}
13-
inline static bool equal(const A &a,const B &b) { return (!(a < b)) && (!(b < a)); }
14-
inline static bool notEqual(const A &a,const B &b) { return (a<b) || (b<a); }
15-
inline static bool less(const A &a,const B &b) { return a<b; }
16-
inline static bool more(const A &a,const B &b) { return b<a; }
17-
inline static bool lessOrEqual(const A &a,const B &b) { return !(b<a); }
18-
inline static bool moreOrEqual(const A &a,const B &b) { return !(a<b); }
13+
inline static bool equal(const A &a,const B &b) { return a==b; }
14+
inline static bool notEqual(const A &a,const B &b) { return a!=b; }
15+
inline static bool equivalent(const A &a,const B &b) { return (!(a < b)) && (!(b < a)); }
16+
inline static bool notEquivalent(const A &a,const B &b) { return (a<b) || (b<a); }
17+
inline static bool less(const A &a,const B &b) { return a<b; }
18+
inline static bool more(const A &a,const B &b) { return b<a; }
19+
inline static bool lessOrEqual(const A &a,const B &b) { return !(b<a); }
20+
inline static bool moreOrEqual(const A &a,const B &b) { return !(a<b); }
1921
};
2022

2123
// helpers for macros
@@ -57,59 +59,61 @@ inline static int arduinoCICompareBetween(const __FlashStringHelper * const &a,c
5759

5860

5961
// this macro works for all the string-based comparisons
62+
// note that it substitutes equivalence for equality
6063
// but just in case, https://stackoverflow.com/a/13842784/2063546
61-
#define comparisonTemplateMacro(T1, T1m, T2, T2m, betweenImpl, ...) \
62-
template < __VA_ARGS__ > struct Compare<T1 T1m, T2 T2m>; \
63-
template < __VA_ARGS__ > struct Compare<T1 T1m, T2 T2m> \
64-
{ \
65-
inline static int between( T1 const (&a)T1m, T2 const (&b)T2m) { return betweenImpl; } \
66-
inline static bool equal( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) == 0; } \
67-
inline static bool notEqual( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) != 0; } \
68-
inline static bool less( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) < 0; } \
69-
inline static bool more( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) > 0; } \
70-
inline static bool lessOrEqual(T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) <= 0; } \
71-
inline static bool moreOrEqual(T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) >= 0; } \
64+
#define eqComparisonTemplateMacro(T1, T1m, T2, T2m, betweenImpl, ...) \
65+
template < __VA_ARGS__ > struct Compare<T1 T1m, T2 T2m>; \
66+
template < __VA_ARGS__ > struct Compare<T1 T1m, T2 T2m> \
67+
{ \
68+
inline static int between( T1 const (&a)T1m, T2 const (&b)T2m) { return betweenImpl; } \
69+
inline static bool equal( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) == 0; } \
70+
inline static bool notEqual( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) != 0; } \
71+
inline static bool equivalent( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) == 0; } \
72+
inline static bool notEquivalent(T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) != 0; } \
73+
inline static bool less( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) < 0; } \
74+
inline static bool more( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) > 0; } \
75+
inline static bool lessOrEqual( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) <= 0; } \
76+
inline static bool moreOrEqual( T1 const (&a)T1m, T2 const (&b)T2m) { return between(a, b) >= 0; } \
7277
};
7378

74-
comparisonTemplateMacro(String, , String, , a.compareTo(b))
75-
comparisonTemplateMacro(String, , const char *, , a.compareTo(b))
79+
eqComparisonTemplateMacro(String, , String, , a.compareTo(b))
80+
eqComparisonTemplateMacro(String, , const char *, , a.compareTo(b))
7681
#if defined(F)
77-
comparisonTemplateMacro(String, , const __FlashStringHelper *, , arduinoCICompareBetween(a, b))
78-
comparisonTemplateMacro(const char *,, const __FlashStringHelper *, , strcmp_P(a,(const char *)b))
79-
comparisonTemplateMacro(const __FlashStringHelper *, , String, , -arduinoCICompareBetween(b, a))
80-
comparisonTemplateMacro(const __FlashStringHelper *, , const char *, , -strcmp_P(b,(const char *)a))
81-
comparisonTemplateMacro(const __FlashStringHelper *, , const __FlashStringHelper *, , arduinoCICompareBetween(a, b))
82-
comparisonTemplateMacro(const __FlashStringHelper *, , char *, , -strcmp_P(b,(const char *)a))
83-
comparisonTemplateMacro(char *, , const __FlashStringHelper *, , strcmp_P(a,(const char *)b))
84-
comparisonTemplateMacro(const __FlashStringHelper *, , char, [M], -strcmp_P(b,(const char *)a), size_t M)
85-
comparisonTemplateMacro(char, [N], const __FlashStringHelper *, , strcmp_P(a,(const char *)b), size_t N)
82+
eqComparisonTemplateMacro(String, , const __FlashStringHelper *, , arduinoCICompareBetween(a, b))
83+
eqComparisonTemplateMacro(const char *,, const __FlashStringHelper *, , strcmp_P(a,(const char *)b))
84+
eqComparisonTemplateMacro(const __FlashStringHelper *, , String, , -arduinoCICompareBetween(b, a))
85+
eqComparisonTemplateMacro(const __FlashStringHelper *, , const char *, , -strcmp_P(b,(const char *)a))
86+
eqComparisonTemplateMacro(const __FlashStringHelper *, , const __FlashStringHelper *, , arduinoCICompareBetween(a, b))
87+
eqComparisonTemplateMacro(const __FlashStringHelper *, , char *, , -strcmp_P(b,(const char *)a))
88+
eqComparisonTemplateMacro(char *, , const __FlashStringHelper *, , strcmp_P(a,(const char *)b))
89+
eqComparisonTemplateMacro(const __FlashStringHelper *, , char, [M], -strcmp_P(b,(const char *)a), size_t M)
90+
eqComparisonTemplateMacro(char, [N], const __FlashStringHelper *, , strcmp_P(a,(const char *)b), size_t N)
8691
#endif
87-
comparisonTemplateMacro(String, , char *, , a.compareTo(b))
88-
comparisonTemplateMacro(const char *, , String, , -b.compareTo(a))
89-
comparisonTemplateMacro(const char *, , const char *, , strcmp(a,b))
90-
comparisonTemplateMacro(const char *, , char *, , strcmp(a,b))
91-
comparisonTemplateMacro(char *, , String, , -b.compareTo(a))
92-
comparisonTemplateMacro(char *, , const char *, , strcmp(a,b))
93-
comparisonTemplateMacro(char *, , char *, , strcmp(a,b))
94-
comparisonTemplateMacro(String, , char, [M], a.compareTo(b), size_t M)
95-
comparisonTemplateMacro(const char *, , char, [M], strcmp(a,b), size_t M)
96-
comparisonTemplateMacro(char *, , char, [M], strcmp(a,b), size_t M)
97-
comparisonTemplateMacro(char, [N], String, , -b.compareTo(a), size_t N)
98-
comparisonTemplateMacro(char, [N], const char *, , strcmp(a,b), size_t N)
99-
comparisonTemplateMacro(char, [N], char *, , strcmp(a,b), size_t N)
100-
comparisonTemplateMacro(char, [N], char, [M], strcmp(a,b), size_t N, size_t M)
92+
eqComparisonTemplateMacro(String, , char *, , a.compareTo(b))
93+
eqComparisonTemplateMacro(const char *, , String, , -b.compareTo(a))
94+
eqComparisonTemplateMacro(const char *, , const char *, , strcmp(a,b))
95+
eqComparisonTemplateMacro(const char *, , char *, , strcmp(a,b))
96+
eqComparisonTemplateMacro(char *, , String, , -b.compareTo(a))
97+
eqComparisonTemplateMacro(char *, , const char *, , strcmp(a,b))
98+
eqComparisonTemplateMacro(char *, , char *, , strcmp(a,b))
99+
eqComparisonTemplateMacro(String, , char, [M], a.compareTo(b), size_t M)
100+
eqComparisonTemplateMacro(const char *, , char, [M], strcmp(a,b), size_t M)
101+
eqComparisonTemplateMacro(char *, , char, [M], strcmp(a,b), size_t M)
102+
eqComparisonTemplateMacro(char, [N], String, , -b.compareTo(a), size_t N)
103+
eqComparisonTemplateMacro(char, [N], const char *, , strcmp(a,b), size_t N)
104+
eqComparisonTemplateMacro(char, [N], char *, , strcmp(a,b), size_t N)
105+
eqComparisonTemplateMacro(char, [N], char, [M], strcmp(a,b), size_t N, size_t M)
101106

102-
comparisonTemplateMacro(A, , std::nullptr_t, , a ? 1 : 0, typename A)
103-
comparisonTemplateMacro(std::nullptr_t, , B, , b ? -1 : 0, typename B)
107+
eqComparisonTemplateMacro(A, , std::nullptr_t, , a ? 1 : 0, typename A)
108+
eqComparisonTemplateMacro(std::nullptr_t, , B, , b ? -1 : 0, typename B)
104109

105110
// super general comparisons
106-
template <typename A, typename B> int compareBetween( const A &a, const B &b) { return Compare<A, B>::between( a, b); }
107-
template <typename A, typename B> bool compareEqual( const A &a, const B &b) { return Compare<A, B>::equal( a, b); }
108-
template <typename A, typename B> bool compareNotEqual( const A &a, const B &b) { return Compare<A, B>::notEqual( a, b); }
109-
template <typename A, typename B> bool compareLess( const A &a, const B &b) { return Compare<A, B>::less( a, b); }
110-
template <typename A, typename B> bool compareMore( const A &a, const B &b) { return Compare<A, B>::more( a, b); }
111-
template <typename A, typename B> bool compareLessOrEqual(const A &a, const B &b) { return Compare<A, B>::lessOrEqual(a, b); }
112-
template <typename A, typename B> bool compareMoreOrEqual(const A &a, const B &b) { return Compare<A, B>::moreOrEqual(a, b); }
113-
114-
template <typename A, typename B> bool evaluateDoubleEqual(const A &a, const B &b) { return a == b; }
115-
template <typename A, typename B> bool evaluateNotEqual( const A &a, const B &b) { return a != b; }
111+
template <typename A, typename B> int compareBetween( const A &a, const B &b) { return Compare<A, B>::between( a, b); }
112+
template <typename A, typename B> bool compareEqual( const A &a, const B &b) { return Compare<A, B>::equal( a, b); }
113+
template <typename A, typename B> bool compareNotEqual( const A &a, const B &b) { return Compare<A, B>::notEqual( a, b); }
114+
template <typename A, typename B> bool compareEquivalent( const A &a, const B &b) { return Compare<A, B>::equivalent( a, b); }
115+
template <typename A, typename B> bool compareNotEquivalent(const A &a, const B &b) { return Compare<A, B>::notEquivalent(a, b); }
116+
template <typename A, typename B> bool compareLess( const A &a, const B &b) { return Compare<A, B>::less( a, b); }
117+
template <typename A, typename B> bool compareMore( const A &a, const B &b) { return Compare<A, B>::more( a, b); }
118+
template <typename A, typename B> bool compareLessOrEqual( const A &a, const B &b) { return Compare<A, B>::lessOrEqual( a, b); }
119+
template <typename A, typename B> bool compareMoreOrEqual( const A &a, const B &b) { return Compare<A, B>::moreOrEqual( a, b); }

0 commit comments

Comments
 (0)