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

- Cleaned up UnitPointer_Set (thanks Eric)

Browse Source 
- Cleaned up a casting warning error
- Removed a couple semicolons from the end of macros SHAME!
This commit is contained in:
Mark VanderVoord
2015-12-07 21:41:44 -05:00
parent 90813a3e78
commit 9aeaee26c9
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
extras/fixture/src/unity_fixture.c
View File

@ -117,7 +117,7 @@ void UnityTestRunner(unityfunction* setup,
void UnityIgnoreTest(const char * printableName, const char * group, const char * name)
{
if (testSelected(name) && groupSelected(group))
if (testSelected(name) && groupSelected(group))
{
Unity.NumberOfTests++;
Unity.CurrentTestIgnored = 1;
@ -291,7 +291,7 @@ typedef struct _PointerPair
} PointerPair;
enum {MAX_POINTERS=50};
static PointerPair pointer_store[MAX_POINTERS];
static PointerPair pointer_store[MAX_POINTERS+1];
static int pointer_index = 0;
void UnityPointer_Init(void)
@ -302,12 +302,16 @@ void UnityPointer_Init(void)
void UnityPointer_Set(void ** pointer, void * newValue)
{
if (pointer_index >= MAX_POINTERS)
{
TEST_FAIL_MESSAGE("Too many pointers set");
pointer_store[pointer_index].pointer = pointer;
pointer_store[pointer_index].old_value = *pointer;
*pointer = newValue;
pointer_index++;
}
else
{
pointer_store[pointer_index].pointer = pointer;
pointer_store[pointer_index].old_value = *pointer;
*pointer = newValue;
pointer_index++;
}
}
void UnityPointer_UndoAllSets(void)

4
src/unity.c
View File

@ -188,7 +188,7 @@ void UnityPrintNumber(const _U_SINT number_to_print)
}
// figure out initial divisor
while (number / divisor > 9)
while ((_U_SINT)number / divisor > 9)
{
next_divisor = divisor * 10;
if (next_divisor > divisor)
@ -200,7 +200,7 @@ void UnityPrintNumber(const _U_SINT number_to_print)
// now mod and print, then divide divisor
do
{
UNITY_OUTPUT_CHAR((char)('0' + (number / divisor % 10)));
UNITY_OUTPUT_CHAR((char)('0' + ((_U_SINT)number / divisor % 10)));
divisor /= 10;
}
while (divisor > 0);

4
src/unity_internals.h
View File

@ -593,8 +593,8 @@ extern const char UnityStrErr64[];
// Basic Fail and Ignore
//-------------------------------------------------------
#define UNITY_TEST_FAIL(line, message) UnityFail( (message), (UNITY_LINE_TYPE)(line));
#define UNITY_TEST_IGNORE(line, message) UnityIgnore( (message), (UNITY_LINE_TYPE)(line));
#define UNITY_TEST_FAIL(line, message) UnityFail( (message), (UNITY_LINE_TYPE)(line))
#define UNITY_TEST_IGNORE(line, message) UnityIgnore( (message), (UNITY_LINE_TYPE)(line))
//-------------------------------------------------------
// Test Asserts