ceedling 0.15.1 → 0.15.2

data/vendor/cmock/test/system/test_interactions/stubs_with_callbacks.yml

@@ -8,7 +8,7 @@
 :systest:
   :types: |
     #define UINT32 unsigned int
-    
+
     typedef signed int custom_type;
 
   :mockable: |
@@ -17,57 +17,57 @@
     int    baz(void);
     void   fuz(int* args, int num);
 
-  :source: 
-    :header: |    
+  :source:
+    :header: |
       void   function_a(int a, int b);
       UINT32 function_b(void);
       int    function_c(void);
 
     :code: |
-      void function_a(int a, int b)    
+      void function_a(int a, int b)
       {
         int args[6] = {0, 1, 2, 3, 5, 5};
         args[0] = a;
         fuz(args, b);
-      }    
-      
-      UINT32 function_b(void) 
+      }
+
+      UINT32 function_b(void)
       {
         UINT32 sum = 0;
         custom_type a = 0;
         custom_type b = 0;
         sum = foo(&a) + bar(&b);
-        return sum + a + b;
+        return (UINT32)((custom_type)sum + a + b);
       }
-      
-      int function_c(void)    
+
+      int function_c(void)
       {
         return (baz() + baz() + baz());
       }
-      
+
   :tests:
     :common: |
       void setUp(void) {}
       void tearDown(void) {}
-      
+
       UINT32 FooAndBarHelper(custom_type* data, int num)
       {
           num++;
           *data = (custom_type)(num * 2);
-          return (*data * 2);
+          return (UINT32)(*data * 2);
       }
-      
+
       int BazCallbackPointless(int num)
       {
           return num;
       }
-      
+
       int BazCallbackComplainsIfCalledMoreThanTwice(int num)
       {
           TEST_ASSERT_MESSAGE(num < 2, "Do Not Call Baz More Than Twice");
           return num;
       }
-      
+
       void FuzVerifier(int* args, int num_args, int num_calls)
       {
           int i;
@@ -75,9 +75,9 @@
           for (i = 0; i < num_args; i++)
           {
               TEST_ASSERT_EQUAL(num_calls + i, args[i]);
-          }   
+          }
       }
-      
+
     :units:
     - :pass: TRUE
       :should: 'successfully exercise two simple ExpectAndReturn mock calls the normal way'
@@ -89,7 +89,7 @@
           bar_ExpectAndReturn(&exp, 20);
           TEST_ASSERT_EQUAL(30, function_b());
         }
-        
+
     - :pass: FALSE
       :should: 'successfully exercise two simple ExpectAndReturn mock calls and catch failure the normal way'
       :code: |
@@ -100,7 +100,7 @@
           bar_ExpectAndReturn(&exp, 20);
           TEST_ASSERT_EQUAL(30, function_b());
         }
-      
+
     - :pass: TRUE
       :should: 'successfully exercise using some basic callbacks'
       :code: |
@@ -110,7 +110,7 @@
           bar_StubWithCallback((CMOCK_bar_CALLBACK)FooAndBarHelper);
           TEST_ASSERT_EQUAL(12, function_b());
         }
-      
+
     - :pass: TRUE
       :should: 'successfully exercise using some basic callbacks even if there were expects'
       :code: |
@@ -132,7 +132,7 @@
           bar_StubWithCallback((CMOCK_bar_CALLBACK)FooAndBarHelper);
           TEST_ASSERT_EQUAL(10, function_b());
         }
-      
+
     - :pass: TRUE
       :should: 'successfully exercise a callback with no arguments'
       :code: |
@@ -150,7 +150,7 @@
           baz_StubWithCallback((CMOCK_baz_CALLBACK)BazCallbackComplainsIfCalledMoreThanTwice);
           function_c();
         }
-      
+
     - :pass: TRUE
       :should: 'be usable for things like dynamically sized memory checking for passing conditions'
       :code: |
@@ -159,7 +159,7 @@
           fuz_StubWithCallback((CMOCK_fuz_CALLBACK)FuzVerifier);
           function_a(0, 4);
         }
-      
+
     - :pass: FALSE
       :should: 'be usable for things like dynamically sized memory checking for failing conditions'
       :code: |
@@ -168,7 +168,7 @@
           fuz_StubWithCallback((CMOCK_fuz_CALLBACK)FuzVerifier);
           function_a(0, 5);
         }
-      
+
     - :pass: FALSE
       :should: 'be usable for things like dynamically sized memory checking for failing conditions 2'
       :code: |
@@ -177,7 +177,7 @@
           fuz_StubWithCallback((CMOCK_fuz_CALLBACK)FuzVerifier);
           function_a(1, 4);
         }
-      
+
     - :pass: TRUE
       :should: 'run them interlaced'
       :code: |
