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

There was no reason that CMock init and destroy calls should be in the protected blocks. teardown is more flexible if verify is called afterwards.

Browse Source
This commit is contained in:
Mark VanderVoord
2014-04-21 16:55:12 -04:00
parent a77f0308a7
commit d4197dacd0
9 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
auto/generate_test_runner.rb
View File

@ -230,21 +230,21 @@ class UnityTestRunnerGenerator
output.puts(" Unity.CurrentTestName = #TestFunc#{va_args2.empty? ? '' : " \"(\" ##{va_args2} \")\""}; \\")
output.puts(" Unity.CurrentTestLineNumber = TestLineNum; \\")
output.puts(" Unity.NumberOfTests++; \\")
output.puts(" CMock_Init(); \\") unless (used_mocks.empty?)
output.puts(" if (TEST_PROTECT()) \\")
output.puts(" { \\")
output.puts(" CEXCEPTION_T e; \\") if cexception
output.puts(" Try { \\") if cexception
output.puts(" CMock_Init(); \\") unless (used_mocks.empty?)
output.puts(" setUp(); \\")
output.puts(" TestFunc(#{va_args2}); \\")
output.puts(" CMock_Verify(); \\") unless (used_mocks.empty?)
output.puts(" } Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, \"Unhandled Exception!\"); } \\") if cexception
output.puts(" } \\")
output.puts(" CMock_Destroy(); \\") unless (used_mocks.empty?)
output.puts(" if (TEST_PROTECT() && !TEST_IS_IGNORED) \\")
output.puts(" { \\")
output.puts(" tearDown(); \\")
output.puts(" CMock_Verify(); \\") unless (used_mocks.empty?)
output.puts(" } \\")
output.puts(" CMock_Destroy(); \\") unless (used_mocks.empty?)
output.puts(" UnityConcludeTest(); \\")
output.puts("}\n")
end

6
test/expectdata/testsample_mock_cmd.c
View File

@ -6,21 +6,21 @@
Unity.CurrentTestName = #TestFunc; \
Unity.CurrentTestLineNumber = TestLineNum; \
Unity.NumberOfTests++; \
CMock_Init(); \
if (TEST_PROTECT()) \
{ \
CEXCEPTION_T e; \
Try { \
CMock_Init(); \
setUp(); \
TestFunc(); \
CMock_Verify(); \
} Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
} \
CMock_Destroy(); \
if (TEST_PROTECT() && !TEST_IS_IGNORED) \
{ \
tearDown(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
UnityConcludeTest(); \
}

6
test/expectdata/testsample_mock_def.c
View File

@ -6,18 +6,18 @@
Unity.CurrentTestName = #TestFunc; \
Unity.CurrentTestLineNumber = TestLineNum; \
Unity.NumberOfTests++; \
CMock_Init(); \
if (TEST_PROTECT()) \
{ \
CMock_Init(); \
setUp(); \
TestFunc(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
if (TEST_PROTECT() && !TEST_IS_IGNORED) \
{ \
tearDown(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
UnityConcludeTest(); \
}

6
test/expectdata/testsample_mock_new1.c
View File

@ -6,21 +6,21 @@
Unity.CurrentTestName = #TestFunc; \
Unity.CurrentTestLineNumber = TestLineNum; \
Unity.NumberOfTests++; \
CMock_Init(); \
if (TEST_PROTECT()) \
{ \
CEXCEPTION_T e; \
Try { \
CMock_Init(); \
setUp(); \
TestFunc(); \
CMock_Verify(); \
} Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
} \
CMock_Destroy(); \
if (TEST_PROTECT() && !TEST_IS_IGNORED) \
{ \
tearDown(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
UnityConcludeTest(); \
}

6
test/expectdata/testsample_mock_new2.c
View File

@ -6,18 +6,18 @@
Unity.CurrentTestName = #TestFunc; \
Unity.CurrentTestLineNumber = TestLineNum; \
Unity.NumberOfTests++; \
CMock_Init(); \
if (TEST_PROTECT()) \
{ \
CMock_Init(); \
setUp(); \
TestFunc(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
if (TEST_PROTECT() && !TEST_IS_IGNORED) \
{ \
tearDown(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
UnityConcludeTest(); \
}

6
test/expectdata/testsample_mock_param.c
View File

@ -7,18 +7,18 @@
Unity.CurrentTestName = #TestFunc "(" #__VA_ARGS__ ")"; \
Unity.CurrentTestLineNumber = TestLineNum; \
Unity.NumberOfTests++; \
CMock_Init(); \
if (TEST_PROTECT()) \
{ \
CMock_Init(); \
setUp(); \
TestFunc(__VA_ARGS__); \
CMock_Verify(); \
} \
CMock_Destroy(); \
if (TEST_PROTECT() && !TEST_IS_IGNORED) \
{ \
tearDown(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
UnityConcludeTest(); \
}

6
test/expectdata/testsample_mock_run1.c
View File

@ -6,21 +6,21 @@
Unity.CurrentTestName = #TestFunc; \
Unity.CurrentTestLineNumber = TestLineNum; \
Unity.NumberOfTests++; \
CMock_Init(); \
if (TEST_PROTECT()) \
{ \
CEXCEPTION_T e; \
Try { \
CMock_Init(); \
setUp(); \
TestFunc(); \
CMock_Verify(); \
} Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
} \
CMock_Destroy(); \
if (TEST_PROTECT() && !TEST_IS_IGNORED) \
{ \
tearDown(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
UnityConcludeTest(); \
}

6
test/expectdata/testsample_mock_run2.c
View File

@ -6,18 +6,18 @@
Unity.CurrentTestName = #TestFunc; \
Unity.CurrentTestLineNumber = TestLineNum; \
Unity.NumberOfTests++; \
CMock_Init(); \
if (TEST_PROTECT()) \
{ \
CMock_Init(); \
setUp(); \
TestFunc(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
if (TEST_PROTECT() && !TEST_IS_IGNORED) \
{ \
tearDown(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
UnityConcludeTest(); \
}

6
test/expectdata/testsample_mock_yaml.c
View File

@ -6,21 +6,21 @@
Unity.CurrentTestName = #TestFunc; \
Unity.CurrentTestLineNumber = TestLineNum; \
Unity.NumberOfTests++; \
CMock_Init(); \
if (TEST_PROTECT()) \
{ \
CEXCEPTION_T e; \
Try { \
CMock_Init(); \
setUp(); \
TestFunc(); \
CMock_Verify(); \
} Catch(e) { TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!"); } \
} \
CMock_Destroy(); \
if (TEST_PROTECT() && !TEST_IS_IGNORED) \
{ \
tearDown(); \
CMock_Verify(); \
} \
CMock_Destroy(); \
UnityConcludeTest(); \
}