ceedling 0.13.0 → 0.15.0

data/vendor/cmock/test/test_helper.rb

@@ -9,12 +9,17 @@
   require File.expand_path(File.dirname(__FILE__)) + req
 end
 
+# Note from Matt July 16 2012: not sure why this is here, as 1.9 comes with
+# minitest, an implementation for Test::Unit in 1.9.
+# Using test-unit makes hardmock quite unhappy.
+# Long-term solution: replace hardmock with a mocking library like rr or rspec
+# that is well maintained into the future. hardmock is off of life support.
 #gem install test-unit -v 1.2.3
-ruby_version = RUBY_VERSION.split('.')
-if (ruby_version[1].to_i == 9) and (ruby_version[2].to_i > 1)
-  require 'rubygems'
-  gem 'test-unit'
-end
+# ruby_version = RUBY_VERSION.split('.')
+# if (ruby_version[1].to_i == 9) and (ruby_version[2].to_i > 1)
+#   require 'rubygems'
+#   gem 'test-unit'
+# end
 require 'test/unit'
 require 'hardmock'
 

data/vendor/cmock/test/unit/cmock_generator_main_test.rb

@@ -52,6 +52,7 @@ class CMockGeneratorTest < Test::Unit::TestCase
     @cmock_generator = CMockGenerator.new(@config, @file_writer, @utils, @plugins)
     @cmock_generator.module_name = @module_name
     @cmock_generator.mock_name = "Mock#{@module_name}"
+    @cmock_generator.clean_mock_name = "Mock#{@module_name}"
     
     #strict handling
     @config.expect.mock_prefix.returns("Mock")
@@ -65,6 +66,7 @@ class CMockGeneratorTest < Test::Unit::TestCase
     @cmock_generator_strict = CMockGenerator.new(@config, @file_writer, @utils, @plugins)
     @cmock_generator_strict.module_name = @module_name
     @cmock_generator_strict.mock_name = "Mock#{@module_name}"
+    @cmock_generator_strict.clean_mock_name = "Mock#{@module_name}"
   end
 
   def teardown
@@ -100,6 +102,42 @@ class CMockGeneratorTest < Test::Unit::TestCase
     assert_equal(expected, output)
   end
 
+  should "handle dashes and spaces in the module name" do
+    #no strict handling
+    @config.expect.mock_prefix.returns("Mock")
+    @config.expect.enforce_strict_ordering.returns(nil)
+    @config.expect.framework.returns(:unity)
+    @config.expect.includes.returns(["ConfigRequiredHeader1.h","ConfigRequiredHeader2.h"])
+    @config.expect.includes_h_post_orig_header.returns(nil)
+    @config.expect.includes_c_pre_header.returns(nil)
+    @config.expect.includes_c_post_header.returns(nil)
+    @cmock_generator2 = CMockGenerator.new(@config, @file_writer, @utils, @plugins)
+    @cmock_generator2.module_name = "Pout-Pout Fish"
+    @cmock_generator2.mock_name = "MockPout-Pout Fish"
+    @cmock_generator2.clean_mock_name = "MockPout_Pout_Fish"
+    
+    @config.expect.mock_prefix.returns("Mock")
+    orig_filename = "Pout-Pout Fish.h"
+    define_name = "MOCKPOUT_POUT_FISH_H"
+    mock_name = "MockPout_Pout_Fish"
+    output = []
+    expected = [ "/* AUTOGENERATED FILE. DO NOT EDIT. */\n",
+                 "#ifndef _#{define_name}\n",
+                 "#define _#{define_name}\n\n",
+                 "#include \"ConfigRequiredHeader1.h\"\n",
+                 "#include \"ConfigRequiredHeader2.h\"\n",
+                 "#include \"#{orig_filename}\"\n",
+                 "#include \"PluginRequiredHeader.h\"\n",
+                 "\n"
+               ]
+
+    @plugins.expect.run(:include_files).returns("#include \"PluginRequiredHeader.h\"\n")
+    
+    @cmock_generator2.create_mock_header_header(output, "MockPout-Pout Fish.h")
+    
+    assert_equal(expected, output)
+  end
+  
   should "create the top of a header file with optional include files from config" do
     @config.expect.mock_prefix.returns("Mock")
     orig_filename = "PoutPoutFish.h"

data/vendor/cmock/test/unit/cmock_generator_plugin_ignore_arg_test.rb

