ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-08-06 19:27:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

- beefed up unit tests for function pointers

Browse Source 
- added module name to reduce chance of typedef name collisions.

git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@160 bf332499-1b4d-0410-844d-d2d48d5cc64c
This commit is contained in:
mvandervoord
2010-04-27 01:40:34 +00:00
parent 436ffe0fee
commit 89737d59fe
3 changed files with 88 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock.rb
+1 -1
View File
@@ -32,7 +32,7 @@ class CMock
def generate_mock(src)
name = File.basename(src, '.h')
puts "Creating mock for #{name}..." unless @silent
@cm_generator.create_mock(name, @cm_parser.parse(File.read(src)))
@cm_generator.create_mock(name, @cm_parser.parse(name, File.read(src)))
end
end
lib/cmock_header_parser.rb
+4 -3
View File
@@ -13,7 +13,8 @@ class CMockHeaderParser
@verbosity = cfg.verbosity
end
def parse(source)
def parse(name, source)
@module_name = name
@typedefs = []
@funcs = []
function_names = []
@@ -68,7 +69,7 @@ class CMockHeaderParser
#scan for functions which return function pointers, because they are a pain
source.gsub!(/([\w\s]+)\(*\(\s*\*([\w\s]+)\s*\(([\w\s,]+)\)\)\s*\(([\w\s,]+)\)\)*/) do |m|
functype = "cmock_func_ptr#{@typedefs.size + 1}"
functype = "cmock_#{@module_name}_func_ptr#{@typedefs.size + 1}"
@typedefs << "typedef #{$1.strip}(*#{functype})(#{$4});"
"#{functype} #{$2.strip}(#{$3});"
end
@@ -134,7 +135,7 @@ class CMockHeaderParser
#scan argument list for function pointers and replace them with custom types
arg_list.gsub!(/([\w\s]+)\(*\(\s*\*([\w\s]+)\)\s*\(([\w\s,]+)\)\)*/) do |m|
functype = "cmock_func_ptr#{@typedefs.size + 1}"
functype = "cmock_#{@module_name}_func_ptr#{@typedefs.size + 1}"
funcret = $1.strip
funcname = $2.strip
funcargs = $3.strip
test/unit/cmock_header_parser_test.rb
+83 -11
View File
@@ -338,14 +338,14 @@ class CMockHeaderParserTest < Test::Unit::TestCase
# ensure it's expected type of exception
assert_raise RuntimeError do
@parser.parse("")
@parser.parse("module", "")
end
assert_equal([], @parser.funcs)
# verify exception message
begin
@parser.parse("")
@parser.parse("module", "")
rescue RuntimeError => e
assert_equal("ERROR: No function prototypes found!", e.message)
end
@@ -361,14 +361,14 @@ class CMockHeaderParserTest < Test::Unit::TestCase
# ensure it's expected type of exception
assert_raise(RuntimeError) do
@parser.parse(source)
@parser.parse("module", source)
end
assert_equal([], @parser.funcs)
# verify exception message
begin
@parser.parse(source)
@parser.parse("module", source)
rescue RuntimeError => e
assert_equal("ERROR: No function prototypes found!", e.message)
end
@@ -380,12 +380,12 @@ class CMockHeaderParserTest < Test::Unit::TestCase
# ensure it's expected type of exception
assert_raise(RuntimeError) do
@parser.parse(source)
@parser.parse("module", source)
end
# verify exception message
begin
@parser.parse(source)
@parser.parse("module", source)
rescue RuntimeError => e
assert(e.message.include?("Failed Parsing Declaration Prototype!"))
end
@@ -516,7 +516,7 @@ class CMockHeaderParserTest < Test::Unit::TestCase
:args_string=>"int cmock_arg1, unsigned int* cmock_arg2",
:args_call=>"cmock_arg1, cmock_arg2"
}]
assert_equal(expected, @parser.parse(source)[:functions])
assert_equal(expected, @parser.parse("module", source)[:functions])
end
should "not extract for mocking multiply defined prototypes" do
@@ -541,7 +541,7 @@ class CMockHeaderParserTest < Test::Unit::TestCase
:args_string=>"int Trinity, unsigned int* Neo",
:args_call=>"Trinity, Neo"
}]
assert_equal(expected, @parser.parse(source)[:functions])
assert_equal(expected, @parser.parse("module", source)[:functions])
end
should "properly detect typedef'd variants of void and use those" do
@@ -581,7 +581,7 @@ class CMockHeaderParserTest < Test::Unit::TestCase
:args_string=>"void",
:args_call=>""
}]
assert_equal(expected, @parser.parse(source)[:functions])
assert_equal(expected, @parser.parse("module", source)[:functions])
end
should "be ok with structs inside of function declarations" do
@@ -635,7 +635,79 @@ class CMockHeaderParserTest < Test::Unit::TestCase
:args_string=>"void",
:args_call=>""
}]
assert_equal(expected, @parser.parse(source)[:functions])
assert_equal(expected, @parser.parse("module", source)[:functions])
end
should "extract functions containing a function pointer" do
source = "void FunkyChicken(unsigned int (*func_ptr)(int, char))"
expected = [{ :var_arg=>nil,
:return=>{ :type => "void",
:name => 'cmock_to_return',
:ptr? => false,
:const? => false,
:str => "void cmock_to_return",
:void? => true
},
:name=>"FunkyChicken",
:modifier=>"",
:contains_ptr? => false,
:args=>[ {:type=>"cmock_module_func_ptr1", :name=>"func_ptr", :ptr? => false, :const? => false}
],
:args_string=>"cmock_module_func_ptr1 func_ptr",
:args_call=>"func_ptr" }]
typedefs = ["typedef unsigned int(*cmock_module_func_ptr1)(int, char);"]
result = @parser.parse("module", source)
assert_equal(expected, result[:functions])
assert_equal(typedefs, result[:typedefs])
end
should "extract functions containing an anonymous function pointer" do
source = "void FunkyChicken(unsigned int (* const)(int, char))"
expected = [{ :var_arg=>nil,
:return=>{ :type => "void",
:name => 'cmock_to_return',
:ptr? => false,
:const? => false,
:str => "void cmock_to_return",
:void? => true
},
:name=>"FunkyChicken",
:modifier=>"",
:contains_ptr? => false,
:args=>[ {:type=>"cmock_module_func_ptr1", :name=>"cmock_arg1", :ptr? => false, :const? => true}
],
:args_string=>"cmock_module_func_ptr1 const cmock_arg1",
:args_call=>"cmock_arg1" }]
typedefs = ["typedef unsigned int(*cmock_module_func_ptr1)(int, char);"]
result = @parser.parse("module", source)
assert_equal(expected, result[:functions])
assert_equal(typedefs, result[:typedefs])
end
should "extract functions returning a function pointer" do
source = "unsigned short (*FunkyChicken( const char op_code ))( int, long int )"
expected = [{ :var_arg=>nil,
:return=>{ :type => "cmock_module_func_ptr1",
:name => 'cmock_to_return',
:ptr? => false,
:const? => false,
:str => "cmock_module_func_ptr1 cmock_to_return",
:void? => false
},
:name=>"FunkyChicken",
:modifier=>"",
:contains_ptr? => false,
:args=>[ {:type=>"char", :name=>"op_code", :ptr? => false, :const? => true}
],
:args_string=>"const char op_code",
:args_call=>"op_code" }]
typedefs = ["typedef unsigned short(*cmock_module_func_ptr1)( int, long int );"]
result = @parser.parse("module", source)
assert_equal(expected, result[:functions])
assert_equal(typedefs, result[:typedefs])
end
should "extract functions with varargs" do
@@ -658,7 +730,7 @@ class CMockHeaderParserTest < Test::Unit::TestCase
:args_string=>"int Scully, int Mulder",
:args_call=>"Scully, Mulder"
}]
assert_equal(expected, @parser.parse(source)[:functions])
assert_equal(expected, @parser.parse("module", source)[:functions])
end
end