ceedling 0.15.2 → 0.15.3

data/examples/temp_sensor/src/TimerInterruptConfigurator.h

@@ -1,5 +1,5 @@
 #ifndef _TIMERINTERRUPTCONFIGURATOR_H
-#define _TIMERINTERRUPCONFIGURATOR_H
+#define _TIMERINTERRUPTCONFIGURATOR_H
 
 #include "Types.h"
 

data/lib/ceedling/defaults.rb

@@ -42,15 +42,14 @@ DEFAULT_TEST_FIXTURE_TOOL = {
   :arguments => [].freeze
   }
 
-
-
 DEFAULT_TEST_INCLUDES_PREPROCESSOR_TOOL = {
-  :executable => FilePathUtils.os_executable_ext('cpp').freeze,
+  :executable => FilePathUtils.os_executable_ext('gcc').freeze,
   :name => 'default_test_includes_preprocessor'.freeze,
   :stderr_redirect => StdErrRedirect::NONE.freeze,
   :background_exec => BackgroundExec::NONE.freeze,
   :optional => false.freeze,
   :arguments => [
+    '-E'.freeze,
     '-MM'.freeze,
     '-MG'.freeze,
     # avoid some possibility of deep system lib header file complications by omitting vendor paths
@@ -58,7 +57,7 @@ DEFAULT_TEST_INCLUDES_PREPROCESSOR_TOOL = {
     {"-I\"$\"" => "{SystemWrapper.windows? ? COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE : COLLECTION_PATHS_TEST_SUPPORT_SOURCE_INCLUDE.map{|path| path.gsub(\/ \/, \'\\\\ \') }}"}.freeze,
     {"-D$" => 'COLLECTION_DEFINES_TEST_AND_VENDOR'}.freeze,
     {"-D$" => 'DEFINES_TEST_PREPROCESS'}.freeze,
-    "-DGNU_PREPROCESSOR".freeze,
+    "-DGNU_COMPILER".freeze,
     '-w'.freeze,
     '-nostdinc'.freeze,
     "\"${1}\"".freeze
@@ -328,8 +327,17 @@ DEFAULT_TESTS_RESULTS_REPORT_TEMPLATE = %q{
 % header_prepend = ((hash[:header].length > 0) ? "#{hash[:header]}: " : '')
 % banner_width   = 25 + header_prepend.length # widest message
 
+% if (stdout_count > 0)
+<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'TEST OUTPUT')%>
+%   hash[:results][:stdout].each do |string|
+%     string[:collection].each do |item|
+<%=string[:source][:path]%><%=File::SEPARATOR%><%=string[:source][:file]%>: "<%=item%>"
+%     end
+%   end
+
+% end
 % if (ignored > 0)
-<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'IGNORED UNIT TEST SUMMARY')%>
+<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'IGNORED TEST SUMMARY')%>
 %   hash[:results][:ignores].each do |ignore|
 %     ignore[:collection].each do |item|
 <%=ignore[:source][:path]%><%=File::SEPARATOR%><%=ignore[:source][:file]%>:<%=item[:line]%>:<%=item[:test]%>
@@ -343,7 +351,7 @@ DEFAULT_TESTS_RESULTS_REPORT_TEMPLATE = %q{
 
 % end
 % if (failed > 0)
-<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'FAILED UNIT TEST SUMMARY')%>
+<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'FAILED TEST SUMMARY')%>
 %   hash[:results][:failures].each do |failure|
 %     failure[:collection].each do |item|
 <%=failure[:source][:path]%><%=File::SEPARATOR%><%=failure[:source][:file]%>:<%=item[:line]%>:<%=item[:test]%>
@@ -355,19 +363,10 @@ DEFAULT_TESTS_RESULTS_REPORT_TEMPLATE = %q{
 %     end
 %   end
 
-% end
-% if (stdout_count > 0)
-<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'UNIT TEST OTHER OUTPUT')%>
-%   hash[:results][:stdout].each do |string|
-%     string[:collection].each do |item|
-<%=string[:source][:path]%><%=File::SEPARATOR%><%=string[:source][:file]%>: "<%=item%>"
-%     end
-%   end
-
 % end
 % total_string = hash[:results][:counts][:total].to_s
 % format_string = "%#{total_string.length}i"
