ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-10-06 08:57:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #241 from jlindgren90/expect-details

Browse Source 
Expect plugin should call UNITY_SET/CLR_DETAILS in pairs.
This commit is contained in:
Mark VanderVoord
2019-09-03 11:07:03 -04:00
committed by GitHub
parent e17180b2ef b895a4575a
commit e1f7c35f2e
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_generator_plugin_expect.rb
+2 -2
View File
@@ -91,14 +91,14 @@ class CMockGeneratorPluginExpect
lines << @utils.code_add_base_expectation(func_name) lines << @utils.code_add_base_expectation(func_name)
lines << @utils.code_call_argument_loader(function) lines << @utils.code_call_argument_loader(function)
lines << @utils.code_assign_argument_quickly("cmock_call_instance->ReturnVal", function[:return]) unless (function[:return][:void?]) lines << @utils.code_assign_argument_quickly("cmock_call_instance->ReturnVal", function[:return]) unless (function[:return][:void?])
lines << " UNITY_CLR_DETAILS();\n"
lines << "}\n\n" lines << "}\n\n"
end end
def mock_verify(function) def mock_verify(function)
func_name = function[:name] func_name = function[:name]
" UNITY_SET_DETAIL(CMockString_#{function[:name]});\n" + " UNITY_SET_DETAIL(CMockString_#{function[:name]});\n" +
" UNITY_TEST_ASSERT(CMOCK_GUTS_NONE == call_instance, cmock_line, CMockStringCalledLess);\n" " UNITY_TEST_ASSERT(CMOCK_GUTS_NONE == call_instance, cmock_line, CMockStringCalledLess);\n" +
" UNITY_CLR_DETAILS();\n"
end end
end end
test/unit/cmock_generator_plugin_expect_a_test.rb
+2 -5
View File
@@ -119,7 +119,6 @@ describe CMockGeneratorPluginExpect, "Verify CMockGeneratorPluginExpect Module W
"{\n", "{\n",
"mock_retval_0 ", "mock_retval_0 ",
"mock_retval_1 ", "mock_retval_1 ",
" UNITY_CLR_DETAILS();\n",
"}\n\n" "}\n\n"
].join ].join
returned = @cmock_generator_plugin_expect.mock_interfaces(function) returned = @cmock_generator_plugin_expect.mock_interfaces(function)
@@ -136,7 +135,6 @@ describe CMockGeneratorPluginExpect, "Verify CMockGeneratorPluginExpect Module W
"mock_retval_0 ", "mock_retval_0 ",
"mock_retval_1 ", "mock_retval_1 ",
"mock_retval_2", "mock_retval_2",
" UNITY_CLR_DETAILS();\n",
"}\n\n" "}\n\n"
].join ].join
returned = @cmock_generator_plugin_expect.mock_interfaces(function) returned = @cmock_generator_plugin_expect.mock_interfaces(function)
@@ -153,7 +151,6 @@ describe CMockGeneratorPluginExpect, "Verify CMockGeneratorPluginExpect Module W
"mock_retval_0 ", "mock_retval_0 ",
"mock_retval_1 ", "mock_retval_1 ",
"mock_retval_2", "mock_retval_2",
" UNITY_CLR_DETAILS();\n",
"}\n\n" "}\n\n"
].join ].join
returned = @cmock_generator_plugin_expect.mock_interfaces(function) returned = @cmock_generator_plugin_expect.mock_interfaces(function)
@@ -168,7 +165,6 @@ describe CMockGeneratorPluginExpect, "Verify CMockGeneratorPluginExpect Module W
"{\n", "{\n",
"mock_retval_0 ", "mock_retval_0 ",
"mock_retval_1 ", "mock_retval_1 ",
" UNITY_CLR_DETAILS();\n",
"}\n\n" "}\n\n"
].join ].join
@cmock_generator_plugin_expect.ordered = true @cmock_generator_plugin_expect.ordered = true
@@ -179,7 +175,8 @@ describe CMockGeneratorPluginExpect, "Verify CMockGeneratorPluginExpect Module W
it "add mock verify lines" do it "add mock verify lines" do
function = {:name => "Banana" } function = {:name => "Banana" }
expected = " UNITY_SET_DETAIL(CMockString_Banana);\n" + expected = " UNITY_SET_DETAIL(CMockString_Banana);\n" +
" UNITY_TEST_ASSERT(CMOCK_GUTS_NONE == call_instance, cmock_line, CMockStringCalledLess);\n" " UNITY_TEST_ASSERT(CMOCK_GUTS_NONE == call_instance, cmock_line, CMockStringCalledLess);\n" +
" UNITY_CLR_DETAILS();\n"
returned = @cmock_generator_plugin_expect.mock_verify(function) returned = @cmock_generator_plugin_expect.mock_verify(function)
assert_equal(expected, returned) assert_equal(expected, returned)
end end
test/unit/cmock_generator_plugin_expect_b_test.rb
+2 -5
View File
@@ -135,7 +135,6 @@ describe CMockGeneratorPluginExpect, "Verify CMockGeneratorPluginExpect Module w
"{\n", "{\n",
"mock_retval_0\n", "mock_retval_0\n",
"mock_retval_1\n", "mock_retval_1\n",
" UNITY_CLR_DETAILS();\n",
"}\n\n" "}\n\n"
].join ].join
returned = @cmock_generator_plugin_expect.mock_interfaces(function) returned = @cmock_generator_plugin_expect.mock_interfaces(function)
@@ -152,7 +151,6 @@ describe CMockGeneratorPluginExpect, "Verify CMockGeneratorPluginExpect Module w
"mock_retval_0\n", "mock_retval_0\n",
"mock_retval_1\n", "mock_retval_1\n",
"mock_retval_2\n", "mock_retval_2\n",
" UNITY_CLR_DETAILS();\n",
"}\n\n" "}\n\n"
].join ].join
returned = @cmock_generator_plugin_expect.mock_interfaces(function) returned = @cmock_generator_plugin_expect.mock_interfaces(function)
@@ -169,7 +167,6 @@ describe CMockGeneratorPluginExpect, "Verify CMockGeneratorPluginExpect Module w
"mock_retval_0\n", "mock_retval_0\n",
"mock_retval_1\n", "mock_retval_1\n",
"mock_retval_2\n", "mock_retval_2\n",
" UNITY_CLR_DETAILS();\n",
"}\n\n" "}\n\n"
].join ].join
returned = @cmock_generator_plugin_expect.mock_interfaces(function) returned = @cmock_generator_plugin_expect.mock_interfaces(function)
@@ -184,7 +181,6 @@ describe CMockGeneratorPluginExpect, "Verify CMockGeneratorPluginExpect Module w
"{\n", "{\n",
"mock_retval_0\n", "mock_retval_0\n",
"mock_retval_1\n", "mock_retval_1\n",
" UNITY_CLR_DETAILS();\n",
"}\n\n" "}\n\n"
].join ].join
@cmock_generator_plugin_expect.ordered = true @cmock_generator_plugin_expect.ordered = true
@@ -195,7 +191,8 @@ describe CMockGeneratorPluginExpect, "Verify CMockGeneratorPluginExpect Module w
it "add mock verify lines" do it "add mock verify lines" do
function = {:name => "Banana" } function = {:name => "Banana" }
expected = " UNITY_SET_DETAIL(CMockString_Banana);\n" + expected = " UNITY_SET_DETAIL(CMockString_Banana);\n" +
" UNITY_TEST_ASSERT(CMOCK_GUTS_NONE == call_instance, cmock_line, CMockStringCalledLess);\n" " UNITY_TEST_ASSERT(CMOCK_GUTS_NONE == call_instance, cmock_line, CMockStringCalledLess);\n" +
" UNITY_CLR_DETAILS();\n"
returned = @cmock_generator_plugin_expect.mock_verify(function) returned = @cmock_generator_plugin_expect.mock_verify(function)
assert_equal(expected, returned) assert_equal(expected, returned)
end end