ceedling 0.17.0 → 0.18.0

data/vendor/cmock/lib/cmock_generator.rb

@@ -4,8 +4,6 @@
 #   [Released under MIT License. Please refer to license.txt for details]
 # ==========================================
 
-$here = File.dirname __FILE__
-
 class CMockGenerator
 
   attr_accessor :config, :file_writer, :module_name, :clean_mock_name, :mock_name, :utils, :plugins, :ordered
@@ -23,12 +21,24 @@ class CMockGenerator
     @includes_h_post_orig_header = (@config.includes_h_post_orig_header || []).map{|h| h =~ /</ ? h : "\"#{h}\""}
     @includes_c_pre_header       = (@config.includes_c_pre_header || []).map{|h| h =~ /</ ? h : "\"#{h}\""}
     @includes_c_post_header      = (@config.includes_c_post_header || []).map{|h| h =~ /</ ? h : "\"#{h}\""}
+    
+    here = File.dirname __FILE__
+    unity_path_in_ceedling = "#{here}/../../unity" # path to Unity from within Ceedling
+    unity_path_in_cmock = "#{here}/../vendor/unity" # path to Unity from within CMock
+    if File.exist? unity_path_in_ceedling
+      require "#{unity_path_in_ceedling}/auto/type_sanitizer"
+    elsif File.exist? unity_path_in_cmock
+      require "#{unity_path_in_cmock}/auto/type_sanitizer"
+    else
+      raise "Failed to find an instance of Unity to pull in type_sanitizer module!"
+    end
+    
   end
 
   def create_mock(module_name, parsed_stuff)
     @module_name = module_name
     @mock_name   = @prefix + @module_name
-    @clean_mock_name = @mock_name.gsub(/(?:-|\s+)/, "_")
+    @clean_mock_name = TypeSanitizer.sanitize_c_identifier(@mock_name)
     create_mock_header_file(parsed_stuff)
     create_mock_source_file(parsed_stuff)
   end
@@ -63,7 +73,7 @@ class CMockGenerator
   end
 
   def create_mock_header_header(file, filename)
-    define_name   = @clean_mock_name.gsub(/[-\/\\\.\,\s]+/,'_').upcase
+    define_name   = @clean_mock_name.upcase
     orig_filename = filename[@config.mock_prefix.size..-1]
     file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n"
     file << "#ifndef _#{define_name}_H\n"
@@ -75,11 +85,13 @@ class CMockGenerator
     file << plugin_includes if (!plugin_includes.empty?)
     file << "\n"
     file << "/* Ignore the following warnings, since we are copying code */\n"
-    file << "#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)\n"
+    file << "#if defined(__GNUC__) && !defined(__ICC)\n"
+    file << "#if !defined(__clang__)\n"
     file << "#pragma GCC diagnostic ignored \"-Wpragmas\"\n"
     file << "#endif\n"
     file << "#pragma GCC diagnostic ignored \"-Wunknown-pragmas\"\n"
     file << "#pragma GCC diagnostic ignored \"-Wduplicate-decl-specifier\"\n"
+    file << "#endif\n"
     file << "\n"
   end
 

data/vendor/cmock/lib/cmock_generator_plugin_array.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]
-# ========================================== 
+# ==========================================
 
 class CMockGeneratorPluginArray
 
@@ -26,7 +26,10 @@ class CMockGeneratorPluginArray
   def mock_function_declarations(function)
     return nil unless function[:contains_ptr?]
     args_call   = function[:args].map{|m| m[:ptr?] ? "#{m[:name]}, #{m[:name]}_Depth" : "#{m[:name]}"}.join(', ')
-    args_string = function[:args].map{|m| m[:ptr?] ? "#{m[:type]} #{m[:name]}, int #{m[:name]}_Depth" : "#{m[:type]} #{m[:name]}"}.join(', ')
+    args_string = function[:args].map do |m|
+      const_str = m[:const?] ? 'const ' : ''
+      m[:ptr?] ? "#{const_str}#{m[:type]} #{m[:name]}, int #{m[:name]}_Depth" : "#{const_str}#{m[:type]} #{m[:name]}"
+    end.join(', ')
     if (function[:return][:void?])
       return "#define #{function[:name]}_ExpectWithArray(#{args_call}) #{function[:name]}_CMockExpectWithArray(__LINE__, #{args_call})\n" +
              "void #{function[:name]}_CMockExpectWithArray(UNITY_LINE_TYPE cmock_line, #{args_string});\n"
@@ -40,7 +43,10 @@ class CMockGeneratorPluginArray
     return nil unless function[:contains_ptr?]
     lines = []
     func_name = function[:name]
