From 8cb956367d253180c50e2d06b8215fbd6dee6db3 Mon Sep 17 00:00:00 2001
From: mvandervoord <mvandervoord@bf332499-1b4d-0410-844d-d2d48d5cc64c>
Date: Tue, 8 Jun 2010 00:46:50 +0000
Subject: [PATCH] - added ability to use callbacks with or without argument
 checking - added ability to use callbacks with or without the extra count
 argument - updated docs

git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@164 bf332499-1b4d-0410-844d-d2d48d5cc64c
---
 docs/CMock Summary.odt                        | Bin 38190 -> 38476 bytes
 docs/CMock Summary.pdf                        | Bin 72059 -> 72645 bytes
 lib/cmock_config.rb                           |  36 +++++------
 lib/cmock_generator_plugin_callback.rb        |  30 ++++++---
 .../cmock_generator_plugin_callback_test.rb   |  57 +++++++++++++++++-
 5 files changed, 95 insertions(+), 28 deletions(-)

diff --git a/docs/CMock Summary.odt b/docs/CMock Summary.odt
index a567741b96186a3a34f5bde02eec0ba6ca6ff112..4f054c1b69e7775280ffb97994472edb06d4727e 100644
GIT binary patch
delta 8912
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
L4!%C|AM5`CcPr9;

delta 8654
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
Q**FMUDjj@E!r$!w0nVFl)Bpeg

diff --git a/docs/CMock Summary.pdf b/docs/CMock Summary.pdf
index fc8c562c3b7dcea926a06109f0f4875d4d656cc5..8cddcf14698ee063c560646549eb07b4455eb20d 100644
GIT binary patch
delta 5879
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
CZAOLw

delta 5258
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
G0RIJ$P&Zuw

diff --git a/lib/cmock_config.rb b/lib/cmock_config.rb
index 06b103b..bf8e64c 100644
--- a/lib/cmock_config.rb
+++ b/lib/cmock_config.rb
@@ -8,23 +8,25 @@ class CMockConfig
   
   CMockDefaultOptions = 
   {
-    :framework               => :unity,
-    :mock_path               => 'mocks',
-    :mock_prefix             => 'Mock',
-    :plugins                 => [],
-    :includes                => [],
-    :attributes              => ['__ramfunc', '__irq', '__fiq', 'register', 'extern'],
-    :enforce_strict_ordering => false,
-    :cexception_include      => nil,
-    :unity_helper            => false,
-    :treat_as                => {},
-    :treat_as_void           => [],
-    :memcmp_if_unknown       => true,
-    :when_no_prototypes      => :warn,           #the options being :ignore, :warn, or :error
-    :when_ptr                => :compare_data,   #the options being :compare_ptr, :compare_data, or :smart
-    :verbosity               => 2,               #the options being 0 errors only, 1 warnings and errors, 2 normal info, 3 verbose
-    :treat_externs           => :exclude,        #the options being :include or :exclude
-    :ignore                  => :args_and_calls, #the options being :args_and_calls or :args_only
+    :framework                => :unity,
+    :mock_path                => 'mocks',
+    :mock_prefix              => 'Mock',
+    :plugins                  => [],
+    :includes                 => [],
+    :attributes               => ['__ramfunc', '__irq', '__fiq', 'register', 'extern'],
+    :enforce_strict_ordering  => false,
+    :cexception_include       => nil,
+    :unity_helper             => false,
+    :treat_as                 => {},
+    :treat_as_void            => [],
+    :memcmp_if_unknown        => true,
+    :when_no_prototypes       => :warn,           #the options being :ignore, :warn, or :error
+    :when_ptr                 => :compare_data,   #the options being :compare_ptr, :compare_data, or :smart
+    :verbosity                => 2,               #the options being 0 errors only, 1 warnings and errors, 2 normal info, 3 verbose
+    :treat_externs            => :exclude,        #the options being :include or :exclude
+    :ignore                   => :args_and_calls, #the options being :args_and_calls or :args_only
+    :callback_include_count   => true,
+    :callback_after_arg_check => false,
   }
   
   def initialize(options=nil)
diff --git a/lib/cmock_generator_plugin_callback.rb b/lib/cmock_generator_plugin_callback.rb
index ea0dbe7..6533eb5 100644
--- a/lib/cmock_generator_plugin_callback.rb
+++ b/lib/cmock_generator_plugin_callback.rb
@@ -6,6 +6,7 @@
 
 class CMockGeneratorPluginCallback
 
+  attr_accessor :include_count
   attr_reader :priority
   attr_reader :config, :utils
   
@@ -13,6 +14,13 @@ class CMockGeneratorPluginCallback
     @config = config
     @utils = utils
     @priority = 3
+    
+    @include_count = @config.callback_include_count
+    if (@config.callback_after_arg_check)
+      alias :mock_implementation          :mock_implementation_for_callbacks
+    else
+      alias :mock_implementation_precheck :mock_implementation_for_callbacks
+    end
   end
 
   def instance_structure(function)
@@ -24,18 +32,24 @@ class CMockGeneratorPluginCallback
   def mock_function_declarations(function)
     func_name = function[:name]
     return_type = function[:return][:const?] ? "const #{function[:return][:type]}" : function[:return][:type]
-    "typedef #{return_type} (* CMOCK_#{func_name}_CALLBACK)(#{(function[:args_string] == "void") ? '' : function[:args_string] + ', '}int cmock_num_calls);\n" +
-    "void #{func_name}_StubWithCallback(CMOCK_#{func_name}_CALLBACK Callback);\n"
+    style  = (@include_count ? 1 : 0) | (function[:args].empty? ? 0 : 2)
+    styles = [ "void", "int cmock_num_calls", function[:args_string], "#{function[:args_string]}, int cmock_num_calls" ]
+    "typedef #{return_type} (* CMOCK_#{func_name}_CALLBACK)(#{styles[style]});\nvoid #{func_name}_StubWithCallback(CMOCK_#{func_name}_CALLBACK Callback);\n"
   end
 
-  def mock_implementation_precheck(function)
+  def mock_implementation_for_callbacks(function)
     func_name   = function[:name]
-    call_string = function[:args].empty? ? '' : function[:args].map{|m| m[:name]}.join(', ') + ', '
+    style  = (@include_count ? 1 : 0) | (function[:args].empty? ? 0 : 2) | (function[:return][:void?] ? 0 : 4)
     "  if (Mock.#{func_name}_CallbackFunctionPointer != NULL)\n  {\n" +
-    if (function[:return][:void?])
-      "    Mock.#{func_name}_CallbackFunctionPointer(#{call_string}Mock.#{func_name}_CallbackCalls++);\n    return;\n  }\n"
-    else
-      "    return Mock.#{func_name}_CallbackFunctionPointer(#{call_string}Mock.#{func_name}_CallbackCalls++);\n  }\n"
+    case(style)
+      when 0 then "    Mock.#{func_name}_CallbackFunctionPointer();\n    return;\n  }\n"
+      when 1 then "    Mock.#{func_name}_CallbackFunctionPointer(Mock.#{func_name}_CallbackCalls++);\n    return;\n  }\n"
+      when 2 then "    Mock.#{func_name}_CallbackFunctionPointer(#{function[:args].map{|m| m[:name]}.join(', ')});\n    return;\n  }\n"
+      when 3 then "    Mock.#{func_name}_CallbackFunctionPointer(#{function[:args].map{|m| m[:name]}.join(', ')}, Mock.#{func_name}_CallbackCalls++);\n    return;\n  }\n"
+      when 4 then "    return Mock.#{func_name}_CallbackFunctionPointer(void);\n  }\n"
+      when 5 then "    return Mock.#{func_name}_CallbackFunctionPointer(Mock.#{func_name}_CallbackCalls++);\n  }\n"
+      when 6 then "    return Mock.#{func_name}_CallbackFunctionPointer(#{function[:args].map{|m| m[:name]}.join(', ')});\n  }\n"
+      when 7 then "    return Mock.#{func_name}_CallbackFunctionPointer(#{function[:args].map{|m| m[:name]}.join(', ')}, Mock.#{func_name}_CallbackCalls++);\n  }\n"
     end
   end
 
diff --git a/test/unit/cmock_generator_plugin_callback_test.rb b/test/unit/cmock_generator_plugin_callback_test.rb
index 553664d..599c4fc 100644
--- a/test/unit/cmock_generator_plugin_callback_test.rb
+++ b/test/unit/cmock_generator_plugin_callback_test.rb
@@ -11,6 +11,9 @@ class CMockGeneratorPluginCallbackTest < Test::Unit::TestCase
   def setup
     create_mocks :config, :utils
     
+    @config.expect.callback_include_count.returns(true)
+    @config.expect.callback_after_arg_check.returns(false)
+  
     @cmock_generator_plugin_callback = CMockGeneratorPluginCallback.new(@config, @utils)
   end
 
@@ -36,15 +39,24 @@ class CMockGeneratorPluginCallbackTest < Test::Unit::TestCase
   end
   
   should "add mock function declaration for function without arguments" do
-    function = {:name => "Maple", :args_string => "void", :return => test_return[:void]}
+    function = {:name => "Maple", :args_string => "void", :args => [], :return => test_return[:void]}
     expected = [ "typedef void (* CMOCK_Maple_CALLBACK)(int cmock_num_calls);\n",
                  "void Maple_StubWithCallback(CMOCK_Maple_CALLBACK Callback);\n" ].join
     returned = @cmock_generator_plugin_callback.mock_function_declarations(function)
     assert_equal(expected, returned)
   end
   
+  should "add mock function declaration for function without arguments when count is also turned off" do
+    function = {:name => "Maple", :args_string => "void", :args => [], :return => test_return[:void]}
+    expected = [ "typedef void (* CMOCK_Maple_CALLBACK)(void);\n",
+                 "void Maple_StubWithCallback(CMOCK_Maple_CALLBACK Callback);\n" ].join
+    @cmock_generator_plugin_callback.include_count = false
+    returned = @cmock_generator_plugin_callback.mock_function_declarations(function)
+    assert_equal(expected, returned)
+  end
+  
   should "add mock function declaration for function with arguments" do
-    function = {:name => "Maple", :args_string => "int* tofu", :return => test_return[:void]}
+    function = {:name => "Maple", :args_string => "int* tofu", :args => [1], :return => test_return[:void]}
     expected = [ "typedef void (* CMOCK_Maple_CALLBACK)(int* tofu, int cmock_num_calls);\n",
                  "void Maple_StubWithCallback(CMOCK_Maple_CALLBACK Callback);\n" ].join
     returned = @cmock_generator_plugin_callback.mock_function_declarations(function)
@@ -52,12 +64,21 @@ class CMockGeneratorPluginCallbackTest < Test::Unit::TestCase
   end
   
   should "add mock function declaration for function with return values" do
-    function = {:name => "Maple", :args_string => "int* tofu", :return => test_return[:string]}
+    function = {:name => "Maple", :args_string => "int* tofu", :args => [1], :return => test_return[:string]}
     expected = [ "typedef const char* (* CMOCK_Maple_CALLBACK)(int* tofu, int cmock_num_calls);\n",
                  "void Maple_StubWithCallback(CMOCK_Maple_CALLBACK Callback);\n" ].join
     returned = @cmock_generator_plugin_callback.mock_function_declarations(function)
     assert_equal(expected, returned)
   end
+  
+  should "add mock function declaration for function with return values and count is turned off" do
+    function = {:name => "Maple", :args_string => "int* tofu", :args => [1], :return => test_return[:string]}
+    expected = [ "typedef const char* (* CMOCK_Maple_CALLBACK)(int* tofu);\n",
+                 "void Maple_StubWithCallback(CMOCK_Maple_CALLBACK Callback);\n" ].join
+    @cmock_generator_plugin_callback.include_count = false
+    returned = @cmock_generator_plugin_callback.mock_function_declarations(function)
+    assert_equal(expected, returned)
+  end
 
   should "add mock function implementation for functions of style 'void func(void)'" do
     function = {:name => "Apple", :args => [], :args_string => "void", :return => test_return[:void]}
@@ -71,6 +92,19 @@ class CMockGeneratorPluginCallbackTest < Test::Unit::TestCase
     assert_equal(expected, returned)
   end
 
+  should "add mock function implementation for functions of style 'void func(void)' when count turned off" do
+    function = {:name => "Apple", :args => [], :args_string => "void", :return => test_return[:void]}
+    expected = ["  if (Mock.Apple_CallbackFunctionPointer != NULL)\n",
+                "  {\n",
+                "    Mock.Apple_CallbackFunctionPointer();\n",
+                "    return;\n",
+                "  }\n"
+               ].join
+    @cmock_generator_plugin_callback.include_count = false
+    returned = @cmock_generator_plugin_callback.mock_implementation_precheck(function)
+    assert_equal(expected, returned)
+  end
+
   should "add mock function implementation for functions of style 'int func(void)'" do
     function = {:name => "Apple", :args => [], :args_string => "void", :return => test_return[:int]}
     expected = ["  if (Mock.Apple_CallbackFunctionPointer != NULL)\n",
@@ -98,6 +132,23 @@ class CMockGeneratorPluginCallbackTest < Test::Unit::TestCase
     assert_equal(expected, returned)
   end
 
+  should "add mock function implementation for functions of style 'void func(int* steak, uint8_t flag)' when count turned off" do
+    function = {:name => "Apple", 
+                :args => [ { :type => 'int*', :name => 'steak', :ptr? => true},
+                  { :type => 'uint8_t', :name => 'flag', :ptr? => false} ], 
+                :args_string => "int* steak, uint8_t flag",
+                :return=> test_return[:void]}
+    expected = ["  if (Mock.Apple_CallbackFunctionPointer != NULL)\n",
+                "  {\n",
+                "    Mock.Apple_CallbackFunctionPointer(steak, flag);\n",
+                "    return;\n",
+                "  }\n"
+               ].join
+    @cmock_generator_plugin_callback.include_count = false
+    returned = @cmock_generator_plugin_callback.mock_implementation_precheck(function)
+    assert_equal(expected, returned)
+  end
+
   should "add mock function implementation for functions of style 'int16_t func(int* steak, uint8_t flag)'" do
     function = {:name => "Apple", 
                 :args => [ { :type => 'int*', :name => 'steak', :ptr? => true},