@@ -0,0 +1,116 @@
+# ==========================================
+#   CMock Project - Automatic Mock Generation for C
+#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+#   [Released under MIT License. Please refer to license.txt for details]
+# ========================================== 
+
+require File.expand_path(File.dirname(__FILE__)) + "/../test_helper"
+require 'cmock_generator_plugin_ignore_arg'
+
+class CMockGeneratorPluginIgnoreArgTest < Test::Unit::TestCase
+  def setup
+    create_mocks :config, :utils
+
+    # int *Oak(void)"
+    @void_func = {:name => "Oak", :args => [], :return => test_return[:int_ptr]}
+
+    # void Pine(int chicken, const int beef, int *tofu)
+    @complex_func = {:name => "Pine", 
+                     :args => [{ :type => "int",
+                                 :name => "chicken",
+                                 :ptr? => false,
+                               },
+                               { :type => "int*",
+                                 :name => "beef",
+                                 :ptr? => true,
+                                 :const? => true,
+                               },
+                               { :type => "int*",
+                                 :name => "tofu",
+                                 :ptr? => true,
+                               }],
+                     :return => test_return[:void], 
+                     :contains_ptr? => true }
+
+    #no strict ordering
+    @cmock_generator_plugin_ignore_arg = CMockGeneratorPluginIgnoreArg.new(@config, @utils)
+  end
+
+  def teardown
+  end
+
+  should "have set up internal accessors correctly on init" do
+    assert_equal(@utils,  @cmock_generator_plugin_ignore_arg.utils)
+    assert_equal(10,      @cmock_generator_plugin_ignore_arg.priority)
+  end
+  
+  should "not include any additional include files" do 
+    assert(!@cmock_generator_plugin_ignore_arg.respond_to?(:include_files))
+  end
+
+  should "not add to typedef structure for functions with no args" do
+    returned = @cmock_generator_plugin_ignore_arg.instance_typedefs(@void_func)
+    assert_equal("", returned)
+  end
+  
+  should "add to tyepdef structure mock needs of functions of style 'void func(int chicken, int* pork)'" do
+    expected = "  int IgnoreArg_chicken;\n" +
+               "  int IgnoreArg_beef;\n" +
+               "  int IgnoreArg_tofu;\n"
+    returned = @cmock_generator_plugin_ignore_arg.instance_typedefs(@complex_func)
+    assert_equal(expected, returned)
+  end
+
+  should "add mock function declarations for all arguments" do
+    expected =
+      "#define Pine_IgnoreArg_chicken()" +
+      " Pine_CMockIgnoreArg_chicken(__LINE__)\n" +
+      "void Pine_CMockIgnoreArg_chicken(UNITY_LINE_TYPE cmock_line);\n" +
+
+      "#define Pine_IgnoreArg_beef()" +
+      " Pine_CMockIgnoreArg_beef(__LINE__)\n" +
+      "void Pine_CMockIgnoreArg_beef(UNITY_LINE_TYPE cmock_line);\n" +
+
+      "#define Pine_IgnoreArg_tofu()" +
+      " Pine_CMockIgnoreArg_tofu(__LINE__)\n" +
+      "void Pine_CMockIgnoreArg_tofu(UNITY_LINE_TYPE cmock_line);\n"
+
+    returned = @cmock_generator_plugin_ignore_arg.mock_function_declarations(@complex_func)
+    assert_equal(expected, returned)
+  end
+
+  should "add mock interfaces for all arguments" do
+    expected =
+      "void Pine_CMockIgnoreArg_chicken(UNITY_LINE_TYPE cmock_line)\n" +
+      "{\n" +
+      "  CMOCK_Pine_CALL_INSTANCE* cmock_call_instance = " +
+        "cmock_call_instance = (CMOCK_Pine_CALL_INSTANCE*)CMock_Guts_GetAddressFor(CMock_Guts_MemEndOfChain(Mock.Pine_CallInstance));\n" +
+      "  UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, \"chicken IgnoreArg called before Expect on 'Pine'.\");\n" +
+      "  cmock_call_instance->IgnoreArg_chicken = 1;\n" +
+      "}\n\n" +
+
+      "void Pine_CMockIgnoreArg_beef(UNITY_LINE_TYPE cmock_line)\n" +
+      "{\n" +
+      "  CMOCK_Pine_CALL_INSTANCE* cmock_call_instance = " +
+        "cmock_call_instance = (CMOCK_Pine_CALL_INSTANCE*)CMock_Guts_GetAddressFor(CMock_Guts_MemEndOfChain(Mock.Pine_CallInstance));\n" +
+      "  UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, \"beef IgnoreArg called before Expect on 'Pine'.\");\n" +
+      "  cmock_call_instance->IgnoreArg_beef = 1;\n" +
+      "}\n\n" +
+
+      "void Pine_CMockIgnoreArg_tofu(UNITY_LINE_TYPE cmock_line)\n" +
+      "{\n" +
+      "  CMOCK_Pine_CALL_INSTANCE* cmock_call_instance = " +
+        "cmock_call_instance = (CMOCK_Pine_CALL_INSTANCE*)CMock_Guts_GetAddressFor(CMock_Guts_MemEndOfChain(Mock.Pine_CallInstance));\n" +
+      "  UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, \"tofu IgnoreArg called before Expect on 'Pine'.\");\n" +
+      "  cmock_call_instance->IgnoreArg_tofu = 1;\n" +
+      "}\n\n"
+
+    returned = @cmock_generator_plugin_ignore_arg.mock_interfaces(@complex_func).join("")
+    assert_equal(expected, returned)
+  end
+
+  should "not add a mock implementation" do
+    assert(!@cmock_generator_plugin_ignore_arg.respond_to?(:mock_implementation))
+  end
+
+end

