ceedling 0.19.0 → 0.20.2

data/plugins/module_generator/module_generator.rake

@@ -1,14 +1,14 @@
-
-namespace :module do
-
-  desc "Generate module (source, header and test files)"
-    task :create, :module_path do |t, args|
-    @ceedling[:module_generator].create(args[:module_path])
-  end
-
-  desc "Destroy module (source, header and test files)"
-  task :destroy, :module_path do |t, args|
-    @ceedling[:module_generator].create(args[:module_path], {:destroy => true})
-  end
-  
-end
+
+namespace :module do
+
+  desc "Generate module (source, header and test files)"
+    task :create, :module_path do |t, args|
+    @ceedling[:module_generator].create(args[:module_path])
+  end
+
+  desc "Destroy module (source, header and test files)"
+  task :destroy, :module_path do |t, args|
+    @ceedling[:module_generator].create(args[:module_path], {:destroy => true})
+  end
+  
+end

data/plugins/stdout_gtestlike_tests_report/assets/template.erb

@@ -0,0 +1,84 @@
+% ignored        = hash[:results][:counts][:ignored]
+% failed         = hash[:results][:counts][:failed]
+% stdout_count   = hash[:results][:counts][:stdout]
+% header_prepend = ((hash[:header].length > 0) ? "#{hash[:header]}: " : '')
+% banner_width   = 25 + header_prepend.length # widest message
+% results = {}
+% hash[:results][:successes].each do |testresult|
+%   results[ testresult[:source][:file] ] = testresult[:collection]
+%   results[ testresult[:source][:file] ].length.times do |i|
+%     results[ testresult[:source][:file] ][i][:pass] = true
+%   end
+% end
+% hash[:results][:ignores].each do |testresult|
+%   if (results[ testresult[:source][:file] ].nil?)
+%     results[ testresult[:source][:file] ] = testresult[:collection]
+%   else
+%     results[ testresult[:source][:file] ] += testresult[:collection]
+%   end
+%   results[ testresult[:source][:file] ].length.times do |i|
+%     results[ testresult[:source][:file] ][i][:pass] = true
+%   end
+% end
+% hash[:results][:failures].each do |testresult|
+%   if (results[ testresult[:source][:file] ].nil?)
+%     results[ testresult[:source][:file] ] = testresult[:collection]
+%   else
+%     results[ testresult[:source][:file] ] += testresult[:collection]
+%   end
+% end
+
+
+[==========] Running <%=hash[:results][:counts][:total].to_s%> tests from <%=results.length.to_s%> test cases.
+[----------] Global test environment set-up.
+% results.each_pair do |modulename, moduledetails|
+[----------] <%=moduledetails.length.to_s%> tests from <%=modulename%>
+%   moduledetails.each do |item|
+[ RUN      ] <%=modulename%>.<%=item[:test]%>
+%     if (not item[:pass])
+%       if (not item[:message].empty?)
+<%=modulename%>(<%=item[:line]%>): error: <%=item[:message]%>
+
+%         m = item[:message].match(/Expected\s+(.*)\s+Was\s+([^\.]*)\./)
+%         if m.nil?
+ Actual:   FALSE
+ Expected: TRUE
+%         else
+ Actual:   <%=m[2]%>
+ Expected: <%=m[1]%>
+%         end
+%       else
+<%=modulename%>(<%=item[:line]%>): fail: <%=item[:message]%>
+ Actual:   FALSE
+ Expected: TRUE
+%       end
+[  FAILED  ] <%=modulename%>.<%=item[:test]%> (0 ms)
+%     else
+[       OK ] <%=modulename%>.<%=item[:test]%> (0 ms)
+%     end
+%   end
+[----------] <%=moduledetails.length.to_s%> tests from <%=modulename%> (0 ms total)
+% end
+
+% if (hash[:results][:counts][:total] > 0)
+[----------] Global test environment tear-down.
+[==========] <%=hash[:results][:counts][:total].to_s%> tests from <%=hash[:results][:stdout].length.to_s%> test cases ran.
+[  PASSED  ] <%=hash[:results][:counts][:passed].to_s%> tests.
+%   if (failed == 0)
+[  FAILED  ] 0 tests.
+
+ 0 FAILED TESTS
+%   else
+[  FAILED  ] <%=failed.to_s%> tests, listed below:
+%     hash[:results][:failures].each do |failure|
+%       failure[:collection].each do |item|
+[  FAILED  ] <%=failure[:source][:file]%>.<%=item[:test]%>
+%       end
+%     end
+%   end
+
+ <%=failed.to_s%> FAILED TESTS
+% else
+
+No tests executed.
+% end

