mirror of
https://github.com/ThrowTheSwitch/CMock.git
synced 2026-10-06 08:57:25 +00:00
Merge pull request #109 from redarc-tech/ignore-bool
Clear Ignore flag when StubWithCallback is called (Thanks!)
This commit is contained in:
@@ -79,8 +79,12 @@ class CMockGeneratorPluginCallback
|
|||||||
|
|
||||||
def mock_interfaces(function)
|
def mock_interfaces(function)
|
||||||
func_name = function[:name]
|
func_name = function[:name]
|
||||||
"void #{func_name}_StubWithCallback(CMOCK_#{func_name}_CALLBACK Callback)\n{\n" +
|
lines = ""
|
||||||
" Mock.#{func_name}_CallbackFunctionPointer = Callback;\n}\n\n"
|
lines << "void #{func_name}_StubWithCallback(CMOCK_#{func_name}_CALLBACK Callback)\n{\n"
|
||||||
|
if @config.plugins.include? :ignore
|
||||||
|
lines << " Mock.#{func_name}_IgnoreBool = (int)0;\n"
|
||||||
|
end
|
||||||
|
lines << " Mock.#{func_name}_CallbackFunctionPointer = Callback;\n}\n\n"
|
||||||
end
|
end
|
||||||
|
|
||||||
def mock_destroy(function)
|
def mock_destroy(function)
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu
|
|||||||
|
|
||||||
@config.expect :callback_include_count, true
|
@config.expect :callback_include_count, true
|
||||||
@config.expect :callback_after_arg_check, false
|
@config.expect :callback_after_arg_check, false
|
||||||
|
@config.expect :plugins, [:ignore]
|
||||||
|
|
||||||
@cmock_generator_plugin_callback = CMockGeneratorPluginCallback.new(@config, @utils)
|
@cmock_generator_plugin_callback = CMockGeneratorPluginCallback.new(@config, @utils)
|
||||||
end
|
end
|
||||||
@@ -240,6 +241,7 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu
|
|||||||
|
|
||||||
expected = ["void Lemon_StubWithCallback(CMOCK_Lemon_CALLBACK Callback)\n",
|
expected = ["void Lemon_StubWithCallback(CMOCK_Lemon_CALLBACK Callback)\n",
|
||||||
"{\n",
|
"{\n",
|
||||||
|
" Mock.Lemon_IgnoreBool = (int)0;\n",
|
||||||
" Mock.Lemon_CallbackFunctionPointer = Callback;\n",
|
" Mock.Lemon_CallbackFunctionPointer = Callback;\n",
|
||||||
"}\n\n"
|
"}\n\n"
|
||||||
].join
|
].join
|
||||||
|
|||||||
Reference in New Issue
Block a user