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

Clean up conversion warnings in Fixture

Browse Source 
Turn on -Wconversion in Makefile, fix all warnings
This commit is contained in:
jsalling
2016-02-17 22:17:05 -06:00
parent ad14ccf26b
commit 7b0f3cf986
5 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,9 +23,9 @@ void tearDown(void) { /*does nothing*/ }
static void announceTestRun(unsigned int runNumber) static void announceTestRun(unsigned int runNumber)
{ {
UnityPrint("Unity test run "); UnityPrint("Unity test run ");
UnityPrintNumber(runNumber+1); UnityPrintNumberUnsigned(runNumber+1);
UnityPrint(" of "); UnityPrint(" of ");
UnityPrintNumber(UnityFixture.RepeatCount); UnityPrintNumberUnsigned(UnityFixture.RepeatCount);
UNITY_PRINT_EOL(); UNITY_PRINT_EOL();
} }
@ -45,7 +45,7 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
UnityEnd(); UnityEnd();
} }
return Unity.TestFailures; return (int)Unity.TestFailures;
} }
static int selected(const char* filter, const char* name) static int selected(const char* filter, const char* name)
@ -71,7 +71,7 @@ void UnityTestRunner(unityfunction* setup,
const char* printableName, const char* printableName,
const char* group, const char* group,
const char* name, const char* name,
const char* file, int line) const char* file, unsigned int line)
{ {
if (testSelected(name) && groupSelected(group)) if (testSelected(name) && groupSelected(group))
{ {

2
extras/fixture/src/unity_fixture_internals.h
View File

@ -23,7 +23,7 @@ void UnityTestRunner(unityfunction* setup,
const char* printableName, const char* printableName,
const char* group, const char* group,
const char* name, const char* name,
const char* file, int line); const char* file, unsigned int line);
void UnityIgnoreTest(const char* printableName, const char* group, const char* name); void UnityIgnoreTest(const char* printableName, const char* group, const char* name);
void UnityMalloc_StartTest(void); void UnityMalloc_StartTest(void);

2
extras/fixture/test/Makefile
View File

@ -46,7 +46,7 @@ clean:
# These extended flags DO get included before any target build runs # These extended flags DO get included before any target build runs
CFLAGS += -Wbad-function-cast CFLAGS += -Wbad-function-cast
CFLAGS += -Wcast-qual CFLAGS += -Wcast-qual
#CFLAGS += -Wconversion CFLAGS += -Wconversion
CFLAGS += -Wformat=2 CFLAGS += -Wformat=2
CFLAGS += -Wmissing-prototypes CFLAGS += -Wmissing-prototypes
CFLAGS += -Wold-style-definition CFLAGS += -Wold-style-definition

2
extras/fixture/test/unity_fixture_Test.c
View File

@ -144,7 +144,7 @@ TEST(UnityFixture, FreeNULLSafety)
TEST_GROUP(UnityCommandOptions); TEST_GROUP(UnityCommandOptions);
int savedVerbose; int savedVerbose;
int savedRepeat; unsigned int savedRepeat;
const char* savedName; const char* savedName;
const char* savedGroup; const char* savedGroup;

4
extras/fixture/test/unity_output_Spy.c
View File

@ -22,7 +22,7 @@ void UnityOutputCharSpy_Create(int s)
size = s; size = s;
count = 0; count = 0;
spy_enable = 0; spy_enable = 0;
buffer = malloc(size); buffer = malloc((size_t)size);
TEST_ASSERT_NOT_NULL_MESSAGE(buffer, "Internal malloc failed in Spy Create():" __FILE__); TEST_ASSERT_NOT_NULL_MESSAGE(buffer, "Internal malloc failed in Spy Create():" __FILE__);
memset(buffer, 0, size); memset(buffer, 0, size);
} }
@ -38,7 +38,7 @@ int UnityOutputCharSpy_OutputChar(int c)
if (spy_enable) if (spy_enable)
{ {
if (count < (size-1)) if (count < (size-1))
buffer[count++] = c; buffer[count++] = (char)c;
} }
else else
{ {