data/plugins/stdout_gtestlike_tests_report/assets/template.erb copy

@@ -0,0 +1,59 @@
+% ignored        = hash[:results][:counts][:ignored]
+% failed         = hash[:results][:counts][:failed]
+% stdout_count   = hash[:results][:counts][:stdout]
+% header_prepend = ((hash[:header].length > 0) ? "#{hash[:header]}: " : '')
+% banner_width   = 25 + header_prepend.length # widest message
+
+
+% if (stdout_count > 0)
+[==========] Running <%=hash[:results][:counts][:total].to_s%> tests from <%=hash[:results][:stdout].length.to_s%> test cases.
+[----------] Global test environment set-up.
+% end
+% if (failed > 0)
+%   hash[:results][:failures].each do |failure|
+[----------] <%=failure[:collection].length.to_s%> tests from <%=failure[:source][:file]%>
+%     failure[:collection].each do |item|
+[ RUN      ] <%=failure[:source][:file]%>.<%=item[:test]%>
+% if (not item[:message].empty?)
+<%=failure[:source][:file]%>(<%=item[:line]%>): error: <%=item[:message]%>
+
+%   m = item[:message].match(/Expected\s+(.*)\s+Was\s+([^\.]*)\./)
+%    if m.nil?
+ Actual:   FALSE
+ Expected: TRUE
+%    else
+ Actual:   <%=m[2]%>
+ Expected: <%=m[1]%>
+%    end
+% else
+<%=failure[:source][:file]%>(<%=item[:line]%>): fail: <%=item[:message]%>
+ Actual:   FALSE
+ Expected: TRUE
+% end
+[  FAILED  ] <%=failure[:source][:file]%>.<%=item[:test]%> (0 ms)
+%     end
+[----------] <%=failure[:collection].length.to_s%> tests from <%=failure[:source][:file]%> (0 ms total)
+%   end
+% end
+% if (hash[:results][:counts][:total] > 0)
+[----------] Global test environment tear-down.
+[==========] <%=hash[:results][:counts][:total].to_s%> tests from <%=hash[:results][:stdout].length.to_s%> test cases ran.
+[  PASSED  ] <%=hash[:results][:counts][:passed].to_s%> tests.
+% if (failed == 0)
+[  FAILED  ] 0 tests.
+
+ 0 FAILED TESTS
+% else
+[  FAILED  ] <%=failed.to_s%> tests, listed below:
+%   hash[:results][:failures].each do |failure|
+%     failure[:collection].each do |item|
+[  FAILED  ] <%=failure[:source][:file]%>.<%=item[:test]%>
+%     end
+%   end
+
+ <%=failed.to_s%> FAILED TESTS
+% end
+% else
+
+No tests executed.
+% end

data/plugins/stdout_gtestlike_tests_report/config/stdout_gtestlike_tests_report.yml

@@ -0,0 +1,4 @@
+---
+:plugins:
+  # tell Ceedling we got results display taken care of
+  :display_raw_test_results: FALSE

data/plugins/stdout_gtestlike_tests_report/lib/stdout_gtestlike_tests_report.rb

