From 616dd8bd435844671b92bda66699ea58923487f4 Mon Sep 17 00:00:00 2001 From: Mark McCrum Date: Wed, 29 Oct 2014 16:08:30 +0000 Subject: [PATCH] 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. --- auto/generate_test_runner.rb | 6 +++--- test/expectdata/testsample_cmd.c | 3 +-- test/expectdata/testsample_def.c | 3 +-- test/expectdata/testsample_mock_cmd.c | 3 +-- test/expectdata/testsample_mock_def.c | 3 +-- test/expectdata/testsample_mock_new1.c | 3 +-- test/expectdata/testsample_mock_new2.c | 3 +-- test/expectdata/testsample_mock_param.c | 3 +-- test/expectdata/testsample_mock_run1.c | 3 +-- test/expectdata/testsample_mock_run2.c | 3 +-- test/expectdata/testsample_mock_yaml.c | 3 +-- test/expectdata/testsample_new1.c | 3 +-- test/expectdata/testsample_new2.c | 3 +-- test/expectdata/testsample_param.c | 3 +-- test/expectdata/testsample_run1.c | 3 +-- test/expectdata/testsample_run2.c | 3 +-- test/expectdata/testsample_yaml.c | 3 +-- test/rakefile | 2 +- test/tests/test_generate_test_runner.rb | 16 ++++++++-------- 19 files changed, 28 insertions(+), 44 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index c7d9a2b..01a8683 100644 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -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) diff --git a/test/expectdata/testsample_cmd.c b/test/expectdata/testsample_cmd.c index ffcd895..9890344 100644 --- a/test/expectdata/testsample_cmd.c +++ b/test/expectdata/testsample_cmd.c @@ -48,8 +48,7 @@ void resetTest() //=======MAIN===== int main(void) { - UnityBegin(); - Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin("testdata/testsample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_def.c b/test/expectdata/testsample_def.c index e2c9c68..f89b256 100644 --- a/test/expectdata/testsample_def.c +++ b/test/expectdata/testsample_def.c @@ -44,8 +44,7 @@ void resetTest() //=======MAIN===== int main(void) { - UnityBegin(); - Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin("testdata/testsample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_mock_cmd.c b/test/expectdata/testsample_mock_cmd.c index aa61372..ed9fe99 100644 --- a/test/expectdata/testsample_mock_cmd.c +++ b/test/expectdata/testsample_mock_cmd.c @@ -69,8 +69,7 @@ void resetTest() //=======MAIN===== int main(void) { - UnityBegin(); - Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin("testdata/mocksample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_mock_def.c b/test/expectdata/testsample_mock_def.c index 801b002..be933b7 100644 --- a/test/expectdata/testsample_mock_def.c +++ b/test/expectdata/testsample_mock_def.c @@ -65,8 +65,7 @@ void resetTest() //=======MAIN===== int main(void) { - UnityBegin(); - Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin("testdata/mocksample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_mock_new1.c b/test/expectdata/testsample_mock_new1.c index 62f344f..f6a8743 100644 --- a/test/expectdata/testsample_mock_new1.c +++ b/test/expectdata/testsample_mock_new1.c @@ -78,8 +78,7 @@ void resetTest() //=======MAIN===== int main(void) { - UnityBegin(); - Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin("testdata/mocksample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_mock_new2.c b/test/expectdata/testsample_mock_new2.c index e121676..df816f7 100644 --- a/test/expectdata/testsample_mock_new2.c +++ b/test/expectdata/testsample_mock_new2.c @@ -78,8 +78,7 @@ void resetTest() int main(void) { suite_setup(); - UnityBegin(); - Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin("testdata/mocksample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_mock_param.c b/test/expectdata/testsample_mock_param.c index 1ceb98f..4497799 100644 --- a/test/expectdata/testsample_mock_param.c +++ b/test/expectdata/testsample_mock_param.c @@ -66,8 +66,7 @@ void resetTest() //=======MAIN===== int main(void) { - UnityBegin(); - Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin("testdata/mocksample.c"); RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS); RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS); diff --git a/test/expectdata/testsample_mock_run1.c b/test/expectdata/testsample_mock_run1.c index 62f344f..f6a8743 100644 --- a/test/expectdata/testsample_mock_run1.c +++ b/test/expectdata/testsample_mock_run1.c @@ -78,8 +78,7 @@ void resetTest() //=======MAIN===== int main(void) { - UnityBegin(); - Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin("testdata/mocksample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_mock_run2.c b/test/expectdata/testsample_mock_run2.c index e121676..df816f7 100644 --- a/test/expectdata/testsample_mock_run2.c +++ b/test/expectdata/testsample_mock_run2.c @@ -78,8 +78,7 @@ void resetTest() int main(void) { suite_setup(); - UnityBegin(); - Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin("testdata/mocksample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_mock_yaml.c b/test/expectdata/testsample_mock_yaml.c index ad40188..e02b3c2 100644 --- a/test/expectdata/testsample_mock_yaml.c +++ b/test/expectdata/testsample_mock_yaml.c @@ -79,8 +79,7 @@ void resetTest() int main(void) { suite_setup(); - UnityBegin(); - Unity.TestFile = "test/testdata/mocksample.c"; + UnityBegin("testdata/mocksample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_new1.c b/test/expectdata/testsample_new1.c index bc726e5..73bc499 100644 --- a/test/expectdata/testsample_new1.c +++ b/test/expectdata/testsample_new1.c @@ -54,8 +54,7 @@ void resetTest() //=======MAIN===== int main(void) { - UnityBegin(); - Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin("testdata/testsample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_new2.c b/test/expectdata/testsample_new2.c index 884af51..5d66771 100644 --- a/test/expectdata/testsample_new2.c +++ b/test/expectdata/testsample_new2.c @@ -57,8 +57,7 @@ void resetTest() int main(void) { suite_setup(); - UnityBegin(); - Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin("testdata/testsample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_param.c b/test/expectdata/testsample_param.c index b287401..820ded2 100644 --- a/test/expectdata/testsample_param.c +++ b/test/expectdata/testsample_param.c @@ -45,8 +45,7 @@ void resetTest() //=======MAIN===== int main(void) { - UnityBegin(); - Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin("testdata/testsample.c"); RUN_TEST(test_TheFirstThingToTest, 21, RUN_TEST_NO_ARGS); RUN_TEST(test_TheSecondThingToTest, 43, RUN_TEST_NO_ARGS); diff --git a/test/expectdata/testsample_run1.c b/test/expectdata/testsample_run1.c index bc726e5..73bc499 100644 --- a/test/expectdata/testsample_run1.c +++ b/test/expectdata/testsample_run1.c @@ -54,8 +54,7 @@ void resetTest() //=======MAIN===== int main(void) { - UnityBegin(); - Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin("testdata/testsample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_run2.c b/test/expectdata/testsample_run2.c index 884af51..5d66771 100644 --- a/test/expectdata/testsample_run2.c +++ b/test/expectdata/testsample_run2.c @@ -57,8 +57,7 @@ void resetTest() int main(void) { suite_setup(); - UnityBegin(); - Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin("testdata/testsample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/expectdata/testsample_yaml.c b/test/expectdata/testsample_yaml.c index 75882a6..0b38ad2 100644 --- a/test/expectdata/testsample_yaml.c +++ b/test/expectdata/testsample_yaml.c @@ -58,8 +58,7 @@ void resetTest() int main(void) { suite_setup(); - UnityBegin(); - Unity.TestFile = "test/testdata/testsample.c"; + UnityBegin("testdata/testsample.c"); RUN_TEST(test_TheFirstThingToTest, 21); RUN_TEST(test_TheSecondThingToTest, 43); diff --git a/test/rakefile b/test/rakefile index b2af40e..476d3ab 100644 --- a/test/rakefile +++ b/test/rakefile @@ -34,7 +34,7 @@ end desc "Test unity's helper scripts" task :scripts => [:prepare_for_tests] do - Dir['test/test_*.rb'].each do |scriptfile| + Dir['tests/test_*.rb'].each do |scriptfile| require "./"+scriptfile end end diff --git a/test/tests/test_generate_test_runner.rb b/test/tests/test_generate_test_runner.rb index 8e0ace2..1f60f98 100644 --- a/test/tests/test_generate_test_runner.rb +++ b/test/tests/test_generate_test_runner.rb @@ -4,12 +4,12 @@ # [Released under MIT License. Please refer to license.txt for details] # ========================================== -require './auto/generate_test_runner.rb' +require '../auto/generate_test_runner.rb' -TEST_FILE = 'test/testdata/testsample.c' -TEST_MOCK = 'test/testdata/mocksample.c' +TEST_FILE = 'testdata/testsample.c' +TEST_MOCK = 'testdata/mocksample.c' OUT_FILE = 'build/testsample_' -EXP_FILE = 'test/expectdata/testsample_' +EXP_FILE = 'expectdata/testsample_' $generate_test_runner_failures = 0 @@ -53,22 +53,22 @@ end should "GenerateARunnerByPullingYamlOptions" do subtest = 'yaml' - cmdstr = "ruby auto/generate_test_runner.rb test/testdata/sample.yml \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\"" + cmdstr = "ruby ../auto/generate_test_runner.rb testdata/sample.yml \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\"" `#{cmdstr}` verify_output_equal(subtest) - cmdstr = "ruby auto/generate_test_runner.rb test/testdata/sample.yml \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\"" + cmdstr = "ruby ../auto/generate_test_runner.rb testdata/sample.yml \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\"" `#{cmdstr}` verify_output_equal('mock_' + subtest) end should "GenerateARunnerByPullingCommandlineOptions" do subtest = 'cmd' - cmdstr = "ruby auto/generate_test_runner.rb -cexception \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\"" + cmdstr = "ruby ../auto/generate_test_runner.rb -cexception \"#{TEST_FILE}\" \"#{OUT_FILE + subtest + '.c'}\"" `#{cmdstr}` verify_output_equal(subtest) - cmdstr = "ruby auto/generate_test_runner.rb -cexception \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\"" + cmdstr = "ruby ../auto/generate_test_runner.rb -cexception \"#{TEST_MOCK}\" \"#{OUT_FILE + 'mock_' + subtest + '.c'}\"" `#{cmdstr}` verify_output_equal('mock_' + subtest) end -- GitLab