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

Merge pull request #176 from jsalling/refactor/ignored-tests

Browse Source 
Clean up IgnoreTest function in Fixture
This commit is contained in:
Mark VanderVoord
2016-02-29 16:56:58 -05:00
parent bcf6515329 f8d5f0eee6
commit 4187255a8f
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,6 @@ void UnityTestRunner(unityfunction* setup,
{ {
if (testSelected(name) && groupSelected(group)) if (testSelected(name) && groupSelected(group))
{ {
Unity.CurrentTestFailed = 0;
Unity.TestFile = file; Unity.TestFile = file;
Unity.CurrentTestName = printableName; Unity.CurrentTestName = printableName;
Unity.CurrentTestLineNumber = line; Unity.CurrentTestLineNumber = line;
@ -112,12 +111,14 @@ void UnityIgnoreTest(const char* printableName, const char* group, const char* n
if (testSelected(name) && groupSelected(group)) if (testSelected(name) && groupSelected(group))
{ {
Unity.NumberOfTests++; Unity.NumberOfTests++;
Unity.CurrentTestIgnored = 1; Unity.TestIgnores++;
if (!UnityFixture.Verbose) if (!UnityFixture.Verbose)
UNITY_OUTPUT_CHAR('!'); UNITY_OUTPUT_CHAR('!');
else else
{
UnityPrint(printableName); UnityPrint(printableName);
UnityConcludeFixtureTest(); UNITY_PRINT_EOL();
}
} }
} }
@ -403,11 +404,8 @@ void UnityConcludeFixtureTest(void)
{ {
if (Unity.CurrentTestIgnored) if (Unity.CurrentTestIgnored)
{ {
if (UnityFixture.Verbose)
{
UNITY_PRINT_EOL();
}
Unity.TestIgnores++; Unity.TestIgnores++;
UNITY_PRINT_EOL();
} }
else if (!Unity.CurrentTestFailed) else if (!Unity.CurrentTestFailed)
{ {
@ -417,7 +415,7 @@ void UnityConcludeFixtureTest(void)
UNITY_PRINT_EOL(); UNITY_PRINT_EOL();
} }
} }
else if (Unity.CurrentTestFailed) else // Unity.CurrentTestFailed
{ {
Unity.TestFailures++; Unity.TestFailures++;
UNITY_PRINT_EOL(); UNITY_PRINT_EOL();

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

@ -343,7 +343,6 @@ TEST(LeakDetection, DetectsLeak)
TEST(LeakDetection, BufferOverrunFoundDuringFree) TEST(LeakDetection, BufferOverrunFoundDuringFree)
{ {
#ifndef USING_OUTPUT_SPY #ifndef USING_OUTPUT_SPY
UNITY_PRINT_EOL();
TEST_IGNORE(); TEST_IGNORE();
#else #else
void* m = malloc(10); void* m = malloc(10);
@ -363,7 +362,6 @@ TEST(LeakDetection, BufferOverrunFoundDuringFree)
TEST(LeakDetection, BufferOverrunFoundDuringRealloc) TEST(LeakDetection, BufferOverrunFoundDuringRealloc)
{ {
#ifndef USING_OUTPUT_SPY #ifndef USING_OUTPUT_SPY
UNITY_PRINT_EOL();
TEST_IGNORE(); TEST_IGNORE();
#else #else
void* m = malloc(10); void* m = malloc(10);
@ -383,7 +381,6 @@ TEST(LeakDetection, BufferOverrunFoundDuringRealloc)
TEST(LeakDetection, BufferGuardWriteFoundDuringFree) TEST(LeakDetection, BufferGuardWriteFoundDuringFree)
{ {
#ifndef USING_OUTPUT_SPY #ifndef USING_OUTPUT_SPY
UNITY_PRINT_EOL();
TEST_IGNORE(); TEST_IGNORE();
#else #else
void* m = malloc(10); void* m = malloc(10);
@ -404,7 +401,6 @@ TEST(LeakDetection, BufferGuardWriteFoundDuringFree)
TEST(LeakDetection, BufferGuardWriteFoundDuringRealloc) TEST(LeakDetection, BufferGuardWriteFoundDuringRealloc)
{ {
#ifndef USING_OUTPUT_SPY #ifndef USING_OUTPUT_SPY
UNITY_PRINT_EOL();
TEST_IGNORE(); TEST_IGNORE();
#else #else
void* m = malloc(10); void* m = malloc(10);
@ -424,7 +420,6 @@ TEST(LeakDetection, BufferGuardWriteFoundDuringRealloc)
TEST(LeakDetection, PointerSettingMax) TEST(LeakDetection, PointerSettingMax)
{ {
#ifndef USING_OUTPUT_SPY #ifndef USING_OUTPUT_SPY
UNITY_PRINT_EOL();
TEST_IGNORE(); TEST_IGNORE();
#else #else
int i; int i;