From c719dff1ade7a871684934c2ba2435662bf9259f Mon Sep 17 00:00:00 2001 From: Timothy Fosdike Date: Mon, 7 Nov 2016 09:39:27 +1030 Subject: [PATCH 1/3] Clear Ignore flag when StubWithCallback is called --- lib/cmock_generator_plugin_callback.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/cmock_generator_plugin_callback.rb b/lib/cmock_generator_plugin_callback.rb index 761b3f4..c2a4e62 100644 --- a/lib/cmock_generator_plugin_callback.rb +++ b/lib/cmock_generator_plugin_callback.rb @@ -80,6 +80,7 @@ class CMockGeneratorPluginCallback def mock_interfaces(function) func_name = function[:name] "void #{func_name}_StubWithCallback(CMOCK_#{func_name}_CALLBACK Callback)\n{\n" + + " Mock.#{func_name}_IgnoreBool = (int)0;\n" + " Mock.#{func_name}_CallbackFunctionPointer = Callback;\n}\n\n" end From 30064aa63c11d17b686459098a81b85660f71e51 Mon Sep 17 00:00:00 2001 From: Tim Bates Date: Mon, 13 Feb 2017 17:19:55 +1030 Subject: [PATCH 2/3] Fix generator test Also fix indentation (tabs bad) --- lib/cmock_generator_plugin_callback.rb | 2 +- test/unit/cmock_generator_plugin_callback_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/cmock_generator_plugin_callback.rb b/lib/cmock_generator_plugin_callback.rb index c2a4e62..23d4d22 100644 --- a/lib/cmock_generator_plugin_callback.rb +++ b/lib/cmock_generator_plugin_callback.rb @@ -80,7 +80,7 @@ class CMockGeneratorPluginCallback def mock_interfaces(function) func_name = function[:name] "void #{func_name}_StubWithCallback(CMOCK_#{func_name}_CALLBACK Callback)\n{\n" + - " Mock.#{func_name}_IgnoreBool = (int)0;\n" + + " Mock.#{func_name}_IgnoreBool = (int)0;\n" + " Mock.#{func_name}_CallbackFunctionPointer = Callback;\n}\n\n" end diff --git a/test/unit/cmock_generator_plugin_callback_test.rb b/test/unit/cmock_generator_plugin_callback_test.rb index e38ccf1..835eec5 100644 --- a/test/unit/cmock_generator_plugin_callback_test.rb +++ b/test/unit/cmock_generator_plugin_callback_test.rb @@ -240,6 +240,7 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu expected = ["void Lemon_StubWithCallback(CMOCK_Lemon_CALLBACK Callback)\n", "{\n", + " Mock.Lemon_IgnoreBool = (int)0;\n", " Mock.Lemon_CallbackFunctionPointer = Callback;\n", "}\n\n" ].join From 39e99e98038fd5c7cb129bf81551dc45cb5fe858 Mon Sep 17 00:00:00 2001 From: Tim Bates Date: Mon, 13 Feb 2017 17:36:20 +1030 Subject: [PATCH 3/3] Fix system test Generator for callback plugin now checks for existence of ignore plugin to know what code to generate --- lib/cmock_generator_plugin_callback.rb | 9 ++++++--- test/unit/cmock_generator_plugin_callback_test.rb | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/cmock_generator_plugin_callback.rb b/lib/cmock_generator_plugin_callback.rb index 23d4d22..0731c13 100644 --- a/lib/cmock_generator_plugin_callback.rb +++ b/lib/cmock_generator_plugin_callback.rb @@ -79,9 +79,12 @@ class CMockGeneratorPluginCallback def mock_interfaces(function) func_name = function[:name] - "void #{func_name}_StubWithCallback(CMOCK_#{func_name}_CALLBACK Callback)\n{\n" + - " Mock.#{func_name}_IgnoreBool = (int)0;\n" + - " Mock.#{func_name}_CallbackFunctionPointer = Callback;\n}\n\n" + lines = "" + 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 def mock_destroy(function) diff --git a/test/unit/cmock_generator_plugin_callback_test.rb b/test/unit/cmock_generator_plugin_callback_test.rb index 835eec5..9962860 100644 --- a/test/unit/cmock_generator_plugin_callback_test.rb +++ b/test/unit/cmock_generator_plugin_callback_test.rb @@ -14,6 +14,7 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu @config.expect :callback_include_count, true @config.expect :callback_after_arg_check, false + @config.expect :plugins, [:ignore] @cmock_generator_plugin_callback = CMockGeneratorPluginCallback.new(@config, @utils) end