data/vendor/cmock/test/unit/cmock_generator_plugin_return_thru_ptr_test.rb

@@ -0,0 +1,134 @@
+# ==========================================
+#   CMock Project - Automatic Mock Generation for C
+#   Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams
+#   [Released under MIT License. Please refer to license.txt for details]
+# ========================================== 
+
+require File.expand_path(File.dirname(__FILE__)) + "/../test_helper"
+require 'cmock_generator_plugin_return_thru_ptr'
+
+class CMockGeneratorPluginReturnThruPtrTest < Test::Unit::TestCase
+  def setup
+    create_mocks :config, :utils
+
+    # int *Oak(void)"
+    @void_func = {:name => "Oak", :args => [], :return => test_return[:int_ptr]}
+
+    # char *Maple(int blah)
+    @simple_func = {:name => "Maple",
+                    :args => [{:name => "blah", :type => "int", :ptr? => false}],
+                    :return  => test_return[:string],
+                    :contains_ptr? => false}
+
+    # void Pine(int chicken, const int beef, int *tofu)
+    @complex_func = {:name => "Pine", 
+                     :args => [{ :type => "int",
+                                 :name => "chicken",
+                                 :ptr? => false,
+                               },
+                               { :type => "int*",
+                                 :name => "beef",
+                                 :ptr? => true,
+                                 :const? => true,
+                               },
+                               { :type => "int*",
+                                 :name => "tofu",
+                                 :ptr? => true,
+                               }],
+                     :return => test_return[:void], 
+                     :contains_ptr? => true }
+
+    #no strict ordering
+    @cmock_generator_plugin_return_thru_ptr = CMockGeneratorPluginReturnThruPtr.new(@config, @utils)
+  end
+
+  def teardown
+  end
+
+  def simple_func_expect
+    @utils.expect.ptr_or_str?('int').returns(false)
+  end
+
+  def complex_func_expect
+    @utils.expect.ptr_or_str?('int').returns(false)
+    @utils.expect.ptr_or_str?('int*').returns(true)
+    @utils.expect.ptr_or_str?('int*').returns(true)
+  end
+  
+  should "have set up internal accessors correctly on init" do
+    assert_equal(@utils,  @cmock_generator_plugin_return_thru_ptr.utils)
+    assert_equal(9,       @cmock_generator_plugin_return_thru_ptr.priority)
+  end
+  
+  should "not include any additional include files" do 
+    assert(!@cmock_generator_plugin_return_thru_ptr.respond_to?(:include_files))
+  end
+
+  should "not add to typedef structure for functions of style 'int* func(void)'" do
+    returned = @cmock_generator_plugin_return_thru_ptr.instance_typedefs(@void_func)
+    assert_equal("", returned)
+  end
+  
+  should "add to tyepdef structure mock needs of functions of style 'void func(int chicken, int* pork)'" do
+    complex_func_expect()
+    expected = "  int ReturnThruPtr_tofu_Used;\n" +
+               "  int* ReturnThruPtr_tofu_Val;\n" +
+               "  int ReturnThruPtr_tofu_Size;\n"
+    returned = @cmock_generator_plugin_return_thru_ptr.instance_typedefs(@complex_func)
+    assert_equal(expected, returned)
+  end
+
+  should "not add an additional mock interface for functions not containing pointers" do
+    simple_func_expect()
+    returned = @cmock_generator_plugin_return_thru_ptr.mock_function_declarations(@simple_func)
+    assert_equal("", returned)
+  end
+
+  should "add a mock function declaration only for non-const pointer arguments" do
+    complex_func_expect();
+    
+    expected =
+      "#define Pine_ReturnThruPtr_tofu(tofu)" +
+      " Pine_CMockReturnMemThruPtr_tofu(__LINE__, tofu, sizeof(*tofu))\n" +
+      "#define Pine_ReturnArrayThruPtr_tofu(tofu, cmock_len)" +
+      " Pine_CMockReturnMemThruPtr_tofu(__LINE__, tofu, cmock_len * sizeof(*tofu))\n" +
+      "#define Pine_ReturnMemThruPtr_tofu(tofu, cmock_size)" +
+      " Pine_CMockReturnMemThruPtr_tofu(__LINE__, tofu, cmock_size)\n" +
+      "void Pine_CMockReturnMemThruPtr_tofu(UNITY_LINE_TYPE cmock_line, int* tofu, int cmock_size);\n"
+
+    returned = @cmock_generator_plugin_return_thru_ptr.mock_function_declarations(@complex_func)
+    assert_equal(expected, returned)
+  end
+
+  should "add mock interfaces only for non-const pointer arguments" do
+    complex_func_expect();
+
+    expected =
+      "void Pine_CMockReturnMemThruPtr_tofu(UNITY_LINE_TYPE cmock_line, int* tofu, int cmock_size)\n" +
+      "{\n" +
+      "  CMOCK_Pine_CALL_INSTANCE* cmock_call_instance = " +
+      "cmock_call_instance = (CMOCK_Pine_CALL_INSTANCE*)CMock_Guts_GetAddressFor(CMock_Guts_MemEndOfChain(Mock.Pine_CallInstance));\n" +
+      "  UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, \"tofu ReturnThruPtr called before Expect on 'Pine'.\");\n" +
+      "  cmock_call_instance->ReturnThruPtr_tofu_Used = 1;\n" +
+      "  cmock_call_instance->ReturnThruPtr_tofu_Val = tofu;\n" +
+      "  cmock_call_instance->ReturnThruPtr_tofu_Size = cmock_size;\n" +
+      "}\n\n"
+
+    returned = @cmock_generator_plugin_return_thru_ptr.mock_interfaces(@complex_func).join("")
+    assert_equal(expected, returned)
+  end
+
+  should "add mock implementations only for non-const pointer arguments" do
+    complex_func_expect()
+
+    expected =
+      "  if (cmock_call_instance->ReturnThruPtr_tofu_Used)\n" +
+      "  {\n" +
+      "    memcpy(tofu, cmock_call_instance->ReturnThruPtr_tofu_Val,\n" +
+      "      cmock_call_instance->ReturnThruPtr_tofu_Size);\n" +
+      "  }\n" +
+
+    returned = @cmock_generator_plugin_return_thru_ptr.mock_implementation(@complex_func).join("")
+  end
+
+end

