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

- updated fixture to match James' suggestions.

Browse Source 
git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@124 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
mvandervoord
2011-03-09 02:05:05 +00:00
parent 3ef64ee047
commit 3d61357343
6 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,6 +116,13 @@ void UnityTestRunner(unityfunction* setup,
}
}
void UnityIgnoreTest()
{
Unity.NumberOfTests++;
Unity.CurrentTestIgnored = 1;
UNITY_OUTPUT_CHAR('!');
}
//-------------------------------------------------
//Malloc and free stuff
@@ -371,3 +378,4 @@ void UnityConcludeFixtureTest()
Unity.CurrentTestFailed = 0;
Unity.CurrentTestIgnored = 0;
}

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

@@ -25,24 +25,25 @@ int UnityMain(int argc, char* argv[], void (*runAllTests)());
#define TEST(group, name) \
void TEST_##group##_##name##_testBody();\
void TEST_##group##_##name##_();\
void TEST_##group##_##name##_run()\
{\
UnityTestRunner(TEST_##group##_SETUP,\
TEST_##group##_##name##_testBody,\
TEST_##group##_##name##_,\
TEST_##group##_TEAR_DOWN,\
"TEST(" #group ", " #name ")",\
#group, #name,\
__FILE__, __LINE__);\
}\
void TEST_##group##_##name##_testBody()
void TEST_##group##_##name##_()
#define IGNORE_TEST(group, name) \
void TEST_##group##_##name##_testBody();\
void TEST_##group##_##name##_();\
void TEST_##group##_##name##_run()\
{\
UnityIgnoreTest();\
}\
void TEST_##group##_##name##_testBody()
void TEST_##group##_##name##_()
#define DECLARE_TEST_CASE(group, name) \
void TEST_##group##_##name##_run()

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

@@ -25,6 +25,7 @@ void UnityTestRunner(unityfunction * setup,
const char * name,
const char * file, int line);
void UnityIgnoreTest();
void UnityMalloc_StartTest();
void UnityMalloc_EndTest();
int UnityFailureCount();