ceedling 1.1.4 → 1.1.6

data/vendor/cmock/vendor/unity/auto/generate_test_runner.rb

@@ -71,24 +71,30 @@ class UnityTestRunnerGenerator
     source = File.read(input_file)
     source = source.force_encoding('ISO-8859-1').encode('utf-8', replace: nil)
     tests = find_tests(source)
-    headers = find_includes(source)
-    testfile_includes = @options[:use_system_files] ? (headers[:local] + headers[:system]) : headers[:local]
-    used_mocks = find_mocks(testfile_includes)
-    testfile_includes = (testfile_includes - used_mocks)
-    testfile_includes.delete_if { |inc| inc =~ /(unity|cmock)/ }
+    includes = find_includes(source)
+    headers = includes[:headers]
+    used_mocks = find_mocks(headers)
+    headers = (headers - used_mocks)
+    headers.delete_if { |inc| inc =~ /(unity|cmock)/ }
     find_setup_and_teardown(source)
 
     # build runner file
-    generate(input_file, output_file, tests, used_mocks, testfile_includes)
+    generate(input_file, output_file, tests, used_mocks, headers)
 
     # determine which files were used to return them
     all_files_used = [input_file, output_file]
-    all_files_used += testfile_includes.map { |filename| "#{filename}.c" } unless testfile_includes.empty?
+    all_files_used += headers.reject { |filename| filename =~ /^</ }.map { |filename| "#{filename}.c" } unless headers.empty?
     all_files_used += @options[:includes] unless @options[:includes].empty?
-    all_files_used += headers[:linkonly] unless headers[:linkonly].empty?
+    all_files_used += includes[:linkonly] unless includes[:linkonly].empty?
     all_files_used.uniq
   end
 
+  # Generate a test file for the given features:
+  #   input_file        - the name of the test file this is based on
+  #   output_file       - the name of the test runner file to generate
+  #   tests             - an array of all the tests which can be run from this test runner
+  #   used_mocks        - an array of all mock files which are used by this test runner
+  #   testfile_includes - an array of all included headers, in order, where system headers still have their <> attached
   def generate(input_file, output_file, tests, used_mocks, testfile_includes)
     File.open(output_file, 'w') do |output|
       create_header(output, used_mocks, testfile_includes)
@@ -100,16 +106,17 @@ class UnityTestRunnerGenerator
       create_suite_setup(output)
       create_suite_teardown(output)
       create_reset(output)
-      create_run_test(output) unless tests.empty?
+      create_run_test(output)
       create_args_wrappers(output, tests)
       create_shuffle_tests(output) if @options[:shuffle_tests]
+      tests = create_warning_test(output, input_file, tests)
       create_main(output, input_file, tests, used_mocks)
     end
 
     return unless @options[:header_file] && !@options[:header_file].empty?
 
     File.open(@options[:header_file], 'w') do |output|
-      create_h_file(output, @options[:header_file], tests, testfile_includes, used_mocks)
+      create_h_file(output, @options[:header_file], tests, headers, used_mocks)
     end
   end
 
