espressif/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2025-06-27 04:52:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #146 from jsalling/unity-eol

Browse Source 
Move UNITY_PRINT_EOL to internals, change to function macro (Thanks, jsalling!)
This commit is contained in:
Mark VanderVoord
2015-11-24 06:43:27 -05:00
parent c6dc96f387 de7cf8335e
commit 535fe43c2a
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,7 +28,7 @@ static void announceTestRun(unsigned int runNumber)
UnityPrintNumber(runNumber+1); UnityPrintNumber(runNumber+1);
UnityPrint(" of "); UnityPrint(" of ");
UnityPrintNumber(UnityFixture.RepeatCount); UnityPrintNumber(UnityFixture.RepeatCount);
UNITY_OUTPUT_CHAR('\n'); UNITY_PRINT_EOL();
} }
int UnityMain(int argc, const char* argv[], void (*runAllTests)(void)) int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
@ -43,7 +43,7 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void))
UnityBegin(argv[0]); UnityBegin(argv[0]);
announceTestRun(r); announceTestRun(r);
runAllTests(); runAllTests();
UNITY_OUTPUT_CHAR('\n'); UNITY_PRINT_EOL();
UnityEnd(); UnityEnd();
} }
@ -396,7 +396,7 @@ void UnityConcludeFixtureTest(void)
{ {
//if (UnityFixture.Verbose) //if (UnityFixture.Verbose)
//{ //{
UNITY_OUTPUT_CHAR('\n'); UNITY_PRINT_EOL();
//} //}
Unity.TestIgnores++; Unity.TestIgnores++;
} }
@ -405,13 +405,13 @@ void UnityConcludeFixtureTest(void)
if (UnityFixture.Verbose) if (UnityFixture.Verbose)
{ {
UnityPrint(" PASS"); UnityPrint(" PASS");
UNITY_OUTPUT_CHAR('\n'); UNITY_PRINT_EOL();
} }
} }
else if (Unity.CurrentTestFailed) else if (Unity.CurrentTestFailed)
{ {
Unity.TestFailures++; Unity.TestFailures++;
UNITY_OUTPUT_CHAR('\n'); UNITY_PRINT_EOL();
} }
Unity.CurrentTestFailed = 0; Unity.CurrentTestFailed = 0;

11
src/unity.c
View File

@ -11,7 +11,6 @@
#define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; longjmp(Unity.AbortFrame, 1); } #define UNITY_IGNORE_AND_BAIL { Unity.CurrentTestIgnored = 1; longjmp(Unity.AbortFrame, 1); }
/// return prematurely if we are already in failure or ignore state /// return prematurely if we are already in failure or ignore state
#define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} } #define UNITY_SKIP_EXECUTION { if ((Unity.CurrentTestFailed != 0) || (Unity.CurrentTestIgnored != 0)) {return;} }
#define UNITY_PRINT_EOL { UNITY_OUTPUT_CHAR('\n'); }
struct _Unity Unity; struct _Unity Unity;
@ -356,7 +355,7 @@ void UnityConcludeTest(void)
Unity.CurrentTestFailed = 0; Unity.CurrentTestFailed = 0;
Unity.CurrentTestIgnored = 0; Unity.CurrentTestIgnored = 0;
UNITY_PRINT_EOL; UNITY_PRINT_EOL();
} }
//----------------------------------------------- //-----------------------------------------------
@ -1273,16 +1272,16 @@ void UnityBegin(const char* filename)
//----------------------------------------------- //-----------------------------------------------
int UnityEnd(void) int UnityEnd(void)
{ {
UNITY_PRINT_EOL; UNITY_PRINT_EOL();
UnityPrint(UnityStrBreaker); UnityPrint(UnityStrBreaker);
UNITY_PRINT_EOL; UNITY_PRINT_EOL();
UnityPrintNumber((_U_SINT)(Unity.NumberOfTests)); UnityPrintNumber((_U_SINT)(Unity.NumberOfTests));
UnityPrint(UnityStrResultsTests); UnityPrint(UnityStrResultsTests);
UnityPrintNumber((_U_SINT)(Unity.TestFailures)); UnityPrintNumber((_U_SINT)(Unity.TestFailures));
UnityPrint(UnityStrResultsFailures); UnityPrint(UnityStrResultsFailures);
UnityPrintNumber((_U_SINT)(Unity.TestIgnores)); UnityPrintNumber((_U_SINT)(Unity.TestIgnores));
UnityPrint(UnityStrResultsIgnored); UnityPrint(UnityStrResultsIgnored);
UNITY_PRINT_EOL; UNITY_PRINT_EOL();
if (Unity.TestFailures == 0U) if (Unity.TestFailures == 0U)
{ {
UnityPrintOk(); UnityPrintOk();
@ -1291,7 +1290,7 @@ int UnityEnd(void)
{ {
UnityPrintFail(); UnityPrintFail();
} }
UNITY_PRINT_EOL; UNITY_PRINT_EOL();
UNITY_OUTPUT_COMPLETE(); UNITY_OUTPUT_COMPLETE();
return (int)(Unity.TestFailures); return (int)(Unity.TestFailures);
} }

4
src/unity_internals.h
View File

@ -291,6 +291,10 @@ typedef UNITY_DOUBLE_TYPE _UD;
extern int UNITY_OUTPUT_CHAR(int); extern int UNITY_OUTPUT_CHAR(int);
#endif #endif
#ifndef UNITY_PRINT_EOL
#define UNITY_PRINT_EOL() UNITY_OUTPUT_CHAR('\n')
#endif
#ifndef UNITY_OUTPUT_START #ifndef UNITY_OUTPUT_START
#define UNITY_OUTPUT_START() #define UNITY_OUTPUT_START()
#endif #endif