1
0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-01-28 02:34:27 +01:00

Fixed script unit tests. Fixed generate_test_runner configuration loading

- Modified rakefile to look in correct directory for script unit tests
- Updated paths in script unit tests
- Updated 'expectdata' files to match latest version of generated code
- Fixed bug which prevented generate_test_runner from loading config from
yaml file.
This commit is contained in:
Mark McCrum
2014-10-29 16:08:30 +00:00
parent 4a145c10b3
commit 616dd8bd43
19 changed files with 28 additions and 44 deletions

View File

@@ -10,7 +10,7 @@ File.expand_path(File.join(File.dirname(__FILE__),'colour_prompt'))
class UnityTestRunnerGenerator
def initialize(options = nil)
@options = self.default_options
@options = UnityTestRunnerGenerator.default_options
case(options)
when NilClass then @options
when String then @options.merge!(UnityTestRunnerGenerator.grab_config(options))
@@ -19,7 +19,7 @@ class UnityTestRunnerGenerator
end
end
def default_options
def self.default_options
{
:includes => [],
:plugins => [],
@@ -31,7 +31,7 @@ class UnityTestRunnerGenerator
end
def self.grab_config(config_file)
options = default_options
options = self.default_options
unless (config_file.nil? or config_file.empty?)
require 'yaml'
yaml_guts = YAML.load_file(config_file)