-    args_string = function[:args].map{|m| m[:ptr?] ? "#{m[:type]} #{m[:name]}, int #{m[:name]}_Depth" : "#{m[:type]} #{m[:name]}"}.join(', ')
+    args_string = function[:args].map do |m|
+      const_str = m[:const?] ? 'const ' : ''
+      m[:ptr?] ? "#{const_str}#{m[:type]} #{m[:name]}, int #{m[:name]}_Depth" : "#{const_str}#{m[:type]} #{m[:name]}"
+    end.join(', ')
     call_string = function[:args].map{|m| m[:ptr?] ? "#{m[:name]}, #{m[:name]}_Depth" : m[:name]}.join(', ')
     if (function[:return][:void?])
       lines << "void #{func_name}_CMockExpectWithArray(UNITY_LINE_TYPE cmock_line, #{args_string})\n"

data/vendor/cmock/lib/cmock_generator_plugin_ignore_arg.rb

@@ -34,7 +34,7 @@ class CMockGeneratorPluginIgnoreArg
       lines << "void #{function[:name]}_CMockIgnoreArg_#{arg[:name]}(UNITY_LINE_TYPE cmock_line)\n"
       lines << "{\n"
       lines << "  CMOCK_#{func_name}_CALL_INSTANCE* cmock_call_instance = " +
-        "cmock_call_instance = (CMOCK_#{func_name}_CALL_INSTANCE*)CMock_Guts_GetAddressFor(CMock_Guts_MemEndOfChain(Mock.#{func_name}_CallInstance));\n"
+        "(CMOCK_#{func_name}_CALL_INSTANCE*)CMock_Guts_GetAddressFor(CMock_Guts_MemEndOfChain(Mock.#{func_name}_CallInstance));\n"
       lines << "  UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, \"#{arg_name} IgnoreArg called before Expect on '#{func_name}'.\");\n"
       lines << "  cmock_call_instance->IgnoreArg_#{arg_name} = 1;\n"
       lines << "}\n\n"

data/vendor/cmock/lib/cmock_generator_plugin_return_thru_ptr.rb

@@ -45,7 +45,7 @@ class CMockGeneratorPluginReturnThruPtr
         lines << "void #{func_name}_CMockReturnMemThruPtr_#{arg_name}(UNITY_LINE_TYPE cmock_line, #{arg[:type]} #{arg_name}, int cmock_size)\n"
         lines << "{\n"
         lines << "  CMOCK_#{func_name}_CALL_INSTANCE* cmock_call_instance = " +
-          "cmock_call_instance = (CMOCK_#{func_name}_CALL_INSTANCE*)CMock_Guts_GetAddressFor(CMock_Guts_MemEndOfChain(Mock.#{func_name}_CallInstance));\n"
+          "(CMOCK_#{func_name}_CALL_INSTANCE*)CMock_Guts_GetAddressFor(CMock_Guts_MemEndOfChain(Mock.#{func_name}_CallInstance));\n"
         lines << "  UNITY_TEST_ASSERT_NOT_NULL(cmock_call_instance, cmock_line, \"#{arg_name} ReturnThruPtr called before Expect on '#{func_name}'.\");\n"
         lines << "  cmock_call_instance->ReturnThruPtr_#{arg_name}_Used = 1;\n"
         lines << "  cmock_call_instance->ReturnThruPtr_#{arg_name}_Val = #{arg_name};\n"

data/vendor/cmock/lib/cmock_header_parser.rb

@@ -93,6 +93,12 @@ class CMockHeaderParser
       "#{functype} #{$2.strip}(#{$3});"
     end
 
+    # remove function definitions by stripping off the arguments right now
+    source.gsub!(/\([^\)]*\)\s*\{[^\}]*\}/m, ";")
+
+    # remove pairs of braces because no function declarations will be inside of them
+    #source.gsub!(/\{[^\}]*\}/m, '')
+
     #drop extra white space to make the rest go faster
     source.gsub!(/^\s+/, '')          # remove extra white space from beginning of line
     source.gsub!(/\s+$/, '')          # remove extra white space from end of line
@@ -101,7 +107,7 @@ class CMockHeaderParser
     source.gsub!(/\s+/, ' ')          # remove remaining extra white space
 
     #split lines on semicolons and remove things that are obviously not what we are looking for