-<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'OVERALL UNIT TEST SUMMARY')%>
+<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'OVERALL TEST SUMMARY')%>
 % if (hash[:results][:counts][:total] > 0)
 TESTED:  <%=hash[:results][:counts][:total].to_s%>
 PASSED:  <%=sprintf(format_string, hash[:results][:counts][:passed])%>

data/lib/ceedling/generator.rb

@@ -30,21 +30,21 @@ class Generator
 
   def generate_dependencies_file(tool, context, source, object, dependencies)
     @streaminator.stdout_puts("Generating dependencies for #{File.basename(source)}...", Verbosity::NORMAL)
-    
-    command = 
+
+    command =
       @tool_executor.build_command_line(
         tool,
         source,
         dependencies,
         object)
-    
+
     @tool_executor.exec( command[:line], command[:options] )
   end
 
   def generate_mock(context, header_filepath)
     arg_hash = {:header_file => header_filepath, :context => context}
     @plugin_manager.pre_mock_generate( arg_hash )
-    
+
     begin
       @cmock_builder.cmock.setup_mocks( arg_hash[:header_file] )
     rescue
@@ -58,25 +58,27 @@ class Generator
   def generate_test_runner(context, test_filepath, runner_filepath)
     arg_hash = {:context => context, :test_file => test_filepath, :runner_file => runner_filepath}
     @plugin_manager.pre_runner_generate(arg_hash)
-    
+
     # collect info we need
     module_name = File.basename(arg_hash[:test_file])
     test_cases  = @generator_test_runner.find_test_cases( @file_finder.find_test_from_runner_path(runner_filepath) )
     mock_list   = @test_includes_extractor.lookup_raw_mock_list(arg_hash[:test_file])
 
     @streaminator.stdout_puts("Generating runner for #{module_name}...", Verbosity::NORMAL)
-    
+
+    test_file_includes = [] # Empty list for now, since apparently unused
+
     # build runner file
     begin
-      @generator_test_runner.generate(module_name, runner_filepath, test_cases, mock_list)
+      @generator_test_runner.generate(module_name, runner_filepath, test_cases, mock_list, test_file_includes)
     rescue
       raise
     ensure
-      @plugin_manager.post_runner_generate(arg_hash)    
+      @plugin_manager.post_runner_generate(arg_hash)
     end
   end
 
-  def generate_object_file(tool, context, source, object, list='')    
+  def generate_object_file(tool, context, source, object, list='')
     shell_result = {}
     arg_hash = {:tool => tool, :context => context, :source => source, :object => object, :list => list}
     @plugin_manager.pre_compile_execute(arg_hash)
@@ -104,7 +106,7 @@ class Generator
     shell_result = {}
     arg_hash = {:tool => tool, :context => context, :objects => objects, :executable => executable, :map => map}
     @plugin_manager.pre_link_execute(arg_hash)
-    
+
     @streaminator.stdout_puts("Linking #{File.basename(arg_hash[:executable])}...", Verbosity::NORMAL)
     command =
       @tool_executor.build_command_line( arg_hash[:tool],
@@ -112,7 +114,7 @@ class Generator
                                          arg_hash[:executable],
                                          arg_hash[:map],
                                          @flaginator.flag_down( OPERATION_LINK_SYM, context, executable ) )
-    
+
     begin
       shell_result = @tool_executor.exec( command[:line], command[:options] )
     rescue ShellExecutionException => ex
@@ -120,13 +122,13 @@ class Generator
                   "NOTICE: If the linker reports missing symbols, the following may be to blame:\n" +
                   "  1. Test lacks #include statements corresponding to needed source files.\n" +
                   "  2. Project search paths do not contain source files corresponding to #include statements in the test.\n"
-      
+
       if (@configurator.project_use_mocks)
         notice += "  3. Test does not #include needed mocks.\n\n"
       else
         notice += "\n"
       end
-      
+
       @streaminator.stderr_puts(notice, Verbosity::COMPLAIN)
       shell_result = ex.shell_result
       raise ''
