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

Merge pull request #211 from jsalling/feature/testunity-fail-output

Browse Source 
Make testunity.c failure output uniform
This commit is contained in:
Mark VanderVoord
2016-08-31 07:20:34 -04:00
committed by GitHub
parent de7627f098 268c5b7e0b
commit 382c7087f4
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
test/Makefile
View File

@@ -42,12 +42,13 @@ intDetection:
$(BUILD_DIR)/testunityRunner.c: tests/testunity.c | $(BUILD_DIR) $(BUILD_DIR)/testunityRunner.c: tests/testunity.c | $(BUILD_DIR)
awk $(AWK_SCRIPT) tests/testunity.c > $@ awk $(AWK_SCRIPT) tests/testunity.c > $@
AWK_SCRIPT='/^void test/{ declarations[d++]=$$0; gsub(/\(?void\)? ?/,""); tests[t++]=$$0 } \ AWK_SCRIPT=\
END{ print "\#include \"unity.h\" //Autogenerated by awk in Makefile" ; \ '/^void test/{ declarations[d++]=$$0; gsub(/\(?void\)? ?/,""); tests[t++]=$$0; line[u++]=NR } \
for (i=0; i<d; i++) { print declarations[i] ";" } \ END{ print "\#include \"unity.h\" /* Autogenerated by awk in Makefile */" ; \
printf "int main()\n{\n UNITY_BEGIN();\n" ; \ for (i=0; i<d; i++) { print declarations[i] ";" } \
for (i=0; i<t; i++) { print " RUN_TEST(" tests[i] ");" } \ printf "int main(void)\n{\n UNITY_BEGIN();\n" ; \
printf " return UNITY_END();\n}\n" }' for (i=0; i<t; i++) { print " RUN_TEST(" tests[i] ", " line[i] ");" } \
printf " return UNITY_END();\n}\n" }'
$(BUILD_DIR): $(BUILD_DIR):
mkdir -p $(BUILD_DIR) mkdir -p $(BUILD_DIR)

9
test/tests/testunity.c
View File

@@ -30,7 +30,7 @@ static const _UD d_zero = 0.0;
UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber); \ UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber); \
UNITY_OUTPUT_CHAR(':'); \ UNITY_OUTPUT_CHAR(':'); \
UnityPrint(Unity.CurrentTestName); \ UnityPrint(Unity.CurrentTestName); \
UnityPrint("[[[[ Previous Test Should Have Failed But Did Not ]]]]"); \ UnityPrint(":FAIL: [[[[ Test Should Have Failed But Did Not ]]]]"); \
UNITY_OUTPUT_CHAR('\n'); \ UNITY_OUTPUT_CHAR('\n'); \
} }
@@ -40,7 +40,10 @@ static const _UD d_zero = 0.0;
Unity.CurrentTestIgnored = 0; \ Unity.CurrentTestIgnored = 0; \
if (Unity.CurrentTestFailed == 1) { \ if (Unity.CurrentTestFailed == 1) { \
SetToOneMeanWeAlreadyCheckedThisGuy = 1; \ SetToOneMeanWeAlreadyCheckedThisGuy = 1; \
UnityPrint("[[[[ Previous Test Should Have Ignored But Did Not ]]]]"); \ UnityPrintNumberUnsigned(Unity.CurrentTestLineNumber); \
UNITY_OUTPUT_CHAR(':'); \
UnityPrint(Unity.CurrentTestName); \
UnityPrint(":FAIL: [[[[ Test Should Have Ignored But Did Not ]]]]"); \
UNITY_OUTPUT_CHAR('\n'); \ UNITY_OUTPUT_CHAR('\n'); \
} }
@@ -59,7 +62,7 @@ void tearDown(void)
TEST_FAIL_MESSAGE("<= Failed in tearDown"); TEST_FAIL_MESSAGE("<= Failed in tearDown");
if ((SetToOneMeanWeAlreadyCheckedThisGuy == 0) && (Unity.CurrentTestFailed > 0)) if ((SetToOneMeanWeAlreadyCheckedThisGuy == 0) && (Unity.CurrentTestFailed > 0))
{ {
UnityPrint("[[[[ Previous Test Should Have Passed But Did Not ]]]]"); UnityPrint(": [[[[ Test Should Have Passed But Did Not ]]]]");
UNITY_OUTPUT_CHAR('\n'); UNITY_OUTPUT_CHAR('\n');
} }
} }