data/vendor/cmock/test/unit/cmock_generator_utils_test.rb

@@ -15,14 +15,18 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
     @config.expect.enforce_strict_ordering.returns(false)
     @config.expect.plugins.returns([])
     @config.expect.plugins.returns([])
-    @config.expect.treat_as.returns(['int','short','long','char','char*'])
+    @config.expect.plugins.returns([])
+    @config.expect.plugins.returns([])
+    @config.expect.treat_as.returns({'int' => 'INT','short' => 'INT16','long' => 'INT','char' => 'INT8','char*' => 'STRING'})
     @cmock_generator_utils_simple = CMockGeneratorUtils.new(@config, {:unity_helper => @unity_helper})
 
     @config.expect.when_ptr.returns(:smart)
     @config.expect.enforce_strict_ordering.returns(true)
-    @config.expect.plugins.returns([:array, :cexception])
-    @config.expect.plugins.returns([:array, :cexception])
-    @config.expect.treat_as.returns(['int','short','long','char','uint32_t','char*'])
+    @config.expect.plugins.returns([:array, :cexception, :return_thru_ptr, :ignore_arg])
+    @config.expect.plugins.returns([:array, :cexception, :return_thru_ptr, :ignore_arg])
+    @config.expect.plugins.returns([:array, :cexception, :return_thru_ptr, :ignore_arg])
+    @config.expect.plugins.returns([:array, :cexception, :return_thru_ptr, :ignore_arg])
+    @config.expect.treat_as.returns({'int' => 'INT','short' => 'INT16','long' => 'INT','char' => 'INT8','uint32_t' => 'HEX32','char*' => 'STRING'})
     @cmock_generator_utils_complex = CMockGeneratorUtils.new(@config, {:unity_helper => @unity_helper, :A=>1, :B=>2})
   end
 
@@ -42,9 +46,15 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
     assert_equal(true, @cmock_generator_utils_complex.arrays)
     assert_equal(true, @cmock_generator_utils_complex.cexception)
   end