@@ -139,26 +141,26 @@ class Generator
   def generate_test_results(tool, context, executable, result)
     arg_hash = {:tool => tool, :context => context, :executable => executable, :result_file => result}
     @plugin_manager.pre_test_fixture_execute(arg_hash)
-    
+
     @streaminator.stdout_puts("Running #{File.basename(arg_hash[:executable])}...", Verbosity::NORMAL)
-    
+
     # Unity's exit code is equivalent to the number of failed tests, so we tell @tool_executor not to fail out if there are failures
     # so that we can run all tests and collect all results
     command = @tool_executor.build_command_line(arg_hash[:tool], arg_hash[:executable])
     command[:options][:boom] = false
     shell_result = @tool_executor.exec( command[:line], command[:options] )
-    
+
     @generator_helper.test_results_error_handler(executable, shell_result)
-    
+
     processed = @generator_test_results.process_and_write_results( shell_result,
                                                                    arg_hash[:result_file],
                                                                    @file_finder.find_test_from_file_path(arg_hash[:executable]) )
-    
+
     arg_hash[:result_file]  = processed[:result_file]
     arg_hash[:results]      = processed[:results]
     arg_hash[:shell_result] = shell_result # for raw output display if no plugins for formatted display
-    
+
     @plugin_manager.post_test_fixture_execute(arg_hash)
   end
-  
+
 end

data/lib/ceedling/generator_test_runner.rb

@@ -7,23 +7,23 @@ class GeneratorTestRunner
     tests = []
     tests_and_line_numbers = []
     lines = []
-    
+
     # if we don't have preprocessor assistance, do some basic preprocessing of our own
     if (not @configurator.project_use_test_preprocessor)
       source = @file_wrapper.read(test_file)
-    
+
       # remove line comments
       source = source.gsub(/\/\/.*$/, '')
       # remove block comments
       source = source.gsub(/\/\*.*?\*\//m, '')
-    
+
       # treat preprocessor directives as a logical line
       lines = source.split(/(^\s*\#.*$) | (;|\{|\}) /x) # match ;, {, and } as end of lines
     # otherwise, read the preprocessed file raw
     else
       lines = @file_wrapper.read( @file_path_utils.form_preprocessed_file_filepath(test_file) ).split(/;|\{|\}/)
     end
-    
+
     # step 1. find test functions in (possibly preprocessed) file
     # (note that lines are not broken up at end of lines)
     lines.each do |line|
@@ -31,12 +31,12 @@ class GeneratorTestRunner
         tests << ($1.strip)
       end
     end
-    
+
     # step 2. associate test functions with line numbers in (non-preprocessed) original file
     # (note that this time we must scan file contents broken up by end of lines)
     raw_lines = @file_wrapper.read(test_file).split("\n")
     raw_index = 0
-    
+
     tests.each do |test|
       raw_lines[raw_index..-1].each_with_index do |line, index|
         # test function might be declared across lines; look for it by its name followed
@@ -48,16 +48,17 @@ class GeneratorTestRunner
         end
       end
     end
-    
+
     return tests_and_line_numbers
   end
-  
-  def generate(module_name, runner_filepath, test_cases, mock_list)
+
+  def generate(module_name, runner_filepath, test_cases, mock_list, test_file_includes=[])
     require 'generate_test_runner.rb'
     @test_runner_generator ||= UnityTestRunnerGenerator.new( @configurator.get_runner_config )
-    @test_runner_generator.generate( module_name, 
-                                     runner_filepath, 
-                                     test_cases, 
-                                     mock_list)
+    @test_runner_generator.generate( module_name,
+                                     runner_filepath,
+                                     test_cases,
+                                     mock_list,
+                                     test_file_includes)
   end
 end

data/lib/ceedling/version.rb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.15.2"
+    GEM = "0.15.3"
 
     # @private
     CEEDLING = GEM

data/lib/ceedling/version.rb.erb

@@ -2,7 +2,7 @@
 module Ceedling
   module Version
     # @private
-    GEM = "0.15.2"
+    GEM = "0.15.3"
 
     # @private
     CEEDLING = "<%= versions["CEEDLING"] %>"

data/plugins/stdout_pretty_tests_report/assets/template.erb

@@ -4,8 +4,18 @@
 % header_prepend = ((hash[:header].length > 0) ? "#{hash[:header]}: " : '')
 % banner_width   = 25 + header_prepend.length # widest message
 
+% if (stdout_count > 0)
+<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'TEST OUTPUT')%>
+%   hash[:results][:stdout].each do |string|
+[<%=string[:source][:file]%>]
+%     string[:collection].each do |item|
+  - "<%=item%>"
+%     end
+
+%   end
+% end
 % if (ignored > 0)
-<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'IGNORED UNIT TEST SUMMARY')%>
+<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'IGNORED TEST SUMMARY')%>
 %   hash[:results][:ignores].each do |ignore|
 [<%=ignore[:source][:file]%>]
 %     ignore[:collection].each do |item|
