3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-29 11:14:27 +01:00
Code Issues Releases Wiki Activity

If two floats happen to be equal, return right away

Browse Source 
Covers the cases where infinity == infinity
This commit is contained in:
jsalling
2016-08-23 22:36:02 -05:00
parent 75ad84c92f
commit 3108aba5c7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/unity.c
View File

@@ -683,6 +683,8 @@ void UnityAssertFloatsWithin(const _UF delta,
UNITY_SKIP_EXECUTION; UNITY_SKIP_EXECUTION;
if (expected == actual) return;
if (diff < 0.0f) if (diff < 0.0f)
{ {
diff = 0.0f - diff; diff = 0.0f - diff;
@@ -844,6 +846,8 @@ void UnityAssertDoublesWithin(const _UD delta,
UNITY_SKIP_EXECUTION; UNITY_SKIP_EXECUTION;
if (expected == actual) return;
if (diff < 0.0) if (diff < 0.0)
{ {
diff = 0.0 - diff; diff = 0.0 - diff;

4
test/tests/testunity.c
View File

@@ -2838,9 +2838,7 @@ void testFloatsNotEqualBothInf(void)
#ifdef UNITY_EXCLUDE_FLOAT #ifdef UNITY_EXCLUDE_FLOAT
TEST_IGNORE(); TEST_IGNORE();
#else #else
EXPECT_ABORT_BEGIN
TEST_ASSERT_EQUAL_FLOAT(1.0f / f_zero, 1.0f / f_zero); TEST_ASSERT_EQUAL_FLOAT(1.0f / f_zero, 1.0f / f_zero);
VERIFY_FAILS_END
#endif #endif
} }
@@ -3370,9 +3368,7 @@ void testDoublesNotEqualBothInf(void)
#ifdef UNITY_EXCLUDE_DOUBLE #ifdef UNITY_EXCLUDE_DOUBLE
TEST_IGNORE(); TEST_IGNORE();
#else #else
EXPECT_ABORT_BEGIN
TEST_ASSERT_EQUAL_DOUBLE(1.0 / d_zero, 1.0 / d_zero); TEST_ASSERT_EQUAL_DOUBLE(1.0 / d_zero, 1.0 / d_zero);
VERIFY_FAILS_END
#endif #endif
} }