ThrowTheSwitch/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-08-19 17:49:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always run the tearDown() even if test is ignored

Browse Source
This commit is contained in:
jsalling
2016-12-24 13:56:04 -06:00
parent 0603c1cf1e
commit 65e401f3de
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auto/generate_test_runner.rb
+1 -1
View File
@@ -276,7 +276,7 @@ class UnityTestRunnerGenerator
output.puts(" TestFunc(#{va_args2}); \\") output.puts(" TestFunc(#{va_args2}); \\")
output.puts(" } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, \"Unhandled Exception!\"); } \\") if cexception output.puts(" } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, \"Unhandled Exception!\"); } \\") if cexception
output.puts(" } \\") output.puts(" } \\")
output.puts(" if (TEST_PROTECT() && !TEST_IS_IGNORED) \\") output.puts(" if (TEST_PROTECT()) \\")
output.puts(" { \\") output.puts(" { \\")
output.puts(" #{@options[:teardown_name]}(); \\") output.puts(" #{@options[:teardown_name]}(); \\")
output.puts(" CMock_Verify(); \\") unless (used_mocks.empty?) output.puts(" CMock_Verify(); \\") unless (used_mocks.empty?)
src/unity.c
+1 -1
View File
@@ -1275,7 +1275,7 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int
setUp(); setUp();
Func(); Func();
} }
if (TEST_PROTECT() && !(Unity.CurrentTestIgnored)) if (TEST_PROTECT())
{ {
tearDown(); tearDown();
} }
test/tests/testunity.c
+4
View File
@@ -67,7 +67,11 @@ void tearDown(void)
{ {
endPutcharSpy(); /* Stop suppressing test output */ endPutcharSpy(); /* Stop suppressing test output */
if (SetToOneToFailInTearDown == 1) if (SetToOneToFailInTearDown == 1)
{
/* These will be skipped internally if already failed/ignored */
TEST_FAIL_MESSAGE("<= Failed in tearDown"); TEST_FAIL_MESSAGE("<= Failed in tearDown");
TEST_IGNORE_MESSAGE("<= Ignored in tearDown");
}
if ((SetToOneMeanWeAlreadyCheckedThisGuy == 0) && (Unity.CurrentTestFailed > 0)) if ((SetToOneMeanWeAlreadyCheckedThisGuy == 0) && (Unity.CurrentTestFailed > 0))
{ {
UnityPrint(": [[[[ Test Should Have Passed But Did Not ]]]]"); UnityPrint(": [[[[ Test Should Have Passed But Did Not ]]]]");