@@ -20,7 +30,7 @@
 %   end
 % end
 % if (failed > 0)
-<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'FAILED UNIT TEST SUMMARY')%>
+<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'FAILED TEST SUMMARY')%>
 %   hash[:results][:failures].each do |failure|
 [<%=failure[:source][:file]%>]
 %     failure[:collection].each do |item|
@@ -32,21 +42,11 @@
 % end
 
 %     end
-%   end
-% end
-% if (stdout_count > 0)
-<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'UNIT TEST OTHER OUTPUT')%>
-%   hash[:results][:stdout].each do |string|
-[<%=string[:source][:file]%>]
-%     string[:collection].each do |item|
-  - "<%=item%>"
-%     end
-
 %   end
 % end
 % total_string = hash[:results][:counts][:total].to_s
 % format_string = "%#{total_string.length}i"
-<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'OVERALL UNIT TEST SUMMARY')%>
+<%=@ceedling[:plugin_reportinator].generate_banner(header_prepend + 'OVERALL TEST SUMMARY')%>
 % if (hash[:results][:counts][:total] > 0)
 TESTED:  <%=hash[:results][:counts][:total].to_s%>
 PASSED:  <%=sprintf(format_string, hash[:results][:counts][:passed])%>

data/release/build.info

@@ -1,2 +1,2 @@
-226
+227
 

data/release/version.info

@@ -1 +1 @@
-0.15.1
+0.15.3

data/spec/ceedling_spec.rb

@@ -47,7 +47,7 @@ describe 'Ceedling' do
       rakefile_path = File.join(File.dirname(__FILE__), '..').gsub('spec','lib')
       rakefile_path = File.join( rakefile_path, 'lib', 'ceedling', 'rakefile.rb' )
       # mocks/stubs/expected calls
-      Ceedling.should_receive(:load).with(rakefile_path)
+      expect(Ceedling).to receive(:load).with(rakefile_path)
       # execute method
       Ceedling.load_project
       # validate results
@@ -60,7 +60,7 @@ describe 'Ceedling' do
       rakefile_path = File.join(File.dirname(__FILE__), '..').gsub('spec','lib')
       rakefile_path = File.join( rakefile_path, 'lib', 'ceedling', 'rakefile.rb' )
       # mocks/stubs/expected calls
-      Ceedling.should_receive(:load).with(rakefile_path)
+      expect(Ceedling).to receive(:load).with(rakefile_path)
       # execute method
       Ceedling.load_project(config: './foo.yml')
       # validate results
@@ -73,7 +73,7 @@ describe 'Ceedling' do
       rakefile_path = File.join(File.dirname(__FILE__), '..').gsub('spec','lib')
       rakefile_path = File.join( rakefile_path, 'lib', 'ceedling', 'rakefile.rb' )
       # mocks/stubs/expected calls
-      Ceedling.should_receive(:load).with(rakefile_path)
+      expect(Ceedling).to receive(:load).with(rakefile_path)
       # execute method
       Ceedling.load_project
       # validate results
@@ -88,10 +88,10 @@ describe 'Ceedling' do
       rakefile_path = File.join(File.dirname(__FILE__), '..').gsub('spec','lib')
       rakefile_path = File.join( rakefile_path, 'lib', 'ceedling', 'rakefile.rb' )
       # mocks/stubs/expected calls