@@ -190,13 +190,13 @@
           bar_ExpectAndReturn(&exp, 40);
           fuz_StubWithCallback((CMOCK_fuz_CALLBACK)FuzVerifier);
           baz_StubWithCallback((CMOCK_baz_CALLBACK)BazCallbackPointless);
-          
+
           TEST_ASSERT_EQUAL(30, function_b());
           TEST_ASSERT_EQUAL(55, function_b());
           function_a(0, 4);
           TEST_ASSERT_EQUAL(3, function_c());
         }
-      
+
     - :pass: TRUE
       :should: 'run them back to back'
       :code: |
@@ -206,14 +206,14 @@
           foo_ExpectAndReturn(&exp, 10);
           bar_ExpectAndReturn(&exp, 20);
           TEST_ASSERT_EQUAL(30, function_b());
-          
+
           foo_ExpectAndReturn(&exp, 15);
           bar_ExpectAndReturn(&exp, 40);
           TEST_ASSERT_EQUAL(55, function_b());
-          
+
           fuz_StubWithCallback((CMOCK_fuz_CALLBACK)FuzVerifier);
           function_a(0, 4);
-          
+
           baz_StubWithCallback((CMOCK_baz_CALLBACK)BazCallbackPointless);
           TEST_ASSERT_EQUAL(3, function_c());
         }

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

@@ -2,7 +2,7 @@
 #   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]
-# ========================================== 
+# ==========================================
 
 $ThisIsOnlyATest = true
 
@@ -13,23 +13,23 @@ class MockedPluginHelper
   def initialize return_this
     @return_this = return_this
   end
-  
+
   def include_files
     return @return_this
   end
-  
+
   def instance_structure( name, args, rettype )
     return "  #{@return_this}_#{name}(#{args}, #{rettype})"
   end
-  
+
   def mock_verify( name )
     return "  #{@return_this}_#{name}"
   end
-  
+
   def mock_destroy( name, args, rettype )
     return "  #{@return_this}_#{name}(#{args}, #{rettype})"
   end
-  
+
   def mock_implementation(name, args)
     return "  Mock#{name}#{@return_this}(#{args.join(", ")})"
   end
@@ -39,7 +39,7 @@ class CMockGeneratorTest < Test::Unit::TestCase
   def setup
     create_mocks :config, :file_writer, :utils, :plugins
     @module_name = "PoutPoutFish"
-    
+
     #no strict handling
     @config.expect.mock_prefix.returns("Mock")
     @config.expect.enforce_strict_ordering.returns(nil)
@@ -53,7 +53,7 @@ class CMockGeneratorTest < Test::Unit::TestCase
     @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")
     @config.expect.enforce_strict_ordering.returns(true)
@@ -71,34 +71,42 @@ class CMockGeneratorTest < Test::Unit::TestCase
 
   def teardown
   end
-  
+
   should "have set up internal accessors correctly on init" do
     assert_equal(@config,       @cmock_generator.config)
     assert_equal(@file_writer,  @cmock_generator.file_writer)
     assert_equal(@utils,        @cmock_generator.utils)
     assert_equal(@plugins,      @cmock_generator.plugins)
   end
-  
+
   should "create the top of a header file with optional include files from config and include file from plugin" do
     @config.expect.mock_prefix.returns("Mock")
     orig_filename = "PoutPoutFish.h"
     define_name = "MOCKPOUTPOUTFISH_H"
     mock_name = "MockPoutPoutFish"
     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"
-               ]
+    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",
+      "/* Ignore the following warnings, since we are copying code */\n",
+      "#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)\n",
+      "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
+      "#endif\n",
+      "#pragma GCC diagnostic ignored \"-Wunknown-pragmas\"\n",
+      "#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n",
+      "\n",
+    ]
 
     @plugins.expect.run(:include_files).returns("#include \"PluginRequiredHeader.h\"\n")
-    
+
     @cmock_generator.create_mock_header_header(output, "MockPoutPoutFish.h")
-    
+
     assert_equal(expected, output)
   end
 
@@ -115,48 +123,64 @@ class CMockGeneratorTest < Test::Unit::TestCase
     @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"
-               ]
+    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",
+      "/* Ignore the following warnings, since we are copying code */\n",
+      "#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)\n",
+      "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
+      "#endif\n",
+      "#pragma GCC diagnostic ignored \"-Wunknown-pragmas\"\n",
+      "#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\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"
     define_name = "MOCKPOUTPOUTFISH_H"
     mock_name = "MockPoutPoutFish"
     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",
-                 "\n"
-               ]
+    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",
+      "\n",
+      "/* Ignore the following warnings, since we are copying code */\n",
+      "#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)\n",
+      "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
+      "#endif\n",
+      "#pragma GCC diagnostic ignored \"-Wunknown-pragmas\"\n",
+      "#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n",
+      "\n",
+    ]
 
     @plugins.expect.run(:include_files).returns('')
