提交 de6f5163 编写于 作者: J jsalling

Revert "Cleanup Assert Array idiom to be the same everywhere"

This reverts commit ee382194.
Removing these changes per coding standard, after the code review
上级 ef1e2ad5
......@@ -573,7 +573,10 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected,
RETURN_IF_FAIL_OR_IGNORE;
if (num_elements == 0) UnityPrintPointlessAndBail();
if (num_elements == 0)
{
UnityPrintPointlessAndBail();
}
if (expected == actual) return; /* Both are NULL or same pointer */
if (UnityIsOneArrayNull(expected, actual, lineNumber, msg))
......@@ -673,10 +676,15 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* expected,
const UNITY_LINE_TYPE lineNumber)
{
UNITY_UINT32 elements = num_elements;
UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* ptr_expected = expected;
UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* ptr_actual = actual;
RETURN_IF_FAIL_OR_IGNORE;
if (num_elements == 0) UnityPrintPointlessAndBail();
if (elements == 0)
{
UnityPrintPointlessAndBail();
}
if (expected == actual) return; /* Both are NULL or same pointer */
if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
......@@ -684,17 +692,17 @@ void UnityAssertEqualFloatArray(UNITY_PTR_ATTRIBUTE const UNITY_FLOAT* expected,
while (elements--)
{
if (!UnityFloatsWithin(*expected * UNITY_FLOAT_PRECISION, *expected, *actual))
if (!UnityFloatsWithin(*ptr_expected * UNITY_FLOAT_PRECISION, *ptr_expected, *ptr_actual))
{
UnityTestResultsFailBegin(lineNumber);
UnityPrint(UnityStrElement);
UnityPrintNumberUnsigned(num_elements - elements - 1);
UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(*expected, *actual);
UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(*ptr_expected, *ptr_actual);
UnityAddMsgIfSpecified(msg);
UNITY_FAIL_AND_BAIL;
}
expected++;
actual++;
ptr_expected++;
ptr_actual++;
}
}
......@@ -794,10 +802,15 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* expecte
const UNITY_LINE_TYPE lineNumber)
{
UNITY_UINT32 elements = num_elements;
UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* ptr_expected = expected;
UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* ptr_actual = actual;
RETURN_IF_FAIL_OR_IGNORE;
if (num_elements == 0) UnityPrintPointlessAndBail();
if (elements == 0)
{
UnityPrintPointlessAndBail();
}
if (expected == actual) return; /* Both are NULL or same pointer */
if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
......@@ -805,17 +818,17 @@ void UnityAssertEqualDoubleArray(UNITY_PTR_ATTRIBUTE const UNITY_DOUBLE* expecte
while (elements--)
{
if (!UnityDoublesWithin(*expected * UNITY_DOUBLE_PRECISION, *expected, *actual))
if (!UnityDoublesWithin(*ptr_expected * UNITY_DOUBLE_PRECISION, *ptr_expected, *ptr_actual))
{
UnityTestResultsFailBegin(lineNumber);
UnityPrint(UnityStrElement);
UnityPrintNumberUnsigned(num_elements - elements - 1);
UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(*expected, *actual);
UNITY_PRINT_EXPECTED_AND_ACTUAL_FLOAT(*ptr_expected, *ptr_actual);
UnityAddMsgIfSpecified(msg);
UNITY_FAIL_AND_BAIL;
}
expected++;
actual++;
ptr_expected++;
ptr_actual++;
}
}
......@@ -1032,7 +1045,10 @@ void UnityAssertEqualStringArray( const char** expected,
RETURN_IF_FAIL_OR_IGNORE;
/* if no elements, it's an error */
if (num_elements == 0) UnityPrintPointlessAndBail();
if (num_elements == 0)
{
UnityPrintPointlessAndBail();
}
if (expected == actual) return; /* Both are NULL or same pointer */
if (UnityIsOneArrayNull((UNITY_INTERNAL_PTR)expected, (UNITY_INTERNAL_PTR)actual, lineNumber, msg))
......@@ -1090,7 +1106,10 @@ void UnityAssertEqualMemory( UNITY_INTERNAL_PTR expected,
RETURN_IF_FAIL_OR_IGNORE;
if (num_elements == 0 || length == 0) UnityPrintPointlessAndBail();
if ((elements == 0) || (length == 0))
{
UnityPrintPointlessAndBail();
}
if (expected == actual) return; /* Both are NULL or same pointer */
if (UnityIsOneArrayNull(expected, actual, lineNumber, msg))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册