ThrowTheSwitch/CMock
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/CMock.git synced 2026-09-24 19:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

undid include processing in mock header & source generation

Browse Source 
git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@86 bf332499-1b4d-0410-844d-d2d48d5cc64c
This commit is contained in:
mkarlesky
2009-04-20 23:34:07 +00:00
parent 6a5f4d4cdf
commit 9088e2038d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/cmock_generator.rb
+1 -1
View File
@@ -52,7 +52,6 @@ class CMockGenerator
file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n"
file << "#ifndef _#{define_name}\n"
file << "#define _#{define_name}\n\n"
@config.includes.each {|include| file << "#include \"#{include}\"\n"}
file << "#include \"#{orig_filename}\"\n\n"
file << "void #{@mock_name}_Init(void);\n"
file << "void #{@mock_name}_Destroy(void);\n"
@@ -71,6 +70,7 @@ class CMockGenerator
file << "#include <setjmp.h>\n"
file << "#include \"unity.h\"\n"
file << @plugins.run(:include_files)
@config.includes.each {|include| file << "#include \"#{include}\"\n"}
file << "#include \"#{header_file}\"\n\n"
end
test/unit/cmock_generator_main_test.rb
+3 -2
View File
@@ -59,7 +59,6 @@ class CMockGeneratorTest < Test::Unit::TestCase
should "create the top of a header file" do
@config.expect.mock_prefix.returns("Mock")
@config.expect.includes.returns("included.h")
orig_filename = "PoutPoutFish.h"
define_name = "MOCKPOUTPOUTFISH_H"
mock_name = "MockPoutPoutFish"
@@ -67,7 +66,6 @@ class CMockGeneratorTest < Test::Unit::TestCase
expected = [ "/* AUTOGENERATED FILE. DO NOT EDIT. */\n",
"#ifndef _#{define_name}\n",
"#define _#{define_name}\n\n",
"#include \"included.h\"\n",
"#include \"#{orig_filename}\"\n\n",
"void #{mock_name}_Init(void);\n",
"void #{mock_name}_Destroy(void);\n",
@@ -96,9 +94,12 @@ class CMockGeneratorTest < Test::Unit::TestCase
"#include <setjmp.h>\n",
"#include \"unity.h\"\n",
"#include \"PluginRequiredHeader.h\"\n",
"#include \"ConfigRequiredHeader1.h\"\n",
"#include \"ConfigRequiredHeader2.h\"\n",
"#include \"MockPoutPoutFish.h\"\n\n"
]
@plugins.expect.run(:include_files).returns("#include \"PluginRequiredHeader.h\"\n")
@config.expect.includes.returns(["ConfigRequiredHeader1.h","ConfigRequiredHeader2.h"])
@cmock_generator.create_source_header_section(output, "MockPoutPoutFish.c")