From c60dc79c937dffd097748aeff6f68b11ab85200d Mon Sep 17 00:00:00 2001 From: mvandervoord Date: Tue, 3 Mar 2009 20:51:39 +0000 Subject: [PATCH] - fixed bug in cmock header generation if using non-default mock prefix. git-svn-id: http://cmock.svn.sourceforge.net/svnroot/cmock/trunk@69 bf332499-1b4d-0410-844d-d2d48d5cc64c --- lib/cmock_generator.rb | 2 +- test/unit/cmock_generator_main_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/cmock_generator.rb b/lib/cmock_generator.rb index 6b6f37d..b0dcf26 100644 --- a/lib/cmock_generator.rb +++ b/lib/cmock_generator.rb @@ -49,7 +49,7 @@ class CMockGenerator def create_mock_header_header(file, filename) define_name = filename.gsub(/\.h/, "_h").upcase - orig_filename = filename.gsub("Mock", "") + orig_filename = filename.gsub(@config.mock_prefix, "") file << "/* AUTOGENERATED FILE. DO NOT EDIT. */\n" file << "#ifndef _#{define_name}\n" file << "#define _#{define_name}\n\n" diff --git a/test/unit/cmock_generator_main_test.rb b/test/unit/cmock_generator_main_test.rb index 0b47936..581225f 100644 --- a/test/unit/cmock_generator_main_test.rb +++ b/test/unit/cmock_generator_main_test.rb @@ -58,6 +58,7 @@ class CMockGeneratorTest < Test::Unit::TestCase end should "create the top of a header file" do + @config.expect.mock_prefix.returns("Mock") orig_filename = "PoutPoutFish.h" define_name = "MOCKPOUTPOUTFISH_H" mock_name = "MockPoutPoutFish"