diff --git a/lib/cmock_generator.rb b/lib/cmock_generator.rb index 8cfe07b..44e9740 100644 --- a/lib/cmock_generator.rb +++ b/lib/cmock_generator.rb @@ -95,6 +95,7 @@ class CMockGenerator file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n" file << "#ifndef _#{define_name}_H\n" file << "#define _#{define_name}_H\n\n" + file << "#include \"#{@framework}.h\"\n" @includes_h_pre_orig_header.each {|inc| file << "#include #{inc}\n"} file << @config.orig_header_include_fmt.gsub(/%s/, "#{orig_filename}") + "\n" @includes_h_post_orig_header.each {|inc| file << "#include #{inc}\n"} @@ -144,7 +145,6 @@ class CMockGenerator file << "#include \n" file << "#include \n" file << "#include \n" - file << "#include \"#{@framework}.h\"\n" file << "#include \"cmock.h\"\n" @includes_c_pre_header.each {|inc| file << "#include #{inc}\n"} file << "#include \"#{header_file}\"\n" diff --git a/test/unit/cmock_generator_main_test.rb b/test/unit/cmock_generator_main_test.rb index fbfe41c..2993082 100644 --- a/test/unit/cmock_generator_main_test.rb +++ b/test/unit/cmock_generator_main_test.rb @@ -92,6 +92,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do "/* AUTOGENERATED FILE. DO NOT EDIT. */\n", "#ifndef _#{define_name}\n", "#define _#{define_name}\n\n", + "#include \"unity.h\"\n", "#include \"ConfigRequiredHeader1.h\"\n", "#include \"ConfigRequiredHeader2.h\"\n", "#include \"#{orig_filename}\"\n", @@ -147,6 +148,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do "/* AUTOGENERATED FILE. DO NOT EDIT. */\n", "#ifndef _#{define_name}\n", "#define _#{define_name}\n\n", + "#include \"unity.h\"\n", "#include \"ConfigRequiredHeader1.h\"\n", "#include \"ConfigRequiredHeader2.h\"\n", "#include \"#{orig_filename}\"\n", @@ -185,6 +187,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do "/* AUTOGENERATED FILE. DO NOT EDIT. */\n", "#ifndef _#{define_name}\n", "#define _#{define_name}\n\n", + "#include \"unity.h\"\n", "#include \"ConfigRequiredHeader1.h\"\n", "#include \"ConfigRequiredHeader2.h\"\n", "#include \"#{orig_filename}\"\n", @@ -222,6 +225,7 @@ describe CMockGenerator, "Verify CMockGenerator Module" do "/* AUTOGENERATED FILE. DO NOT EDIT. */\n", "#ifndef _#{define_name}\n", "#define _#{define_name}\n\n", + "#include \"unity.h\"\n", "#include \"ConfigRequiredHeader1.h\"\n", "#include \"ConfigRequiredHeader2.h\"\n", "#include \"#{orig_filename}\"\n", @@ -308,7 +312,6 @@ describe CMockGenerator, "Verify CMockGenerator Module" do "#include \n", "#include \n", "#include \n", - "#include \"unity.h\"\n", "#include \"cmock.h\"\n", "#include \"MockPoutPoutFish.h\"\n", "\n",