-      Gem::Specification.should_receive(:find_by_name).with('ceedling-foo').and_return(spec_double)
-      spec_double.should_receive(:gem_dir).and_return('dummy/path')
-      Ceedling.should_receive(:require).with('ceedling/defaults')
-      Ceedling.should_receive(:load).with(rakefile_path)
+      expect(Gem::Specification).to receive(:find_by_name).with('ceedling-foo').and_return(spec_double)
+      expect(spec_double).to receive(:gem_dir).and_return('dummy/path')
+      expect(Ceedling).to receive(:require).with('ceedling/defaults')
+      expect(Ceedling).to receive(:load).with(rakefile_path)
       # execute method
       Ceedling.load_project( config:  './foo.yml',
                              plugins: ['foo'])
@@ -107,7 +107,7 @@ describe 'Ceedling' do
       rakefile_path = File.join(File.dirname(__FILE__), '..').gsub('spec','lib')
       rakefile_path = File.join( rakefile_path, 'lib', 'ceedling', 'rakefile.rb' )
       # mocks/stubs/expected calls
-      Ceedling.should_receive(:load).with(rakefile_path)
+      expect(Ceedling).to receive(:load).with(rakefile_path)
       # execute method
       Ceedling.load_project( config:  './foo.yml',
                              root:    './')
@@ -124,9 +124,9 @@ describe 'Ceedling' do
       DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths].clear()
       spec_double = double('spec-double')
       # mocks/stubs/expected calls
-      Gem::Specification.should_receive(:find_by_name).with('ceedling-foo').and_return(spec_double)
-      spec_double.should_receive(:gem_dir).and_return('dummy/path')
-      Ceedling.should_receive(:require).with('ceedling/defaults')
+      expect(Gem::Specification).to receive(:find_by_name).with('ceedling-foo').and_return(spec_double)
+      expect(spec_double).to receive(:gem_dir).and_return('dummy/path')
+      expect(Ceedling).to receive(:require).with('ceedling/defaults')
       # execute method
       Ceedling.register_plugin('foo')
       # validate results
@@ -140,9 +140,9 @@ describe 'Ceedling' do
       DEFAULT_CEEDLING_CONFIG[:plugins][:load_paths].clear()
       spec_double = double('spec-double')
       # mocks/stubs/expected calls
-      Gem::Specification.should_receive(:find_by_name).with('prefix-foo').and_return(spec_double)
-      spec_double.should_receive(:gem_dir).and_return('dummy/path')
-      Ceedling.should_receive(:require).with('ceedling/defaults')
+      expect(Gem::Specification).to receive(:find_by_name).with('prefix-foo').and_return(spec_double)
+      expect(spec_double).to receive(:gem_dir).and_return('dummy/path')
+      expect(Ceedling).to receive(:require).with('ceedling/defaults')
       # execute method
       Ceedling.register_plugin('foo','prefix-')
       # validate results

data/spec/spec_system_helper.rb

@@ -124,10 +124,10 @@ module CeedlingTestCases
   def can_create_projects
     @c.with_context do
       Dir.chdir @proj_name do
-        File.exists?("project.yml").should be_true
-        File.exists?("rakefile.rb").should be_true
-        File.exists?("src").should be_true
-        File.exists?("test").should be_true
+        File.exists?("project.yml").should == true
+        File.exists?("rakefile.rb").should == true
+        File.exists?("src").should == true
+        File.exists?("test").should == true
       end
     end
   end
@@ -135,7 +135,7 @@ module CeedlingTestCases
   def contains_a_vendor_directory
     @c.with_context do
       Dir.chdir @proj_name do
-        File.exists?("vendor/ceedling").should be_true
+        File.exists?("vendor/ceedling").should == true
       end
     end
   end
@@ -143,7 +143,7 @@ module CeedlingTestCases
   def does_not_contain_a_vendor_directory
     @c.with_context do
       Dir.chdir @proj_name do
-        File.exists?("vendor/ceedling").should be_false
+        File.exists?("vendor/ceedling").should == false
       end
     end
   end