-    src_lines = source.split(/\s*;\s*/)
+    src_lines = source.split(/\s*;\s*/).uniq
     src_lines.delete_if {|line| line.strip.length == 0}                            # remove blank lines
     src_lines.delete_if {|line| !(line =~ /[\w\s\*]+\(+\s*\*[\*\s]*[\w\s]+(?:\[[\w\s]*\]\s*)+\)+\s*\((?:[\w\s\*]*,?)*\s*\)/).nil?}     #remove function pointer arrays
     if (@treat_externs == :include)
@@ -109,8 +115,6 @@ class CMockHeaderParser
     else
       src_lines.delete_if {|line| !(line =~ /(?:^|\s+)(?:extern|inline)\s+/).nil?} # remove inline and extern functions
     end
-    src_lines.delete_if {|line| !(line =~ /\{/).nil? }  # remove lines with opening braces { because this isn't a declaration, it's a definition!
-    src_lines.map!{|line| line.gsub(/.*\}/,'')} #remove braces left at the beginning of lines
     src_lines.delete_if {|line| line.empty? } #drop empty lines
   end
 

data/vendor/cmock/release/version.info

@@ -1,2 +1,2 @@
-2.0
+2.3
 

data/vendor/cmock/test/c/TestCMockCDynamic_Runner.c

@@ -21,8 +21,7 @@ extern void test_ThatWeCanAskForAllSortsOfSizes(void);
 
 int main(void)
 {
-  UnityBegin();
-  Unity.TestFile = "TestCMockDynamic.c";
+  UnityBegin("TestCMockDynamic.c");
 
   RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes, 26);
   RUN_TEST(test_MemNewWillNowSupportSizesGreaterThanTheDefinesCMockSize, 35);

data/vendor/cmock/test/c/TestCMockC_Runner.c

