ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-06-05 21:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unset argument detail before calling callback

Browse Source
This commit is contained in:
ml-physec
2025-07-04 16:32:37 +02:00
parent 204117cb59
commit 2bb9086214
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_generator_plugin_callback.rb
+2 -1
View File
@@ -43,7 +43,8 @@ class CMockGeneratorPluginCallback
end end
def mock_implementation(function) def mock_implementation(function)
" if (Mock.#{function[:name]}_CallbackFunctionPointer != NULL)\n {\n" + " if (Mock.#{function[:name]}_CallbackFunctionPointer != NULL)\n {\n" \
" UNITY_SET_DETAIL(CMockString_#{function[:name]});\n" +
if function[:return][:void?] if function[:return][:void?]
" #{generate_call(function)};\n }\n" " #{generate_call(function)};\n }\n"
else else
test/unit/cmock_generator_plugin_callback_test.rb
+6
View File
@@ -96,6 +96,7 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu
function = {:name => "Apple", :args => [], :args_string => "void", :return => test_return[:void]} function = {:name => "Apple", :args => [], :args_string => "void", :return => test_return[:void]}
expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n", expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n",
" {\n", " {\n",
" UNITY_SET_DETAIL(CMockString_#{function[:name]});\n",
" Mock.Apple_CallbackFunctionPointer(Mock.Apple_CallbackCalls++);\n", " Mock.Apple_CallbackFunctionPointer(Mock.Apple_CallbackCalls++);\n",
" }\n" " }\n"
].join ].join
@@ -107,6 +108,7 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu
function = {:name => "Apple", :args => [], :args_string => "void", :return => test_return[:void]} function = {:name => "Apple", :args => [], :args_string => "void", :return => test_return[:void]}
expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n", expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n",
" {\n", " {\n",
" UNITY_SET_DETAIL(CMockString_#{function[:name]});\n",
" Mock.Apple_CallbackFunctionPointer();\n", " Mock.Apple_CallbackFunctionPointer();\n",
" }\n" " }\n"
].join ].join
@@ -119,6 +121,7 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu
function = {:name => "Apple", :args => [], :args_string => "void", :return => test_return[:int]} function = {:name => "Apple", :args => [], :args_string => "void", :return => test_return[:int]}
expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n", expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n",
" {\n", " {\n",
" UNITY_SET_DETAIL(CMockString_#{function[:name]});\n",
" cmock_call_instance->ReturnVal = Mock.Apple_CallbackFunctionPointer(Mock.Apple_CallbackCalls++);\n", " cmock_call_instance->ReturnVal = Mock.Apple_CallbackFunctionPointer(Mock.Apple_CallbackCalls++);\n",
" }\n" " }\n"
].join ].join
@@ -134,6 +137,7 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu
:return=> test_return[:void]} :return=> test_return[:void]}
expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n", expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n",
" {\n", " {\n",
" UNITY_SET_DETAIL(CMockString_#{function[:name]});\n",
" Mock.Apple_CallbackFunctionPointer(steak, flag, Mock.Apple_CallbackCalls++);\n", " Mock.Apple_CallbackFunctionPointer(steak, flag, Mock.Apple_CallbackCalls++);\n",
" }\n" " }\n"
].join ].join
@@ -149,6 +153,7 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu
:return=> test_return[:void]} :return=> test_return[:void]}
expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n", expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n",
" {\n", " {\n",
" UNITY_SET_DETAIL(CMockString_#{function[:name]});\n",
" Mock.Apple_CallbackFunctionPointer(steak, flag);\n", " Mock.Apple_CallbackFunctionPointer(steak, flag);\n",
" }\n" " }\n"
].join ].join
@@ -165,6 +170,7 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu
:return => test_return[:int]} :return => test_return[:int]}
expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n", expected = [" if (Mock.Apple_CallbackFunctionPointer != NULL)\n",
" {\n", " {\n",
" UNITY_SET_DETAIL(CMockString_#{function[:name]});\n",
" cmock_call_instance->ReturnVal = Mock.Apple_CallbackFunctionPointer(steak, flag, Mock.Apple_CallbackCalls++);\n", " cmock_call_instance->ReturnVal = Mock.Apple_CallbackFunctionPointer(steak, flag, Mock.Apple_CallbackCalls++);\n",
" }\n" " }\n"
].join ].join