@@ -211,10 +218,14 @@ class UnityTestRunnerGenerator
     source.gsub!(/\/\*.*?\*\//m, '')                     # remove block comments
     source.gsub!(/\/\/.*$/, '')                          # remove line comments (all that remain)
 
-    # parse out includes
+    # parse out includes (NOTICE: system includes KEEP the angle-brackets in the string, to preserve this information)
+    headers = if @options[:use_system_files]
+                source.scan(/^\s*#include\s+(?:(<)|")\s*(.+\.#{@options[:include_extensions]})\s*(?:(>)|")/).map(&:join).flatten
+              else
+                source.scan(/^\s*#include\s+"\s*(.+\.#{@options[:include_extensions]})\s*"/).flatten
+              end
     {
-      local: source.scan(/^\s*#include\s+"\s*(.+\.#{@options[:include_extensions]})\s*"/).flatten,
-      system: source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" },
+      headers: headers,
       linkonly: source.scan(/^TEST_SOURCE_FILE\(\s*"\s*(.+\.#{@options[:source_extensions]})\s*"/).flatten
     }
   end
@@ -251,7 +262,7 @@ class UnityTestRunnerGenerator
     end
   end
 
-  def create_header(output, mocks, testfile_includes = [])
+  def create_header(output, mocks, headers = [])
     output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
     output.puts("\n/*=======Automagically Detected Files To Include=====*/")
     output.puts('extern "C" {') if @options[:externcincludes]
@@ -274,10 +285,7 @@ class UnityTestRunnerGenerator
     if @options[:header_file] && !@options[:header_file].empty?
       output.puts("#include \"#{File.basename(@options[:header_file])}\"")
     else
-      @options[:includes].flatten.uniq.compact.each do |inc|
-        output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
-      end
-      testfile_includes.each do |inc|
+      [@options[:includes], headers].flatten.uniq.compact.each do |inc|
         output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
       end
     end
@@ -406,10 +414,43 @@ class UnityTestRunnerGenerator
   end
 
   def create_run_test(output)
-    require 'erb'
-    file = File.read(File.join(__dir__, 'run_test.erb'))
-    template = ERB.new(file, trim_mode: '<>')
-    output.puts("\n#{template.result(binding)}")
+    output.puts('/*=======Test Runner Used To Run Each Test=====*/')
+    output.puts('static void run_test(UnityTestFunction func, const char* name, UNITY_LINE_TYPE line_num)')
+    output.puts('{')
+    output.puts('    Unity.CurrentTestName = name;')
+    output.puts('    Unity.CurrentTestLineNumber = (UNITY_UINT) line_num;')
+    output.puts('#ifdef UNITY_USE_COMMAND_LINE_ARGS')
+    output.puts('    if (!UnityTestMatches())')
+    output.puts('        return;')
+    output.puts('#endif')
+    output.puts('    Unity.NumberOfTests++;')
+    output.puts('    UNITY_CLR_DETAILS();')
+    output.puts('    UNITY_EXEC_TIME_START();')
+    output.puts('    CMock_Init();')
+    output.puts('    if (TEST_PROTECT())')
+    output.puts('    {')
+    if @options[:plugins].include?(:cexception)
+      output.puts('        volatile CEXCEPTION_T e;')
+      output.puts('        Try {')
+      output.puts("            #{@options[:setup_name]}();")
+      output.puts('            func();')
+      output.puts('        } Catch(e) {')
+      output.puts('            TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!");')
+      output.puts('        }')
+    else
+      output.puts("        #{@options[:setup_name]}();")
+      output.puts('        func();')
+    end
+    output.puts('    }')
+    output.puts('    if (TEST_PROTECT())')
+    output.puts('    {')
+    output.puts("        #{@options[:teardown_name]}();")
+    output.puts('        CMock_Verify();')
+    output.puts('    }')
+    output.puts('    CMock_Destroy();')
+    output.puts('    UNITY_EXEC_TIME_STOP();')
+    output.puts('    UnityConcludeTest();')
+    output.puts('}')
   end
 
   def create_args_wrappers(output, tests)
@@ -428,6 +469,22 @@ class UnityTestRunnerGenerator
     end
   end
 
+  def create_warning_test(output, filename, tests)
+    if count_tests(tests) == 0
+      warning_test = {
+        :test => 'test_empty_warning',
+        :line_number => 0
+      }
+      output.puts("\n/*=======Warning Test=====*/")
+      output.puts("static void #{warning_test[:test]}(void)")
+      output.puts('{')
+      output.puts("    TEST_IGNORE_MESSAGE(\"Test file '#{filename.gsub(/\\/, '\\\\\\')}' contains no tests.\");")
+      output.puts("}\n")
+      tests = [warning_test]
+    end
+    tests
+  end
+
   def create_shuffle_tests(output)
     output.puts("\n/*=======Shuffle Test Order=====*/")
     output.puts('static void shuffleTests(struct UnityRunTestParameters run_test_params_arr[], int num_of_tests)')
@@ -453,13 +510,15 @@ class UnityTestRunnerGenerator
       end
       output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv)")
       output.puts('{')
+      output.puts('(void)argc;')
+      output.puts('(void)argv;')
       output.puts('#ifdef UNITY_USE_COMMAND_LINE_ARGS')
       output.puts('  int parse_status = UnityParseOptions(argc, argv);')
       output.puts('  if (parse_status != 0)')
       output.puts('  {')
       output.puts('    if (parse_status < 0)')
       output.puts('    {')
-      output.puts("      UnityPrint(\"#{filename.gsub('.c', '').gsub(/\\/, '\\\\\\')}.\");")
+      output.puts("      UnityPrint(\"#{filename.gsub(/\\/, '\\\\\\')}\");")
       output.puts('      UNITY_PRINT_EOL();')
       tests.each do |test|
         if !@options[:use_param_tests] || test[:args].nil? || test[:args].empty?
@@ -533,7 +592,7 @@ class UnityTestRunnerGenerator
     output.puts('  CMock_Guts_MemFreeFinal();') unless used_mocks.empty?
     if @options[:has_suite_teardown]
       if @options[:omit_begin_end]
-        output.puts('  (void) suite_teardown(0);')
+        output.puts('  (void) suiteTearDown(0);')
       else
         output.puts('  return suiteTearDown(UNITY_END());')
       end
@@ -543,17 +602,14 @@ class UnityTestRunnerGenerator
     output.puts('}')
   end
 
-  def create_h_file(output, filename, tests, testfile_includes, used_mocks)
+  def create_h_file(output, filename, tests, headers, used_mocks)
     filename = File.basename(filename).gsub(/[-\/\\.,\s]/, '_').upcase
     output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
     output.puts("#ifndef _#{filename}")
     output.puts("#define _#{filename}\n\n")
     output.puts("#include \"#{@options[:framework]}.h\"")
     output.puts('#include "cmock.h"') unless used_mocks.empty?
-    @options[:includes].flatten.uniq.compact.each do |inc|
-      output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
-    end
-    testfile_includes.each do |inc|
+    [@options[:includes], headers].flatten.uniq.compact.each do |inc|
       output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
     end
     output.puts "\n"

data/vendor/cmock/vendor/unity/docs/UnityChangeLog.md

@@ -29,6 +29,7 @@ Significant Bugfixes:
   - display of failures fixed on ARM processors, particularly with arrays (#807)
   - fixed each-equal assertion for memory (#797)
   - fix many warnings.
+  - Test runner generator calls custom suite teardown when begin/end calls are omitted. @94xhn
 
 Other:
 

data/vendor/cmock/vendor/unity/examples/unity_config.h

@@ -250,4 +250,12 @@
  */
 /* #define UNITY_INCLUDE_EXEC_TIME */
 
+/* Define this macro to redefine what the UnityPrintChar() function considers
+ * a printable character.
+ *
+ * Example, for printing UTF-8:
+ * #define UNITY_IS_PRINTABLE_CHAR(c) ((128 <= (c)) && ((c) <= 255))
+*/
+/* #define UNITY_IS_PRINTABLE_CHAR(c) ((32 <= (c)) && ((c) <= 126)) */
+
 #endif /* UNITY_CONFIG_H */

data/vendor/cmock/vendor/unity/src/unity.c

@@ -7,6 +7,8 @@
 
 #include "unity.h"
 
+#include <stdbool.h>
+
 #ifndef UNITY_PROGMEM
 #define UNITY_PROGMEM
 #endif
@@ -88,8 +90,14 @@ static const char UNITY_PROGMEM UnityStrDetail2Name[]            = " " UNITY_DET
 /* Local helper function to print characters. */
 static void UnityPrintChar(const char* pch)
 {
+#ifdef UNITY_IS_PRINTABLE_CHAR
+    const int isPrintable = UNITY_IS_PRINTABLE_CHAR(*pch);
+#else
+    const int isPrintable = ((32 <= *pch) && (*pch <= 126));
+#endif
+
     /* printable characters plus CR & LF are printed */
-    if ((*pch <= 126) && (*pch >= 32))
+    if (isPrintable)
     {
         UNITY_OUTPUT_CHAR(*pch);
     }

data/vendor/cmock/vendor/unity/src/unity.h

@@ -11,7 +11,7 @@
 
 #define UNITY_VERSION_MAJOR    2
 #define UNITY_VERSION_MINOR    7
-#define UNITY_VERSION_BUILD    0
+#define UNITY_VERSION_BUILD    2
 #define UNITY_VERSION          ((UNITY_VERSION_MAJOR << 16) | (UNITY_VERSION_MINOR << 8) | UNITY_VERSION_BUILD)
 
 #ifdef __cplusplus

data/vendor/cmock/vendor/unity/test/rakefile

@@ -19,6 +19,7 @@ TEMP_DIRS = [
 
 TEMP_DIRS.each do |dir|
   directory(dir)
+  CLEAN.include(File.join(dir, '*.*'))
   CLOBBER.include(dir)
 end
 
@@ -167,7 +168,7 @@ namespace :style do
 
   desc "Attempt to Autocorrect style"
   task :auto  => ['style:clean'] do
-    execute("rubocop ../auto ../examples ../extras --auto-correct --config .rubocop.yml")
+    execute("rubocop ../auto ../examples ../extras --autocorrect --config .rubocop.yml")
     report "Autocorrected What We Could."
   end
 

data/vendor/cmock/vendor/unity/test/testdata/testRunnerGeneratorEmpty.c

@@ -0,0 +1,13 @@
+/* =========================================================================
+    Unity - A Test Framework for C
+    ThrowTheSwitch.org
+    Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    SPDX-License-Identifier: MIT
+========================================================================= */
+
+/* This Test File Is Used To Verify The Warning When No Tests Are Found */
+
+#include "unity.h"
+
+void setUp(void) {}
+void tearDown(void) {}

data/vendor/cmock/vendor/unity/test/tests/test_generate_test_runner.rb

@@ -336,6 +336,17 @@ RUNNER_TESTS = [
   },
 
 
+  { :name => 'EmptyFileWarning',
+    :testfile => 'testdata/testRunnerGeneratorEmpty.c',
+    :testdefines => ['TEST'],
+    :options => nil, #defaults
+    :expected => {
+      :to_pass => [ ],
+      :to_fail => [ ],
+      :to_ignore => [ 'test_empty_warning' ],
+    }
+  },
+
   #### WITH MOCKS ##########################################
 
   { :name => 'DefaultsThroughOptions',
@@ -1303,6 +1314,26 @@ def verify_number(expected, expression, output)
   end
 end
 
+should 'GenerateSuiteTeardownWhenBeginAndEndAreOmitted' do
+  runner_name = OUT_FILE + 'SuiteTeardownWithoutBeginEnd_runner.c'
+  UnityTestRunnerGenerator.new(
+    :test_prefix => 'test',
+    :suite_teardown => '  return num_failures;',
+    :omit_begin_end => true,
+  ).run('testdata/testRunnerGenerator.c', runner_name)
+
+  runner = File.read(runner_name)
+  correct_call = runner.include?('(void) suiteTearDown(0);')
+  incorrect_call = runner.include?('(void) suite_teardown(0);')
+  if correct_call && !incorrect_call
+    report 'Runner_GenerateSuiteTeardownWhenBeginAndEndAreOmitted:PASS'
+  else
+    report 'Runner_GenerateSuiteTeardownWhenBeginAndEndAreOmitted:FAIL'
+    $generate_test_runner_failures += 1
+  end
+  $generate_test_runner_tests += 1
+end
+
 RUNNER_TESTS.each do |testset|
   basename = File.basename(testset[:testfile], C_EXTENSION)
   testset_name = "Runner_#{basename}_#{testset[:name]}"

data/vendor/unity/auto/generate_test_runner.rb

@@ -71,24 +71,30 @@ class UnityTestRunnerGenerator
     source = File.read(input_file)
     source = source.force_encoding('ISO-8859-1').encode('utf-8', replace: nil)
     tests = find_tests(source)
-    headers = find_includes(source)
-    testfile_includes = @options[:use_system_files] ? (headers[:local] + headers[:system]) : headers[:local]
-    used_mocks = find_mocks(testfile_includes)
-    testfile_includes = (testfile_includes - used_mocks)
-    testfile_includes.delete_if { |inc| inc =~ /(unity|cmock)/ }
+    includes = find_includes(source)
+    headers = includes[:headers]
+    used_mocks = find_mocks(headers)
+    headers = (headers - used_mocks)
+    headers.delete_if { |inc| inc =~ /(unity|cmock)/ }
     find_setup_and_teardown(source)
 
     # build runner file
-    generate(input_file, output_file, tests, used_mocks, testfile_includes)
+    generate(input_file, output_file, tests, used_mocks, headers)
 
     # determine which files were used to return them
     all_files_used = [input_file, output_file]
-    all_files_used += testfile_includes.map { |filename| "#{filename}.c" } unless testfile_includes.empty?
+    all_files_used += headers.reject { |filename| filename =~ /^</ }.map { |filename| "#{filename}.c" } unless headers.empty?
     all_files_used += @options[:includes] unless @options[:includes].empty?
-    all_files_used += headers[:linkonly] unless headers[:linkonly].empty?
+    all_files_used += includes[:linkonly] unless includes[:linkonly].empty?
     all_files_used.uniq
   end
 
+  # Generate a test file for the given features:
+  #   input_file        - the name of the test file this is based on
+  #   output_file       - the name of the test runner file to generate
+  #   tests             - an array of all the tests which can be run from this test runner
+  #   used_mocks        - an array of all mock files which are used by this test runner
+  #   testfile_includes - an array of all included headers, in order, where system headers still have their <> attached
   def generate(input_file, output_file, tests, used_mocks, testfile_includes)
     File.open(output_file, 'w') do |output|
       create_header(output, used_mocks, testfile_includes)
@@ -110,7 +116,7 @@ class UnityTestRunnerGenerator
     return unless @options[:header_file] && !@options[:header_file].empty?
 
     File.open(@options[:header_file], 'w') do |output|
-      create_h_file(output, @options[:header_file], tests, testfile_includes, used_mocks)
+      create_h_file(output, @options[:header_file], tests, headers, used_mocks)
     end
   end
 
@@ -212,10 +218,14 @@ class UnityTestRunnerGenerator
     source.gsub!(/\/\*.*?\*\//m, '')                     # remove block comments
     source.gsub!(/\/\/.*$/, '')                          # remove line comments (all that remain)
 
-    # parse out includes
+    # parse out includes (NOTICE: system includes KEEP the angle-brackets in the string, to preserve this information)
+    headers = if @options[:use_system_files]
+                source.scan(/^\s*#include\s+(?:(<)|")\s*(.+\.#{@options[:include_extensions]})\s*(?:(>)|")/).map(&:join).flatten
+              else
+                source.scan(/^\s*#include\s+"\s*(.+\.#{@options[:include_extensions]})\s*"/).flatten
+              end
     {
-      local: source.scan(/^\s*#include\s+"\s*(.+\.#{@options[:include_extensions]})\s*"/).flatten,
-      system: source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" },
+      headers: headers,
       linkonly: source.scan(/^TEST_SOURCE_FILE\(\s*"\s*(.+\.#{@options[:source_extensions]})\s*"/).flatten
     }
   end
@@ -252,7 +262,7 @@ class UnityTestRunnerGenerator
     end
   end
 
-  def create_header(output, mocks, testfile_includes = [])
+  def create_header(output, mocks, headers = [])
     output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
     output.puts("\n/*=======Automagically Detected Files To Include=====*/")
     output.puts('extern "C" {') if @options[:externcincludes]
@@ -275,10 +285,7 @@ class UnityTestRunnerGenerator
     if @options[:header_file] && !@options[:header_file].empty?
       output.puts("#include \"#{File.basename(@options[:header_file])}\"")
     else
-      @options[:includes].flatten.uniq.compact.each do |inc|
-        output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
-      end
-      testfile_includes.each do |inc|
+      [@options[:includes], headers].flatten.uniq.compact.each do |inc|
         output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
       end
     end
@@ -407,43 +414,43 @@ class UnityTestRunnerGenerator
   end
 
   def create_run_test(output)
-    output.puts("/*=======Test Runner Used To Run Each Test=====*/")
-    output.puts("static void run_test(UnityTestFunction func, const char* name, UNITY_LINE_TYPE line_num)")
-    output.puts("{")
-    output.puts("    Unity.CurrentTestName = name;")
-    output.puts("    Unity.CurrentTestLineNumber = (UNITY_UINT) line_num;")
-    output.puts("#ifdef UNITY_USE_COMMAND_LINE_ARGS")
-    output.puts("    if (!UnityTestMatches())")
-    output.puts("        return;")
-    output.puts("#endif")
-    output.puts("    Unity.NumberOfTests++;")
-    output.puts("    UNITY_CLR_DETAILS();")
-    output.puts("    UNITY_EXEC_TIME_START();")
-    output.puts("    CMock_Init();")
-    output.puts("    if (TEST_PROTECT())")
-    output.puts("    {")
+    output.puts('/*=======Test Runner Used To Run Each Test=====*/')
+    output.puts('static void run_test(UnityTestFunction func, const char* name, UNITY_LINE_TYPE line_num)')
+    output.puts('{')
+    output.puts('    Unity.CurrentTestName = name;')
+    output.puts('    Unity.CurrentTestLineNumber = (UNITY_UINT) line_num;')
+    output.puts('#ifdef UNITY_USE_COMMAND_LINE_ARGS')
+    output.puts('    if (!UnityTestMatches())')
+    output.puts('        return;')
+    output.puts('#endif')
+    output.puts('    Unity.NumberOfTests++;')
+    output.puts('    UNITY_CLR_DETAILS();')
+    output.puts('    UNITY_EXEC_TIME_START();')
+    output.puts('    CMock_Init();')
+    output.puts('    if (TEST_PROTECT())')
+    output.puts('    {')
     if @options[:plugins].include?(:cexception)
-      output.puts("        volatile CEXCEPTION_T e;")
-      output.puts("        Try {")
+      output.puts('        volatile CEXCEPTION_T e;')
+      output.puts('        Try {')
       output.puts("            #{@options[:setup_name]}();")
-      output.puts("            func();")
-      output.puts("        } Catch(e) {")
-      output.puts("            TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, \"Unhandled Exception!\");")
-      output.puts("        }")
+      output.puts('            func();')
+      output.puts('        } Catch(e) {')
+      output.puts('            TEST_ASSERT_EQUAL_HEX32_MESSAGE(CEXCEPTION_NONE, e, "Unhandled Exception!");')
+      output.puts('        }')
     else
       output.puts("        #{@options[:setup_name]}();")
-      output.puts("        func();")
+      output.puts('        func();')
     end
-    output.puts("    }")
-    output.puts("    if (TEST_PROTECT())")
-    output.puts("    {")
+    output.puts('    }')
+    output.puts('    if (TEST_PROTECT())')
+    output.puts('    {')
     output.puts("        #{@options[:teardown_name]}();")
-    output.puts("        CMock_Verify();")
-    output.puts("    }")
-    output.puts("    CMock_Destroy();")
-    output.puts("    UNITY_EXEC_TIME_STOP();")
-    output.puts("    UnityConcludeTest();")
-    output.puts("}")
+    output.puts('        CMock_Verify();')
+    output.puts('    }')
+    output.puts('    CMock_Destroy();')
+    output.puts('    UNITY_EXEC_TIME_STOP();')
+    output.puts('    UnityConcludeTest();')
+    output.puts('}')
   end
 
   def create_args_wrappers(output, tests)
@@ -465,7 +472,7 @@ class UnityTestRunnerGenerator
   def create_warning_test(output, filename, tests)
     if count_tests(tests) == 0
       warning_test = {
-        :test => "test_empty_warning",
+        :test => 'test_empty_warning',
         :line_number => 0
       }
       output.puts("\n/*=======Warning Test=====*/")
@@ -475,7 +482,7 @@ class UnityTestRunnerGenerator
       output.puts("}\n")
       tests = [warning_test]
     end
-    return tests
+    tests
   end
 
   def create_shuffle_tests(output)
@@ -503,13 +510,15 @@ class UnityTestRunnerGenerator
       end
       output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv)")
       output.puts('{')
+      output.puts('(void)argc;')
+      output.puts('(void)argv;')
       output.puts('#ifdef UNITY_USE_COMMAND_LINE_ARGS')
       output.puts('  int parse_status = UnityParseOptions(argc, argv);')
       output.puts('  if (parse_status != 0)')
       output.puts('  {')
       output.puts('    if (parse_status < 0)')
       output.puts('    {')
-      output.puts("      UnityPrint(\"#{filename.gsub('.c', '').gsub(/\\/, '\\\\\\')}.\");")
+      output.puts("      UnityPrint(\"#{filename.gsub(/\\/, '\\\\\\')}\");")
       output.puts('      UNITY_PRINT_EOL();')
       tests.each do |test|
         if !@options[:use_param_tests] || test[:args].nil? || test[:args].empty?
@@ -583,7 +592,7 @@ class UnityTestRunnerGenerator
     output.puts('  CMock_Guts_MemFreeFinal();') unless used_mocks.empty?
     if @options[:has_suite_teardown]
       if @options[:omit_begin_end]
-        output.puts('  (void) suite_teardown(0);')
+        output.puts('  (void) suiteTearDown(0);')
       else
         output.puts('  return suiteTearDown(UNITY_END());')
       end
@@ -593,17 +602,14 @@ class UnityTestRunnerGenerator
     output.puts('}')
   end
 
-  def create_h_file(output, filename, tests, testfile_includes, used_mocks)
+  def create_h_file(output, filename, tests, headers, used_mocks)
     filename = File.basename(filename).gsub(/[-\/\\.,\s]/, '_').upcase
     output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */')
     output.puts("#ifndef _#{filename}")
     output.puts("#define _#{filename}\n\n")
     output.puts("#include \"#{@options[:framework]}.h\"")
     output.puts('#include "cmock.h"') unless used_mocks.empty?
-    @options[:includes].flatten.uniq.compact.each do |inc|
-      output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
-    end
-    testfile_includes.each do |inc|
+    [@options[:includes], headers].flatten.uniq.compact.each do |inc|
       output.puts("#include #{inc.include?('<') ? inc : "\"#{inc}\""}")
     end
     output.puts "\n"

data/vendor/unity/docs/UnityChangeLog.md

@@ -29,6 +29,7 @@ Significant Bugfixes:
   - display of failures fixed on ARM processors, particularly with arrays (#807)
   - fixed each-equal assertion for memory (#797)
   - fix many warnings.
+  - Test runner generator calls custom suite teardown when begin/end calls are omitted. @94xhn
 
 Other:
 

data/vendor/unity/examples/unity_config.h

@@ -250,4 +250,12 @@
  */
 /* #define UNITY_INCLUDE_EXEC_TIME */
 
+/* Define this macro to redefine what the UnityPrintChar() function considers
+ * a printable character.
+ *
+ * Example, for printing UTF-8:
+ * #define UNITY_IS_PRINTABLE_CHAR(c) ((128 <= (c)) && ((c) <= 255))
+*/
+/* #define UNITY_IS_PRINTABLE_CHAR(c) ((32 <= (c)) && ((c) <= 126)) */
+
 #endif /* UNITY_CONFIG_H */

data/vendor/unity/src/unity.c

@@ -7,6 +7,8 @@
 
 #include "unity.h"
 
+#include <stdbool.h>
+
 #ifndef UNITY_PROGMEM
 #define UNITY_PROGMEM
 #endif
@@ -88,8 +90,14 @@ static const char UNITY_PROGMEM UnityStrDetail2Name[]            = " " UNITY_DET
 /* Local helper function to print characters. */
 static void UnityPrintChar(const char* pch)
 {
+#ifdef UNITY_IS_PRINTABLE_CHAR
+    const int isPrintable = UNITY_IS_PRINTABLE_CHAR(*pch);
+#else
+    const int isPrintable = ((32 <= *pch) && (*pch <= 126));
+#endif
+
     /* printable characters plus CR & LF are printed */
-    if ((*pch <= 126) && (*pch >= 32))
+    if (isPrintable)
     {
         UNITY_OUTPUT_CHAR(*pch);
     }

data/vendor/unity/src/unity.h

@@ -11,7 +11,7 @@
 
 #define UNITY_VERSION_MAJOR    2
 #define UNITY_VERSION_MINOR    7
-#define UNITY_VERSION_BUILD    1
+#define UNITY_VERSION_BUILD    2
 #define UNITY_VERSION          ((UNITY_VERSION_MAJOR << 16) | (UNITY_VERSION_MINOR << 8) | UNITY_VERSION_BUILD)
 
 #ifdef __cplusplus

data/vendor/unity/test/rakefile

@@ -19,6 +19,7 @@ TEMP_DIRS = [
 
 TEMP_DIRS.each do |dir|
   directory(dir)
+  CLEAN.include(File.join(dir, '*.*'))
   CLOBBER.include(dir)
 end
 
@@ -167,7 +168,7 @@ namespace :style do
 
   desc "Attempt to Autocorrect style"
   task :auto  => ['style:clean'] do
-    execute("rubocop ../auto ../examples ../extras --auto-correct --config .rubocop.yml")
+    execute("rubocop ../auto ../examples ../extras --autocorrect --config .rubocop.yml")
     report "Autocorrected What We Could."
   end