ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-06-05 21:15:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #44 from jlesage/orig_header_include_format_v2

Browse Source 
Offer a more flexible way to include the original header file (Thanks Jocelyn)
This commit is contained in:
Mark VanderVoord
2014-12-09 10:02:55 -05:00
parent 73f6489f09 472daea243
commit e6d0a19a65
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_config.rb
+1 -1
View File
@@ -31,7 +31,7 @@ class CMockConfig
:includes_h_post_orig_header => nil,
:includes_c_pre_header => nil,
:includes_c_post_header => nil,
:orig_header_include_fmt => '"%s"',
:orig_header_include_fmt => "#include \"%s\"",
}
def initialize(options=nil)
lib/cmock_generator.rb
+1 -1
View File
@@ -69,7 +69,7 @@ class CMockGenerator
file << "#ifndef _#{define_name}_H\n"
file << "#define _#{define_name}_H\n\n"
@includes_h_pre_orig_header.each {|inc| file << "#include #{inc}\n"}
file << "#include " + @config.orig_header_include_fmt % "#{orig_filename}" + "\n"
file << @config.orig_header_include_fmt.gsub(/%s/, "#{orig_filename}") + "\n"
@includes_h_post_orig_header.each {|inc| file << "#include #{inc}\n"}
plugin_includes = @plugins.run(:include_files)
file << plugin_includes if (!plugin_includes.empty?)
test/unit/cmock_generator_main_test.rb
+4 -4
View File
@@ -103,7 +103,7 @@ class CMockGeneratorTest < Test::Unit::TestCase
"\n",
]
@config.expect.orig_header_include_fmt.returns('"%s"')
@config.expect.orig_header_include_fmt.returns("#include \"%s\"")
@plugins.expect.run(:include_files).returns("#include \"PluginRequiredHeader.h\"\n")
@cmock_generator.create_mock_header_header(output, "MockPoutPoutFish.h")
@@ -148,7 +148,7 @@ class CMockGeneratorTest < Test::Unit::TestCase
"\n",
]
@config.expect.orig_header_include_fmt.returns('"%s"')
@config.expect.orig_header_include_fmt.returns("#include \"%s\"")
@plugins.expect.run(:include_files).returns("#include \"PluginRequiredHeader.h\"\n")
@cmock_generator2.create_mock_header_header(output, "MockPout-Pout Fish.h")
@@ -179,7 +179,7 @@ class CMockGeneratorTest < Test::Unit::TestCase
"\n",
]
@config.expect.orig_header_include_fmt.returns('"%s"')
@config.expect.orig_header_include_fmt.returns("#include \"%s\"")
@plugins.expect.run(:include_files).returns('')
@cmock_generator.create_mock_header_header(output, "MockPoutPoutFish.h")
@@ -211,7 +211,7 @@ class CMockGeneratorTest < Test::Unit::TestCase
"\n",
]
@config.expect.orig_header_include_fmt.returns('"%s"')
@config.expect.orig_header_include_fmt.returns("#include \"%s\"")
@plugins.expect.run(:include_files).returns("#include \"PluginRequiredHeader.h\"\n")
@cmock_generator.create_mock_header_header(output, "MockPoutPoutFish.h")