@@ -0,0 +1,43 @@
+require 'ceedling/plugin'
+require 'ceedling/defaults'
+
+class StdoutGtestlikeTestsReport < Plugin
+
+  def setup
+    @result_list = []
+    @plugin_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    template = @ceedling[:file_wrapper].read(File.join(@plugin_root, 'assets/template.erb'))
+    @ceedling[:plugin_reportinator].register_test_results_template( template )
+  end
+
+  def post_test_fixture_execute(arg_hash)
+    return if not (arg_hash[:context] == TEST_SYM)
+
+    @result_list << arg_hash[:result_file]
+  end
+
+  def post_build
+    return if not (@ceedling[:task_invoker].test_invoked?)
+
+    results = @ceedling[:plugin_reportinator].assemble_test_results(@result_list)
+    hash = {
+      :header => '',
+      :results => results
+    }
+
+    @ceedling[:plugin_reportinator].run_test_results_report(hash)
+  end
+
+  def summary
+    result_list = @ceedling[:file_path_utils].form_pass_results_filelist( PROJECT_TEST_RESULTS_PATH, COLLECTION_ALL_TESTS )
+
+    # get test results for only those tests in our configuration and of those only tests with results on disk
+    hash = {
+      :header => '',
+      :results => @ceedling[:plugin_reportinator].assemble_test_results(result_list, {:boom => false})
+    }
+
+    @ceedling[:plugin_reportinator].run_test_results_report(hash)
+  end
+
+end

data/spec/system/deployment_spec.rb

@@ -66,7 +66,6 @@ describe "Ceedling" do
     it "should list out all the examples" do
       expect(@output).to match(/blinky/)
       expect(@output).to match(/temp_sensor/)
-      expect(@output.lines.to_a.length).to eq 3
     end
   end
 

data/test_graveyard/integration/paths_test.rb