-    
+
     @cmock_generator.create_mock_header_header(output, "MockPoutPoutFish.h")
-    
+
     assert_equal(expected, output)
   end
 
@@ -166,25 +190,33 @@ class CMockGeneratorTest < Test::Unit::TestCase
     define_name = "MOCKPOUTPOUTFISH_H"
     mock_name = "MockPoutPoutFish"
     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"
-               ]
+    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",
+      "/* Ignore the following warnings, since we are copying code */\n",
+      "#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)\n",
+      "#pragma GCC diagnostic ignored \"-Wpragmas\"\n",
+      "#endif\n",
+      "#pragma GCC diagnostic ignored \"-Wunknown-pragmas\"\n",
+      "#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n",
+      "\n",
+    ]
 
     @plugins.expect.run(:include_files).returns("#include \"PluginRequiredHeader.h\"\n")
-    
+
     @cmock_generator.create_mock_header_header(output, "MockPoutPoutFish.h")
-    
+
     assert_equal(expected, output)
   end
 
   should "write typedefs" do
-    typedefs = [ 'typedef unsigned char U8;', 
+    typedefs = [ 'typedef unsigned char U8;',
                  'typedef char S8;',
                  'typedef unsigned long U32;'
                 ]
@@ -195,9 +227,9 @@ class CMockGeneratorTest < Test::Unit::TestCase
                  "typedef unsigned long U32;\n",
                  "\n\n"
                ]
-    
+
     @cmock_generator.create_typedefs(output, typedefs)
-    
+
     assert_equal(expected, output.flatten)
   end
 
@@ -209,21 +241,21 @@ class CMockGeneratorTest < Test::Unit::TestCase
                  "void #{mock_name}_Destroy(void);\n",
                  "void #{mock_name}_Verify(void);\n\n"
                ]
-    
+
     @cmock_generator.create_mock_header_service_call_declarations(output)
-    
+
     assert_equal(expected, output)
   end
-  
-  should "append the proper footer to the header file" do 
+
+  should "append the proper footer to the header file" do
     output = []
     expected = ["\n#endif\n"]
-    
+
     @cmock_generator.create_mock_header_footer(output)
-    
+
     assert_equal(expected, output)
   end
-  
+
   should "create a proper heading for a source file" do
     output = []
     expected = [ "/* AUTOGENERATED FILE. DO NOT EDIT. */\n",
@@ -235,13 +267,13 @@ class CMockGeneratorTest < Test::Unit::TestCase
                  "#include \"MockPoutPoutFish.h\"\n",
                  "\n"
                ]
-  
+
     @cmock_generator.create_source_header_section(output, "MockPoutPoutFish.c")
-    
+
     assert_equal(expected, output)
   end
-  
-  should "create the instance structure where it is needed when no functions" do 
+
+  should "create the instance structure where it is needed when no functions" do
     output = []
     functions = []
     expected = [ "static struct MockPoutPoutFishInstance\n",
@@ -249,15 +281,15 @@ class CMockGeneratorTest < Test::Unit::TestCase
                  "  unsigned char placeHolder;\n",
                  "} Mock;\n\n"
                ].join
-    
+
     @cmock_generator.create_instance_structure(output, functions)
-    
+
     assert_equal(expected, output.join)
   end
-  
-  should "create the instance structure where it is needed when functions required" do 
+
+  should "create the instance structure where it is needed when functions required" do
     output = []
