ThrowTheSwitch/Unity
1
0
Fork 0
mirror of https://github.com/ThrowTheSwitch/Unity.git synced 2026-09-12 05:10:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

- renamed parts of test hash used internally so ceedling can inject information more easily.

Browse Source 
git-svn-id: http://unity.svn.sourceforge.net/svnroot/unity/trunk@129 e7d17a6e-8845-0410-bbbc-c8efb4fdad7e
This commit is contained in:
mvandervoord
2011-04-17 23:01:26 +00:00
parent 39654f36e8
commit 114755e200
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
auto/generate_test_runner.rb
+6 -6
View File
@@ -88,7 +88,7 @@ class UnityTestRunnerGenerator
args = [] args = []
arguments.scan(/\s*TEST_CASE\s*\((.*)\)\s*$/) {|a| args << a[0]} arguments.scan(/\s*TEST_CASE\s*\((.*)\)\s*$/) {|a| args << a[0]}
end end
tests_and_line_numbers << { :name => name, :args => args, :call => call, :line_number => 0 } tests_and_line_numbers << { :test => name, :args => args, :call => call, :line_number => 0 }
tests_args = [] tests_args = []
end end
end end
@@ -98,7 +98,7 @@ class UnityTestRunnerGenerator
source_index = 0; source_index = 0;
tests_and_line_numbers.size.times do |i| tests_and_line_numbers.size.times do |i|
source_lines[source_index..-1].each_with_index do |line, index| source_lines[source_index..-1].each_with_index do |line, index|
if (line =~ /#{tests_and_line_numbers[i][:name]}/) if (line =~ /#{tests_and_line_numbers[i][:test]}/)
source_index += index source_index += index
tests_and_line_numbers[i][:line_number] = source_index + 1 tests_and_line_numbers[i][:line_number] = source_index + 1
break break
@@ -155,7 +155,7 @@ class UnityTestRunnerGenerator
output.puts("extern void setUp(void);") output.puts("extern void setUp(void);")
output.puts("extern void tearDown(void);") output.puts("extern void tearDown(void);")
tests.each do |test| tests.each do |test|
output.puts("extern void #{test[:name]}(#{test[:call]});") output.puts("extern void #{test[:test]}(#{test[:call]});")
end end
output.puts('') output.puts('')
end end
@@ -260,13 +260,13 @@ class UnityTestRunnerGenerator
if (@options[:use_param_tests]) if (@options[:use_param_tests])
tests.each do |test| tests.each do |test|
if ((test[:args].nil?) or (test[:args].empty?)) if ((test[:args].nil?) or (test[:args].empty?))
output.puts(" RUN_TEST(#{test[:name]}, #{test[:line_number]}, RUN_TEST_NO_ARGS);") output.puts(" RUN_TEST(#{test[:test]}, #{test[:line_number]}, RUN_TEST_NO_ARGS);")
else else
test[:args].each {|args| output.puts(" RUN_TEST(#{test[:name]}, #{test[:line_number]}, #{args});")} test[:args].each {|args| output.puts(" RUN_TEST(#{test[:test]}, #{test[:line_number]}, #{args});")}
end end
end end
else else
tests.each { |test| output.puts(" RUN_TEST(#{test[:name]}, #{test[:line_number]});") } tests.each { |test| output.puts(" RUN_TEST(#{test[:test]}, #{test[:line_number]});") }
end end
output.puts() output.puts()
output.puts(" return #{@options[:suite_teardown].nil? ? "" : "suite_teardown"}(UnityEnd());") output.puts(" return #{@options[:suite_teardown].nil? ? "" : "suite_teardown"}(UnityEnd());")