@@ -1,80 +1,80 @@
-require File.dirname(__FILE__) + '/../integration_test_helper'
-require 'rubygems'
-require 'rake' # for FileList
-require 'constructor'
-require 'ceedling/file_system_utils'
-require 'ceedling/file_wrapper'
-
-
-PATHS_ROOT = INTEGRATION_TEST_ROOT + '/paths'
-
-class PathsTest < Test::Unit::TestCase
-
-  def setup
-    ENV['CEEDLING_MAIN_PROJECT_FILE'] = File.join(INTEGRATION_TEST_ROOT, 'paths.yml')
-    
-    @file_system_utils = FileSystemUtils.new({:file_wrapper => FileWrapper.new})
-  end
-
-  def teardown
-  end
-
-
-  should "collect paths from file system and exercise globs and our special glob handling" do
-    # pass in two strings to find all test(s) dirs in main/ and modules/
-    expected = [
-      "#{PATHS_ROOT}/main/test",
-      "#{PATHS_ROOT}/modules/comm/ethernet/test",
-      "#{PATHS_ROOT}/modules/comm/serial/test",
-      "#{PATHS_ROOT}/modules/eeprom/test",
-      "#{PATHS_ROOT}/modules/display/tests",
-      "#{PATHS_ROOT}/modules/power/tests"]
-    list = @file_system_utils.collect_paths("#{PATHS_ROOT}/main/test", "#{PATHS_ROOT}/modules/**/tes{t,ts}")
-    assert_equal(expected.sort, list.to_a.sort)
-    
-    # pass in a FileList to find all src/ dirs in all of PATHS_ROOT space
-    expected = [
-      "#{PATHS_ROOT}/main/src",
-      "#{PATHS_ROOT}/modules/comm/ethernet/src",
-      "#{PATHS_ROOT}/modules/comm/serial/src",
-      "#{PATHS_ROOT}/modules/display/src",
-      "#{PATHS_ROOT}/modules/eeprom/src",
-      "#{PATHS_ROOT}/modules/power/src"]   
-    list = @file_system_utils.collect_paths(FileList.new("#{PATHS_ROOT}/**/sr?"))
-    assert_equal(expected.sort, list.to_a.sort)
-
-    # pass in a string to recursively find all subdirectories below source/
-    expected = [
-      "#{PATHS_ROOT}/source/comm",
-      "#{PATHS_ROOT}/source/comm/ethernet",
-      "#{PATHS_ROOT}/source/comm/serial",
-      "#{PATHS_ROOT}/source/display",
-      "#{PATHS_ROOT}/source/eeprom",
-      "#{PATHS_ROOT}/source/power"]
-    list = @file_system_utils.collect_paths("#{PATHS_ROOT}/source/**")
-    assert_equal(expected.sort, list.to_a.sort)
-
-    # pass in a string to find all subdirectories one level below source/
-    expected = [
-      "#{PATHS_ROOT}/source/comm",
-      "#{PATHS_ROOT}/source/display",
-      "#{PATHS_ROOT}/source/eeprom",
-      "#{PATHS_ROOT}/source/power"]
-    list = @file_system_utils.collect_paths("#{PATHS_ROOT}/source/*")
-    assert_equal(expected.sort, list.to_a.sort)
-
-
-    # pass in an array of strings to collect tests/ and all subdirectories below tests/
-    expected = [
-      "#{PATHS_ROOT}/tests",
-      "#{PATHS_ROOT}/tests/comm",
-      "#{PATHS_ROOT}/tests/comm/ethernet",
-      "#{PATHS_ROOT}/tests/comm/serial",
-      "#{PATHS_ROOT}/tests/display",
-      "#{PATHS_ROOT}/tests/eeprom",
-      "#{PATHS_ROOT}/tests/power"]
-    list = @file_system_utils.collect_paths(["#{PATHS_ROOT}/tests", "#{PATHS_ROOT}/tests/**"])
-    assert_equal(expected.sort, list.to_a.sort)
-  end
-
-end
+require File.dirname(__FILE__) + '/../integration_test_helper'
+require 'rubygems'
+require 'rake' # for FileList
+require 'constructor'
+require 'ceedling/file_system_utils'
+require 'ceedling/file_wrapper'
+
+
+PATHS_ROOT = INTEGRATION_TEST_ROOT + '/paths'
+
+class PathsTest < Test::Unit::TestCase
+
+  def setup
+    ENV['CEEDLING_MAIN_PROJECT_FILE'] = File.join(INTEGRATION_TEST_ROOT, 'paths.yml')
+    
+    @file_system_utils = FileSystemUtils.new({:file_wrapper => FileWrapper.new})
+  end
+
+  def teardown
+  end
+
+
+  should "collect paths from file system and exercise globs and our special glob handling" do
+    # pass in two strings to find all test(s) dirs in main/ and modules/
+    expected = [
+      "#{PATHS_ROOT}/main/test",
+      "#{PATHS_ROOT}/modules/comm/ethernet/test",
+      "#{PATHS_ROOT}/modules/comm/serial/test",
+      "#{PATHS_ROOT}/modules/eeprom/test",
+      "#{PATHS_ROOT}/modules/display/tests",
+      "#{PATHS_ROOT}/modules/power/tests"]
+    list = @file_system_utils.collect_paths("#{PATHS_ROOT}/main/test", "#{PATHS_ROOT}/modules/**/tes{t,ts}")
+    assert_equal(expected.sort, list.to_a.sort)
+    
+    # pass in a FileList to find all src/ dirs in all of PATHS_ROOT space
+    expected = [
+      "#{PATHS_ROOT}/main/src",
+      "#{PATHS_ROOT}/modules/comm/ethernet/src",
+      "#{PATHS_ROOT}/modules/comm/serial/src",
+      "#{PATHS_ROOT}/modules/display/src",
+      "#{PATHS_ROOT}/modules/eeprom/src",
+      "#{PATHS_ROOT}/modules/power/src"]   
+    list = @file_system_utils.collect_paths(FileList.new("#{PATHS_ROOT}/**/sr?"))
+    assert_equal(expected.sort, list.to_a.sort)
+
+    # pass in a string to recursively find all subdirectories below source/
+    expected = [
+      "#{PATHS_ROOT}/source/comm",
+      "#{PATHS_ROOT}/source/comm/ethernet",
+      "#{PATHS_ROOT}/source/comm/serial",
+      "#{PATHS_ROOT}/source/display",
+      "#{PATHS_ROOT}/source/eeprom",
+      "#{PATHS_ROOT}/source/power"]
+    list = @file_system_utils.collect_paths("#{PATHS_ROOT}/source/**")
+    assert_equal(expected.sort, list.to_a.sort)
+
+    # pass in a string to find all subdirectories one level below source/
+    expected = [
+      "#{PATHS_ROOT}/source/comm",
+      "#{PATHS_ROOT}/source/display",
+      "#{PATHS_ROOT}/source/eeprom",
+      "#{PATHS_ROOT}/source/power"]
+    list = @file_system_utils.collect_paths("#{PATHS_ROOT}/source/*")
+    assert_equal(expected.sort, list.to_a.sort)
+
+
+    # pass in an array of strings to collect tests/ and all subdirectories below tests/
+    expected = [
+      "#{PATHS_ROOT}/tests",
+      "#{PATHS_ROOT}/tests/comm",
+      "#{PATHS_ROOT}/tests/comm/ethernet",
+      "#{PATHS_ROOT}/tests/comm/serial",
+      "#{PATHS_ROOT}/tests/display",
+      "#{PATHS_ROOT}/tests/eeprom",
+      "#{PATHS_ROOT}/tests/power"]
+    list = @file_system_utils.collect_paths(["#{PATHS_ROOT}/tests", "#{PATHS_ROOT}/tests/**"])
+    assert_equal(expected.sort, list.to_a.sort)
+  end
+
+end

