espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-28 13:26:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11 from rryles/master

Browse Source 
Fix For Issue #10 - Thanks Ross.  Nice simple solution.
This commit is contained in:
Mark VanderVoord
2012-10-30 03:53:14 -07:00
parent 731e0f6b5f 5027763534
commit 7b9b7d6ae2
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/unity.c
View File

@ -578,7 +578,8 @@ void UnityAssertFloatsWithin(const _UF delta,
pos_delta = 0.0f - pos_delta; pos_delta = 0.0f - pos_delta;
} }
if (pos_delta < diff) // NOTE: This comparison is deliberately this way round so that NaNs fail.
if ( ! (pos_delta >= diff) )
{ {
UnityTestResultsFailBegin(lineNumber); UnityTestResultsFailBegin(lineNumber);
#ifdef UNITY_FLOAT_VERBOSE #ifdef UNITY_FLOAT_VERBOSE

11
test/testunity.c
View File

@ -2226,6 +2226,17 @@ void testFloatsNotEqualNegative2(void)
#endif #endif
} }
void testFloatsNotEqualActualNaN(void)
{
#ifdef UNITY_EXCLUDE_FLOAT
TEST_IGNORE();
#else
EXPECT_ABORT_BEGIN
TEST_ASSERT_EQUAL_FLOAT(85.963f, 0.0f / 0.0f);
VERIFY_FAILS_END
#endif
}
void testEqualFloatArrays(void) void testEqualFloatArrays(void)
{ {
#ifdef UNITY_EXCLUDE_FLOAT #ifdef UNITY_EXCLUDE_FLOAT