+
+  should "detect pointers and strings" do
+    assert_equal(false, @cmock_generator_utils_simple.ptr_or_str?('int'))
+    assert_equal(true, @cmock_generator_utils_simple.ptr_or_str?('int*'))
+    assert_equal(true, @cmock_generator_utils_simple.ptr_or_str?('char*'))
+  end
   
   should "add code for a base expectation with no plugins" do
-    expected =
+    expected =
       "  CMOCK_MEM_INDEX_TYPE cmock_guts_index = CMock_Guts_MemNew(sizeof(CMOCK_Apple_CALL_INSTANCE));\n" +
       "  CMOCK_Apple_CALL_INSTANCE* cmock_call_instance = (CMOCK_Apple_CALL_INSTANCE*)CMock_Guts_GetAddressFor(cmock_guts_index);\n" +
       "  UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, \"CMock has run out of memory. Please allocate more.\");\n" +
@@ -90,7 +100,7 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
     expected3 = "  cmock_call_instance->Expected_Kiwi = Kiwi;\n"
     
     arg4 = { :name => "Lime", :const? => false, :type => 'LIME_T', :ptr? => false }
-    expected4 = "  memcpy(&cmock_call_instance->Expected_Lime, &Lime, sizeof(LIME_T));\n" 
+    expected4 = "  memcpy(&cmock_call_instance->Expected_Lime, &Lime, sizeof(LIME_T));\n"
 
     assert_equal(expected1, @cmock_generator_utils_simple.code_add_an_arg_expectation(arg1))
     assert_equal(expected2, @cmock_generator_utils_simple.code_add_an_arg_expectation(arg2))
@@ -100,18 +110,23 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   
   should "add argument expectations for values when array plugin enabled" do
     arg1 = { :name => "Orange", :const? => false, :type => 'int', :ptr? => false }
-    expected1 = "  cmock_call_instance->Expected_Orange = Orange;\n"
+    expected1 = "  cmock_call_instance->Expected_Orange = Orange;\n" +
+                "  cmock_call_instance->IgnoreArg_Orange = 0;\n"
     
     arg2 = { :name => "Lemon", :const? => true, :type => 'const char*', :ptr? => true }
     expected2 = "  cmock_call_instance->Expected_Lemon = (const char*)Lemon;\n" +
-                "  cmock_call_instance->Expected_Lemon_Depth = Lemon_Depth;\n"
+                "  cmock_call_instance->Expected_Lemon_Depth = Lemon_Depth;\n" +
+                "  cmock_call_instance->IgnoreArg_Lemon = 0;\n"
     
     arg3 = { :name => "Kiwi", :const? => false, :type => 'KIWI_T*', :ptr? => true }
     expected3 = "  cmock_call_instance->Expected_Kiwi = Kiwi;\n" +
-                "  cmock_call_instance->Expected_Kiwi_Depth = Kiwi_Depth;\n"
+                "  cmock_call_instance->Expected_Kiwi_Depth = Kiwi_Depth;\n" +
+                "  cmock_call_instance->IgnoreArg_Kiwi = 0;\n" +
+                "  cmock_call_instance->ReturnThruPtr_Kiwi_Used = 0;\n"
     
     arg4 = { :name => "Lime", :const? => false, :type => 'LIME_T', :ptr? => false }
-    expected4 = "  memcpy(&cmock_call_instance->Expected_Lime, &Lime, sizeof(LIME_T));\n" 
+    expected4 = "  memcpy(&cmock_call_instance->Expected_Lime, &Lime, sizeof(LIME_T));\n" +
+                "  cmock_call_instance->IgnoreArg_Lime = 0;\n"
 
     assert_equal(expected1, @cmock_generator_utils_complex.code_add_an_arg_expectation(arg1))
     assert_equal(expected2, @cmock_generator_utils_complex.code_add_an_arg_expectation(arg2, 'Lemon_Depth'))
@@ -146,8 +161,12 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
     expected = "void CMockExpectParameters_Melon(CMOCK_Melon_CALL_INSTANCE* cmock_call_instance, int* MyIntPtr, int MyIntPtr_Depth, const MY_TYPE MyMyType, const char* MyStr)\n{\n" + 
                "  cmock_call_instance->Expected_MyIntPtr = MyIntPtr;\n" +
                "  cmock_call_instance->Expected_MyIntPtr_Depth = MyIntPtr_Depth;\n" +
+               "  cmock_call_instance->IgnoreArg_MyIntPtr = 0;\n" +
+               "  cmock_call_instance->ReturnThruPtr_MyIntPtr_Used = 0;\n" +
                "  memcpy(&cmock_call_instance->Expected_MyMyType, &MyMyType, sizeof(MY_TYPE));\n" +
