From d4197dacd05e5101456c6b5c3dff0b58ff771677 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Mon, 21 Apr 2014 16:55:12 -0400 Subject: [PATCH] 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. --- auto/generate_test_runner.rb | 6 +++--- test/expectdata/testsample_mock_cmd.c | 6 +++--- test/expectdata/testsample_mock_def.c | 6 +++--- test/expectdata/testsample_mock_new1.c | 6 +++--- test/expectdata/testsample_mock_new2.c | 6 +++--- test/expectdata/testsample_mock_param.c | 6 +++--- test/expectdata/testsample_mock_run1.c | 6 +++--- test/expectdata/testsample_mock_run2.c | 6 +++--- test/expectdata/testsample_mock_yaml.c | 6 +++--- 9 files changed, 27 insertions(+), 27 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index fd48f1b..e67fb85 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -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 diff --git a/test/expectdata/testsample_mock_cmd.c b/test/expectdata/testsample_mock_cmd.c index 6acb532..2b5b8b8 100644 --- a/test/expectdata/testsample_mock_cmd.c +++ b/test/expectdata/testsample_mock_cmd.c @@ -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(); \ } diff --git a/test/expectdata/testsample_mock_def.c b/test/expectdata/testsample_mock_def.c index 965f26f..7f90d87 100644 --- a/test/expectdata/testsample_mock_def.c +++ b/test/expectdata/testsample_mock_def.c @@ -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(); \ } diff --git a/test/expectdata/testsample_mock_new1.c b/test/expectdata/testsample_mock_new1.c index 041499e..ab7b676 100644 --- a/test/expectdata/testsample_mock_new1.c +++ b/test/expectdata/testsample_mock_new1.c @@ -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(); \ } diff --git a/test/expectdata/testsample_mock_new2.c b/test/expectdata/testsample_mock_new2.c index 56155c0..ed5d890 100644 --- a/test/expectdata/testsample_mock_new2.c +++ b/test/expectdata/testsample_mock_new2.c @@ -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(); \ } diff --git a/test/expectdata/testsample_mock_param.c b/test/expectdata/testsample_mock_param.c index bb445ac..f73ea83 100644 --- a/test/expectdata/testsample_mock_param.c +++ b/test/expectdata/testsample_mock_param.c @@ -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(); \ } diff --git a/test/expectdata/testsample_mock_run1.c b/test/expectdata/testsample_mock_run1.c index 041499e..ab7b676 100644 --- a/test/expectdata/testsample_mock_run1.c +++ b/test/expectdata/testsample_mock_run1.c @@ -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(); \ } diff --git a/test/expectdata/testsample_mock_run2.c b/test/expectdata/testsample_mock_run2.c index 56155c0..ed5d890 100644 --- a/test/expectdata/testsample_mock_run2.c +++ b/test/expectdata/testsample_mock_run2.c @@ -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(); \ } diff --git a/test/expectdata/testsample_mock_yaml.c b/test/expectdata/testsample_mock_yaml.c index 32262f7..9f5f5b1 100644 --- a/test/expectdata/testsample_mock_yaml.c +++ b/test/expectdata/testsample_mock_yaml.c @@ -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(); \ } -- GitLab