From 9088e2038d2c5fb0654915ab4a09b41e36ebdac1 Mon Sep 17 00:00:00 2001
From: mkarlesky <mkarlesky@bf332499-1b4d-0410-844d-d2d48d5cc64c>
Date: Mon, 20 Apr 2009 23:34:07 +0000
Subject: [PATCH] undid include processing in mock header & source generation

git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@86 bf332499-1b4d-0410-844d-d2d48d5cc64c
---
 lib/cmock_generator.rb                 | 2 +-
 test/unit/cmock_generator_main_test.rb | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/cmock_generator.rb b/lib/cmock_generator.rb
index 708a91c..08ac5de 100644
--- a/lib/cmock_generator.rb
+++ b/lib/cmock_generator.rb
@@ -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
   
diff --git a/test/unit/cmock_generator_main_test.rb b/test/unit/cmock_generator_main_test.rb
index a533fd1..c67e228 100644
--- a/test/unit/cmock_generator_main_test.rb
+++ b/test/unit/cmock_generator_main_test.rb
@@ -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")