+               "  cmock_call_instance->IgnoreArg_MyMyType = 0;\n" +
                "  cmock_call_instance->Expected_MyStr = (char*)MyStr;\n" +
+               "  cmock_call_instance->IgnoreArg_MyStr = 0;\n" +
                "}\n\n"
     assert_equal(expected, @cmock_generator_utils_complex.code_add_argument_loader(function))
   end
@@ -179,7 +198,7 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle a simple assert when requested' do
     function = { :name => 'Pear' }
     arg      = test_arg[:int]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_INT(cmock_call_instance->Expected_MyInt, MyInt, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyInt'.\");\n"
+    expected = "  {\n    UNITY_TEST_ASSERT_EQUAL_INT(cmock_call_instance->Expected_MyInt, MyInt, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyInt'.\");\n  }\n"
     @unity_helper.expect.get_helper('int').returns(['UNITY_TEST_ASSERT_EQUAL_INT',''])
     assert_equal(expected, @cmock_generator_utils_simple.code_verify_an_arg_expectation(function, arg))
   end
@@ -187,14 +206,14 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle a pointer comparison when configured to do so' do
     function = { :name => 'Pear' }
     arg      = test_arg[:int_ptr]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_PTR(cmock_call_instance->Expected_MyIntPtr, MyIntPtr, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyIntPtr'.\");\n"
+    expected = "  {\n    UNITY_TEST_ASSERT_EQUAL_PTR(cmock_call_instance->Expected_MyIntPtr, MyIntPtr, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyIntPtr'.\");\n  }\n"
     assert_equal(expected, @cmock_generator_utils_simple.code_verify_an_arg_expectation(function, arg))
   end
 
   should 'handle const char as string compares ' do
     function = { :name => 'Pear' }
     arg      = test_arg[:string]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_STRING(cmock_call_instance->Expected_MyStr, MyStr, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyStr'.\");\n"
+    expected = "  {\n    UNITY_TEST_ASSERT_EQUAL_STRING(cmock_call_instance->Expected_MyStr, MyStr, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyStr'.\");\n  }\n"
     @unity_helper.expect.get_helper('char*').returns(['UNITY_TEST_ASSERT_EQUAL_STRING',''])
     assert_equal(expected, @cmock_generator_utils_simple.code_verify_an_arg_expectation(function, arg))
   end
@@ -202,7 +221,7 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle custom types as memory compares when we have no better way to do it' do
     function = { :name => 'Pear' }
     arg      = test_arg[:mytype]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_MEMORY((void*)(&cmock_call_instance->Expected_MyMyType), (void*)(&MyMyType), sizeof(MY_TYPE), cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n"
+    expected = "  {\n    UNITY_TEST_ASSERT_EQUAL_MEMORY((void*)(&cmock_call_instance->Expected_MyMyType), (void*)(&MyMyType), sizeof(MY_TYPE), cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n  }\n"
     @unity_helper.expect.get_helper('MY_TYPE').returns(['UNITY_TEST_ASSERT_EQUAL_MEMORY','&'])
     assert_equal(expected, @cmock_generator_utils_simple.code_verify_an_arg_expectation(function, arg))
   end
@@ -210,7 +229,7 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle custom types with custom handlers when available, even if they do not support the extra message' do
     function = { :name => 'Pear' }
     arg      = test_arg[:mytype]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_MY_TYPE(cmock_call_instance->Expected_MyMyType, MyMyType, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n"
+    expected = "  {\n    UNITY_TEST_ASSERT_EQUAL_MY_TYPE(cmock_call_instance->Expected_MyMyType, MyMyType, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n  }\n"
     @unity_helper.expect.get_helper('MY_TYPE').returns(['UNITY_TEST_ASSERT_EQUAL_MY_TYPE',''])
     assert_equal(expected, @cmock_generator_utils_simple.code_verify_an_arg_expectation(function, arg))
   end
@@ -218,7 +237,7 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle pointers to custom types with array handlers, even if the array extension is turned off' do
     function = { :name => 'Pear' }
     arg      = test_arg[:mytype]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_MY_TYPE_ARRAY(&cmock_call_instance->Expected_MyMyType, &MyMyType, 1, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n"
+    expected = "  {\n    UNITY_TEST_ASSERT_EQUAL_MY_TYPE_ARRAY(&cmock_call_instance->Expected_MyMyType, &MyMyType, 1, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n  }\n"
     @unity_helper.expect.get_helper('MY_TYPE').returns(['UNITY_TEST_ASSERT_EQUAL_MY_TYPE_ARRAY','&'])
     assert_equal(expected, @cmock_generator_utils_simple.code_verify_an_arg_expectation(function, arg))
   end
@@ -226,7 +245,7 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle a simple assert when requested with array plugin enabled' do
     function = { :name => 'Pear' }
     arg      = test_arg[:int]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_INT(cmock_call_instance->Expected_MyInt, MyInt, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyInt'.\");\n"
+    expected = "  if (!cmock_call_instance->IgnoreArg_MyInt)\n  {\n    UNITY_TEST_ASSERT_EQUAL_INT(cmock_call_instance->Expected_MyInt, MyInt, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyInt'.\");\n  }\n"
     @unity_helper.expect.get_helper('int').returns(['UNITY_TEST_ASSERT_EQUAL_INT',''])
     assert_equal(expected, @cmock_generator_utils_complex.code_verify_an_arg_expectation(function, arg))
   end
@@ -234,12 +253,15 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle an array comparison with array plugin enabled' do
     function = { :name => 'Pear' }
     arg      = test_arg[:int_ptr]
-    expected = "  if (cmock_call_instance->Expected_MyIntPtr == NULL)\n" +
-               "    { UNITY_TEST_ASSERT_NULL(MyIntPtr, cmock_line, \"Expected NULL. Function 'Pear' called with unexpected value for argument 'MyIntPtr'.\"); }\n" +
-               "  else if (cmock_call_instance->Expected_MyIntPtr_Depth == 0)\n" +
-               "    { UNITY_TEST_ASSERT_EQUAL_PTR(cmock_call_instance->Expected_MyIntPtr, MyIntPtr, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyIntPtr'.\"); }\n" +
-               "  else\n" +
-               "    { UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(cmock_call_instance->Expected_MyIntPtr, MyIntPtr, cmock_call_instance->Expected_MyIntPtr_Depth, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyIntPtr'.\"); }\n"
+    expected = "  if (!cmock_call_instance->IgnoreArg_MyIntPtr)\n" +
+               "  {\n" +
+               "    if (cmock_call_instance->Expected_MyIntPtr == NULL)\n" +
+               "      { UNITY_TEST_ASSERT_NULL(MyIntPtr, cmock_line, \"Expected NULL. Function 'Pear' called with unexpected value for argument 'MyIntPtr'.\"); }\n" +
+               "    else if (cmock_call_instance->Expected_MyIntPtr_Depth == 0)\n" +
+               "      { UNITY_TEST_ASSERT_EQUAL_PTR(cmock_call_instance->Expected_MyIntPtr, MyIntPtr, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyIntPtr'.\"); }\n" +
+               "    else\n" +
+               "      { UNITY_TEST_ASSERT_EQUAL_INT_ARRAY(cmock_call_instance->Expected_MyIntPtr, MyIntPtr, cmock_call_instance->Expected_MyIntPtr_Depth, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyIntPtr'.\"); }\n" +
+               "  }\n"
     @unity_helper.expect.get_helper('int*').returns(['UNITY_TEST_ASSERT_EQUAL_INT_ARRAY',''])
    assert_equal(expected, @cmock_generator_utils_complex.code_verify_an_arg_expectation(function, arg))
   end
@@ -247,7 +269,7 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle const char as string compares with array plugin enabled' do
     function = { :name => 'Pear' }
     arg      = test_arg[:string]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_STRING(cmock_call_instance->Expected_MyStr, MyStr, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyStr'.\");\n"
+    expected = "  if (!cmock_call_instance->IgnoreArg_MyStr)\n  {\n    UNITY_TEST_ASSERT_EQUAL_STRING(cmock_call_instance->Expected_MyStr, MyStr, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyStr'.\");\n  }\n"
     @unity_helper.expect.get_helper('char*').returns(['UNITY_TEST_ASSERT_EQUAL_STRING',''])
     assert_equal(expected, @cmock_generator_utils_complex.code_verify_an_arg_expectation(function, arg))
   end
@@ -255,7 +277,7 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle custom types as memory compares when we have no better way to do it with array plugin enabled' do
     function = { :name => 'Pear' }
     arg      = test_arg[:mytype]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_MEMORY((void*)(&cmock_call_instance->Expected_MyMyType), (void*)(&MyMyType), sizeof(MY_TYPE), cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n"
+    expected = "  if (!cmock_call_instance->IgnoreArg_MyMyType)\n  {\n    UNITY_TEST_ASSERT_EQUAL_MEMORY((void*)(&cmock_call_instance->Expected_MyMyType), (void*)(&MyMyType), sizeof(MY_TYPE), cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n  }\n"
     @unity_helper.expect.get_helper('MY_TYPE').returns(['UNITY_TEST_ASSERT_EQUAL_MEMORY','&'])
     assert_equal(expected, @cmock_generator_utils_complex.code_verify_an_arg_expectation(function, arg))
   end
@@ -263,7 +285,7 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle custom types with custom handlers when available, even if they do not support the extra message with array plugin enabled' do
     function = { :name => 'Pear' }
     arg      = test_arg[:mytype]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_MY_TYPE(cmock_call_instance->Expected_MyMyType, MyMyType, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n"
+    expected = "  if (!cmock_call_instance->IgnoreArg_MyMyType)\n  {\n    UNITY_TEST_ASSERT_EQUAL_MY_TYPE(cmock_call_instance->Expected_MyMyType, MyMyType, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n  }\n"
     @unity_helper.expect.get_helper('MY_TYPE').returns(['UNITY_TEST_ASSERT_EQUAL_MY_TYPE',''])
     assert_equal(expected, @cmock_generator_utils_complex.code_verify_an_arg_expectation(function, arg))
   end
@@ -271,12 +293,15 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle custom types with array handlers when array plugin is enabled' do
     function = { :name => 'Pear' }
     arg      = test_arg[:mytype_ptr]
-    expected = "  if (cmock_call_instance->Expected_MyMyTypePtr == NULL)\n" +
-               "    { UNITY_TEST_ASSERT_NULL(MyMyTypePtr, cmock_line, \"Expected NULL. Function 'Pear' called with unexpected value for argument 'MyMyTypePtr'.\"); }\n" +
-               "  else if (cmock_call_instance->Expected_MyMyTypePtr_Depth == 0)\n" +
-               "    { UNITY_TEST_ASSERT_EQUAL_PTR(cmock_call_instance->Expected_MyMyTypePtr, MyMyTypePtr, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyTypePtr'.\"); }\n" +
-               "  else\n" +
-               "    { UNITY_TEST_ASSERT_EQUAL_MY_TYPE_ARRAY(cmock_call_instance->Expected_MyMyTypePtr, MyMyTypePtr, cmock_call_instance->Expected_MyMyTypePtr_Depth, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyTypePtr'.\"); }\n"
+    expected = "  if (!cmock_call_instance->IgnoreArg_MyMyTypePtr)\n" +
+               "  {\n" +
+               "    if (cmock_call_instance->Expected_MyMyTypePtr == NULL)\n" +
+               "      { UNITY_TEST_ASSERT_NULL(MyMyTypePtr, cmock_line, \"Expected NULL. Function 'Pear' called with unexpected value for argument 'MyMyTypePtr'.\"); }\n" +
+               "    else if (cmock_call_instance->Expected_MyMyTypePtr_Depth == 0)\n" +
+               "      { UNITY_TEST_ASSERT_EQUAL_PTR(cmock_call_instance->Expected_MyMyTypePtr, MyMyTypePtr, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyTypePtr'.\"); }\n" +
+               "    else\n" +
+               "      { UNITY_TEST_ASSERT_EQUAL_MY_TYPE_ARRAY(cmock_call_instance->Expected_MyMyTypePtr, MyMyTypePtr, cmock_call_instance->Expected_MyMyTypePtr_Depth, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyTypePtr'.\"); }\n" +
+               "  }\n"
     @unity_helper.expect.get_helper('MY_TYPE*').returns(['UNITY_TEST_ASSERT_EQUAL_MY_TYPE_ARRAY',''])
     assert_equal(expected, @cmock_generator_utils_complex.code_verify_an_arg_expectation(function, arg))
   end
@@ -284,7 +309,7 @@ class CMockGeneratorUtilsTest < Test::Unit::TestCase
   should 'handle custom types with array handlers when array plugin is enabled for non-array types' do
     function = { :name => 'Pear' }
     arg      = test_arg[:mytype]
-    expected = "  UNITY_TEST_ASSERT_EQUAL_MY_TYPE_ARRAY(&cmock_call_instance->Expected_MyMyType, &MyMyType, 1, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n"
+    expected = "  if (!cmock_call_instance->IgnoreArg_MyMyType)\n  {\n    UNITY_TEST_ASSERT_EQUAL_MY_TYPE_ARRAY(&cmock_call_instance->Expected_MyMyType, &MyMyType, 1, cmock_line, \"Function 'Pear' called with unexpected value for argument 'MyMyType'.\");\n  }\n"
     @unity_helper.expect.get_helper('MY_TYPE').returns(['UNITY_TEST_ASSERT_EQUAL_MY_TYPE_ARRAY','&'])
     assert_equal(expected, @cmock_generator_utils_complex.code_verify_an_arg_expectation(function, arg))
   end