-    functions = [ { :name => "First", :args => "int Candy", :return => test_return[:int] }, 
+    functions = [ { :name => "First", :args => "int Candy", :return => test_return[:int] },
                   { :name => "Second", :args => "bool Smarty", :return => test_return[:string] }
                 ]
     expected = [ "typedef struct _CMOCK_First_CALL_INSTANCE\n{\n",
@@ -279,47 +311,47 @@ class CMockGeneratorTest < Test::Unit::TestCase
 
     @plugins.expect.run(:instance_structure, functions[0]).returns(["  d1"])
     @plugins.expect.run(:instance_structure, functions[1]).returns(["  e1","  e2","  e3"])
-    
+
     @cmock_generator.create_instance_structure(output, functions)
-    
+
     assert_equal(expected, output.join)
   end
-  
+
   should "create extern declarations for source file" do
     output = []
     expected = [ "extern jmp_buf AbortFrame;\n",
                  "\n" ]
-    
+
     @cmock_generator.create_extern_declarations(output)
-    
+
     assert_equal(expected, output.flatten)
   end
-  
+
   should "create extern declarations for source file when using strict ordering" do
     output = []
     expected = [ "extern jmp_buf AbortFrame;\n",
                  "extern int GlobalExpectCount;\n",
                  "extern int GlobalVerifyOrder;\n",
                  "\n" ]
-    
+
     @cmock_generator_strict.create_extern_declarations(output)
-    
+
     assert_equal(expected, output.flatten)
   end
-  
+
   should "create mock verify functions in source file when no functions specified" do
     functions = []
     output = []
     expected = "void MockPoutPoutFish_Verify(void)\n{\n}\n\n"
-    
+
     @cmock_generator.create_mock_verify_function(output, functions)
-    
+
     assert_equal(expected, output.join)
   end
-  
+
   should "create mock verify functions in source file when extra functions specified" do
-    functions = [ { :name => "First", :args => "int Candy", :return => test_return[:int] }, 
-                  { :name => "Second", :args => "bool Smarty", :return => test_return[:string] } 
+    functions = [ { :name => "First", :args => "int Candy", :return => test_return[:int] },
+                  { :name => "Second", :args => "bool Smarty", :return => test_return[:string] }
                 ]
     output = []
     expected = [ "void MockPoutPoutFish_Verify(void)\n{\n",
@@ -332,13 +364,13 @@ class CMockGeneratorTest < Test::Unit::TestCase
                ]
     @plugins.expect.run(:mock_verify, functions[0]).returns(["  Uno_First","  Dos_First"])
     @plugins.expect.run(:mock_verify, functions[1]).returns(["  Uno_Second","  Dos_Second"])
-    
+
     @cmock_generator.ordered = true
     @cmock_generator.create_mock_verify_function(output, functions)
-    
+
     assert_equal(expected, output.flatten)
   end
-  
+
   should "create mock init functions in source file" do
     output = []
     expected = [ "void MockPoutPoutFish_Init(void)\n{\n",
@@ -347,10 +379,10 @@ class CMockGeneratorTest < Test::Unit::TestCase
                ]
 
     @cmock_generator.create_mock_init_function(output)
-    
+
     assert_equal(expected.join, output.join)
   end
-  
+
   should "create mock destroy functions in source file" do
     functions = []
     output = []
@@ -364,10 +396,10 @@ class CMockGeneratorTest < Test::Unit::TestCase
 
     assert_equal(expected.join, output.join)
   end
-  
+
   should "create mock destroy functions in source file when specified with strict ordering" do
-    functions = [ { :name => "First", :args => "int Candy", :return => test_return[:int] }, 
-                  { :name => "Second", :args => "bool Smarty", :return => test_return[:string] } 
+    functions = [ { :name => "First", :args => "int Candy", :return => test_return[:int] },
+                  { :name => "Second", :args => "bool Smarty", :return => test_return[:string] }
                 ]
     output = []
     expected = [ "void MockPoutPoutFish_Destroy(void)\n{\n",
@@ -380,16 +412,16 @@ class CMockGeneratorTest < Test::Unit::TestCase
                ]
     @plugins.expect.run(:mock_destroy, functions[0]).returns([])
     @plugins.expect.run(:mock_destroy, functions[1]).returns(["  uno"])
-    
+
     @cmock_generator_strict.create_mock_destroy_function(output, functions)
 
     assert_equal(expected.join, output.join)
   end
-  
+
   should "create mock implementation functions in source file" do
-    function = { :modifier => "static", 
-                 :return => test_return[:int], 
-                 :args_string => "uint32 sandwiches, const char* named", 
+    function = { :modifier => "static",
+                 :return => test_return[:int],
+                 :args_string => "uint32 sandwiches, const char* named",
                  :args => ["uint32 sandwiches", "const char* named"],
                  :var_arg => nil,
                  :name => "SupaFunction",
@@ -411,17 +443,17 @@ class CMockGeneratorTest < Test::Unit::TestCase
                ]
     @plugins.expect.run(:mock_implementation_precheck, function).returns(["  uno"])
     @plugins.expect.run(:mock_implementation, function).returns(["  dos","  tres"])
-    
+
     @cmock_generator.create_mock_implementation(output, function)
-    
+
     assert_equal(expected.join, output.join)
   end
-  
+
   should "create mock implementation functions in source file with different options" do
-    function = { :modifier => "", 
+    function = { :modifier => "",
                  :c_calling_convention => "__stdcall",
-                 :return => test_return[:int], 
-                 :args_string => "uint32 sandwiches", 
+                 :return => test_return[:int],
+                 :args_string => "uint32 sandwiches",
                  :args => ["uint32 sandwiches"],
                  :var_arg => "corn ...",
                  :name => "SupaFunction",
@@ -443,9 +475,9 @@ class CMockGeneratorTest < Test::Unit::TestCase
                ]
     @plugins.expect.run(:mock_implementation_precheck, function).returns(["  uno"])
     @plugins.expect.run(:mock_implementation, function).returns(["  dos","  tres"])
-    
+
     @cmock_generator.create_mock_implementation(output, function)
-    
+
     assert_equal(expected.join, output.join)
   end
 end