提交 7b9b7d6a 编写于 作者: M Mark VanderVoord

Merge pull request #11 from rryles/master

Fix For Issue #10 - Thanks Ross.  Nice simple solution.
...@@ -578,7 +578,8 @@ void UnityAssertFloatsWithin(const _UF delta, ...@@ -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
......
...@@ -2226,6 +2226,17 @@ void testFloatsNotEqualNegative2(void) ...@@ -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
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册