espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-19 21:38:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17 from bjones1/master

Browse Source 
Nice work, Bryan... thanks for the cleanup!
This commit is contained in:
Mark VanderVoord
2012-11-21 05:19:21 -08:00
parent e8d585b998 c2737fc71c
commit 292a6eac9e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/unity.c
View File

@ -534,11 +534,11 @@ void UnityAssertEqualFloatArray(const _UF* expected,
while (elements--) while (elements--)
{ {
diff = *ptr_expected - *ptr_actual; diff = *ptr_expected - *ptr_actual;
if (diff < 0.0) if (diff < 0.0f)
diff = 0.0 - diff; diff = 0.0f - diff;
tol = UNITY_FLOAT_PRECISION * *ptr_expected; tol = UNITY_FLOAT_PRECISION * *ptr_expected;
if (tol < 0.0) if (tol < 0.0f)
tol = 0.0 - tol; tol = 0.0f - tol;
//This first part of this condition will catch any NaN or Infinite values //This first part of this condition will catch any NaN or Infinite values
if ((diff * 0.0f != 0.0f) || (diff > tol)) if ((diff * 0.0f != 0.0f) || (diff > tol))
@ -574,11 +574,11 @@ void UnityAssertFloatsWithin(const _UF delta,
UNITY_SKIP_EXECUTION; UNITY_SKIP_EXECUTION;
if (diff < 0) if (diff < 0.0f)
{ {
diff = 0.0f - diff; diff = 0.0f - diff;
} }
if (pos_delta < 0) if (pos_delta < 0.0f)
{ {
pos_delta = 0.0f - pos_delta; pos_delta = 0.0f - pos_delta;
} }
@ -707,7 +707,7 @@ void UnityAssertEqualDoubleArray(const _UD* expected,
tol = 0.0 - tol; tol = 0.0 - tol;
//This first part of this condition will catch any NaN or Infinite values //This first part of this condition will catch any NaN or Infinite values
if ((diff * 0.0f != 0.0f) || (diff > tol)) if ((diff * 0.0 != 0.0) || (diff > tol))
{ {
UnityTestResultsFailBegin(lineNumber); UnityTestResultsFailBegin(lineNumber);
UnityPrint(UnityStrElement); UnityPrint(UnityStrElement);
@ -740,17 +740,17 @@ void UnityAssertDoublesWithin(const _UD delta,
UNITY_SKIP_EXECUTION; UNITY_SKIP_EXECUTION;
if (diff < 0) if (diff < 0.0)
{ {
diff = 0.0f - diff; diff = 0.0 - diff;
} }
if (pos_delta < 0) if (pos_delta < 0.0)
{ {
pos_delta = 0.0f - pos_delta; pos_delta = 0.0 - pos_delta;
} }
//This first part of this condition will catch any NaN or Infinite values //This first part of this condition will catch any NaN or Infinite values
if ((diff * 0.0f != 0.0f) || (pos_delta < diff)) if ((diff * 0.0 != 0.0) || (pos_delta < diff))
{ {
UnityTestResultsFailBegin(lineNumber); UnityTestResultsFailBegin(lineNumber);
#ifdef UNITY_DOUBLE_VERBOSE #ifdef UNITY_DOUBLE_VERBOSE