3rd-party/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-28 10:44:26 +01:00
Code Issues Releases Wiki Activity

- merged in changes by TheGreenDroid to reduce Lint and Compiler warnings

Browse Source
This commit is contained in:
Mark VanderVoord
2013-09-22 12:10:42 -04:00
parent 72c55e0266
commit 3399bba27b
3 changed files with 65 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
extras/fixture/src/unity_fixture.h
View File

@@ -13,40 +13,40 @@
#include "unity_fixture_malloc_overrides.h"
#include "unity_fixture_internals.h"
int UnityMain(int argc, char* argv[], void (*runAllTests)());
int UnityMain(int argc, char* argv[], void (*runAllTests)(void));
#define TEST_GROUP(group)\
int TEST_GROUP_##group = 0
static const char* TEST_GROUP_##group = #group
#define TEST_SETUP(group) void TEST_##group##_SETUP()
#define TEST_SETUP(group) void TEST_##group##_SETUP(void)
#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN()
#define TEST_TEAR_DOWN(group) void TEST_##group##_TEAR_DOWN(void)
#define TEST(group, name) \
void TEST_##group##_##name##_();\
void TEST_##group##_##name##_run()\
void TEST_##group##_##name##_(void);\
void TEST_##group##_##name##_run(void)\
{\
UnityTestRunner(TEST_##group##_SETUP,\
TEST_##group##_##name##_,\
TEST_##group##_##name##_,\
TEST_##group##_TEAR_DOWN,\
"TEST(" #group ", " #name ")",\
#group, #name,\
TEST_GROUP_##group, #name,\
__FILE__, __LINE__);\
}\
void TEST_##group##_##name##_()
void TEST_##group##_##name##_(void)
#define IGNORE_TEST(group, name) \
void TEST_##group##_##name##_();\
void TEST_##group##_##name##_run()\
void TEST_##group##_##name##_(void);\
void TEST_##group##_##name##_run(void)\
{\
UnityIgnoreTest("IGNORE_TEST(" #group ", " #name ")");\
}\
void TEST_##group##_##name##_()
void TEST_##group##_##name##_(void)
#define DECLARE_TEST_CASE(group, name) \
void TEST_##group##_##name##_run()
void TEST_##group##_##name##_run(void)
#define RUN_TEST_CASE(group, name) \
{ DECLARE_TEST_CASE(group, name);\
@@ -54,8 +54,9 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)());
//This goes at the bottom of each test file or in a separate c file
#define TEST_GROUP_RUNNER(group)\
void TEST_##group##_GROUP_RUNNER_runAll();\
void TEST_##group##_GROUP_RUNNER()\
void TEST_##group##_GROUP_RUNNER_runAll(void);\
void TEST_##group##_GROUP_RUNNER(void);\
void TEST_##group##_GROUP_RUNNER(void)\
{\
TEST_##group##_GROUP_RUNNER_runAll();\
}\
@@ -63,7 +64,7 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)());
//Call this from main
#define RUN_TEST_GROUP(group)\
{ void TEST_##group##_GROUP_RUNNER();\
{ void TEST_##group##_GROUP_RUNNER(void);\
TEST_##group##_GROUP_RUNNER(); }
//CppUTest Compatibility Macros