data/test_graveyard/integration/rake_rules_aux_dependencies_test.rb

@@ -1,75 +1,75 @@
-require File.dirname(__FILE__) + '/../integration_test_helper'
-require 'rubygems'
-require 'rake'
-
-
-class RakeRulesAuxDependenciesTest < Test::Unit::TestCase
-
-  def setup
-    rake_setup('rakefile_rules_deep_dependencies.rb', :file_finder, :generator)
-  end
-
-  def teardown
-    Rake.application = nil
-  end
-  
-  
-  should "recognize missing dependencies files, find their source, and execute rake tasks from the rule for dependency file generation" do
-    # default values as set in test_helper
-    redefine_global_constant('PROJECT_TEST_DEPENDENCIES_PATH', 'project/build/dependencies')
-    redefine_global_constant('EXTENSION_DEPENDENCIES', '.d')
-
-    # reload rakefile with new global constants
-    setup()
-
-    dependencies_src1 = 'files/source/thing.c'
-    dependencies_src2 = 'tests/test_thing.c'
-    dependencies_src3 = 'lib/stuff.c'
-    dependencies1     = 'project/build/dependencies/thing.d'
-    dependencies2     = 'project/build/dependencies/test_thing.d'
-    dependencies3     = 'project/build/dependencies/stuff.d'
-
-    # fake out rake so it won't look for the header files on disk and find they don't exist.
-    # by creating file tasks we're telling rake there's a means to create these files that don't exist (but we never use the mechanism).
-    @rake.define_task(Rake::FileTask, dependencies_src1)
-    @rake.define_task(Rake::FileTask, dependencies_src2)
-    @rake.define_task(Rake::FileTask, dependencies_src3)
-
-    # set up expectations
-    @file_finder.expects.find_compilation_input_file(dependencies1).returns(dependencies_src1)
-    @generator.expects.generate_dependencies_file(dependencies_src1, dependencies1)
-    @file_finder.expects.find_compilation_input_file(dependencies2).returns(dependencies_src2)
-    @generator.expects.generate_dependencies_file(dependencies_src2, dependencies2)
-    @file_finder.expects.find_compilation_input_file(dependencies3).returns(dependencies_src3)
-    @generator.expects.generate_dependencies_file(dependencies_src3, dependencies3)
-
-    # invoke the dependencies creation rule under test
-    @rake[dependencies1].invoke
-    @rake[dependencies2].invoke
-    @rake[dependencies3].invoke
-  end
-
-  should "handle alternate build file paths and file extensions for dependency file generation rule" do
-    # default values as set in test_helper
-    redefine_global_constant('PROJECT_TEST_DEPENDENCIES_PATH', 'dependencies/dump')
-    redefine_global_constant('EXTENSION_DEPENDENCIES', '.i')
-
-    # reload rakefile with new global constants
-    setup()
-
-    dependencies_src1 = 'files/source/thing.c'
-    dependencies1     = 'dependencies/dump/thing.i'
-
-    # fake out rake so it won't look for the header files on disk and find they don't exist.
-    # by creating file tasks we're telling rake there's a means to create these files that don't exist (but we never use the mechanism).
-    @rake.define_task(Rake::FileTask, dependencies_src1)
-
-    # set up expectations
-    @file_finder.expects.find_compilation_input_file(dependencies1).returns(dependencies_src1)
-    @generator.expects.generate_dependencies_file(dependencies_src1, dependencies1)
-
-    # invoke the dependencies creation rule under test
-    @rake[dependencies1].invoke
-  end
-
-end
+require File.dirname(__FILE__) + '/../integration_test_helper'
+require 'rubygems'
+require 'rake'
+
+
+class RakeRulesAuxDependenciesTest < Test::Unit::TestCase
+
+  def setup
+    rake_setup('rakefile_rules_deep_dependencies.rb', :file_finder, :generator)
+  end
+
+  def teardown
+    Rake.application = nil
+  end
+  
+  
+  should "recognize missing dependencies files, find their source, and execute rake tasks from the rule for dependency file generation" do
+    # default values as set in test_helper
+    redefine_global_constant('PROJECT_TEST_DEPENDENCIES_PATH', 'project/build/dependencies')
+    redefine_global_constant('EXTENSION_DEPENDENCIES', '.d')
+
+    # reload rakefile with new global constants
+    setup()
+
+    dependencies_src1 = 'files/source/thing.c'
+    dependencies_src2 = 'tests/test_thing.c'
+    dependencies_src3 = 'lib/stuff.c'
+    dependencies1     = 'project/build/dependencies/thing.d'
+    dependencies2     = 'project/build/dependencies/test_thing.d'
+    dependencies3     = 'project/build/dependencies/stuff.d'
+
+    # fake out rake so it won't look for the header files on disk and find they don't exist.
+    # by creating file tasks we're telling rake there's a means to create these files that don't exist (but we never use the mechanism).
+    @rake.define_task(Rake::FileTask, dependencies_src1)
+    @rake.define_task(Rake::FileTask, dependencies_src2)
+    @rake.define_task(Rake::FileTask, dependencies_src3)
+
+    # set up expectations
+    @file_finder.expects.find_compilation_input_file(dependencies1).returns(dependencies_src1)
+    @generator.expects.generate_dependencies_file(dependencies_src1, dependencies1)
+    @file_finder.expects.find_compilation_input_file(dependencies2).returns(dependencies_src2)
+    @generator.expects.generate_dependencies_file(dependencies_src2, dependencies2)
+    @file_finder.expects.find_compilation_input_file(dependencies3).returns(dependencies_src3)
+    @generator.expects.generate_dependencies_file(dependencies_src3, dependencies3)
+
+    # invoke the dependencies creation rule under test
+    @rake[dependencies1].invoke
+    @rake[dependencies2].invoke
+    @rake[dependencies3].invoke
+  end
+
+  should "handle alternate build file paths and file extensions for dependency file generation rule" do
+    # default values as set in test_helper
+    redefine_global_constant('PROJECT_TEST_DEPENDENCIES_PATH', 'dependencies/dump')
+    redefine_global_constant('EXTENSION_DEPENDENCIES', '.i')
+
+    # reload rakefile with new global constants
+    setup()
+
+    dependencies_src1 = 'files/source/thing.c'
+    dependencies1     = 'dependencies/dump/thing.i'
+
+    # fake out rake so it won't look for the header files on disk and find they don't exist.
+    # by creating file tasks we're telling rake there's a means to create these files that don't exist (but we never use the mechanism).
+    @rake.define_task(Rake::FileTask, dependencies_src1)
+
+    # set up expectations
+    @file_finder.expects.find_compilation_input_file(dependencies1).returns(dependencies_src1)
+    @generator.expects.generate_dependencies_file(dependencies_src1, dependencies1)
+
+    # invoke the dependencies creation rule under test
+    @rake[dependencies1].invoke
+  end
+
+end