1
0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-25 17:31:36 +01:00

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.

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

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(); \
}