@@ -22,8 +22,8 @@ extern void test_ThatWeCanAskForAllSortsOfSizes(void);
 
 int main(void)
 {
-  UnityBegin();
   Unity.TestFile = "TestCMock.c";
+  UnityBegin(Unity.TestFile);
 
   RUN_TEST(test_MemNewWillReturnNullIfGivenIllegalSizes, 21);
   RUN_TEST(test_MemChainWillReturnNullAndDoNothingIfGivenIllegalInformation, 32);

data/vendor/cmock/test/system/systest_generator.rb

@@ -151,11 +151,13 @@ class SystemTestGenerator
         out.puts("#include \"#{include}\"")
       end
       out.puts('')
-      out.puts("#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)")
+      out.puts("#if defined(__GNUC__) && !defined(__ICC)")
+      out.puts("#if !defined(__clang__)")
       out.puts("#pragma GCC diagnostic ignored \"-Wpragmas\"")
       out.puts("#endif")
       out.puts('#pragma GCC diagnostic ignored "-Wunknown-pragmas"')
       out.puts('#pragma GCC diagnostic ignored "-Wduplicate-decl-specifier"')
+      out.puts("#endif")
       out.puts('')
       yield(out)
       out.puts('')
@@ -170,11 +172,13 @@ class SystemTestGenerator
         out.puts("#include \"#{include}\"")
       end
       out.puts('')
-      out.puts("#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)")
+      out.puts("#if defined(__GNUC__) && !defined(__ICC)")
+      out.puts("#if !defined(__clang__)")
       out.puts("#pragma GCC diagnostic ignored \"-Wpragmas\"")
       out.puts("#endif")
       out.puts('#pragma GCC diagnostic ignored "-Wunknown-pragmas"')
       out.puts('#pragma GCC diagnostic ignored "-Wduplicate-decl-specifier"')
+      out.puts("#endif")
       out.puts('')
       yield(out)
       out.puts('')

data/vendor/cmock/test/system/test_compilation/const.h

@@ -4,11 +4,13 @@
     [Released under MIT License. Please refer to license.txt for details]
 ========================================== */
 
-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
+#if defined(__GNUC__) && !defined(__ICC)
+#if !defined(__clang__)
 #pragma GCC diagnostic ignored "-Wpragmas"
 #endif
 #pragma GCC diagnostic ignored "-Wunknown-pragmas"
 #pragma GCC diagnostic ignored "-Wduplicate-decl-specifier"
+#endif
 
 struct _DUMMY_T { unsigned int a; float b; };
 

data/vendor/cmock/test/test_helper.rb

@@ -2,48 +2,46 @@
 #   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]
-# ========================================== 
-[ "/../config/test_environment",
-  "/../vendor/behaviors/lib/behaviors"
-].each do |req|
-  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
-require 'test/unit'
-require 'hardmock'
 
-class Test::Unit::TestCase
-  extend Behaviors
-  
-  #these are helpful test structures which can be used during tests
-  
-  def test_return
-    { 
-      :int     => {:type => "int",   :name => 'cmock_to_return', :ptr? => false, :const? => false, :void? => false, :str => 'int cmock_to_return'},
-      :int_ptr => {:type => "int*",  :name => 'cmock_to_return', :ptr? => true,  :const? => false, :void? => false, :str => 'int* cmock_to_return'},
-      :void    => {:type => "void",  :name => 'cmock_to_return', :ptr? => false, :const? => false, :void? => true,  :str => 'void cmock_to_return'},
-      :string  => {:type => "char*", :name => 'cmock_to_return', :ptr? => false, :const? => true,  :void? => false, :str => 'const char* cmock_to_return'},
-    }
-  end
+require 'minitest/autorun'
 
-  def test_arg
-    { 
-      :int        => {:type => "int",      :name => 'MyInt',       :ptr? => false, :const? => false},
-      :int_ptr    => {:type => "int*",     :name => 'MyIntPtr',    :ptr? => true,  :const? => false},
-      :mytype     => {:type => "MY_TYPE",  :name => 'MyMyType',    :ptr? => false, :const? => true},
-      :mytype_ptr => {:type => "MY_TYPE*", :name => 'MyMyTypePtr', :ptr? => true,  :const? => false},
-      :string     => {:type => "char*",    :name => 'MyStr',       :ptr? => false, :const? => true},
-    }
+def create_mocks(*mocks)
+  mocks.each do |mock|
+    eval "@#{mock} = Minitest::Mock.new"
   end
 end
+
+def create_stub(funcs)
+  stub = Class.new
+  #if (RUBY_VERSION.split('.')[0].to_i >= 2)
+  #  funcs.each_pair {|k,v| stub.define_singleton_method(k) {|*unused| return v } }
+  #else
+    blob = "class << stub\n"
+    funcs.each_pair {|k,v| blob += "def #{k.to_s}(unused=nil)\n #{v.inspect}\nend\n" }
+    blob += "end"
+    eval blob
+  #end
+  stub
+end
+
+def test_return
+  {
+    :int     => {:type => "int",   :name => 'cmock_to_return', :ptr? => false, :const? => false, :void? => false, :str => 'int cmock_to_return'},
+    :int_ptr => {:type => "int*",  :name => 'cmock_to_return', :ptr? => true,  :const? => false, :void? => false, :str => 'int* cmock_to_return'},
+    :void    => {:type => "void",  :name => 'cmock_to_return', :ptr? => false, :const? => false, :void? => true,  :str => 'void cmock_to_return'},
+    :string  => {:type => "char*", :name => 'cmock_to_return', :ptr? => false, :const? => true,  :void? => false, :str => 'const char* cmock_to_return'},
+  }
+end
+
+def test_arg
+  {
+    :int        => {:type => "int",      :name => 'MyInt',       :ptr? => false, :const? => false},
+    :int_ptr    => {:type => "int*",     :name => 'MyIntPtr',    :ptr? => true,  :const? => false},
+    :mytype     => {:type => "MY_TYPE",  :name => 'MyMyType',    :ptr? => false, :const? => true},
+    :mytype_ptr => {:type => "MY_TYPE*", :name => 'MyMyTypePtr', :ptr? => true,  :const? => false},
+    :string     => {:type => "char*",    :name => 'MyStr',       :ptr? => false, :const? => true},
+  }
+end
+

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

@@ -2,19 +2,16 @@
 #   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_config'
 
-class CMockConfigTest < Test::Unit::TestCase
-  def setup
-  end
 
-  def teardown
-  end
-  
-  should "use default settings when no parameters are specified" do
+describe CMockConfig, "Verify CMockConfig Module" do
+
+  it "use default settings when no parameters are specified" do
     config = CMockConfig.new
     assert_equal(CMockConfig::CMockDefaultOptions[:mock_path],             config.mock_path)
     assert_equal(CMockConfig::CMockDefaultOptions[:includes],              config.includes)
@@ -22,8 +19,8 @@ class CMockConfigTest < Test::Unit::TestCase
     assert_equal(CMockConfig::CMockDefaultOptions[:plugins],               config.plugins)
     assert_equal(CMockConfig::CMockDefaultOptions[:treat_externs],         config.treat_externs)
   end
-  
-  should "replace only options specified in a hash" do
+
+  it "replace only options specified in a hash" do
     test_includes = ['hello']
     test_attributes = ['blah', 'bleh']
     config = CMockConfig.new(:includes => test_includes, :attributes => test_attributes)
@@ -33,8 +30,8 @@ class CMockConfigTest < Test::Unit::TestCase
     assert_equal(CMockConfig::CMockDefaultOptions[:plugins],                config.plugins)
     assert_equal(CMockConfig::CMockDefaultOptions[:treat_externs],          config.treat_externs)
   end
-  
-  should "replace only options specified in a yaml file" do
+
+  it "replace only options specified in a yaml file" do
     test_plugins = [:soda, :pizza]
     config = CMockConfig.new("#{File.expand_path(File.dirname(__FILE__))}/cmock_config_test.yml")
     assert_equal(CMockConfig::CMockDefaultOptions[:mock_path],              config.mock_path)
@@ -43,8 +40,8 @@ class CMockConfigTest < Test::Unit::TestCase
     assert_equal(:include,                                                  config.treat_externs)
   end
 
-  should "populate treat_as map with internal standard_treat_as_map defaults, redefine defaults, and add custom values" do
-  
+  it "populate treat_as map with internal standard_treat_as_map defaults, redefine defaults, and add custom values" do
+
     user_treat_as1 = {
       'BOOL'          => 'UINT8', # redefine standard default
       'unsigned long' => 'INT',   # redefine standard default
@@ -55,10 +52,10 @@ class CMockConfigTest < Test::Unit::TestCase
       'BOOL'          => 'INT16', # redefine standard default
       'U16'           => 'HEX16'  # custom value
     }
- 
+
     config1 = CMockConfig.new({:treat_as => user_treat_as1})
     config2 = CMockConfig.new({:treat_as => user_treat_as2})
-    
+
     # ----- USER SET 1
     # standard defaults
     assert_equal('INT',      config1.treat_as['BOOL_T'])
@@ -73,16 +70,16 @@ class CMockConfigTest < Test::Unit::TestCase
     # overrides
     assert_equal('UINT8',    config1.treat_as['BOOL'])
     assert_equal('INT',      config1.treat_as['unsigned long'])
-    
+
     # added custom values
     assert_equal('UINT8',    config1.treat_as['U8'])
     assert_equal('UINT16',   config1.treat_as['U16'])
-    
+
     # standard_treat_as_map: unchanged
     assert_equal('INT',      config1.standard_treat_as_map['BOOL'])
-    assert_equal('HEX32',    config1.standard_treat_as_map['unsigned long'])    
+    assert_equal('HEX32',    config1.standard_treat_as_map['unsigned long'])
     assert_equal('STRING',   config1.standard_treat_as_map['char*'])
-    
+
     # ----- USER SET 2
     # standard defaults
     assert_equal('INT',      config2.treat_as['BOOL_T'])
@@ -97,25 +94,25 @@ class CMockConfigTest < Test::Unit::TestCase
 
     # overrides
     assert_equal('INT16',    config2.treat_as['BOOL'])
-    
+
     # added custom values
     assert_equal('HEX16',    config2.treat_as['U16'])
-    
+
     # standard_treat_as_map: unchanged
     assert_equal('INT',      config2.standard_treat_as_map['BOOL'])
-    assert_equal('HEX32',    config2.standard_treat_as_map['unsigned long'])    
+    assert_equal('HEX32',    config2.standard_treat_as_map['unsigned long'])
     assert_equal('STRING',   config2.standard_treat_as_map['char*'])
   end
-  
-  should "standard treat_as map should be incorruptable" do
+
+  it "standard treat_as map should be incorruptable" do
     config = CMockConfig.new({})
-    
+
     assert_equal('INT', config.standard_treat_as_map['BOOL_T'])
-    
+
     local = config.standard_treat_as_map
     local['BOOL_T'] = "U8"
-    
+
     assert_equal('INT', config.standard_treat_as_map['BOOL_T'])
   end
-  
+
 end

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

@@ -2,29 +2,26 @@
 #   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_file_writer'
 
-class CMockFileWriterTest < Test::Unit::TestCase
-  def setup
+describe CMockFileWriter, "Verify CMockFileWriter Module" do
+
+  before do
     create_mocks :config
     @cmock_file_writer = CMockFileWriter.new(@config)
   end
 
-  def teardown
-  end
-  
-  should "have set up internal accessors correctly on init" do
-    assert_equal(@config, @cmock_file_writer.config)
+  after do
   end
-  
-  should "complain if a block was not specified when calling create" do
+
+  it "complain if a block was not specified when calling create" do
     begin
       @cmock_file_writer.create_file("test.txt")
       assert false, "Should Have Thrown An Error When Calling Without A Block"
     rescue
     end
-  end  
+  end
 end