From 43a32567476a5775fa1e4bcd68f68e3c6ddf79eb Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Mon, 16 Jan 2023 16:41:21 -0500 Subject: [PATCH 01/87] Test across multiple versions of Ruby --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fcae2ad6..ce948bd3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,6 +15,9 @@ jobs: unit-tests: name: "Unit Tests" runs-on: ubuntu-latest + strategy: + matrix: + ruby: ['2.7', '3.0', '3.1', '3.2'] steps: # Install Ruby Testing Tools - name: Setup Ruby Testing Tools From 278b8dd3e205e78e611f1bc7f8525a4068878be2 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Mon, 6 Feb 2023 14:49:29 -0500 Subject: [PATCH 02/87] Pull in PR #553. Bump release. --- auto/unity_test_summary.rb | 5 ++++- src/unity.h | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/auto/unity_test_summary.rb b/auto/unity_test_summary.rb index b3fe8a69..c31b1d5f 100644 --- a/auto/unity_test_summary.rb +++ b/auto/unity_test_summary.rb @@ -86,7 +86,10 @@ def usage(err_msg = nil) def get_details(_result_file, lines) results = { failures: [], ignores: [], successes: [] } lines.each do |line| - _src_file, _src_line, _test_name, status, _msg = line.split(/:/) + status_match = line.match(/^[^:]+:[^:]+:\w+(?:\([^\)]*\))?:([^:]+):?/) + next unless status_match + status = status_match.captures[0] + line_out = (@root && (@root != 0) ? "#{@root}#{line}" : line).gsub(/\//, '\\') case status when 'IGNORE' then results[:ignores] << line_out diff --git a/src/unity.h b/src/unity.h index e321a1da..d199f4b2 100644 --- a/src/unity.h +++ b/src/unity.h @@ -9,8 +9,8 @@ #define UNITY #define UNITY_VERSION_MAJOR 2 -#define UNITY_VERSION_MINOR 5 -#define UNITY_VERSION_BUILD 4 +#define UNITY_VERSION_MINOR 6 +#define UNITY_VERSION_BUILD 0 #define UNITY_VERSION ((UNITY_VERSION_MAJOR << 16) | (UNITY_VERSION_MINOR << 8) | UNITY_VERSION_BUILD) #ifdef __cplusplus From 36259d46b6d3aadac7db96ae94fc0e0ea676dc07 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Mon, 6 Feb 2023 15:15:43 -0500 Subject: [PATCH 03/87] Merge PR #545 --- auto/generate_module.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/auto/generate_module.rb b/auto/generate_module.rb index 7151586b..2f044c4f 100644 --- a/auto/generate_module.rb +++ b/auto/generate_module.rb @@ -13,7 +13,7 @@ require 'pathname' # TEMPLATE_TST -TEMPLATE_TST ||= '#ifdef TEST +TEMPLATE_TST ||= '#ifdef %5$s #include "unity.h" @@ -32,7 +32,7 @@ TEST_IGNORE_MESSAGE("Need to Implement %1$s"); } -#endif // TEST +#endif // %5$s '.freeze # TEMPLATE_SRC @@ -108,7 +108,8 @@ def self.default_options update_svn: false, boilerplates: {}, test_prefix: 'Test', - mock_prefix: 'Mock' + mock_prefix: 'Mock', + test_define: 'TEST' } end @@ -134,7 +135,7 @@ def files_to_operate_on(module_name, pattern = nil) prefix = @options[:test_prefix] || 'Test' triad = [{ ext: '.c', path: @options[:path_src], prefix: '', template: TEMPLATE_SRC, inc: :src, boilerplate: @options[:boilerplates][:src] }, { ext: '.h', path: @options[:path_inc], prefix: '', template: TEMPLATE_INC, inc: :inc, boilerplate: @options[:boilerplates][:inc] }, - { ext: '.c', path: @options[:path_tst], prefix: prefix, template: TEMPLATE_TST, inc: :tst, boilerplate: @options[:boilerplates][:tst] }] + { ext: '.c', path: @options[:path_tst], prefix: prefix, template: TEMPLATE_TST, inc: :tst, boilerplate: @options[:boilerplates][:tst], test_define: @options[:test_define] }] # prepare the pattern for use pattern = (pattern || @options[:pattern] || 'src').downcase @@ -154,6 +155,7 @@ def files_to_operate_on(module_name, pattern = nil) path: (Pathname.new("#{cfg[:path]}#{subfolder}") + filename).cleanpath, name: submodule_name, template: cfg[:template], + test_define: cfg[:test_define] boilerplate: cfg[:boilerplate], includes: case (cfg[:inc]) when :src then (@options[:includes][:src] || []) | (pattern_traits[:inc].map { |f| format(f, module_name) }) @@ -212,7 +214,8 @@ def generate(module_name, pattern = nil) f.write(file[:template] % [file[:name], file[:includes].map { |ff| "#include \"#{ff}\"\n" }.join, file[:name].upcase.tr('-', '_'), - file[:name].tr('-', '_')]) + file[:name].tr('-', '_'), + file[:test_define]]) end if @options[:update_svn] `svn add \"#{file[:path]}\"` From 7a31075b77b998c3a1e992d0516ba0aa00dfea4a Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Mon, 6 Feb 2023 16:26:36 -0500 Subject: [PATCH 04/87] Bump years. --- LICENSE.txt | 2 +- README.md | 2 +- library.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index b9a329dd..a541b843 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2007-21 Mike Karlesky, Mark VanderVoord, Greg Williams +Copyright (c) 2007-23 Mike Karlesky, Mark VanderVoord, Greg Williams Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/README.md b/README.md index e71527b2..1fc220c0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Unity Test ![CI][] -__Copyright (c) 2007 - 2021 Unity Project by Mike Karlesky, Mark VanderVoord, and Greg Williams__ +__Copyright (c) 2007 - 2023 Unity Project by Mike Karlesky, Mark VanderVoord, and Greg Williams__ Welcome to the Unity Test Project, one of the main projects of ThrowTheSwitch.org. Unity Test is a unit testing framework built for C, with a focus on working with embedded toolchains. diff --git a/library.json b/library.json index b5712943..914f5f68 100644 --- a/library.json +++ b/library.json @@ -1,6 +1,6 @@ { "name": "Unity", - "version": "2.5.2", + "version": "2.6.0", "keywords": "unit-testing, testing, tdd, testing-framework", "description": "Simple Unit Testing for C", "homepage": "http://www.throwtheswitch.org/unity", From a7639eeb54f532b57859a85f6de1e41df66d61cc Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Thu, 16 Feb 2023 16:40:23 -0500 Subject: [PATCH 05/87] Bump rubocop up to newer ruby versions (in progress) --- auto/colour_reporter.rb | 2 +- auto/generate_module.rb | 2 +- auto/generate_test_runner.rb | 15 +++++++-------- auto/test_file_filter.rb | 1 + auto/type_sanitizer.rb | 2 +- auto/unity_test_summary.rb | 3 ++- auto/yaml_helper.rb | 7 +++++-- examples/example_3/rakefile_helper.rb | 17 ++++++++--------- test/.rubocop.yml | 8 ++++---- 9 files changed, 30 insertions(+), 27 deletions(-) diff --git a/auto/colour_reporter.rb b/auto/colour_reporter.rb index 1c3bc216..b86b76c5 100644 --- a/auto/colour_reporter.rb +++ b/auto/colour_reporter.rb @@ -12,7 +12,7 @@ def report(message) if !$colour_output $stdout.puts(message) else - message = message.join('\n') if message.class == Array + message = message.join('\n') if message.instance_of?(Array) message.each_line do |line| line.chomp! colour = case line diff --git a/auto/generate_module.rb b/auto/generate_module.rb index 2f044c4f..40586f9c 100644 --- a/auto/generate_module.rb +++ b/auto/generate_module.rb @@ -133,7 +133,7 @@ def files_to_operate_on(module_name, pattern = nil) # create triad definition prefix = @options[:test_prefix] || 'Test' - triad = [{ ext: '.c', path: @options[:path_src], prefix: '', template: TEMPLATE_SRC, inc: :src, boilerplate: @options[:boilerplates][:src] }, + triad = [{ ext: '.c', path: @options[:path_src], prefix: '', template: TEMPLATE_SRC, inc: :src, boilerplate: @options[:boilerplates][:src] }, { ext: '.h', path: @options[:path_inc], prefix: '', template: TEMPLATE_INC, inc: :inc, boilerplate: @options[:boilerplates][:inc] }, { ext: '.c', path: @options[:path_tst], prefix: prefix, template: TEMPLATE_TST, inc: :tst, boilerplate: @options[:boilerplates][:tst], test_define: @options[:test_define] }] diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index aa0f351d..3d64d486 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -144,8 +144,8 @@ def find_tests(source) if @options[:use_param_tests] && !arguments.empty? args = [] type_and_args = arguments.split(/TEST_(CASE|RANGE)/) - for i in (1...type_and_args.length).step(2) - if type_and_args[i] == "CASE" + (1...type_and_args.length).step(2).each do |i| + if type_and_args[i] == 'CASE' args << type_and_args[i + 1].sub(/^\s*\(\s*(.*?)\s*\)\s*$/m, '\1') next end @@ -194,12 +194,11 @@ def find_includes(source) source.gsub!(/\/\/.*$/, '') # remove line comments (all that remain) # parse out includes - includes = { - local: source.scan(/^\s*#include\s+\"\s*(.+\.#{@options[:include_extensions]})\s*\"/).flatten, + { + local: source.scan(/^\s*#include\s+"\s*(.+\.#{@options[:include_extensions]})\s*"/).flatten, system: source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" }, - linkonly: source.scan(/^TEST_FILE\(\s*\"\s*(.+\.#{@options[:source_extensions]})\s*\"/).flatten + linkonly: source.scan(/^TEST_FILE\(\s*"\s*(.+\.#{@options[:source_extensions]})\s*"/).flatten } - includes end def find_mocks(includes) @@ -446,7 +445,7 @@ def create_main(output, filename, tests, used_mocks) end def create_h_file(output, filename, tests, testfile_includes, used_mocks) - filename = File.basename(filename).gsub(/[-\/\\\.\,\s]/, '_').upcase + filename = File.basename(filename).gsub(/[-\/\\.,\s]/, '_').upcase output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */') output.puts("#ifndef _#{filename}") output.puts("#define _#{filename}\n\n") @@ -485,7 +484,7 @@ def create_h_file(output, filename, tests, testfile_includes, used_mocks) when /\.*\.ya?ml$/ options = UnityTestRunnerGenerator.grab_config(arg) true - when /--(\w+)=\"?(.*)\"?/ + when /--(\w+)="?(.*)"?/ options[Regexp.last_match(1).to_sym] = Regexp.last_match(2) true when /\.*\.(?:hpp|hh|H|h)$/ diff --git a/auto/test_file_filter.rb b/auto/test_file_filter.rb index 3cc32de8..f4834a12 100644 --- a/auto/test_file_filter.rb +++ b/auto/test_file_filter.rb @@ -15,6 +15,7 @@ def initialize(all_files = false) file = 'test_file_filter.yml' return unless File.exist?(file) + filters = YamlHelper.load_file(file) @all_files = filters[:all_files] @only_files = filters[:only_files] diff --git a/auto/type_sanitizer.rb b/auto/type_sanitizer.rb index dafb8826..3d1db09f 100644 --- a/auto/type_sanitizer.rb +++ b/auto/type_sanitizer.rb @@ -1,6 +1,6 @@ module TypeSanitizer def self.sanitize_c_identifier(unsanitized) # convert filename to valid C identifier by replacing invalid chars with '_' - unsanitized.gsub(/[-\/\\\.\,\s]/, '_') + unsanitized.gsub(/[-\/\\.,\s]/, '_') end end diff --git a/auto/unity_test_summary.rb b/auto/unity_test_summary.rb index c31b1d5f..0253b5d7 100644 --- a/auto/unity_test_summary.rb +++ b/auto/unity_test_summary.rb @@ -86,8 +86,9 @@ def usage(err_msg = nil) def get_details(_result_file, lines) results = { failures: [], ignores: [], successes: [] } lines.each do |line| - status_match = line.match(/^[^:]+:[^:]+:\w+(?:\([^\)]*\))?:([^:]+):?/) + status_match = line.match(/^[^:]+:[^:]+:\w+(?:\([^)]*\))?:([^:]+):?/) next unless status_match + status = status_match.captures[0] line_out = (@root && (@root != 0) ? "#{@root}#{line}" : line).gsub(/\//, '\\') diff --git a/auto/yaml_helper.rb b/auto/yaml_helper.rb index e5a08657..3296ba0e 100644 --- a/auto/yaml_helper.rb +++ b/auto/yaml_helper.rb @@ -8,8 +8,11 @@ module YamlHelper def self.load(body) - YAML.respond_to?(:unsafe_load) ? - YAML.unsafe_load(body) : YAML.load(body) + if YAML.respond_to?(:unsafe_load) + YAML.unsafe_load(body) + else + YAML.load(body) + end end def self.load_file(file) diff --git a/examples/example_3/rakefile_helper.rb b/examples/example_3/rakefile_helper.rb index 49060750..d88df584 100644 --- a/examples/example_3/rakefile_helper.rb +++ b/examples/example_3/rakefile_helper.rb @@ -42,7 +42,7 @@ def extract_headers(filename) includes = [] lines = File.readlines(filename) lines.each do |line| - m = line.match(/^\s*#include\s+\"\s*(.+\.[hH])\s*\"/) + m = line.match(/^\s*#include\s+"\s*(.+\.[hH])\s*"/) includes << m[1] unless m.nil? end includes @@ -57,12 +57,11 @@ def find_source_file(header, paths) end def tackit(strings) - result = if strings.is_a?(Array) - "\"#{strings.join}\"" - else - strings - end - result + if strings.is_a?(Array) + "\"#{strings.join}\"" + else + strings + end end def squash(prefix, items) @@ -80,7 +79,7 @@ def build_compiler_fields end options = squash('', $cfg['compiler']['options']) includes = squash($cfg['compiler']['includes']['prefix'], $cfg['compiler']['includes']['items']) - includes = includes.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR) + includes = includes.gsub(/\\ /, ' ').gsub(/\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR) { command: command, defines: defines, options: options, includes: includes } end @@ -105,7 +104,7 @@ def build_linker_fields '' else squash($cfg['linker']['includes']['prefix'], $cfg['linker']['includes']['items']) - end.gsub(/\\ /, ' ').gsub(/\\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR) + end.gsub(/\\ /, ' ').gsub(/\\"/, '"').gsub(/\\$/, '') # Remove trailing slashes (for IAR) { command: command, options: options, includes: includes } end diff --git a/test/.rubocop.yml b/test/.rubocop.yml index 6c9542f5..44b01605 100644 --- a/test/.rubocop.yml +++ b/test/.rubocop.yml @@ -3,7 +3,7 @@ #inherit_from: .rubocop_todo.yml AllCops: - TargetRubyVersion: 2.3 + TargetRubyVersion: 3.0 # These are areas where ThrowTheSwitch's coding style diverges from the Ruby standard Style/SpecialGlobalVars: @@ -36,10 +36,12 @@ Style/FormatStringToken: Enabled: false # This is disabled because it seems to get confused over nested hashes -Layout/AlignHash: +Layout/HashAlignment: Enabled: false EnforcedHashRocketStyle: table EnforcedColonStyle: table +Layout/LineLength: + Enabled: false # We purposefully use these insecure features because they're what makes Ruby awesome Security/Eval: @@ -64,8 +66,6 @@ Metrics/ClassLength: Enabled: false Metrics/CyclomaticComplexity: Enabled: false -Metrics/LineLength: - Enabled: false Metrics/MethodLength: Enabled: false Metrics/ModuleLength: From b35f6b0851d1c5086dc61b0eb382d634ba7aeb2c Mon Sep 17 00:00:00 2001 From: nfarid <54642193+nfarid@users.noreply.github.com> Date: Tue, 30 May 2023 11:40:39 +0100 Subject: [PATCH 06/87] Add CMAKE_INSTALL_INCLUDEDIR to INSTALL_INTERFACE's include directory This allows one to #include --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 348266d5..f7062199 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,6 +76,7 @@ target_include_directories(${PROJECT_NAME} $ $ $ + $ $:${CMAKE_CURRENT_SOURCE_DIR}/extras/memory/src>> $:${CMAKE_CURRENT_SOURCE_DIR}/extras/fixture/src>> ) From e271a76a11df631702af5b2e3e4e5a27a08388cd Mon Sep 17 00:00:00 2001 From: James Browning Date: Tue, 4 Jul 2023 15:16:47 -0700 Subject: [PATCH 07/87] Squash warnings about unhandled enumeration. --- src/unity.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/unity.c b/src/unity.c index 3e4bc04d..8c946ebe 100644 --- a/src/unity.c +++ b/src/unity.c @@ -1115,6 +1115,7 @@ void UnityAssertFloatSpecial(const UNITY_FLOAT actual, is_trait = !isinf(actual) && !isnan(actual); break; + case UNITY_FLOAT_INVALID_TRAIT: /* Supress warning */ default: /* including UNITY_FLOAT_INVALID_TRAIT */ trait_index = 0; trait_names[0] = UnityStrInvalidFloatTrait; @@ -1341,6 +1342,7 @@ void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual, is_trait = !isinf(actual) && !isnan(actual); break; + case UNITY_FLOAT_INVALID_TRAIT: /* Supress warning */ default: /* including UNITY_FLOAT_INVALID_TRAIT */ trait_index = 0; trait_names[0] = UnityStrInvalidFloatTrait; From 30b1a05c33cda2489ea2ff1259d3c12f05c2b93c Mon Sep 17 00:00:00 2001 From: Alex Overchenko Date: Sat, 8 Jul 2023 23:15:15 +0300 Subject: [PATCH 08/87] Fix TEST_CASE description typo --- docs/UnityHelperScriptsGuide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/UnityHelperScriptsGuide.md b/docs/UnityHelperScriptsGuide.md index 06c34ea6..8b1e6372 100644 --- a/docs/UnityHelperScriptsGuide.md +++ b/docs/UnityHelperScriptsGuide.md @@ -220,7 +220,7 @@ If we use replace comment before test function with the following code: ```C TEST_CASE(1, 2, 5) -TEST_CASE(3, 7, 20) +TEST_CASE(10, 7, 20) ``` script will generate 2 test calls: From 8a5918b81d313fc902c7b51fdf7070f7d09435d0 Mon Sep 17 00:00:00 2001 From: Jason Heeris Date: Thu, 13 Jul 2023 14:53:21 +0800 Subject: [PATCH 09/87] Expose double support as an option. --- meson.build | 7 +++++++ meson_options.txt | 1 + 2 files changed, 8 insertions(+) diff --git a/meson.build b/meson.build index c5cf9711..6585129c 100644 --- a/meson.build +++ b/meson.build @@ -25,7 +25,9 @@ project('unity', 'c', build_fixture = get_option('extension_fixture') build_memory = get_option('extension_memory') +support_double = get_option('support_double') +unity_args = [] unity_src = [] unity_inc = [] @@ -42,8 +44,13 @@ if build_memory subdir('extras/memory/src') endif +if support_double + unity_args += '-DUNITY_INCLUDE_DOUBLE' +endif + unity_lib = static_library(meson.project_name(), sources: unity_src, + c_args: unity_args, include_directories: unity_inc, install: not meson.is_subproject(), ) diff --git a/meson_options.txt b/meson_options.txt index fbb66d7e..8e66784b 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,2 +1,3 @@ option('extension_fixture', type: 'boolean', value: 'false', description: 'Whether to enable the fixture extension.') option('extension_memory', type: 'boolean', value: 'false', description: 'Whether to enable the memory extension.') +option('support_double', type: 'boolean', value: 'false', description: 'Whether to enable double precision floating point assertions.') From d59381763041ba09ac2387793275477d2f86b387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Hangh=C3=B8j=20Henneberg?= Date: Thu, 13 Jul 2023 22:35:53 +0200 Subject: [PATCH 10/87] Add TEST_MATIX option for parameterization Added matrix option for parameterization that generates cases based on the product of the given arguments. --- auto/generate_test_runner.rb | 49 +++++++++++++++++++++++------------- src/unity.h | 2 +- src/unity_internals.h | 3 +++ 3 files changed, 35 insertions(+), 19 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index ace59303..4fc83f68 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -132,8 +132,8 @@ def find_tests(source) lines.each_with_index do |line, _index| # find tests - next unless line =~ /^((?:\s*(?:TEST_CASE|TEST_RANGE)\s*\(.*?\)\s*)*)\s*void\s+((?:#{@options[:test_prefix]}).*)\s*\(\s*(.*)\s*\)/m - next unless line =~ /^((?:\s*(?:TEST_CASE|TEST_RANGE)\s*\(.*?\)\s*)*)\s*void\s+((?:#{@options[:test_prefix]})\w*)\s*\(\s*(.*)\s*\)/m + next unless line =~ /^((?:\s*(?:TEST_(?:CASE|RANGE|MATRIX))\s*\(.*?\)\s*)*)\s*void\s+((?:#{@options[:test_prefix]}).*)\s*\(\s*(.*)\s*\)/m + next unless line =~ /^((?:\s*(?:TEST_(?:CASE|RANGE|MATRIX))\s*\(.*?\)\s*)*)\s*void\s+((?:#{@options[:test_prefix]})\w*)\s*\(\s*(.*)\s*\)/m arguments = Regexp.last_match(1) name = Regexp.last_match(2) @@ -143,25 +143,38 @@ def find_tests(source) if @options[:use_param_tests] && !arguments.empty? args = [] - type_and_args = arguments.split(/TEST_(CASE|RANGE)/) + type_and_args = arguments.split(/TEST_(CASE|RANGE|MATRIX)/) for i in (1...type_and_args.length).step(2) - if type_and_args[i] == "CASE" + case type_and_args[i] + when "CASE" args << type_and_args[i + 1].sub(/^\s*\(\s*(.*?)\s*\)\s*$/m, '\1') - next - end - # RANGE - args += type_and_args[i + 1].scan(/(\[|<)\s*(-?\d+.?\d*)\s*,\s*(-?\d+.?\d*)\s*,\s*(-?\d+.?\d*)\s*(\]|>)/m).map do |arg_values_str| - exclude_end = arg_values_str[0] == '<' && arg_values_str[-1] == '>' - arg_values_str[1...-1].map do |arg_value_str| - arg_value_str.include?('.') ? arg_value_str.to_f : arg_value_str.to_i - end.push(exclude_end) - end.map do |arg_values| - Range.new(arg_values[0], arg_values[1], arg_values[3]).step(arg_values[2]).to_a - end.reduce(nil) do |result, arg_range_expanded| - result.nil? ? arg_range_expanded.map { |a| [a] } : result.product(arg_range_expanded) - end.map do |arg_combinations| - arg_combinations.flatten.join(', ') + when "RANGE" + args += type_and_args[i + 1].scan(/(\[|<)\s*(-?\d+.?\d*)\s*,\s*(-?\d+.?\d*)\s*,\s*(-?\d+.?\d*)\s*(\]|>)/m).map do |arg_values_str| + exclude_end = arg_values_str[0] == '<' && arg_values_str[-1] == '>' + arg_values_str[1...-1].map do |arg_value_str| + arg_value_str.include?('.') ? arg_value_str.to_f : arg_value_str.to_i + end.push(exclude_end) + end.map do |arg_values| + Range.new(arg_values[0], arg_values[1], arg_values[3]).step(arg_values[2]).to_a + end.reduce(nil) do |result, arg_range_expanded| + result.nil? ? arg_range_expanded.map { |a| [a] } : result.product(arg_range_expanded) + end.map do |arg_combinations| + arg_combinations.flatten.join(', ') + end + + when "MATRIX" + single_arg_regex_string = /(?:(?:"(?:\\"|[^\\])*?")+|(?:'\\?.')+|(?:[^\s\]\["'\,]|\[[\d\S_-]+\])+)/.source + args_regex = /\[((?:\s*#{single_arg_regex_string}\s*,?)*(?:\s*#{single_arg_regex_string})?\s*)\]/m + arg_elements_regex = /\s*(#{single_arg_regex_string})\s*,\s*/m + + args += type_and_args[i + 1].scan(args_regex).flatten.map do |arg_values_str| + (arg_values_str + ',').scan(arg_elements_regex) + end.reduce do |result, arg_range_expanded| + result.product(arg_range_expanded) + end.map do |arg_combinations| + arg_combinations.flatten.join(', ') + end end end end diff --git a/src/unity.h b/src/unity.h index e321a1da..e4db3147 100644 --- a/src/unity.h +++ b/src/unity.h @@ -89,7 +89,7 @@ void verifyTest(void); * - define UNITY_SUPPORT_TEST_CASES to include the TEST_CASE macro, though really it's mostly about the runner generator script * Parameterized Tests - * - you'll want to create a define of TEST_CASE(...) and/or TEST_RANGE(...) which basically evaluates to nothing + * - you'll want to create a define of TEST_CASE(...), TEST_RANGE(...) and/or TEST_MATRIX(...) which basically evaluates to nothing * Tests with Arguments * - you'll want to define UNITY_USE_COMMAND_LINE_ARGS if you have the test runner passing arguments to Unity diff --git a/src/unity_internals.h b/src/unity_internals.h index 98e298fc..9f89eda9 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -793,6 +793,9 @@ extern const char UnityStrErrShorthand[]; #if !defined(TEST_RANGE) && !defined(UNITY_EXCLUDE_TEST_RANGE) #define TEST_RANGE(...) #endif + #if !defined(TEST_MATRIX) && !defined(UNITY_EXCLUDE_TEST_MATRIX) + #define TEST_MATRIX(...) + #endif #endif #endif From 5dd2be96fa64d2c09cc040f531ce9c384690746c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Hangh=C3=B8j=20Henneberg?= Date: Thu, 13 Jul 2023 23:01:13 +0200 Subject: [PATCH 11/87] Add TEST_MATRIX to docs --- docs/UnityConfigurationGuide.md | 4 +- docs/UnityHelperScriptsGuide.md | 87 +++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+), 1 deletion(-) diff --git a/docs/UnityConfigurationGuide.md b/docs/UnityConfigurationGuide.md index d5e4098f..88603fc8 100644 --- a/docs/UnityConfigurationGuide.md +++ b/docs/UnityConfigurationGuide.md @@ -448,7 +448,7 @@ To enable it, use the following example: #define UNITY_SUPPORT_TEST_CASES ``` -You can manually provide required `TEST_CASE` or `TEST_RANGE` macro definitions +You can manually provide required `TEST_CASE`, `TEST_RANGE` or `TEST_MATRIX` macro definitions before including `unity.h`, and they won't be redefined. If you provide one of the following macros, some of default definitions will not be defined: @@ -456,8 +456,10 @@ defined: |---|---| | `UNITY_EXCLUDE_TEST_CASE` | `TEST_CASE` | | `UNITY_EXCLUDE_TEST_RANGE` | `TEST_RANGE` | +| `UNITY_EXCLUDE_TEST_MATRIX` | `TEST_MATRIX` | | `TEST_CASE` | `TEST_CASE` | | `TEST_RANGE` | `TEST_RANGE` | +| `TEST_MATRIX` | `TEST_MATRIX` | `UNITY_EXCLUDE_TEST_*` defines is not processed by test runner generator script. If you exclude one of them from definition, you should provide your own definition diff --git a/docs/UnityHelperScriptsGuide.md b/docs/UnityHelperScriptsGuide.md index 8b1e6372..3c321336 100644 --- a/docs/UnityHelperScriptsGuide.md +++ b/docs/UnityHelperScriptsGuide.md @@ -296,6 +296,93 @@ TEST_CASE(4, 8, 30) TEST_CASE(4, 6, 30) ``` +##### `TEST_MATRIX` + +Test matix is an advanced generator. It single call can be converted to zero, +one or few `TEST_CASE` equivalent commands. + +That generator will create tests for all cobinations of the provided list. Each argument has to be given as a list of one or more elements in the format `[, , ..., , ]`. + +All parameters supported by the `TEST_CASE` is supported as arguments: +- Numbers incl type specifiers e.g. `<1>`, `<1u>`, `<1l>`, `<2.3>`, or `<2.3f>` +- Strings incl string concatianion e.g. `<"string">`, or `<"partial" "string">` +- Chars e.g. `<'c'>` +- Enums e.g. `` +- Elements of arrays e.g. `` + +Let's use our `test_demoParamFunction` test for checking, what ranges +will be generated for our single `TEST_RANGE` row: + +```C +TEST_MATRIX([3, 4, 7], [10, 8, 2, 1],[30u, 20.0f]) +``` + +Tests execution output will be similar to that text: + +```Log +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(3, 10, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(3, 10, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(3, 8, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(3, 8, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(3, 2, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(3, 2, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(3, 1, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(3, 1, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(4, 10, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(4, 10, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(4, 8, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(4, 8, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(4, 2, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(4, 2, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(4, 1, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(4, 1, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(7, 10, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(7, 10, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(7, 8, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(7, 8, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(7, 2, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(7, 2, 20.0f):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(7, 1, 30u):PASS +tests/test_unity_parameterizedDemo.c:18:test_demoParamFunction(7, 1, 20.0f):PASS +``` + +As we can see: + +| Parameter | Format | Count of values | +|---|---|---| +| `a` | `[3, 4, 7]` | 2 | +| `b` | `[10, 8, 2, 1]` | 4 | +| `c` | `[30u, 20.0f]` | 2 | + +We totally have 2 * 4 * 2 = 16 equal test cases, that can be written as following: + +```C +TEST_CASE(3, 10, 30u) +TEST_CASE(3, 10, 20.0f) +TEST_CASE(3, 8, 30u) +TEST_CASE(3, 8, 20.0f) +TEST_CASE(3, 2, 30u) +TEST_CASE(3, 2, 20.0f) +TEST_CASE(3, 1, 30u) +TEST_CASE(3, 1, 20.0f) +TEST_CASE(4, 10, 30u) +TEST_CASE(4, 10, 20.0f) +TEST_CASE(4, 8, 30u) +TEST_CASE(4, 8, 20.0f) +TEST_CASE(4, 2, 30u) +TEST_CASE(4, 2, 20.0f) +TEST_CASE(4, 1, 30u) +TEST_CASE(4, 1, 20.0f) +TEST_CASE(7, 10, 30u) +TEST_CASE(7, 10, 20.0f) +TEST_CASE(7, 8, 30u) +TEST_CASE(7, 8, 20.0f) +TEST_CASE(7, 2, 30u) +TEST_CASE(7, 2, 20.0f) +TEST_CASE(7, 1, 30u) +TEST_CASE(7, 1, 20.0f) +``` + ### `unity_test_summary.rb` A Unity test file contains one or more test case functions. From c97a2705b36a23f4a09228daddaae9d94d41fc1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Hangh=C3=B8j=20Henneberg?= Date: Thu, 13 Jul 2023 22:36:23 +0200 Subject: [PATCH 12/87] Add tests for TEST_MATRIX --- test/tests/test_unity_parameterized.c | 90 +++++++++++++++++++++++ test/tests/test_unity_parameterizedDemo.c | 4 + test/tests/types_for_test.h | 14 ++++ 3 files changed, 108 insertions(+) create mode 100644 test/tests/types_for_test.h diff --git a/test/tests/test_unity_parameterized.c b/test/tests/test_unity_parameterized.c index 6b8aeb79..24e1f9cd 100644 --- a/test/tests/test_unity_parameterized.c +++ b/test/tests/test_unity_parameterized.c @@ -7,6 +7,7 @@ #include #include #include "unity.h" +#include "types_for_test.h" /* Include Passthroughs for Linking Tests */ void putcharSpy(int c) { (void)putchar(c);} @@ -209,6 +210,14 @@ TEST_RANGE([2, TEST_CASE( 6 , 7) +TEST_MATRIX([7, + 8 , + + 9, 10], + [ + 11] + + ) void test_SpaceInTestCase(unsigned index, unsigned bigger) { TEST_ASSERT_EQUAL_UINT32(NextExpectedSpaceIndex, index); @@ -216,3 +225,84 @@ void test_SpaceInTestCase(unsigned index, unsigned bigger) NextExpectedSpaceIndex++; } + +TEST_MATRIX([1, 5, (2*2)+1, 4]) +void test_SingleMatix(unsigned value) +{ + TEST_ASSERT_LESS_OR_EQUAL(10, value); +} + +TEST_MATRIX([2, 5l, 4u+3, 4ul], [-2, 3]) +void test_TwoMatrices(unsigned first, signed second) +{ + static unsigned idx = 0; + static const unsigned expected[] = + { + // -2 3 + -4, 6, // 2 + -10, 15, // 5 + -14, 21, // 7 + -8, 12, // 4 + }; + TEST_ASSERT_EQUAL_INT(expected[idx++], first * second); +} + +TEST_MATRIX(["String1", "String,2", "Stri" "ng3", "String[4]", "String\"5\""], [-5, 12.5f]) +void test_StringsAndNumbersMatrices(const char* str, float number) +{ + static unsigned idx = 0; + static const char* expected[] = + { + "String1_-05.00", + "String1_+12.50", + "String,2_-05.00", + "String,2_+12.50", + "String3_-05.00", + "String3_+12.50", + "String[4]_-05.00", + "String[4]_+12.50", + "String\"5\"_-05.00", + "String\"5\"_+12.50", + }; + char buf[200] = {0}; + snprintf(buf, sizeof(buf), "%s_%+06.2f", str, number); + TEST_ASSERT_EQUAL_STRING(expected[idx++], buf); +} + +TEST_MATRIX( + [ENUM_A, ENUM_4, ENUM_C], + [test_arr[0], 7.8f, test_arr[2]], + ['a', 'f', '[', ']', '\'', '"'], +) +void test_EnumCharAndArrayMatrices(test_enum_t e, float n, char c) +{ + static unsigned enum_idx = 0; + static const test_enum_t exp_enum[3] = { + ENUM_A, ENUM_4, ENUM_C, + }; + + static unsigned float_idx = 0; + float exp_float[3] = {0}; + exp_float[0] = test_arr[0]; + exp_float[1] = 7.8f; + exp_float[2] = test_arr[2]; + + static unsigned char_idx = 0; + static const test_enum_t exp_char[] = { + 'a', 'f', '[', ']', '\'', '"' + }; + + TEST_ASSERT_EQUAL_INT(exp_enum[enum_idx], e); + TEST_ASSERT_EQUAL_FLOAT(exp_float[float_idx], n); + TEST_ASSERT_EQUAL_CHAR(exp_char[char_idx], c); + + char_idx = (char_idx + 1) % 6; + if (char_idx == 0.0f) + { + float_idx = (float_idx + 1) % 3; + if (float_idx == 0.0f) + { + enum_idx = (enum_idx + 1) % 3; + } + } +} \ No newline at end of file diff --git a/test/tests/test_unity_parameterizedDemo.c b/test/tests/test_unity_parameterizedDemo.c index 2e2efc8f..83dfad66 100644 --- a/test/tests/test_unity_parameterizedDemo.c +++ b/test/tests/test_unity_parameterizedDemo.c @@ -7,10 +7,14 @@ #ifndef TEST_RANGE #define TEST_RANGE(...) #endif +#ifndef TEST_MATRIX +#define TEST_MATRIX(...) +#endif TEST_CASE(1, 2, 5) TEST_CASE(10, 7, 20) TEST_RANGE([3, 4, 1], [10, 5, -2], <30, 31, 1>) +TEST_MATRIX([3, 4, 7], [10, 8, 2, 1],[30u, 20.0f]) void test_demoParamFunction(int a, int b, int c) { TEST_ASSERT_GREATER_THAN_INT(a + b, c); diff --git a/test/tests/types_for_test.h b/test/tests/types_for_test.h new file mode 100644 index 00000000..8bae1eca --- /dev/null +++ b/test/tests/types_for_test.h @@ -0,0 +1,14 @@ +#pragma once + +typedef enum { + ENUM_A, + ENUM_2, + ENUM_C, + ENUM_4, +} test_enum_t; + +static const float test_arr[] = { + 1.2f, + 2.3f, + 3.4f, +}; \ No newline at end of file From 5baa4580eebdbebc7eba4797cb46a5df17016470 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Hangh=C3=B8j=20Henneberg?= Date: Sat, 15 Jul 2023 22:19:46 +0200 Subject: [PATCH 13/87] Fix file endings --- test/tests/test_unity_parameterized.c | 2 +- test/tests/types_for_test.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/tests/test_unity_parameterized.c b/test/tests/test_unity_parameterized.c index 24e1f9cd..aa9f9c16 100644 --- a/test/tests/test_unity_parameterized.c +++ b/test/tests/test_unity_parameterized.c @@ -305,4 +305,4 @@ void test_EnumCharAndArrayMatrices(test_enum_t e, float n, char c) enum_idx = (enum_idx + 1) % 3; } } -} \ No newline at end of file +} diff --git a/test/tests/types_for_test.h b/test/tests/types_for_test.h index 8bae1eca..6da4e515 100644 --- a/test/tests/types_for_test.h +++ b/test/tests/types_for_test.h @@ -11,4 +11,4 @@ static const float test_arr[] = { 1.2f, 2.3f, 3.4f, -}; \ No newline at end of file +}; From aa3ca2d5728ed91a9f20581533f749b8b2e470df Mon Sep 17 00:00:00 2001 From: Michael Karlesky Date: Sat, 29 Jul 2023 20:20:33 -0400 Subject: [PATCH 14/87] Add/update build directives * Renamed macro `TEST_FILE()` to `TEST_SOURCE_FILE()` * Added macro `TEST_INCLUDE_PATH()` * Added full comment block for documentation --- src/unity.h | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/unity.h b/src/unity.h index e321a1da..d849a3f7 100644 --- a/src/unity.h +++ b/src/unity.h @@ -113,9 +113,19 @@ void verifyTest(void); #define TEST_PASS() TEST_ABORT() #define TEST_PASS_MESSAGE(message) do { UnityMessage((message), __LINE__); TEST_ABORT(); } while (0) -/* This macro does nothing, but it is useful for build tools (like Ceedling) to make use of this to figure out - * which files should be linked to in order to perform a test. Use it like TEST_FILE("sandwiches.c") */ -#define TEST_FILE(a) +/*------------------------------------------------------- + * Build Directives + *------------------------------------------------------- + + * These macros do nothing, but they are useful for additional build context. + * Tools (like Ceedling) can scan for these directives and make use of them for + * per-test-executable #include search paths and linking. */ + +/* Add source files to a test executable's compilation and linking. Ex: TEST_SOURCE_FILE("sandwiches.c") */ +#define TEST_SOURCE_FILE(a) + +/* Customize #include search paths for a test executable's compilation. Ex: TEST_INCLUDE_PATH("src/module_a/inc") */ +#define TEST_INCLUDE_PATH(a) /*------------------------------------------------------- * Test Asserts (simple) From 7a9e25b445ecc3d744bc46a97b4f05f87dcc614e Mon Sep 17 00:00:00 2001 From: epsilonrt Date: Tue, 8 Aug 2023 22:15:56 +0200 Subject: [PATCH 15/87] fix: fixes TEST_PRINTF() expansion error #691 fixes TEST_PRINTF() expansion error when no variadic arguments are passed --- src/unity.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unity.h b/src/unity.h index e321a1da..77dfc127 100644 --- a/src/unity.h +++ b/src/unity.h @@ -105,7 +105,7 @@ void verifyTest(void); #define TEST_MESSAGE(message) UnityMessage((message), __LINE__) #define TEST_ONLY() #ifdef UNITY_INCLUDE_PRINT_FORMATTED -#define TEST_PRINTF(message, ...) UnityPrintF(__LINE__, (message), __VA_ARGS__) +#define TEST_PRINTF(message, ...) UnityPrintF(__LINE__, (message), ##__VA_ARGS__) #endif /* It is not necessary for you to call PASS. A PASS condition is assumed if nothing fails. From 5109be3881f5f2304e801b1df06a99157167cca7 Mon Sep 17 00:00:00 2001 From: Mike Karlesky Date: Tue, 15 Aug 2023 21:16:02 -0400 Subject: [PATCH 16/87] Missed renames of TEST_FILE() directive --- auto/generate_test_runner.rb | 2 +- test/testdata/testRunnerGeneratorSmall.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index ace59303..30d4107b 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -197,7 +197,7 @@ def find_includes(source) includes = { local: source.scan(/^\s*#include\s+\"\s*(.+\.#{@options[:include_extensions]})\s*\"/).flatten, system: source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" }, - linkonly: source.scan(/^TEST_FILE\(\s*\"\s*(.+\.#{@options[:source_extensions]})\s*\"/).flatten + linkonly: source.scan(/^TEST_SOURCE_FILE\(\s*\"\s*(.+\.#{@options[:source_extensions]})\s*\"/).flatten } includes end diff --git a/test/testdata/testRunnerGeneratorSmall.c b/test/testdata/testRunnerGeneratorSmall.c index dc687ba2..58bc65c0 100644 --- a/test/testdata/testRunnerGeneratorSmall.c +++ b/test/testdata/testRunnerGeneratorSmall.c @@ -4,7 +4,7 @@ #include "unity.h" #include "Defs.h" -TEST_FILE("some_file.c") +TEST_SOURCE_FILE("some_file.c") /* Notes about prefixes: test - normal default prefix. these are "always run" tests for this procedure From f3b2de4da260b67e36a515844ecc34a131ae86ff Mon Sep 17 00:00:00 2001 From: cmachida Date: Fri, 25 Aug 2023 17:14:55 +0000 Subject: [PATCH 17/87] fix: TEST_PRINTF(): printing 64-bit hex numbers or pointers --- src/unity.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/unity.c b/src/unity.c index 8c946ebe..b6c08b70 100644 --- a/src/unity.c +++ b/src/unity.c @@ -2031,15 +2031,29 @@ static void UnityPrintFVA(const char* format, va_list va) UNITY_EXTRACT_ARG(UNITY_UINT, number, length_mod, va, unsigned int); UNITY_OUTPUT_CHAR('0'); UNITY_OUTPUT_CHAR('x'); - UnityPrintNumberHex(number, 8); + if (length_mod == UNITY_LENGTH_MODIFIER_LONG_LONG) + { + UnityPrintNumberHex(number, 16); + } + else + { + UnityPrintNumberHex(number, 8); + } break; } case 'p': { - const unsigned int number = va_arg(va, unsigned int); + UNITY_UINT number; + char nibbles_to_print = 8; + if (UNITY_POINTER_WIDTH == 64) + { + length_mod = UNITY_LENGTH_MODIFIER_LONG_LONG; + nibbles_to_print = 16; + } + UNITY_EXTRACT_ARG(UNITY_UINT, number, length_mod, va, unsigned int); UNITY_OUTPUT_CHAR('0'); UNITY_OUTPUT_CHAR('x'); - UnityPrintNumberHex((UNITY_UINT)number, 8); + UnityPrintNumberHex((UNITY_UINT)number, nibbles_to_print); break; } case 'c': From 710bb58c6a91dfbd605973e0c38c4f624cd13776 Mon Sep 17 00:00:00 2001 From: Filip Jagodzinski Date: Tue, 29 Aug 2023 13:46:18 +0200 Subject: [PATCH 18/87] Allow user-defined TEST_PROTECT & TEST_ABORT macros However rare, this update covers real-world use cases where: - Unity is used to provide the assertion macros only, and an external test harness/runner is used for test orchestration/reporting. - Calling longjmp on a given platform is possible, but has a platform-specific (or implementation-specific) set of prerequisites, e.g. privileged access level. Enable project-specific customisation of TEST_PROTECT and TEST_ABORT macros. - Use the user-defined UNITY_TEST_ABORT if available; fall back to default behaviour otherwise. - Use the user-defined UNITY_TEST_PROTECT if available; fall back to default behaviour otherwise. - These may be defined independently. --- docs/UnityConfigurationGuide.md | 62 +++++++++++++++++++++++++++++++++ src/unity_internals.h | 14 +++++++- 2 files changed, 75 insertions(+), 1 deletion(-) diff --git a/docs/UnityConfigurationGuide.md b/docs/UnityConfigurationGuide.md index 88603fc8..e56b4a40 100644 --- a/docs/UnityConfigurationGuide.md +++ b/docs/UnityConfigurationGuide.md @@ -399,6 +399,68 @@ _Example:_ #define UNITY_EXCLUDE_SETJMP ``` +#### `UNITY_TEST_PROTECT` + +#### `UNITY_TEST_ABORT` + +Unity handles test failures via `setjmp`/`longjmp` pair by default. As mentioned above, you can disable this with `UNITY_EXCLUDE_SETJMP`. You can also customise what happens on every `TEST_PROTECT` and `TEST_ABORT` call. This can be accomplished by providing user-defined `UNITY_TEST_PROTECT` and `UNITY_TEST_ABORT` macros (and these may be defined independently). + +`UNITY_TEST_PROTECT` is used as an `if` statement expression, and has to evaluate to `true` on the first call (when saving stack environment with `setjmp`), and to `false` when it returns as a result of a `TEST_ABORT` (when restoring the stack environment with `longjmp`). + +Whenever an assert macro fails, `TEST_ABORT` is used to restore the stack environment previously set by `TEST_PROTECT`. This part may be overriden with `UNITY_TEST_ABORT`, e.g. if custom failure handling is needed. + +_Example 1:_ + +Calling `longjmp` on your target is possible, but has a platform-specific (or implementation-specific) set of prerequisites, e.g. privileged access level. You can extend the default behaviour of `TEST_PROTECT` and `TEST_ABORT` as: + +`unity_config.h`: + +```C +#include "my_custom_test_handlers.h" + +#define UNITY_TEST_PROTECT() custom_test_protect() +#define UNITY_TEST_ABORT() custom_test_abort() +``` + +`my_custom_test_handlers.c`: + +```C +int custom_test_protect(void) { + platform_specific_code(); + return setjmp(Unity.AbortFrame) == 0; +} + +UNITY_NORETURN void custom_test_abort(void) { + more_platform_specific_code(); + longjmp(Unity.AbortFrame, 1); +} +``` + +_Example 2:_ + +Unity is used to provide the assertion macros only, and an external test harness/runner is used for test orchestration/reporting. In this case you can easily plug your code by overriding `TEST_ABORT` as: + +`unity_config.h`: + +```C +#include "my_custom_test_handlers.h" + +#define UNITY_TEST_PROTECT() 1 +#define UNITY_TEST_ABORT() custom_test_abort() +``` + +`my_custom_test_handlers.c`: + +```C +void custom_test_abort(void) { + if (Unity.CurrentTestFailed == 1) { + custom_failed_test_handler(); + } else if (Unity.CurrentTestIgnored == 1) { + custom_ignored_test_handler(); + } +} +``` + #### `UNITY_OUTPUT_COLOR` If you want to add color using ANSI escape codes you can use this define. diff --git a/src/unity_internals.h b/src/unity_internals.h index 9f89eda9..11d9abb4 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -759,13 +759,25 @@ extern const char UnityStrErrShorthand[]; * Test Running Macros *-------------------------------------------------------*/ +#ifdef UNITY_TEST_PROTECT +#define TEST_PROTECT() UNITY_TEST_PROTECT() +#else #ifndef UNITY_EXCLUDE_SETJMP_H #define TEST_PROTECT() (setjmp(Unity.AbortFrame) == 0) -#define TEST_ABORT() longjmp(Unity.AbortFrame, 1) #else #define TEST_PROTECT() 1 +#endif +#endif + +#ifdef UNITY_TEST_ABORT +#define TEST_ABORT() UNITY_TEST_ABORT() +#else +#ifndef UNITY_EXCLUDE_SETJMP_H +#define TEST_ABORT() longjmp(Unity.AbortFrame, 1) +#else #define TEST_ABORT() return #endif +#endif /* Automatically enable variadic macros support, if it not enabled before */ #ifndef UNITY_SUPPORT_VARIADIC_MACROS From 955809048c3a7fbe04481abbfd9d0deeee2b7784 Mon Sep 17 00:00:00 2001 From: "Michael Gene Brockus (Dreamer)" <55331536+dreamer-coding-555@users.noreply.github.com> Date: Fri, 15 Sep 2023 09:53:34 -0600 Subject: [PATCH 19/87] Create bdd.h --- extras/bdd/src/bdd.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 extras/bdd/src/bdd.h diff --git a/extras/bdd/src/bdd.h b/extras/bdd/src/bdd.h new file mode 100644 index 00000000..35f177d9 --- /dev/null +++ b/extras/bdd/src/bdd.h @@ -0,0 +1,42 @@ +/* Copyright (c) 2023 Michael Gene Brockus (Dreamer) and Contributed to Unity Project + * ========================================== + * Unity Project - A Test Framework for C + * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams + * [Released under MIT License. Please refer to license.txt for details] + * ========================================== */ + +#ifndef UNITY_BDD_TEST_H_ +#define UNITY_BDD_TEST_H_ + +#ifdef __cplusplus +extern "C" +{ +#endif + +/** + * @brief Macros for defining a Behavior-Driven Development (BDD) structure with descriptions. + * + * These macros provide a way to structure and describe different phases (Given, When, Then) of a + * test scenario in a BDD-style format. However, they don't have functional behavior by themselves + * and are used for descriptive purposes. + */ +#define GIVEN(description) \ + if (0) { \ + printf("Given %s\n", description); \ + } else + +#define WHEN(description) \ + if (0) { \ + printf("When %s\n", description); \ + } else + +#define THEN(description) \ + if (0) { \ + printf("Then %s\n", description); \ + } else + +#ifdef __cplusplus +} +#endif + +#endif From cf13244043603803a8fefc84162e8efd06dfc471 Mon Sep 17 00:00:00 2001 From: "Michael Gene Brockus (Dreamer)" <55331536+dreamer-coding-555@users.noreply.github.com> Date: Fri, 15 Sep 2023 09:54:32 -0600 Subject: [PATCH 20/87] adding stdio --- extras/bdd/src/bdd.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/extras/bdd/src/bdd.h b/extras/bdd/src/bdd.h index 35f177d9..d91b3f13 100644 --- a/extras/bdd/src/bdd.h +++ b/extras/bdd/src/bdd.h @@ -13,6 +13,8 @@ extern "C" { #endif +#include + /** * @brief Macros for defining a Behavior-Driven Development (BDD) structure with descriptions. * From de387ef0731219dd50119f008e0f9e99810bb220 Mon Sep 17 00:00:00 2001 From: "Michael Gene Brockus (Dreamer)" <55331536+dreamer-coding-555@users.noreply.github.com> Date: Fri, 15 Sep 2023 10:12:34 -0600 Subject: [PATCH 21/87] Create test_bdd.c --- extras/bdd/test/test_bdd.c | 128 +++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 extras/bdd/test/test_bdd.c diff --git a/extras/bdd/test/test_bdd.c b/extras/bdd/test/test_bdd.c new file mode 100644 index 00000000..4f415858 --- /dev/null +++ b/extras/bdd/test/test_bdd.c @@ -0,0 +1,128 @@ +/* ========================================== + * Unity Project - A Test Framework for C + * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams + * [Released under MIT License. Please refer to license.txt for details] + * ========================================== */ + +#include "unity.h" +#include "unity_bdd.h" + +void test_bdd_logic_test(void) { + GIVEN("a valid statement is passed") + { + // Set up the context + bool givenExecuted = true; + + WHEN("a statement is true") + { + // Perform the login action + bool whenExecuted = true; + + THEN("we validate everything was worked") + { + // Check the expected outcome + bool thenExecuted = true; + + TEST_ASSERT_TRUE(givenExecuted); + TEST_ASSERT_TRUE(whenExecuted); + TEST_ASSERT_TRUE(thenExecuted); + } + } + } +} // end of case + +void test_bdd_user_account(void) { + GIVEN("a user's account with sufficient balance") + { + // Set up the context + float accountBalance = 500.0; + float withdrawalAmount = 200.0; + + WHEN("the user requests a withdrawal of $200") + { + // Perform the withdrawal action + if (accountBalance >= withdrawalAmount) + { + accountBalance -= withdrawalAmount; + } // end if + THEN("the withdrawal amount should be deducted from the account balance") + { + // Check the expected outcome + + // Simulate the scenario + float compareBalance = 500.0; + TEST_ASSERT_LESS_THAN_FLOAT(accountBalance, compareBalance); + } + } + } +} // end of case + +void test_bdd_empty_cart(void) { + GIVEN("a user with an empty shopping cart") + { + // Set up the context + int cartItemCount = 0; + + WHEN("the user adds a product to the cart") + { + // Perform the action of adding a product + + THEN("the cart item count should increase by 1") + { + // Check the expected outcome + cartItemCount++; + + TEST_ASSERT_EQUAL_INT(cartItemCount, 1); + } + } + } +} // end of case + +void test_bdd_valid_login(void) { + GIVEN("a registered user with valid credentials") + { + // Set up the context + const char* validUsername = "user123"; + const char* validPassword = "pass456"; + + WHEN("the user provides correct username and password") + { + // Perform the action of user login + const char* inputUsername = "user123"; + const char* inputPassword = "pass456"; + + THEN("the login should be successful") + { + // Check the expected outcome + // Simulate login validation + TEST_ASSERT_EQUAL_STRING(inputUsername, validUsername); + TEST_ASSERT_EQUAL_STRING(inputPassword, validPassword); + } + } + + WHEN("the user provides incorrect password") + { + // Perform the action of user login + const char* inputUsername = "user123"; + const char* inputPassword = "wrongpass"; + + THEN("the login should fail with an error message") + { + // Check the expected outcome + // Simulate login validation + TEST_ASSERT_EQUAL_STRING(inputUsername, validUsername); + // TEST_ASSERT_NOT_EQUAL_STRING(inputPassword, validPassword); + } + } + } +} // end of case + +int main(void) +{ + UnityBegin("test_bdd.c"); + RUN_TEST(test_bdd_logic_test); + RUN_TEST(test_bdd_user_account); + RUN_TEST(test_bdd_empty_cart); + RUN_TEST(test_bdd_valid_login); + return UnityEnd(); +} From a4d0150758aa8bcd25563c727fe04d845e3399a3 Mon Sep 17 00:00:00 2001 From: "Michael Gene Brockus (Dreamer)" <55331536+dreamer-coding-555@users.noreply.github.com> Date: Fri, 15 Sep 2023 10:13:06 -0600 Subject: [PATCH 22/87] Rename bdd.h to unity_bdd.h --- extras/bdd/src/{bdd.h => unity_bdd.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename extras/bdd/src/{bdd.h => unity_bdd.h} (100%) diff --git a/extras/bdd/src/bdd.h b/extras/bdd/src/unity_bdd.h similarity index 100% rename from extras/bdd/src/bdd.h rename to extras/bdd/src/unity_bdd.h From 24c175f64f31a6b2d5fcc25de1e5f32897f6118d Mon Sep 17 00:00:00 2001 From: "Michael Gene Brockus (Dreamer)" <55331536+dreamer-coding-555@users.noreply.github.com> Date: Fri, 15 Sep 2023 10:20:26 -0600 Subject: [PATCH 23/87] Create readme.md --- extras/bdd/readme.md | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 extras/bdd/readme.md diff --git a/extras/bdd/readme.md b/extras/bdd/readme.md new file mode 100644 index 00000000..e7035885 --- /dev/null +++ b/extras/bdd/readme.md @@ -0,0 +1,40 @@ +# Unity Project - BDD Feature + +Unity's Behavior-Driven Development (BDD) test feature. It allows developers to structure and describe various phases (Given, When, Then) of a test scenario in a BDD-style format. + +## Introduction + +This project is based on the Unity framework originally created by Mike Karlesky, Mark VanderVoord, and Greg Williams in 2007. The project extends Unity by providing macros to define BDD structures with descriptive elements. Feature added by Michael Gene Brockus (Dreamer). + +## License + +This project is distributed under the MIT License. See the [license.txt](license.txt) file for more information. + +## Usage + +### BDD Macros + +The provided BDD macros allow you to structure your test scenarios in a descriptive manner. These macros are for descriptive purposes only and do not have functional behavior. + +- `GIVEN(description)`: Describes the "Given" phase of a test scenario. +- `WHEN(description)`: Describes the "When" phase of a test scenario. +- `THEN(description)`: Describes the "Then" phase of a test scenario. + +Example usage: + +```c +GIVEN("a valid input") { + // Test setup and context + // ... + + WHEN("the input is processed") { + // Perform the action + // ... + + THEN("the expected outcome occurs") { + // Assert the outcome + // ... + } + } +} +``` From 4403d97d1420d0638150486ea1cfde3130d6b097 Mon Sep 17 00:00:00 2001 From: "Michael Gene Brockus (Dreamer)" <55331536+dreamer-coding-555@users.noreply.github.com> Date: Fri, 15 Sep 2023 10:22:26 -0600 Subject: [PATCH 24/87] Create meson.build --- extras/bdd/test/meson.build | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 extras/bdd/test/meson.build diff --git a/extras/bdd/test/meson.build b/extras/bdd/test/meson.build new file mode 100644 index 00000000..fcdaffff --- /dev/null +++ b/extras/bdd/test/meson.build @@ -0,0 +1,9 @@ +project('BDD Tester', 'c') + +# Add Unity as a dependency +unity_dep = dependency('unity') + +# Define your source files +sources = files('test_bdd.c') + +executable('tester', sources, dependencies : unity_dep) From 7d0bcc892ec8517c4d97c605711e9a5cd43c23d8 Mon Sep 17 00:00:00 2001 From: SteveBroshar Date: Sun, 8 Oct 2023 15:47:22 -0500 Subject: [PATCH 25/87] use null check instead of pointer compar --- src/unity.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/unity.c b/src/unity.c index b6c08b70..e455f57a 100644 --- a/src/unity.c +++ b/src/unity.c @@ -1609,8 +1609,8 @@ void UnityAssertEqualString(const char* expected, } } else - { /* handle case of one pointers being null (if both null, test should pass) */ - if (expected != actual) + { /* fail if either null but not if both */ + if (expected || actual) { Unity.CurrentTestFailed = 1; } @@ -1649,8 +1649,8 @@ void UnityAssertEqualStringLen(const char* expected, } } else - { /* handle case of one pointers being null (if both null, test should pass) */ - if (expected != actual) + { /* fail if either null but not if both */ + if (expected || actual) { Unity.CurrentTestFailed = 1; } From 88069f045cdf7d9f2a9d202a9560ac18ee848994 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Tue, 7 Nov 2023 23:48:48 -0500 Subject: [PATCH 26/87] Fix docs issues. Update scripts to match latest rubocop. Fix hex length of unity printf feature. --- README.md | 8 +++++--- auto/generate_module.rb | 23 ++++++++++++----------- src/unity.c | 4 ++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index 1fc220c0..942ad9d7 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ The message is output stating why. Compare two integers for equality and display errors as signed integers. A cast will be performed to your natural integer size so often this can just be used. -When you need to specify the exact size, like when comparing arrays, you can use a specific version: +When you need to specify the exact size, you can use a specific version. TEST_ASSERT_EQUAL_UINT(expected, actual) TEST_ASSERT_EQUAL_UINT8(expected, actual) @@ -72,7 +72,8 @@ Like INT, there are variants for different sizes also. TEST_ASSERT_EQUAL_HEX64(expected, actual) Compares two integers for equality and display errors as hexadecimal. -Like the other integer comparisons, you can specify the size... here the size will also effect how many nibbles are shown (for example, `HEX16` will show 4 nibbles). +Like the other integer comparisons, you can specify the size... +here the size will also effect how many nibbles are shown (for example, `HEX16` will show 4 nibbles). TEST_ASSERT_EQUAL(expected, actual) @@ -214,7 +215,8 @@ Fails if the pointer is equal to NULL TEST_ASSERT_EQUAL_MEMORY(expected, actual, len) Compare two blocks of memory. -This is a good generic assertion for types that can't be coerced into acting like standard types... but since it's a memory compare, you have to be careful that your data types are packed. +This is a good generic assertion for types that can't be coerced into acting like standard types... +but since it's a memory compare, you have to be careful that your data types are packed. ### \_MESSAGE diff --git a/auto/generate_module.rb b/auto/generate_module.rb index 40586f9c..7b33c727 100644 --- a/auto/generate_module.rb +++ b/auto/generate_module.rb @@ -155,7 +155,7 @@ def files_to_operate_on(module_name, pattern = nil) path: (Pathname.new("#{cfg[:path]}#{subfolder}") + filename).cleanpath, name: submodule_name, template: cfg[:template], - test_define: cfg[:test_define] + test_define: cfg[:test_define], boilerplate: cfg[:boilerplate], includes: case (cfg[:inc]) when :src then (@options[:includes][:src] || []) | (pattern_traits[:inc].map { |f| format(f, module_name) }) @@ -170,18 +170,19 @@ def files_to_operate_on(module_name, pattern = nil) end ############################ - def neutralize_filename(name, start_cap = true) + def neutralize_filename(name, start_cap: true) return name if name.empty? + name = name.split(/(?:\s+|_|(?=[A-Z][a-z]))|(?<=[a-z])(?=[A-Z])/).map(&:capitalize).join('_') - name = name[0].downcase + name[1..-1] unless start_cap + name = name[0].downcase + name[1..] unless start_cap name end ############################ def create_filename(part1, part2 = '') - name = part2.empty? ? part1 : part1 + '_' + part2 + name = part2.empty? ? part1 : "#{part1}_#{part2}" case (@options[:naming]) - when 'bumpy' then neutralize_filename(name, false).delete('_') + when 'bumpy' then neutralize_filename(name, start_cap: false).delete('_') when 'camel' then neutralize_filename(name).delete('_') when 'snake' then neutralize_filename(name).downcase when 'caps' then neutralize_filename(name).upcase @@ -263,12 +264,12 @@ def destroy(module_name, pattern = nil) case arg when /^-d/ then destroy = true when /^-u/ then options[:update_svn] = true - when /^-p\"?(\w+)\"?/ then options[:pattern] = Regexp.last_match(1) - when /^-s\"?(.+)\"?/ then options[:path_src] = Regexp.last_match(1) - when /^-i\"?(.+)\"?/ then options[:path_inc] = Regexp.last_match(1) - when /^-t\"?(.+)\"?/ then options[:path_tst] = Regexp.last_match(1) - when /^-n\"?(.+)\"?/ then options[:naming] = Regexp.last_match(1) - when /^-y\"?(.+)\"?/ then options = UnityModuleGenerator.grab_config(Regexp.last_match(1)) + when /^-p"?(\w+)"?/ then options[:pattern] = Regexp.last_match(1) + when /^-s"?(.+)"?/ then options[:path_src] = Regexp.last_match(1) + when /^-i"?(.+)"?/ then options[:path_inc] = Regexp.last_match(1) + when /^-t"?(.+)"?/ then options[:path_tst] = Regexp.last_match(1) + when /^-n"?(.+)"?/ then options[:naming] = Regexp.last_match(1) + when /^-y"?(.+)"?/ then options = UnityModuleGenerator.grab_config(Regexp.last_match(1)) when /^(\w+)/ raise "ERROR: You can't have more than one Module name specified!" unless module_name.nil? diff --git a/src/unity.c b/src/unity.c index 3e4bc04d..74071555 100644 --- a/src/unity.c +++ b/src/unity.c @@ -2029,7 +2029,7 @@ static void UnityPrintFVA(const char* format, va_list va) UNITY_EXTRACT_ARG(UNITY_UINT, number, length_mod, va, unsigned int); UNITY_OUTPUT_CHAR('0'); UNITY_OUTPUT_CHAR('x'); - UnityPrintNumberHex(number, 8); + UnityPrintNumberHex(number, UNITY_MAX_NIBBLES); break; } case 'p': @@ -2037,7 +2037,7 @@ static void UnityPrintFVA(const char* format, va_list va) const unsigned int number = va_arg(va, unsigned int); UNITY_OUTPUT_CHAR('0'); UNITY_OUTPUT_CHAR('x'); - UnityPrintNumberHex((UNITY_UINT)number, 8); + UnityPrintNumberHex((UNITY_UINT)number, UNITY_MAX_NIBBLES); break; } case 'c': From 3f7564ea3b86ec25c45a240b38a26aea521d1482 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sun, 12 Nov 2023 19:07:32 -0500 Subject: [PATCH 27/87] Catch up on Ruby style and formatting changes. --- auto/generate_test_runner.rb | 23 ++++++++-------- auto/parse_output.rb | 38 +++++++++++++-------------- auto/stylize_as_junit.rb | 2 +- auto/unity_test_summary.rb | 4 +-- examples/example_3/rakefile_helper.rb | 18 ++++++------- test/.rubocop.yml | 2 ++ 6 files changed, 45 insertions(+), 42 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 483739b7..057c02fb 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -45,6 +45,7 @@ def self.default_options cmdline_args: false, omit_begin_end: false, use_param_tests: false, + use_system_files: true, include_extensions: '(?:hpp|hh|H|h)', source_extensions: '(?:cpp|cc|ino|C|c)' } @@ -69,7 +70,7 @@ def run(input_file, output_file, options = nil) source = source.force_encoding('ISO-8859-1').encode('utf-8', replace: nil) tests = find_tests(source) headers = find_includes(source) - testfile_includes = (headers[:local] + headers[:system]) + 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)/ } @@ -80,7 +81,7 @@ def run(input_file, output_file, options = nil) # 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 += testfile_includes.map { |filename| "#{filename}.c" } unless testfile_includes.empty? all_files_used += @options[:includes] unless @options[:includes].empty? all_files_used += headers[:linkonly] unless headers[:linkonly].empty? all_files_used.uniq @@ -144,12 +145,12 @@ def find_tests(source) if @options[:use_param_tests] && !arguments.empty? args = [] type_and_args = arguments.split(/TEST_(CASE|RANGE|MATRIX)/) - for i in (1...type_and_args.length).step(2) + (1...type_and_args.length).step(2).each do |i| case type_and_args[i] - when "CASE" + when 'CASE' args << type_and_args[i + 1].sub(/^\s*\(\s*(.*?)\s*\)\s*$/m, '\1') - when "RANGE" + when 'RANGE' args += type_and_args[i + 1].scan(/(\[|<)\s*(-?\d+.?\d*)\s*,\s*(-?\d+.?\d*)\s*,\s*(-?\d+.?\d*)\s*(\]|>)/m).map do |arg_values_str| exclude_end = arg_values_str[0] == '<' && arg_values_str[-1] == '>' arg_values_str[1...-1].map do |arg_value_str| @@ -163,13 +164,13 @@ def find_tests(source) arg_combinations.flatten.join(', ') end - when "MATRIX" - single_arg_regex_string = /(?:(?:"(?:\\"|[^\\])*?")+|(?:'\\?.')+|(?:[^\s\]\["'\,]|\[[\d\S_-]+\])+)/.source + when 'MATRIX' + single_arg_regex_string = /(?:(?:"(?:\\"|[^\\])*?")+|(?:'\\?.')+|(?:[^\s\]\["',]|\[[\d\S_-]+\])+)/.source args_regex = /\[((?:\s*#{single_arg_regex_string}\s*,?)*(?:\s*#{single_arg_regex_string})?\s*)\]/m arg_elements_regex = /\s*(#{single_arg_regex_string})\s*,\s*/m args += type_and_args[i + 1].scan(args_regex).flatten.map do |arg_values_str| - (arg_values_str + ',').scan(arg_elements_regex) + ("#{arg_values_str},").scan(arg_elements_regex) end.reduce do |result, arg_range_expanded| result.product(arg_range_expanded) end.map do |arg_combinations| @@ -188,7 +189,7 @@ def find_tests(source) source_lines = source.split("\n") source_index = 0 tests_and_line_numbers.size.times do |i| - source_lines[source_index..-1].each_with_index do |line, index| + source_lines[source_index..].each_with_index do |line, index| next unless line =~ /\s+#{tests_and_line_numbers[i][:test]}(?:\s|\()/ source_index += index @@ -210,7 +211,7 @@ def find_includes(source) { local: source.scan(/^\s*#include\s+"\s*(.+\.#{@options[:include_extensions]})\s*"/).flatten, system: source.scan(/^\s*#include\s+<\s*(.+)\s*>/).flatten.map { |inc| "<#{inc}>" }, - linkonly: source.scan(/^TEST_SOURCE_FILE\(\s*\"\s*(.+\.#{@options[:source_extensions]})\s*\"/).flatten + linkonly: source.scan(/^TEST_SOURCE_FILE\(\s*"\s*(.+\.#{@options[:source_extensions]})\s*"/).flatten } end @@ -368,7 +369,7 @@ 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("\n#{template.result(binding)}") end def create_args_wrappers(output, tests) diff --git a/auto/parse_output.rb b/auto/parse_output.rb index 864104be..aa306e2c 100644 --- a/auto/parse_output.rb +++ b/auto/parse_output.rb @@ -56,7 +56,7 @@ def set_xml_output # Set the flag to indicate if there will be an XML output file or not def test_suite_name=(cli_arg) @real_test_suite_name = cli_arg - puts 'Real test suite name will be \'' + @real_test_suite_name + '\'' + puts "Real test suite name will be '#{@real_test_suite_name}'" end def xml_encode_s(str) @@ -75,7 +75,7 @@ def write_xml_output # Pushes the suite info as xml to the array list, which will be written later def push_xml_output_suite_info # Insert opening tag at front - heading = '' + heading = "" @array_list.insert(0, heading) # Push back the closing tag @array_list.push '' @@ -83,20 +83,20 @@ def push_xml_output_suite_info # Pushes xml output data to the array list, which will be written later def push_xml_output_passed(test_name, execution_time = 0) - @array_list.push ' ' + @array_list.push " " end # Pushes xml output data to the array list, which will be written later def push_xml_output_failed(test_name, reason, execution_time = 0) - @array_list.push ' ' - @array_list.push ' ' + reason + '' + @array_list.push " " + @array_list.push " #{reason}" @array_list.push ' ' end # Pushes xml output data to the array list, which will be written later def push_xml_output_ignored(test_name, reason, execution_time = 0) - @array_list.push ' ' - @array_list.push ' ' + reason + '' + @array_list.push " " + @array_list.push " #{reason}" @array_list.push ' ' end @@ -144,7 +144,7 @@ def test_failed_unity_fixture(array) test_name = array[1] test_suite_verify(class_name) reason_array = array[2].split(':') - reason = reason_array[-1].lstrip.chomp + ' at line: ' + reason_array[-4] + reason = "#{reason_array[-1].lstrip.chomp} at line: #{reason_array[-4]}" printf "%-40s FAILED\n", test_name @@ -189,12 +189,12 @@ def test_passed(array) def test_failed(array) # ':' symbol will be valid in function args now real_method_name = array[@result_usual_idx - 1..-3].join(':') - array = array[0..@result_usual_idx - 3] + [real_method_name] + array[-2..-1] + array = array[0..@result_usual_idx - 3] + [real_method_name] + array[-2..] last_item = array.length - 1 test_time = get_test_time(array[last_item]) test_name = array[last_item - 2] - reason = array[last_item].chomp.lstrip + ' at line: ' + array[last_item - 3] + reason = "#{array[last_item].chomp.lstrip} at line: #{array[last_item - 3]}" class_name = array[@class_name_idx] if test_name.start_with? 'TEST(' @@ -217,7 +217,7 @@ def test_failed(array) def test_ignored(array) # ':' symbol will be valid in function args now real_method_name = array[@result_usual_idx - 1..-3].join(':') - array = array[0..@result_usual_idx - 3] + [real_method_name] + array[-2..-1] + array = array[0..@result_usual_idx - 3] + [real_method_name] + array[-2..] last_item = array.length - 1 test_time = get_test_time(array[last_item]) @@ -268,7 +268,7 @@ def detect_os_specifics(line) def process(file_name) @array_list = [] - puts 'Parsing file: ' + file_name + puts "Parsing file: #{file_name}" @test_passed = 0 @test_failed = 0 @@ -333,17 +333,17 @@ def process(file_name) @test_ignored += 1 elsif line_array.size >= 4 # We will check output from color compilation - if line_array[@result_usual_idx..-1].any? { |l| l.include? 'PASS' } + if line_array[@result_usual_idx..].any? { |l| l.include? 'PASS' } test_passed(line_array) @test_passed += 1 - elsif line_array[@result_usual_idx..-1].any? { |l| l.include? 'FAIL' } + elsif line_array[@result_usual_idx..].any? { |l| l.include? 'FAIL' } test_failed(line_array) @test_failed += 1 elsif line_array[@result_usual_idx..-2].any? { |l| l.include? 'IGNORE' } test_ignored(line_array) @test_ignored += 1 - elsif line_array[@result_usual_idx..-1].any? { |l| l.include? 'IGNORE' } - line_array.push('No reason given (' + get_test_time(line_array[@result_usual_idx..-1]).to_s + ' ms)') + elsif line_array[@result_usual_idx..].any? { |l| l.include? 'IGNORE' } + line_array.push("No reason given (#{get_test_time(line_array[@result_usual_idx..])} ms)") test_ignored(line_array) @test_ignored += 1 end @@ -353,9 +353,9 @@ def process(file_name) puts '' puts '=================== SUMMARY =====================' puts '' - puts 'Tests Passed : ' + @test_passed.to_s - puts 'Tests Failed : ' + @test_failed.to_s - puts 'Tests Ignored : ' + @test_ignored.to_s + puts "Tests Passed : #{@test_passed}" + puts "Tests Failed : #{@test_failed}" + puts "Tests Ignored : #{@test_ignored}" return unless @xml_out diff --git a/auto/stylize_as_junit.rb b/auto/stylize_as_junit.rb index e01f7912..e4b911eb 100755 --- a/auto/stylize_as_junit.rb +++ b/auto/stylize_as_junit.rb @@ -99,7 +99,7 @@ def run test_file = if test_file_str.length < 2 result_file else - test_file_str[0] + ':' + test_file_str[1] + "#{test_file_str[0]}:#{test_file_str[1]}" end result_output[:source][:path] = File.dirname(test_file) result_output[:source][:file] = File.basename(test_file) diff --git a/auto/unity_test_summary.rb b/auto/unity_test_summary.rb index 0253b5d7..03d67a68 100644 --- a/auto/unity_test_summary.rb +++ b/auto/unity_test_summary.rb @@ -112,7 +112,7 @@ def parse_test_summary(summary) # parse out the command options opts, args = ARGV.partition { |v| v =~ /^--\w+/ } - opts.map! { |v| v[2..-1].to_sym } + opts.map! { |v| v[2..].to_sym } # create an instance to work with uts = UnityTestSummary.new(opts) @@ -128,7 +128,7 @@ def parse_test_summary(summary) uts.targets = results # set the root path - args[1] ||= Dir.pwd + '/' + args[1] ||= "#{Dir.pwd}/" uts.root = ARGV[1] # run the summarizer diff --git a/examples/example_3/rakefile_helper.rb b/examples/example_3/rakefile_helper.rb index d88df584..cbc4549f 100644 --- a/examples/example_3/rakefile_helper.rb +++ b/examples/example_3/rakefile_helper.rb @@ -17,7 +17,7 @@ def load_configuration(config_file) end def configure_clean - CLEAN.include($cfg['compiler']['build_path'] + '*.*') unless $cfg['compiler']['build_path'].nil? + CLEAN.include("#{$cfg['compiler']['build_path']}*.*") unless $cfg['compiler']['build_path'].nil? end def configure_toolchain(config_file = DEFAULT_CONFIG_FILE) @@ -27,7 +27,7 @@ def configure_toolchain(config_file = DEFAULT_CONFIG_FILE) end def unit_test_files - path = $cfg['compiler']['unit_tests_path'] + 'Test*' + C_EXTENSION + path = "#{$cfg['compiler']['unit_tests_path']}Test*#{C_EXTENSION}" path.tr!('\\', '/') FileList.new(path) end @@ -111,11 +111,11 @@ def build_linker_fields def link_it(exe_name, obj_list) linker = build_linker_fields - cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]} " + - (obj_list.map { |obj| "#{$cfg['linker']['object_files']['path']}#{obj} " }).join + - $cfg['linker']['bin_files']['prefix'] + ' ' + - $cfg['linker']['bin_files']['destination'] + - exe_name + $cfg['linker']['bin_files']['extension'] + cmd_str = "#{linker[:command]}#{linker[:options]}#{linker[:includes]}" + cmd_str += " #{(obj_list.map { |obj| "#{$cfg['linker']['object_files']['path']}#{obj}" }).join(' ')}" + cmd_str += " #{$cfg['linker']['bin_files']['prefix']} " + cmd_str += $cfg['linker']['bin_files']['destination'] + cmd_str += exe_name + $cfg['linker']['bin_files']['extension'] execute(cmd_str) end @@ -125,7 +125,7 @@ def build_simulator_fields command = if $cfg['simulator']['path'].nil? '' else - (tackit($cfg['simulator']['path']) + ' ') + "#{tackit($cfg['simulator']['path'])} " end pre_support = if $cfg['simulator']['pre_support'].nil? '' @@ -188,7 +188,7 @@ def run_tests(test_files) # Build the test runner (generate if configured to do so) test_base = File.basename(test, C_EXTENSION) - runner_name = test_base + '_Runner.c' + runner_name = "#{test_base}_Runner.c" if $cfg['compiler']['runner_path'].nil? runner_path = $cfg['compiler']['build_path'] + runner_name test_gen = UnityTestRunnerGenerator.new($cfg_file) diff --git a/test/.rubocop.yml b/test/.rubocop.yml index 44b01605..a3b811bd 100644 --- a/test/.rubocop.yml +++ b/test/.rubocop.yml @@ -28,6 +28,8 @@ Style/EvalWithLocation: Enabled: false Style/MixinUsage: Enabled: false +Style/OptionalBooleanParameter: + Enabled: false # These are also places we diverge... but we will likely comply down the road Style/IfUnlessModifier: From a1b1600e4361cdf98bdb57e7d32a1cafa6eb90bf Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Mon, 13 Nov 2023 17:03:07 -0500 Subject: [PATCH 28/87] Update change log and known issues. Fix bug with infinity and NaN handling. --- README.md | 4 ++ docs/UnityChangeLog.md | 93 +++++++++++++++++++++++++++++++++ docs/UnityConfigurationGuide.md | 11 ++++ docs/UnityKnownIssues.md | 13 +++++ src/unity.c | 34 ++++++------ src/unity_internals.h | 23 +++++--- 6 files changed, 154 insertions(+), 24 deletions(-) create mode 100644 docs/UnityChangeLog.md create mode 100644 docs/UnityKnownIssues.md diff --git a/README.md b/README.md index 8a020f6f..71488b3e 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,8 @@ If you'd like to leave the hard work to us, you might be interested in Ceedling, If you're new to Unity, we encourage you to tour the [getting started guide][]. +You can also find the [change log][] and [known issues][] in our documentation. + ## Getting Started The [docs][] folder contains a [getting started guide][] and much more tips about using Unity. @@ -226,5 +228,7 @@ This is useful for specifying more information about the problem. [CI]: https://github.com/ThrowTheSwitch/Unity/workflows/CI/badge.svg [getting started guide]: docs/UnityGettingStartedGuide.md +[change log]: docs/UnityChangeLog.md +[known issues]: docs/UnityKnownIssues.md [docs]: docs/ [UnityAssertionsReference.md]: docs/UnityAssertionsReference.md diff --git a/docs/UnityChangeLog.md b/docs/UnityChangeLog.md new file mode 100644 index 00000000..9c3bb7bf --- /dev/null +++ b/docs/UnityChangeLog.md @@ -0,0 +1,93 @@ +# Unity Test - Change Log + +## A Note + +This document captures significant features and fixes to the Unity project core source files +and scripts. More detail can be found in the history on Github. + +This project is now tracking changes in more detail. Previous releases get less detailed as +we move back in histroy. + +Prior to 2012, the project was hosted on SourceForge.net +Prior to 2008, the project was an internal project and not released to the public. + +## Log + +### Unity 2.6.0 () + +New Features: + + - Fill out missing variations of arrays, within, etc. + - Add `TEST_PRINTF()` + - Add `TEST_MATRIX()` and `TEST_RANGE()` options and documentation + - Add support for searching `TEST_SOURCE_FILE()` for determining test dependencies + - Add Unity BDD plugin + - Add `UNITY_INCLUDE_EXEC_TIME` option to report test times + - Allow user to override test abort underlying mechanism + +Significant Bugfixes: + + - More portable validation of NaN and Infinity. Added `UNITY_IS_NAN` and `UNITY_IS_INF` options + - Add `UNITY_PROGMEM` configuration option + - Fix overflow detection of hex values when using arrays + - Fix scripts broken by Ruby standard changes + +Other: + + - Avoid pointer comparison when one is null to avoid compiler warnings + - Significant improvements to documentation + - Updates to match latest Ruby style specification + - Meson, CMake, PlatformIO builds + +### Unity 2.5.2 (January 2021) + + - improvements to RUN_TEST macro and generated RUN_TEST + - Fix `UNITY_TEST_ASSERT_BIT(S)_HIGH` + - Cleaner handling of details tracking by CMock + +### Unity 2.5.1 (May 2020) + +Mostly a bugfix and stability release. +Bonus Features: + + - Optional TEST_PRINTF macro + - Improve self-testing procedures. + +### Unity 2.5.0 (October 2019) + +It's been a LONG time since the last release of Unity. Finally, here it is! +There are too many updates to list here, so some highlights: + + - more standards compliant (without giving up on supporting ALL compilers, no matter how quirky) + - many more specialized assertions for better test feedback + - more examples for integrating into your world + - many many bugfixes and tweaks + +### Unity 2.4.3 (November 2017) + + - Allow suiteSetUp() and suiteTearDown() to be povided as normal C functions + - Fix & Expand Greater Than / Less Than assertions for integers + - Built-in option to colorize test results + - Documentation updates + +### Unity 2.4.2 (September 2017) + + - Fixed bug in UNTY_TEST_ASSERT_EACH_EQUAL_* + - Added TEST_ASSERT_GREATER_THAN and TEST_ASSERT_LESS_THAN + - Updated Module Generator to stop changing names when no style given + - Cleanup to custom float printing for accuracy + - Cleanup incorrect line numbers are partial name matching + - Reduce warnings from using popular function names as variable names + +### Unity 2.4.1 (April 2017) + + - test runner generator can inject defines as well as headers + - added a built-in floating point print routine instead of relying on printf + - updated to new coding and naming standard + - updated documentation to be markdown instead of pdf + - fixed many many little bugs, most of which were supplied by the community (you people are awesome!) + - coding standard actually enforced in CI + +### Unity 2.4.0 (October, 2016) + + - port from SourceForge and numerous bugfixes diff --git a/docs/UnityConfigurationGuide.md b/docs/UnityConfigurationGuide.md index e56b4a40..953851fd 100644 --- a/docs/UnityConfigurationGuide.md +++ b/docs/UnityConfigurationGuide.md @@ -222,6 +222,17 @@ _Example:_ #define UNITY_FLOAT_PRECISION 0.001f ``` +#### `UNITY_IS_NAN` and `UNITY_IS_INF` + +If your toolchain defines `isnan` and `isinf` in `math.h` as macros, nothing needs to be done. If your toolchain doesn't define these, Unity +will create these macros itself. You may override either or both of these defines to specify how you want to evaluate if a number is NaN or Infinity. + +_Example:_ + +```C +#define UNITY_IS_NAN(n) ((n != n) ? 1 : 0) +``` + ### Miscellaneous #### `UNITY_EXCLUDE_STDDEF_H` diff --git a/docs/UnityKnownIssues.md b/docs/UnityKnownIssues.md new file mode 100644 index 00000000..34493197 --- /dev/null +++ b/docs/UnityKnownIssues.md @@ -0,0 +1,13 @@ +# Unity Test - Known Issues + +## A Note + +This project will do its best to keep track of significant bugs that might effect your usage of this +project and its supporting scripts. A more detailed and up-to-date list for cutting edge Unity can +be found on our Github repository. + +## Issues + + - No built-in validation of no-return functions + - Incomplete support for Printf-style formatting + - Incomplete support for VarArgs diff --git a/src/unity.c b/src/unity.c index e049e3ae..cc2e5ce1 100644 --- a/src/unity.c +++ b/src/unity.c @@ -356,11 +356,11 @@ void UnityPrintFloat(const UNITY_DOUBLE input_number) { UnityPrint("0"); } - else if (isnan(number)) + else if (UNITY_IS_NAN(number)) { UnityPrint("nan"); } - else if (isinf(number)) + else if (UNITY_IS_INF(number)) { UnityPrint("inf"); } @@ -895,15 +895,15 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected, #ifndef UNITY_EXCLUDE_FLOAT /* Wrap this define in a function with variable types as float or double */ #define UNITY_FLOAT_OR_DOUBLE_WITHIN(delta, expected, actual, diff) \ - if (isinf(expected) && isinf(actual) && (((expected) < 0) == ((actual) < 0))) return 1; \ + if (UNITY_IS_INF(expected) && UNITY_IS_INF(actual) && (((expected) < 0) == ((actual) < 0))) return 1; \ if (UNITY_NAN_CHECK) return 1; \ (diff) = (actual) - (expected); \ if ((diff) < 0) (diff) = -(diff); \ if ((delta) < 0) (delta) = -(delta); \ - return !(isnan(diff) || isinf(diff) || ((diff) > (delta))) + return !(UNITY_IS_NAN(diff) || UNITY_IS_INF(diff) || ((diff) > (delta))) /* This first part of this condition will catch any NaN or Infinite values */ #ifndef UNITY_NAN_NOT_EQUAL_NAN - #define UNITY_NAN_CHECK isnan(expected) && isnan(actual) + #define UNITY_NAN_CHECK UNITY_IS_NAN(expected) && UNITY_IS_NAN(actual) #else #define UNITY_NAN_CHECK 0 #endif @@ -954,12 +954,12 @@ void UnityAssertWithinFloatArray(const UNITY_FLOAT delta, #endif } - if (isinf(in_delta)) + if (UNITY_IS_INF(in_delta)) { return; /* Arrays will be force equal with infinite delta */ } - if (isnan(in_delta)) + if (UNITY_IS_NAN(in_delta)) { /* Delta must be correct number */ UnityPrintPointlessAndBail(); @@ -1098,21 +1098,21 @@ void UnityAssertFloatSpecial(const UNITY_FLOAT actual, { case UNITY_FLOAT_IS_INF: case UNITY_FLOAT_IS_NOT_INF: - is_trait = isinf(actual) && (actual > 0); + is_trait = UNITY_IS_INF(actual) && (actual > 0); break; case UNITY_FLOAT_IS_NEG_INF: case UNITY_FLOAT_IS_NOT_NEG_INF: - is_trait = isinf(actual) && (actual < 0); + is_trait = UNITY_IS_INF(actual) && (actual < 0); break; case UNITY_FLOAT_IS_NAN: case UNITY_FLOAT_IS_NOT_NAN: - is_trait = isnan(actual) ? 1 : 0; + is_trait = UNITY_IS_NAN(actual) ? 1 : 0; break; case UNITY_FLOAT_IS_DET: /* A determinate number is non infinite and not NaN. */ case UNITY_FLOAT_IS_NOT_DET: - is_trait = !isinf(actual) && !isnan(actual); + is_trait = !UNITY_IS_INF(actual) && !UNITY_IS_NAN(actual); break; case UNITY_FLOAT_INVALID_TRAIT: /* Supress warning */ @@ -1182,12 +1182,12 @@ void UnityAssertWithinDoubleArray(const UNITY_DOUBLE delta, #endif } - if (isinf(in_delta)) + if (UNITY_IS_INF(in_delta)) { return; /* Arrays will be force equal with infinite delta */ } - if (isnan(in_delta)) + if (UNITY_IS_NAN(in_delta)) { /* Delta must be correct number */ UnityPrintPointlessAndBail(); @@ -1325,21 +1325,21 @@ void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual, { case UNITY_FLOAT_IS_INF: case UNITY_FLOAT_IS_NOT_INF: - is_trait = isinf(actual) && (actual > 0); + is_trait = UNITY_IS_INF(actual) && (actual > 0); break; case UNITY_FLOAT_IS_NEG_INF: case UNITY_FLOAT_IS_NOT_NEG_INF: - is_trait = isinf(actual) && (actual < 0); + is_trait = UNITY_IS_INF(actual) && (actual < 0); break; case UNITY_FLOAT_IS_NAN: case UNITY_FLOAT_IS_NOT_NAN: - is_trait = isnan(actual) ? 1 : 0; + is_trait = UNITY_IS_NAN(actual) ? 1 : 0; break; case UNITY_FLOAT_IS_DET: /* A determinate number is non infinite and not NaN. */ case UNITY_FLOAT_IS_NOT_DET: - is_trait = !isinf(actual) && !isnan(actual); + is_trait = !UNITY_IS_INF(actual) && !UNITY_IS_NAN(actual); break; case UNITY_FLOAT_INVALID_TRAIT: /* Supress warning */ diff --git a/src/unity_internals.h b/src/unity_internals.h index 11d9abb4..65938ff7 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -241,16 +241,25 @@ #endif typedef UNITY_FLOAT_TYPE UNITY_FLOAT; -/* isinf & isnan macros should be provided by math.h */ -#ifndef isinf -/* The value of Inf - Inf is NaN */ -#define isinf(n) (isnan((n) - (n)) && !isnan(n)) -#endif - +/* isnan macro should be provided by math.h. Override if not macro */ +#ifndef UNITY_IS_NAN #ifndef isnan /* NaN is the only floating point value that does NOT equal itself. * Therefore if n != n, then it is NaN. */ -#define isnan(n) ((n != n) ? 1 : 0) +#define UNITY_IS_NAN(n) ((n != n) ? 1 : 0) +#else +#define UNITY_IS_NAN(n) isnan(n) +#endif +#endif + +/* isinf macro should be provided by math.h. Override if not macro */ +#ifndef UNITY_IS_INF +#ifndef isinf +/* The value of Inf - Inf is NaN */ +#define UNITY_IS_INF(n) (UNITY_IS_NAN((n) - (n)) && !UNITY_IS_NAN(n)) +#else +#define UNITY_IS_INF(n) isinf(n) +#endif #endif #endif From 3911b01d8166f3bc3778e81737711d241f642c2a Mon Sep 17 00:00:00 2001 From: "Lei, Andre" Date: Thu, 16 Nov 2023 19:40:45 +0000 Subject: [PATCH 29/87] Update generate test runner to leverage custom UNITY_END() --- auto/generate_test_runner.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 057c02fb..4b34c8b7 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -450,10 +450,10 @@ def create_main(output, filename, tests, used_mocks) if @options[:omit_begin_end] output.puts(' (void) suite_teardown(0);') else - output.puts(' return suiteTearDown(UnityEnd());') + output.puts(' return suiteTearDown(UNITY_END());') end else - output.puts(' return UnityEnd();') unless @options[:omit_begin_end] + output.puts(' return UNITY_END();') unless @options[:omit_begin_end] end output.puts('}') end @@ -529,7 +529,7 @@ def create_h_file(output, filename, tests, testfile_includes, used_mocks) ' --suite_setup="" - code to execute for setup of entire suite', ' --suite_teardown="" - code to execute for teardown of entire suite', ' --use_param_tests=1 - enable parameterized tests (disabled by default)', - ' --omit_begin_end=1 - omit calls to UnityBegin and UnityEnd (disabled by default)', + ' --omit_begin_end=1 - omit calls to UnityBegin and UNITY_END (disabled by default)', ' --header_file="" - path/name of test header file to generate too'].join("\n") exit 1 end From 985f6e019472a2165cbae2320eac04f90eb8d226 Mon Sep 17 00:00:00 2001 From: Dennis Skinner Date: Sat, 2 Dec 2023 03:05:32 -0500 Subject: [PATCH 30/87] Add help option to test command line args When test binaries are run with unknown options or with the standard -h option, a help menu will print all available options. This is much more convenient than having to dig through unity.c to find every option. --- src/unity.c | 11 ++++++++ test/tests/test_generate_test_runner.rb | 36 ++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/unity.c b/src/unity.c index cc2e5ce1..284f0dce 100644 --- a/src/unity.c +++ b/src/unity.c @@ -2329,6 +2329,17 @@ int UnityParseOptions(int argc, char** argv) UnityPrint("ERROR: Unknown Option "); UNITY_OUTPUT_CHAR(argv[i][1]); UNITY_PRINT_EOL(); + /* fall-through to display help */ + case 'h': + UnityPrint("Options: "); UNITY_PRINT_EOL(); + UnityPrint("-l List all tests"); UNITY_PRINT_EOL(); + UnityPrint("-f TEST Only run tests with TEST in the name"); UNITY_PRINT_EOL(); + UnityPrint("-n TEST Only run tests with TEST in the name"); UNITY_PRINT_EOL(); + UnityPrint("-h Show this help menu"); UNITY_PRINT_EOL(); + UnityPrint("-q Quiet/Decrease verbosity"); UNITY_PRINT_EOL(); + UnityPrint("-v Increase verbosity"); UNITY_PRINT_EOL(); + UnityPrint("-x TEST Exclude tests with TEST in the name"); UNITY_PRINT_EOL(); + UNITY_OUTPUT_FLUSH(); return 1; } } diff --git a/test/tests/test_generate_test_runner.rb b/test/tests/test_generate_test_runner.rb index 658b6e2e..1d73bf81 100644 --- a/test/tests/test_generate_test_runner.rb +++ b/test/tests/test_generate_test_runner.rb @@ -1158,9 +1158,43 @@ :to_pass => [ ], :to_fail => [ ], :to_ignore => [ ], - :text => [ "ERROR: Unknown Option z" ], + :text => [ + "ERROR: Unknown Option z", + "Options:", + "-l List all tests", + "-f TEST Only run tests with TEST in the name", + "-n TEST Only run tests with TEST in the name", + "-h Show this help menu", + "-q Quiet/Decrease verbosity", + "-v Increase verbosity", + "-x TEST Exclude tests with TEST in the name", + ], } }, + + { :name => 'ArgsHelp', + :testfile => 'testdata/testRunnerGenerator.c', + :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'], + :options => { + :cmdline_args => true, + }, + :cmdline_args => "-h", + :expected => { + :to_pass => [ ], + :to_fail => [ ], + :to_ignore => [ ], + :text => [ + "Options:", + "-l List all tests", + "-f TEST Only run tests with TEST in the name", + "-n TEST Only run tests with TEST in the name", + "-h Show this help menu", + "-q Quiet/Decrease verbosity", + "-v Increase verbosity", + "-x TEST Exclude tests with TEST in the name", + ], + } + }, ] def runner_test(test, runner, expected, test_defines, cmdline_args, features) From fcb4e53c367b8df1053810ed8ed6192ee322e27d Mon Sep 17 00:00:00 2001 From: Dennis Skinner <1518323+Skinner927@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:07:15 -0500 Subject: [PATCH 31/87] Update help menu to use mnemonics --- src/unity.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/unity.c b/src/unity.c index 284f0dce..8b858c98 100644 --- a/src/unity.c +++ b/src/unity.c @@ -2332,13 +2332,13 @@ int UnityParseOptions(int argc, char** argv) /* fall-through to display help */ case 'h': UnityPrint("Options: "); UNITY_PRINT_EOL(); - UnityPrint("-l List all tests"); UNITY_PRINT_EOL(); - UnityPrint("-f TEST Only run tests with TEST in the name"); UNITY_PRINT_EOL(); - UnityPrint("-n TEST Only run tests with TEST in the name"); UNITY_PRINT_EOL(); - UnityPrint("-h Show this help menu"); UNITY_PRINT_EOL(); - UnityPrint("-q Quiet/Decrease verbosity"); UNITY_PRINT_EOL(); - UnityPrint("-v Increase verbosity"); UNITY_PRINT_EOL(); - UnityPrint("-x TEST Exclude tests with TEST in the name"); UNITY_PRINT_EOL(); + UnityPrint("-l List all tests and exit"); UNITY_PRINT_EOL(); + UnityPrint("-f NAME Filter to run only tests whose name includes NAME"); UNITY_PRINT_EOL(); + UnityPrint("-n NAME (deprecated) alias of -f"); UNITY_PRINT_EOL(); + UnityPrint("-h show this Help menu"); UNITY_PRINT_EOL(); + UnityPrint("-q Quiet/decrease verbosity"); UNITY_PRINT_EOL(); + UnityPrint("-v increase Verbosity"); UNITY_PRINT_EOL(); + UnityPrint("-x NAME eXclude tests whose name includes NAME"); UNITY_PRINT_EOL(); UNITY_OUTPUT_FLUSH(); return 1; } From 049ddda6156ec4889748805e85328876e322cac4 Mon Sep 17 00:00:00 2001 From: Dennis Skinner <1518323+Skinner927@users.noreply.github.com> Date: Sun, 3 Dec 2023 23:02:09 -0500 Subject: [PATCH 32/87] Fix tests for new help verbiage --- test/tests/test_generate_test_runner.rb | 56 ++++++++++++------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/test/tests/test_generate_test_runner.rb b/test/tests/test_generate_test_runner.rb index 1d73bf81..0f92a3af 100644 --- a/test/tests/test_generate_test_runner.rb +++ b/test/tests/test_generate_test_runner.rb @@ -1161,40 +1161,40 @@ :text => [ "ERROR: Unknown Option z", "Options:", - "-l List all tests", - "-f TEST Only run tests with TEST in the name", - "-n TEST Only run tests with TEST in the name", - "-h Show this help menu", - "-q Quiet/Decrease verbosity", - "-v Increase verbosity", - "-x TEST Exclude tests with TEST in the name", + "-l List all tests and exit", + "-f NAME Filter to run only tests whose name includes NAME", + "-n NAME (deprecated) alias of -f", + "-h show this Help menu", + "-q Quiet/decrease verbosity", + "-v increase Verbosity", + "-x NAME eXclude tests whose name includes NAME", ], } }, { :name => 'ArgsHelp', - :testfile => 'testdata/testRunnerGenerator.c', - :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'], - :options => { - :cmdline_args => true, - }, - :cmdline_args => "-h", - :expected => { - :to_pass => [ ], - :to_fail => [ ], - :to_ignore => [ ], - :text => [ - "Options:", - "-l List all tests", - "-f TEST Only run tests with TEST in the name", - "-n TEST Only run tests with TEST in the name", - "-h Show this help menu", - "-q Quiet/Decrease verbosity", - "-v Increase verbosity", - "-x TEST Exclude tests with TEST in the name", - ], - } + :testfile => 'testdata/testRunnerGenerator.c', + :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'], + :options => { + :cmdline_args => true, }, + :cmdline_args => "-h", + :expected => { + :to_pass => [ ], + :to_fail => [ ], + :to_ignore => [ ], + :text => [ + "Options:", + "-l List all tests and exit", + "-f NAME Filter to run only tests whose name includes NAME", + "-n NAME (deprecated) alias of -f", + "-h show this Help menu", + "-q Quiet/decrease verbosity", + "-v increase Verbosity", + "-x NAME eXclude tests whose name includes NAME", + ], + } + }, ] def runner_test(test, runner, expected, test_defines, cmdline_args, features) From 4a606dc2cd47e1fcd8391c45ae6be7fc648346e9 Mon Sep 17 00:00:00 2001 From: Dennis Skinner <1518323+Skinner927@users.noreply.github.com> Date: Sun, 3 Dec 2023 22:58:39 -0500 Subject: [PATCH 33/87] Add missing `generate_test_runner.rb` options to docs --- docs/UnityHelperScriptsGuide.md | 63 ++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/docs/UnityHelperScriptsGuide.md b/docs/UnityHelperScriptsGuide.md index 3c321336..68382808 100644 --- a/docs/UnityHelperScriptsGuide.md +++ b/docs/UnityHelperScriptsGuide.md @@ -114,6 +114,11 @@ In the `examples` directory, Example 3's Rakefile demonstrates using a Ruby hash This option specifies an array of file names to be `#include`'d at the top of your runner C file. You might use it to reference custom types or anything else universally needed in your generated runners. +##### `:defines` + +This option specifies an array of definitions to be `#define`'d at the top of your runner C file. +Each definition will be wrapped in an `#ifndef`. + ##### `:suite_setup` Define this option with C code to be executed _before any_ test cases are run. @@ -191,7 +196,63 @@ Few usage examples can be found in `/test/tests/test_unity_parameterized.c` file You should define `UNITY_SUPPORT_TEST_CASES` macro for tests success compiling, if you enable current option. -You can see list of supported macros list in the next section. +You can see list of supported macros list in the +[Parameterized tests provided macros](#parameterized-tests-provided-macros) +section that follows. + +##### `:cmdline_args` + +When set to `true`, the generated test runner can accept a number of +options to modify how the test(s) are run. + +Ensure Unity is compiled with `UNITY_USE_COMMAND_LINE_ARGS` defined or else +the required functions will not exist. + +These are the available options: + +| Option | Description | +| --------- | ------------------------------------------------- | +| `-l` | List all tests and exit | +| `-f NAME` | Filter to run only tests whose name includes NAME | +| `-n NAME` | (deprecated) alias of -f | +| `-h` | show the Help menu that lists these options | +| `-q` | Quiet/decrease verbosity | +| `-v` | increase Verbosity | +| `-x NAME` | eXclude tests whose name includes NAME | + +##### `:setup_name` + +Override the default test `setUp` function name. + +##### `:teardown_name` + +Override the default test `tearDown` function name. + +##### `:test_reset_name` + +Override the default test `resetTest` function name. + +##### `:test_verify_name` + +Override the default test `verifyTest` function name. + +##### `:main_name` + +Override the test's `main()` function name (from `main` to whatever is specified). +The sentinel value `:auto` will use the test's filename with the `.c` extension removed prefixed +with `main_` as the "main" function. + +To clarify, if `:main_name == :auto` and the test filename is "test_my_project.c", then the +generated function name will be `main_test_my_project(int argc, char** argv)`. + +##### `main_export_decl` + +Provide any `cdecl` for the `main()` test function. Is empty by default. + +##### `:omit_begin_end` + +If `true`, the `UnityBegin` and `UnityEnd` function will not be called for +Unity test state setup and cleanup. #### Parameterized tests provided macros From 3adb5dd7b92bab98ed079f2a4729a6b281b3dbde Mon Sep 17 00:00:00 2001 From: Dennis Skinner <1518323+Skinner927@users.noreply.github.com> Date: Mon, 4 Dec 2023 13:38:50 -0500 Subject: [PATCH 34/87] Add FALLTHRU --- src/unity.c | 3 ++- test/tests/test_generate_test_runner.rb | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/unity.c b/src/unity.c index 8b858c98..b105fa27 100644 --- a/src/unity.c +++ b/src/unity.c @@ -2329,7 +2329,8 @@ int UnityParseOptions(int argc, char** argv) UnityPrint("ERROR: Unknown Option "); UNITY_OUTPUT_CHAR(argv[i][1]); UNITY_PRINT_EOL(); - /* fall-through to display help */ + /* Now display help */ + /* FALLTHRU */ case 'h': UnityPrint("Options: "); UNITY_PRINT_EOL(); UnityPrint("-l List all tests and exit"); UNITY_PRINT_EOL(); diff --git a/test/tests/test_generate_test_runner.rb b/test/tests/test_generate_test_runner.rb index 0f92a3af..229b6abb 100644 --- a/test/tests/test_generate_test_runner.rb +++ b/test/tests/test_generate_test_runner.rb @@ -1163,7 +1163,7 @@ "Options:", "-l List all tests and exit", "-f NAME Filter to run only tests whose name includes NAME", - "-n NAME (deprecated) alias of -f", + "-n NAME \\(deprecated\\) alias of -f", "-h show this Help menu", "-q Quiet/decrease verbosity", "-v increase Verbosity", @@ -1187,7 +1187,7 @@ "Options:", "-l List all tests and exit", "-f NAME Filter to run only tests whose name includes NAME", - "-n NAME (deprecated) alias of -f", + "-n NAME \\(deprecated\\) alias of -f", "-h show this Help menu", "-q Quiet/decrease verbosity", "-v increase Verbosity", From b4f65573f75564d4b5d33e1812a31946191620d1 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Thu, 4 Jan 2024 16:57:45 -0500 Subject: [PATCH 35/87] Bump rubocop version --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ce948bd3..339bd23a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Ruby Testing Tools run: | sudo gem install rspec - sudo gem install rubocop -v 0.57.2 + sudo gem install rubocop -v 1.57.2 # Checks out repository under $GITHUB_WORKSPACE - name: Checkout Latest Repo From 64939db64e3271808fdfcfa348120b36790a23cf Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Fri, 19 Jan 2024 11:44:48 -0500 Subject: [PATCH 36/87] generate test runner: clean injected defines so the ifndef doesn't use the assignment when it exists. --- auto/generate_test_runner.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 057c02fb..102f6f30 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -239,7 +239,11 @@ def create_header(output, mocks, testfile_includes = []) output.puts('#include "cmock.h"') unless mocks.empty? output.puts('}') if @options[:externcincludes] if @options[:defines] && !@options[:defines].empty? - @options[:defines].each { |d| output.puts("#ifndef #{d}\n#define #{d}\n#endif /* #{d} */") } + output.puts("/* injected defines for unity settings, etc */") + @options[:defines].each do |d| + def_only = d.match(/(\w+).*/)[1] + output.puts("#ifndef #{def_only}\n#define #{d}\n#endif /* #{def_only} */") + end end if @options[:header_file] && !@options[:header_file].empty? output.puts("#include \"#{File.basename(@options[:header_file])}\"") From 2777955d3a3275447ebcfca01b844ea6430c9fbb Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sat, 9 Mar 2024 18:28:42 -0500 Subject: [PATCH 37/87] Document unity exec time options. --- LICENSE.txt | 2 +- docs/UnityConfigurationGuide.md | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/LICENSE.txt b/LICENSE.txt index a541b843..e12b59e6 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2007-23 Mike Karlesky, Mark VanderVoord, Greg Williams +Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, Greg Williams Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/docs/UnityConfigurationGuide.md b/docs/UnityConfigurationGuide.md index 953851fd..0b735f7a 100644 --- a/docs/UnityConfigurationGuide.md +++ b/docs/UnityConfigurationGuide.md @@ -482,6 +482,34 @@ _Example:_ #define UNITY_OUTPUT_COLOR ``` +#### `UNITY_INCLUDE_EXEC_TIME` + +Define this to measure and report execution time for each test in the suite. When enabled, Unity will do +it's best to automatically find a way to determine the time in milliseconds. On most Windows, macos, or +Linux environments, this is automatic. If not, you can give Unity more information. + +#### `UNITY_CLOCK_MS` + +If you're working on a system (embedded or otherwise) which has an accessible millisecond timer. You can +define `UNITY_CLOCK_MS` to be the name of the function which returns the millisecond timer. It will then +attempt to use that function for timing purposes. + +#### `UNITY_EXEC_TIME_START` + +Define this hook to start a millisecond timer if necessary. + +#### `UNITY_EXEC_TIME_STOP` + +Define this hook to stop a millisecond timer if necessary. + +#### `UNITY_PRINT_EXEC_TIME` + +Define this hook to print the current execution time. Used to report the milliseconds elapsed. + +#### `UNITY_TIME_TYPE` + +Finally, this can be set to the type which holds the millisecond timer. + #### `UNITY_SHORTHAND_AS_INT` #### `UNITY_SHORTHAND_AS_MEM` From b512a1c184f61861f0e1e43a80fb770cffd720d3 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sat, 9 Mar 2024 18:50:25 -0500 Subject: [PATCH 38/87] Flesh out documentation for command line options for runner generator. --- docs/UnityHelperScriptsGuide.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/docs/UnityHelperScriptsGuide.md b/docs/UnityHelperScriptsGuide.md index 68382808..01db2752 100644 --- a/docs/UnityHelperScriptsGuide.md +++ b/docs/UnityHelperScriptsGuide.md @@ -126,6 +126,8 @@ Define this option with C code to be executed _before any_ test cases are run. Alternatively, if your C compiler supports weak symbols, you can leave this option unset and instead provide a `void suiteSetUp(void)` function in your test suite. The linker will look for this symbol and fall back to a Unity-provided stub if it is not found. +This option can also be specified at the command prompt as `--suite_setup=""` + ##### `:suite_teardown` Define this option with C code to be executed _after all_ test cases have finished. @@ -136,6 +138,8 @@ You can normally just return `num_failures`. Alternatively, if your C compiler supports weak symbols, you can leave this option unset and instead provide a `int suiteTearDown(int num_failures)` function in your test suite. The linker will look for this symbol and fall back to a Unity-provided stub if it is not found. +This option can also be specified at the command prompt as `--suite_teardown=""` + ##### `:enforce_strict_ordering` This option should be defined if you have the strict order feature enabled in CMock (see CMock documentation). @@ -146,6 +150,8 @@ If you provide the same YAML to the generator as used in CMock's configuration, This option should be defined if you are mixing C and CPP and want your test runners to automatically include extern "C" support when they are generated. +This option can also be specified at the command prompt as `--externc` + ##### `:mock_prefix` and `:mock_suffix` Unity automatically generates calls to Init, Verify and Destroy for every file included in the main test file that starts with the given mock prefix and ends with the given mock suffix, file extension not included. @@ -170,8 +176,11 @@ Or as a yaml file: If you are using CMock, it is very likely that you are already passing an array of plugins to CMock. You can just use the same array here. + This script will just ignore the plugins that don't require additional support. +This option can also be specified at the command prompt as `--cexception` + ##### `:include_extensions` This option specifies the pattern for matching acceptable header file extensions. @@ -200,6 +209,8 @@ You can see list of supported macros list in the [Parameterized tests provided macros](#parameterized-tests-provided-macros) section that follows. +This option can also be specified at the command prompt as `--use_param_tests=1` + ##### `:cmdline_args` When set to `true`, the generated test runner can accept a number of @@ -224,18 +235,26 @@ These are the available options: Override the default test `setUp` function name. +This option can also be specified at the command prompt as `--setup_name=""` + ##### `:teardown_name` Override the default test `tearDown` function name. +This option can also be specified at the command prompt as `--teardown_name=""` + ##### `:test_reset_name` Override the default test `resetTest` function name. +This option can also be specified at the command prompt as `--test_reset_name=""` + ##### `:test_verify_name` Override the default test `verifyTest` function name. +This option can also be specified at the command prompt as `--test_verify_name=""` + ##### `:main_name` Override the test's `main()` function name (from `main` to whatever is specified). @@ -245,6 +264,8 @@ with `main_` as the "main" function. To clarify, if `:main_name == :auto` and the test filename is "test_my_project.c", then the generated function name will be `main_test_my_project(int argc, char** argv)`. +This option can also be specified at the command prompt as `--main_name=""` + ##### `main_export_decl` Provide any `cdecl` for the `main()` test function. Is empty by default. @@ -254,6 +275,8 @@ Provide any `cdecl` for the `main()` test function. Is empty by default. If `true`, the `UnityBegin` and `UnityEnd` function will not be called for Unity test state setup and cleanup. +This option can also be specified at the command prompt as `--omit_begin_end` + #### Parameterized tests provided macros Unity provides support for few param tests generators, that can be combined From e3457a85f4738bdcb4359b6a8abef2d7bc716ade Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sat, 9 Mar 2024 19:26:38 -0500 Subject: [PATCH 39/87] Fix temperamental test in core test suite. --- test/tests/test_unity_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tests/test_unity_core.c b/test/tests/test_unity_core.c index d324e861..c6ac8128 100644 --- a/test/tests/test_unity_core.c +++ b/test/tests/test_unity_core.c @@ -296,9 +296,9 @@ void testFailureCountIncrementsAndIsReturnedAtEnd(void) Unity.CurrentTestFailed = 1; startPutcharSpy(); /* Suppress output */ startFlushSpy(); - TEST_ASSERT_EQUAL(0, getFlushSpyCalls()); UnityConcludeTest(); endPutcharSpy(); + TEST_ASSERT_EQUAL(0, getFlushSpyCalls()); TEST_ASSERT_EQUAL(savedFailures + 1, Unity.TestFailures); #if defined(UNITY_OUTPUT_FLUSH) && defined(UNITY_OUTPUT_FLUSH_HEADER_DECLARATION) TEST_ASSERT_EQUAL(1, getFlushSpyCalls()); From 860062d51b2e8a75d150337b63ca2a472840d13c Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sat, 9 Mar 2024 19:36:15 -0500 Subject: [PATCH 40/87] Fixed issue #715 (typo that disabled two tests) --- test/tests/test_unity_arrays.c | 2 +- test/tests/test_unity_integers_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/tests/test_unity_arrays.c b/test/tests/test_unity_arrays.c index 59848836..2151eef9 100644 --- a/test/tests/test_unity_arrays.c +++ b/test/tests/test_unity_arrays.c @@ -61,7 +61,7 @@ void testInt64ArrayWithinDeltaAndMessage(void) #endif } -void tesUInt64ArrayNotWithinDelta(void) +void testInt64ArrayNotWithinDelta(void) { #ifndef UNITY_SUPPORT_64 TEST_IGNORE(); diff --git a/test/tests/test_unity_integers_64.c b/test/tests/test_unity_integers_64.c index 867d1e79..6e83329e 100644 --- a/test/tests/test_unity_integers_64.c +++ b/test/tests/test_unity_integers_64.c @@ -61,7 +61,7 @@ void testInt64ArrayWithinDeltaAndMessage(void) #endif } -void tesUInt64ArrayNotWithinDelta(void) +void testInt64ArrayNotWithinDelta(void) { #ifndef UNITY_SUPPORT_64 TEST_IGNORE(); From 85452ad1544f77d752a2444eb8859f73346bfb97 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Wed, 13 Mar 2024 15:07:30 -0400 Subject: [PATCH 41/87] :memo: Add Code of Conduct and Contributing docs --- docs/CODE_OF_CONDUCT.md | 138 +++++++++++++++++++++++ docs/CONTRIBUTING.md | 238 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 376 insertions(+) create mode 100644 docs/CODE_OF_CONDUCT.md create mode 100644 docs/CONTRIBUTING.md diff --git a/docs/CODE_OF_CONDUCT.md b/docs/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..84e34806 --- /dev/null +++ b/docs/CODE_OF_CONDUCT.md @@ -0,0 +1,138 @@ + +# ThrowTheSwitch.org Code of Conduct + +Thank you for participating in a ThrowTheSwitch.org community project! We want +this to continue to be a warm and inviting place for everyone to share ideas +and get help. To accomplish this goal, we've developed this Code of Conduct. + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, caste, color, religion, or sexual +identity and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the overall + community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or advances of + any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email address, + without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official email address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +hello@thingamabyte.com. + +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series of +actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or permanent +ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within the +community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.1, available at +[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. + +Community Impact Guidelines were inspired by +[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. + +For answers to common questions about this code of conduct, see the FAQ at +[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at +[https://www.contributor-covenant.org/translations][translations]. + +[homepage]: https://www.contributor-covenant.org +[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html +[Mozilla CoC]: https://github.com/mozilla/diversity +[FAQ]: https://www.contributor-covenant.org/faq +[translations]: https://www.contributor-covenant.org/translations diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md new file mode 100644 index 00000000..e64a285a --- /dev/null +++ b/docs/CONTRIBUTING.md @@ -0,0 +1,238 @@ +# Contributing to a ThrowTheSwitch.org Project + +👍🎉 _First off, thanks for taking the time to contribute!_ 🎉👍 + +The following is a set of guidelines for contributing to any of ThrowTheSwitch.org's projects or the website itself, hosted at throwtheswitch.org or ThrowTheSwitch's organization on GitHub. These are mostly guidelines, not rules. Use your best judgment, and feel free to propose changes to this document in a pull request. + +### Table Of Contents + +- [Code of Conduct](#book-code-of-conduct) +- [Asking Questions](#bulb-asking-questions) +- [Opening an Issue](#inbox_tray-opening-an-issue) +- [Feature Requests](#love_letter-feature-requests) +- [Triaging Issues](#mag-triaging-issues) +- [Submitting Pull Requests](#repeat-submitting-pull-requests) +- [Writing Commit Messages](#memo-writing-commit-messages) +- [Code Review](#white_check_mark-code-review) +- [Coding Style](#nail_care-coding-style) +- [Certificate of Origin](#medal_sports-certificate-of-origin) +- [Credits](#pray-credits) + +## :book: Code of Conduct + +Please review our [Code of Conduct](CODE_OF_CONDUCT.md). It is in effect at all times. We expect it to be honored by everyone who contributes to this project. Be a Good Human! + +## :bulb: Asking Questions + +> **Note:** Please don't file an issue to ask a question. We have an official forum where the community chimes in with helpful advice if you have questions. + +* [ThrowTheSwitch Forums](https://throwtheswitch.org/forums) + +### What should I know before I get started? + +ThrowTheSwitch hosts a number of open source projects — Ceedling is the entrypoint for many users. Ceedling is actually built upon the foundation of Unity Test (a flexible C testing framework) and CMock (a mocking tool for C) and it coordinates many other open source and proprietary tools. Please do your best to focus your ideas and questions at the correct tool. We'll do our best to help you find your way, but there will be times where we'll have to direct your attention to another subtool. + +Here are some of the main projects hosted by ThrowTheSwitch.org: + + - [Ceedling](https://www.github.com/throwtheswitch/ceedling) -- Build coordinator for testing C applications, especially embedded C (and optionally your release build too!) + - [CMock](https://www.github.com/throwtheswitch/cmock) -- Mocking tool for automatically creating stubs, mocks, and skeletons in C + - [Unity](https://www.github.com/throwtheswitch/unity) -- Unit Testing framework for C, specially embedded C. + - [MadScienceLabDocker](https://www.github.com/throwtheswitch/madsciencelabdocker) -- Docker image giving you a shortcut to getting running with Ceedling + - [CException](https://www.github.com/throwtheswitch/cexception) -- An exception framework for using simple exceptions in C. + +There are many more, but this list should be a good starting point. + +## :inbox_tray: Opening an Issue + +Before [creating an issue](https://help.github.com/en/github/managing-your-work-on-github/creating-an-issue), check if you are using the latest version of the project. If you are not up-to-date, see if updating fixes your issue first. + +### :beetle: Bug Reports and Other Issues + +A great way to contribute to the project is to send a detailed issue when you encounter a problem. We always appreciate a well-written, thorough bug report. :v: + +In short, since you are most likely a developer, **provide a ticket that you would like to receive**. + +- **Review the documentation** before opening a new issue. + +- **Do not open a duplicate issue!** Search through existing issues to see if your issue has previously been reported. If your issue exists, comment with any additional information you have. You may simply note "I have this problem too", which helps prioritize the most common problems and requests. + +- **Prefer using [reactions](https://github.blog/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/)**, not comments, if you simply want to "+1" an existing issue. + +- **Fully complete the provided issue template.** The bug report template requests all the information we need to quickly and efficiently address your issue. Be clear, concise, and descriptive. Provide as much information as you can, including steps to reproduce, stack traces, compiler errors, library versions, OS versions, and screenshots (if applicable). + +- **Use [GitHub-flavored Markdown](https://help.github.com/en/github/writing-on-github/basic-writing-and-formatting-syntax).** Especially put code blocks and console outputs in backticks (```). This improves readability. + +## :seedling: Feature Requests + +Feature requests are welcome! We don't have all the answers and we truly love the collaborative experience of building software together! That being said, we cannot guarantee your request will be accepted. We want to avoid [feature creep](https://en.wikipedia.org/wiki/Feature_creep). Your idea may be great, but also out-of-scope for the project. If accepted, we'll do our best to tackle it in a timely manner, but cannot make any commitments regarding the timeline for implementation and release. However, you are welcome to submit a pull request to help! + +- **Please don't open a duplicate feature request.** Search for existing feature requests first. If you find your feature (or one very similar) previously requested, comment on that issue. + +- **Fully complete the provided issue template.** The feature request template asks for all necessary information for us to begin a productive conversation. + +- Be precise about the proposed outcome of the feature and how it relates to existing features. Include implementation details if possible. + +## :mag: Triaging Issues + +You can triage issues which may include reproducing bug reports or asking for additional information, such as version numbers or reproduction instructions. Any help you can provide to quickly resolve an issue is very much appreciated! + +## :repeat: Submitting Pull Requests + +We **love** pull requests! Before [forking the repo](https://help.github.com/en/github/getting-started-with-github/fork-a-repo) and [creating a pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/proposing-changes-to-your-work-with-pull-requests) for non-trivial changes, it is usually best to first open an issue to discuss the changes, or discuss your intended approach for solving the problem in the comments for an existing issue. + +For most contributions, after your first pull request is accepted and merged, you will be [invited to the project](https://help.github.com/en/github/setting-up-and-managing-your-github-user-account/inviting-collaborators-to-a-personal-repository) and given **push access**. :tada: + +*Note: All contributions will be licensed under the project's license.* + +- **Smaller is better.** Submit **one** pull request per bug fix or feature. A pull request should contain isolated changes pertaining to a single bug fix or feature implementation. **Do not** refactor or reformat code that is unrelated to your change. It is better to **submit many small pull requests** rather than a single large one. Enormous pull requests will take enormous amounts of time to review, or may be rejected altogether. + +- **Coordinate bigger changes.** For large and non-trivial changes, open an issue to discuss a strategy with the maintainers. Otherwise, you risk doing a lot of work for nothing! + +- **Prioritize understanding over cleverness.** Write code clearly and concisely. Remember that source code usually gets written once and read often. Ensure the code is clear to the reader. The purpose and logic should be obvious to a reasonably skilled developer, otherwise you should add a comment that explains it. + +- **Follow existing coding style and conventions.** Keep your code consistent with the style, formatting, and conventions in the rest of the code base. When possible, these will be enforced with a linter. Consistency makes it easier to review and modify in the future. + +- **Include test coverage.** Add unit tests when possible. Follow existing patterns for implementing tests. + +- **Update the example project** if one exists to exercise any new functionality you have added. + +- **Add documentation.** Document your changes with code doc comments or in existing guides. + +- **Update the CHANGELOG** for all enhancements and bug fixes. Include the corresponding issue number if one exists, and your GitHub username. (example: "- Fixed crash in profile view. #123 @jessesquires") + +- **Use the repo's default branch.** Branch from and [submit your pull request](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request-from-a-fork) to the repo's default branch. Usually this is `main`, but it could be `dev`, `develop`, or `master`. + +- **[Resolve any merge conflicts](https://help.github.com/en/github/collaborating-with-issues-and-pull-requests/resolving-a-merge-conflict-on-github)** that occur. + +- **Promptly address any CI failures**. If your pull request fails to build or pass tests, please push another commit to fix it. + +- When writing comments, use properly constructed sentences, including punctuation. + +- Use spaces, not tabs. + +## :memo: Writing Commit Messages + +Please [write a great commit message](https://chris.beams.io/posts/git-commit/). + +1. Separate subject from body with a blank line +1. Limit the subject line to 50 characters +1. Capitalize the subject line +1. Do not end the subject line with a period +1. Wrap the body at _about_ 72 characters +1. Use the body to explain **why**, *not what and how* (the code shows that!) +1. If applicable, prefix the title with the relevant component name or emoji (see below. examples: "[Docs] Fix typo", "[Profile] Fix missing avatar") + +``` +:palm_tree: Summary of Amazing Feature Here + +Add a more detailed explanation here, if necessary. Possibly give +some background about the issue being fixed, etc. The body of the +commit message can be several paragraphs. Further paragraphs come +after blank lines and please do proper word-wrap. + +Wrap it to about 72 characters or so. In some contexts, +the first line is treated as the subject of the commit and the +rest of the text as the body. The blank line separating the summary +from the body is critical (unless you omit the body entirely); +various tools like `log`, `shortlog` and `rebase` can get confused +if you run the two together. + +Explain the problem that this commit is solving. Focus on why you +are making this change as opposed to how or what. The code explains +how or what. Reviewers and your future self can read the patch, +but might not understand why a particular solution was implemented. +Are there side effects or other unintuitive consequences of this +change? Here's the place to explain them. + + - Bullet points are awesome, too + + - A hyphen should be used for the bullet, preceded + by a single space, with blank lines in between + +Note the fixed or relevant GitHub issues at the end: + +Resolves: #123 +See also: #456, #789 +``` + +## :heart: Who Loves Emoji? + +Commit comments, Issues, Feature Requests... they can all use a little sprucing up, right? Consider using the following emoji for a mix of function and :sparkles: dazzle! + + - actions + - :seedling: `:seedling:` (or other plants) when growing new features. Choose your fav! :cactus: :herb: :evergreen_tree: :palm_tree: :deciduous_tree: :blossom: + - :art: `:art:` when improving the format/structure of the code + - :racehorse: `:racehorse:` when improving performance + - :non-potable_water: `:non-potable_water:` when plugging memory leaks + - :memo: `:memo:` when writing docs + - :bug: `:bug:` (or other insects) when fixing a bug. Maybe :beetle: :ant: or :honeybee: ? + - :fire: `:fire:` when removing code or files + - :green_heart: `:green_heart:` when fixing the CI build + - :white_check_mark: `:white_check_mark:` when adding tests + - :lock: `:lock:` when dealing with security + - :arrow_up: `:arrow_up:` when upgrading dependencies + - :arrow_down: `:arrow_down:` when downgrading dependencies + - :shirt: `:shirt:` when removing linter warnings + + - platforms + - :penguin: `:penguin:` when fixing something on Linux + - :apple: `:apple:` when fixing something on macOS + - :checkered_flag: `:checkered_flag:` when fixing something on Windows + +## :white_check_mark: Code Review + +- **Review the code, not the author.** Look for and suggest improvements without disparaging or insulting the author. Provide actionable feedback and explain your reasoning. + +- **You are not your code.** When your code is critiqued, questioned, or constructively criticized, remember that you are not your code. Do not take code review personally. + +- **Always do your best.** No one writes bugs on purpose. Do your best, and learn from your mistakes. + +- Kindly note any violations to the guidelines specified in this document. + +## :violin: Coding Style + +Consistency is the most important. Following the existing style, formatting, and naming conventions of the file you are modifying and of the overall project. Failure to do so will result in a prolonged review process that has to focus on updating the superficial aspects of your code, rather than improving its functionality and performance. + +For example, if all private properties are prefixed with an underscore `_`, then new ones you add should be prefixed in the same way. Or, if methods are named using camelcase, like `thisIsMyNewMethod`, then do not diverge from that by writing `this_is_my_new_method`. You get the idea. If in doubt, please ask or search the codebase for something similar. + +When possible, style and format will be enforced with a linter. + +### C Styleguide + +C code is linted with [AStyle](https://astyle.sourceforge.net/). + +### Ruby Styleguide + +Ruby code is linted with [Rubocop](https://github.com/rubocop/rubocop) + +## :medal_sports: Certificate of Origin + +*Developer's Certificate of Origin 1.1* + +By making a contribution to this project, I certify that: + +> 1. The contribution was created in whole or in part by me and I have the right to submit it under the open source license indicated in the file; or +> 1. The contribution is based upon previous work that, to the best of my knowledge, is covered under an appropriate open source license and I have the right under that license to submit that work with modifications, whether created in whole or in part by me, under the same open source license (unless I am permitted to submit under a different license), as indicated in the file; or +> 1. The contribution was provided directly to me by some other person who certified (1), (2) or (3) and I have not modified it. +> 1. I understand and agree that this project and the contribution are public and that a record of the contribution (including all personal information I submit with it, including my sign-off) is maintained indefinitely and may be redistributed consistent with this project or the open source license(s) involved. + +## [No Brown M&M's](https://en.wikipedia.org/wiki/Van_Halen#Contract_riders) + +If you are reading this, bravo dear user and (hopefully) contributor for making it this far! You are awesome. :100: + +To confirm that you have read this guide and are following it as best as possible, **include this emoji at the top** of your issue or pull request: :pineapple: `:pineapple:` + +## :pray: Credits + +Written by [@jessesquires](https://github.com/jessesquires). Lovingly adapted to ThrowTheSwitch.org by [@mvandervoord](https://github.com/mvandervoord). + +**Please feel free to adopt this guide in your own projects. Fork it wholesale or remix it for your needs.** + +*Many of the ideas and prose for the statements in this document were based on or inspired by work from the following communities:* + +- [Alamofire](https://github.com/Alamofire/Alamofire/blob/master/CONTRIBUTING.md) +- [CocoaPods](https://github.com/CocoaPods/CocoaPods/blob/master/CONTRIBUTING.md) +- [Docker](https://github.com/moby/moby/blob/master/CONTRIBUTING.md) +- [Linux](https://elinux.org/Developer_Certificate_Of_Origin) + +*We commend them for their efforts to facilitate collaboration in their projects.* From 671f8d25f19527a17d15475b038a16e5ba249bdf Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sat, 16 Mar 2024 23:15:00 -0400 Subject: [PATCH 42/87] Update all the boilerplates --- LICENSE.txt | 2 +- auto/__init__.py | 7 +++++++ auto/colour_prompt.rb | 11 ++++++----- auto/colour_reporter.rb | 11 ++++++----- auto/extract_version.py | 7 +++++++ auto/generate_config.yml | 7 +++++++ auto/generate_module.rb | 11 ++++++----- auto/generate_test_runner.rb | 11 ++++++----- auto/parse_output.rb | 6 ++++++ auto/stylize_as_junit.py | 13 ++++++------- auto/stylize_as_junit.rb | 7 +++++++ auto/test_file_filter.rb | 11 ++++++----- auto/type_sanitizer.rb | 7 +++++++ auto/unity_test_summary.py | 12 ++++++------ auto/unity_test_summary.rb | 11 ++++++----- auto/yaml_helper.rb | 11 ++++++----- examples/example_1/makefile | 11 ++++++----- examples/example_1/src/ProductionCode.c | 7 +++++++ examples/example_1/src/ProductionCode.h | 7 +++++++ examples/example_1/src/ProductionCode2.c | 7 +++++++ examples/example_1/src/ProductionCode2.h | 7 +++++++ examples/example_1/test/TestProductionCode.c | 7 +++++++ examples/example_1/test/TestProductionCode2.c | 7 +++++++ examples/example_2/makefile | 11 ++++++----- examples/example_2/src/ProductionCode.c | 7 +++++++ examples/example_2/src/ProductionCode.h | 7 +++++++ examples/example_2/src/ProductionCode2.c | 7 +++++++ examples/example_2/src/ProductionCode2.h | 7 +++++++ examples/example_2/test/TestProductionCode.c | 7 +++++++ examples/example_2/test/TestProductionCode2.c | 7 +++++++ .../test_runners/TestProductionCode2_Runner.c | 7 +++++++ .../test/test_runners/TestProductionCode_Runner.c | 7 +++++++ examples/example_2/test/test_runners/all_tests.c | 7 +++++++ examples/example_3/helper/UnityHelper.c | 7 +++++++ examples/example_3/helper/UnityHelper.h | 7 +++++++ examples/example_3/rakefile.rb | 7 +++++++ examples/example_3/rakefile_helper.rb | 11 ++++++----- examples/example_3/src/ProductionCode.c | 7 +++++++ examples/example_3/src/ProductionCode.h | 7 +++++++ examples/example_3/src/ProductionCode2.c | 7 +++++++ examples/example_3/src/ProductionCode2.h | 7 +++++++ examples/example_3/target_gcc_32.yml | 7 +++++++ examples/example_3/test/TestProductionCode.c | 7 +++++++ examples/example_3/test/TestProductionCode2.c | 7 +++++++ examples/example_4/src/ProductionCode.c | 7 +++++++ examples/example_4/src/ProductionCode.h | 7 +++++++ examples/example_4/src/ProductionCode2.c | 7 +++++++ examples/example_4/src/ProductionCode2.h | 7 +++++++ examples/example_4/test/TestProductionCode.c | 7 +++++++ examples/example_4/test/TestProductionCode2.c | 7 +++++++ examples/unity_config.h | 7 +++++++ extras/bdd/src/unity_bdd.h | 12 ++++++------ extras/bdd/test/test_bdd.c | 11 ++++++----- extras/fixture/src/unity_fixture.c | 12 ++++++------ extras/fixture/src/unity_fixture.h | 13 +++++++------ extras/fixture/src/unity_fixture_internals.h | 13 +++++++------ extras/fixture/test/main/AllTests.c | 12 ++++++------ extras/fixture/test/template_fixture_tests.c | 13 +++++++------ extras/fixture/test/unity_fixture_Test.c | 13 +++++++------ extras/fixture/test/unity_fixture_TestRunner.c | 13 +++++++------ extras/memory/src/unity_memory.c | 11 ++++++----- extras/memory/src/unity_memory.h | 11 ++++++----- extras/memory/test/Makefile | 7 +++++++ extras/memory/test/unity_memory_Test.c | 11 ++++++----- extras/memory/test/unity_memory_TestRunner.c | 11 ++++++----- extras/memory/test/unity_output_Spy.c | 11 ++++++----- extras/memory/test/unity_output_Spy.h | 11 ++++++----- library.json | 7 +++++++ platformio-build.py | 7 +++++++ src/unity.c | 9 +++++---- src/unity.h | 11 ++++++----- src/unity_internals.h | 11 ++++++----- test/.rubocop.yml | 7 ++++++- test/Makefile | 6 ++++++ test/rakefile | 11 ++++++----- test/rakefile_helper.rb | 11 ++++++----- test/spec/generate_module_existing_file_spec.rb | 7 +++++++ test/targets/ansi.yml | 7 +++++++ test/targets/clang_file.yml | 7 +++++++ test/targets/clang_strict.yml | 7 +++++++ test/targets/gcc_32.yml | 7 +++++++ test/targets/gcc_64.yml | 7 +++++++ test/targets/gcc_auto_limits.yml | 7 +++++++ test/targets/gcc_auto_stdint.yml | 7 +++++++ test/targets/gcc_manual_math.yml | 7 +++++++ test/targets/hitech_picc18.yml | 7 +++++++ test/targets/iar_arm_v4.yml | 7 +++++++ test/targets/iar_arm_v5.yml | 7 +++++++ test/targets/iar_arm_v5_3.yml | 7 +++++++ test/targets/iar_armcortex_LM3S9B92_v5_4.yml | 7 +++++++ test/targets/iar_cortexm3_v5.yml | 7 +++++++ test/targets/iar_msp430.yml | 7 +++++++ test/targets/iar_sh2a_v6.yml | 7 +++++++ test/testdata/CException.h | 7 +++++++ test/testdata/Defs.h | 7 +++++++ test/testdata/cmock.h | 7 +++++++ test/testdata/mockMock.h | 7 +++++++ test/testdata/testRunnerGenerator.c | 7 +++++++ test/testdata/testRunnerGeneratorSmall.c | 7 +++++++ test/testdata/testRunnerGeneratorWithMocks.c | 7 +++++++ test/tests/self_assessment_utils.h | 7 +++++++ test/tests/test_generate_test_runner.rb | 11 ++++++----- test/tests/test_unity_arrays.c | 11 ++++++----- test/tests/test_unity_core.c | 15 +++++++++------ test/tests/test_unity_doubles.c | 11 ++++++----- test/tests/test_unity_floats.c | 11 ++++++----- test/tests/test_unity_integers.c | 11 ++++++----- test/tests/test_unity_integers_64.c | 11 ++++++----- test/tests/test_unity_memory.c | 11 ++++++----- test/tests/test_unity_parameterized.c | 11 ++++++----- test/tests/test_unity_parameterizedDemo.c | 7 +++++++ test/tests/test_unity_strings.c | 11 ++++++----- test/tests/types_for_test.h | 7 +++++++ 113 files changed, 747 insertions(+), 223 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index e12b59e6..ecca34ce 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, Greg Williams +Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, Greg Williams Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/auto/__init__.py b/auto/__init__.py index e69de29b..793090f9 100644 --- a/auto/__init__.py +++ b/auto/__init__.py @@ -0,0 +1,7 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + diff --git a/auto/colour_prompt.rb b/auto/colour_prompt.rb index 85cbfd80..57b495a0 100644 --- a/auto/colour_prompt.rb +++ b/auto/colour_prompt.rb @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= if RUBY_PLATFORM =~ /(win|w)32$/ begin diff --git a/auto/colour_reporter.rb b/auto/colour_reporter.rb index b86b76c5..273ea3b6 100644 --- a/auto/colour_reporter.rb +++ b/auto/colour_reporter.rb @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= require_relative 'colour_prompt' diff --git a/auto/extract_version.py b/auto/extract_version.py index 1d137e5b..44cb3b41 100755 --- a/auto/extract_version.py +++ b/auto/extract_version.py @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + #!/usr/bin/env python3 import re import sys diff --git a/auto/generate_config.yml b/auto/generate_config.yml index 4a5e4742..d0fccec7 100644 --- a/auto/generate_config.yml +++ b/auto/generate_config.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + #this is a sample configuration file for generate_module #you would use it by calling generate_module with the -ygenerate_config.yml option #files like this are useful for customizing generate_module to your environment diff --git a/auto/generate_module.rb b/auto/generate_module.rb index 7b33c727..4c91a131 100644 --- a/auto/generate_module.rb +++ b/auto/generate_module.rb @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= # This script creates all the files with start code necessary for a new module. # A simple module only requires a source file, header file, and test file. diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 102f6f30..1a90564d 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -1,10 +1,11 @@ #!/usr/bin/ruby -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= class UnityTestRunnerGenerator def initialize(options = nil) diff --git a/auto/parse_output.rb b/auto/parse_output.rb index aa306e2c..7a5b7a5e 100644 --- a/auto/parse_output.rb +++ b/auto/parse_output.rb @@ -1,3 +1,9 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= #============================================================ # Author: John Theofanopoulos # A simple parser. Takes the output files generated during the diff --git a/auto/stylize_as_junit.py b/auto/stylize_as_junit.py index 06c86596..a60c472e 100644 --- a/auto/stylize_as_junit.py +++ b/auto/stylize_as_junit.py @@ -1,11 +1,10 @@ #! python3 -# ========================================== -# Fork from Unity Project - A Test Framework for C -# Pull request on Gerrit in progress, the objective of this file is to be deleted when official Unity deliveries -# include that modification -# Copyright (c) 2015 Alexander Mueller / XelaRellum@web.de -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= import sys import os from glob import glob diff --git a/auto/stylize_as_junit.rb b/auto/stylize_as_junit.rb index e4b911eb..b44979e2 100755 --- a/auto/stylize_as_junit.rb +++ b/auto/stylize_as_junit.rb @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + #!/usr/bin/ruby # # unity_to_junit.rb diff --git a/auto/test_file_filter.rb b/auto/test_file_filter.rb index f4834a12..c922cdd2 100644 --- a/auto/test_file_filter.rb +++ b/auto/test_file_filter.rb @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= require_relative 'yaml_helper' diff --git a/auto/type_sanitizer.rb b/auto/type_sanitizer.rb index 3d1db09f..0cf9563c 100644 --- a/auto/type_sanitizer.rb +++ b/auto/type_sanitizer.rb @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + module TypeSanitizer def self.sanitize_c_identifier(unsanitized) # convert filename to valid C identifier by replacing invalid chars with '_' diff --git a/auto/unity_test_summary.py b/auto/unity_test_summary.py index 00c0da8c..a7d24bad 100644 --- a/auto/unity_test_summary.py +++ b/auto/unity_test_summary.py @@ -1,10 +1,10 @@ #! python3 -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2015 Alexander Mueller / XelaRellum@web.de -# [Released under MIT License. Please refer to license.txt for details] -# Based on the ruby script by Mike Karlesky, Mark VanderVoord, Greg Williams -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= import sys import os import re diff --git a/auto/unity_test_summary.rb b/auto/unity_test_summary.rb index 03d67a68..0d7f1838 100644 --- a/auto/unity_test_summary.rb +++ b/auto/unity_test_summary.rb @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= # !/usr/bin/ruby # diff --git a/auto/yaml_helper.rb b/auto/yaml_helper.rb index 3296ba0e..32746db7 100644 --- a/auto/yaml_helper.rb +++ b/auto/yaml_helper.rb @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= require 'yaml' diff --git a/examples/example_1/makefile b/examples/example_1/makefile index 28409c10..9c97687e 100644 --- a/examples/example_1/makefile +++ b/examples/example_1/makefile @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= #We try to detect the OS we are running on, and adjust commands as needed ifeq ($(OS),Windows_NT) diff --git a/examples/example_1/src/ProductionCode.c b/examples/example_1/src/ProductionCode.c index db128e5b..6be26aca 100644 --- a/examples/example_1/src/ProductionCode.c +++ b/examples/example_1/src/ProductionCode.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode.h" diff --git a/examples/example_1/src/ProductionCode.h b/examples/example_1/src/ProductionCode.h index 250ca0dc..5aaa8bbc 100644 --- a/examples/example_1/src/ProductionCode.h +++ b/examples/example_1/src/ProductionCode.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + int FindFunction_WhichIsBroken(int NumberToFind); int FunctionWhichReturnsLocalVariable(void); diff --git a/examples/example_1/src/ProductionCode2.c b/examples/example_1/src/ProductionCode2.c index 98ee7eeb..ea12cd71 100644 --- a/examples/example_1/src/ProductionCode2.c +++ b/examples/example_1/src/ProductionCode2.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode2.h" diff --git a/examples/example_1/src/ProductionCode2.h b/examples/example_1/src/ProductionCode2.h index 34ae980d..63f8b0f5 100644 --- a/examples/example_1/src/ProductionCode2.h +++ b/examples/example_1/src/ProductionCode2.h @@ -1,2 +1,9 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction); diff --git a/examples/example_1/test/TestProductionCode.c b/examples/example_1/test/TestProductionCode.c index 404c3718..44441fd1 100644 --- a/examples/example_1/test/TestProductionCode.c +++ b/examples/example_1/test/TestProductionCode.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode.h" #include "unity.h" diff --git a/examples/example_1/test/TestProductionCode2.c b/examples/example_1/test/TestProductionCode2.c index 7d940c17..cb6e4444 100644 --- a/examples/example_1/test/TestProductionCode2.c +++ b/examples/example_1/test/TestProductionCode2.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode2.h" #include "unity.h" diff --git a/examples/example_2/makefile b/examples/example_2/makefile index e2832173..c0b41852 100644 --- a/examples/example_2/makefile +++ b/examples/example_2/makefile @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= #We try to detect the OS we are running on, and adjust commands as needed ifeq ($(OS),Windows_NT) diff --git a/examples/example_2/src/ProductionCode.c b/examples/example_2/src/ProductionCode.c index 3bafe205..e30851a7 100644 --- a/examples/example_2/src/ProductionCode.c +++ b/examples/example_2/src/ProductionCode.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode.h" diff --git a/examples/example_2/src/ProductionCode.h b/examples/example_2/src/ProductionCode.h index 250ca0dc..5aaa8bbc 100644 --- a/examples/example_2/src/ProductionCode.h +++ b/examples/example_2/src/ProductionCode.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + int FindFunction_WhichIsBroken(int NumberToFind); int FunctionWhichReturnsLocalVariable(void); diff --git a/examples/example_2/src/ProductionCode2.c b/examples/example_2/src/ProductionCode2.c index 77c969f1..bd6f4ce8 100644 --- a/examples/example_2/src/ProductionCode2.c +++ b/examples/example_2/src/ProductionCode2.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode2.h" diff --git a/examples/example_2/src/ProductionCode2.h b/examples/example_2/src/ProductionCode2.h index 34ae980d..63f8b0f5 100644 --- a/examples/example_2/src/ProductionCode2.h +++ b/examples/example_2/src/ProductionCode2.h @@ -1,2 +1,9 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction); diff --git a/examples/example_2/test/TestProductionCode.c b/examples/example_2/test/TestProductionCode.c index b8fb95c0..0e05a0db 100644 --- a/examples/example_2/test/TestProductionCode.c +++ b/examples/example_2/test/TestProductionCode.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode.h" #include "unity.h" #include "unity_fixture.h" diff --git a/examples/example_2/test/TestProductionCode2.c b/examples/example_2/test/TestProductionCode2.c index d9f4efe3..de6c3242 100644 --- a/examples/example_2/test/TestProductionCode2.c +++ b/examples/example_2/test/TestProductionCode2.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode2.h" #include "unity.h" #include "unity_fixture.h" diff --git a/examples/example_2/test/test_runners/TestProductionCode2_Runner.c b/examples/example_2/test/test_runners/TestProductionCode2_Runner.c index 6fcc3b12..c528c80f 100644 --- a/examples/example_2/test/test_runners/TestProductionCode2_Runner.c +++ b/examples/example_2/test/test_runners/TestProductionCode2_Runner.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "unity.h" #include "unity_fixture.h" diff --git a/examples/example_2/test/test_runners/TestProductionCode_Runner.c b/examples/example_2/test/test_runners/TestProductionCode_Runner.c index 41a416a6..b65e6695 100644 --- a/examples/example_2/test/test_runners/TestProductionCode_Runner.c +++ b/examples/example_2/test/test_runners/TestProductionCode_Runner.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "unity.h" #include "unity_fixture.h" diff --git a/examples/example_2/test/test_runners/all_tests.c b/examples/example_2/test/test_runners/all_tests.c index e706ece7..6cd4ef95 100644 --- a/examples/example_2/test/test_runners/all_tests.c +++ b/examples/example_2/test/test_runners/all_tests.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "unity_fixture.h" static void RunAllTests(void) diff --git a/examples/example_3/helper/UnityHelper.c b/examples/example_3/helper/UnityHelper.c index 9cf42c67..12110176 100644 --- a/examples/example_3/helper/UnityHelper.c +++ b/examples/example_3/helper/UnityHelper.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "unity.h" #include "UnityHelper.h" #include diff --git a/examples/example_3/helper/UnityHelper.h b/examples/example_3/helper/UnityHelper.h index 15161115..573f26c9 100644 --- a/examples/example_3/helper/UnityHelper.h +++ b/examples/example_3/helper/UnityHelper.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #ifndef _TESTHELPER_H #define _TESTHELPER_H diff --git a/examples/example_3/rakefile.rb b/examples/example_3/rakefile.rb index c095af38..48de0d05 100644 --- a/examples/example_3/rakefile.rb +++ b/examples/example_3/rakefile.rb @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + require 'rake' require 'rake/clean' require_relative 'rakefile_helper' diff --git a/examples/example_3/rakefile_helper.rb b/examples/example_3/rakefile_helper.rb index cbc4549f..9b57e814 100644 --- a/examples/example_3/rakefile_helper.rb +++ b/examples/example_3/rakefile_helper.rb @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= require 'fileutils' require_relative '../../auto/unity_test_summary' diff --git a/examples/example_3/src/ProductionCode.c b/examples/example_3/src/ProductionCode.c index 3bafe205..e30851a7 100644 --- a/examples/example_3/src/ProductionCode.c +++ b/examples/example_3/src/ProductionCode.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode.h" diff --git a/examples/example_3/src/ProductionCode.h b/examples/example_3/src/ProductionCode.h index 250ca0dc..5aaa8bbc 100644 --- a/examples/example_3/src/ProductionCode.h +++ b/examples/example_3/src/ProductionCode.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + int FindFunction_WhichIsBroken(int NumberToFind); int FunctionWhichReturnsLocalVariable(void); diff --git a/examples/example_3/src/ProductionCode2.c b/examples/example_3/src/ProductionCode2.c index 77c969f1..bd6f4ce8 100644 --- a/examples/example_3/src/ProductionCode2.c +++ b/examples/example_3/src/ProductionCode2.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode2.h" diff --git a/examples/example_3/src/ProductionCode2.h b/examples/example_3/src/ProductionCode2.h index 34ae980d..63f8b0f5 100644 --- a/examples/example_3/src/ProductionCode2.h +++ b/examples/example_3/src/ProductionCode2.h @@ -1,2 +1,9 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction); diff --git a/examples/example_3/target_gcc_32.yml b/examples/example_3/target_gcc_32.yml index d7568ab8..3fa10040 100644 --- a/examples/example_3/target_gcc_32.yml +++ b/examples/example_3/target_gcc_32.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + # Copied from ~Unity/targets/gcc_32.yml unity_root: &unity_root '../..' unity_source: &unity_source '../../src/' diff --git a/examples/example_3/test/TestProductionCode.c b/examples/example_3/test/TestProductionCode.c index 28a55812..a74e9eab 100644 --- a/examples/example_3/test/TestProductionCode.c +++ b/examples/example_3/test/TestProductionCode.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode.h" #include "unity.h" diff --git a/examples/example_3/test/TestProductionCode2.c b/examples/example_3/test/TestProductionCode2.c index e2119cc3..43907d4f 100644 --- a/examples/example_3/test/TestProductionCode2.c +++ b/examples/example_3/test/TestProductionCode2.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode2.h" #include "unity.h" diff --git a/examples/example_4/src/ProductionCode.c b/examples/example_4/src/ProductionCode.c index db128e5b..6be26aca 100644 --- a/examples/example_4/src/ProductionCode.c +++ b/examples/example_4/src/ProductionCode.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode.h" diff --git a/examples/example_4/src/ProductionCode.h b/examples/example_4/src/ProductionCode.h index 250ca0dc..5aaa8bbc 100644 --- a/examples/example_4/src/ProductionCode.h +++ b/examples/example_4/src/ProductionCode.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + int FindFunction_WhichIsBroken(int NumberToFind); int FunctionWhichReturnsLocalVariable(void); diff --git a/examples/example_4/src/ProductionCode2.c b/examples/example_4/src/ProductionCode2.c index 98ee7eeb..ea12cd71 100644 --- a/examples/example_4/src/ProductionCode2.c +++ b/examples/example_4/src/ProductionCode2.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode2.h" diff --git a/examples/example_4/src/ProductionCode2.h b/examples/example_4/src/ProductionCode2.h index 34ae980d..63f8b0f5 100644 --- a/examples/example_4/src/ProductionCode2.h +++ b/examples/example_4/src/ProductionCode2.h @@ -1,2 +1,9 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction); diff --git a/examples/example_4/test/TestProductionCode.c b/examples/example_4/test/TestProductionCode.c index 526a84eb..15a19fcd 100644 --- a/examples/example_4/test/TestProductionCode.c +++ b/examples/example_4/test/TestProductionCode.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode.h" #include "unity.h" diff --git a/examples/example_4/test/TestProductionCode2.c b/examples/example_4/test/TestProductionCode2.c index 2578ca94..479a1a67 100644 --- a/examples/example_4/test/TestProductionCode2.c +++ b/examples/example_4/test/TestProductionCode2.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "ProductionCode2.h" #include "unity.h" diff --git a/examples/unity_config.h b/examples/unity_config.h index fc6cdb05..98931aba 100644 --- a/examples/unity_config.h +++ b/examples/unity_config.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + /* Unity Configuration * As of May 11th, 2016 at ThrowTheSwitch/Unity commit 837c529 * Update: December 29th, 2016 diff --git a/extras/bdd/src/unity_bdd.h b/extras/bdd/src/unity_bdd.h index d91b3f13..129b7bc3 100644 --- a/extras/bdd/src/unity_bdd.h +++ b/extras/bdd/src/unity_bdd.h @@ -1,9 +1,9 @@ -/* Copyright (c) 2023 Michael Gene Brockus (Dreamer) and Contributed to Unity Project - * ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #ifndef UNITY_BDD_TEST_H_ #define UNITY_BDD_TEST_H_ diff --git a/extras/bdd/test/test_bdd.c b/extras/bdd/test/test_bdd.c index 4f415858..548ba97c 100644 --- a/extras/bdd/test/test_bdd.c +++ b/extras/bdd/test/test_bdd.c @@ -1,8 +1,9 @@ -/* ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #include "unity_bdd.h" diff --git a/extras/fixture/src/unity_fixture.c b/extras/fixture/src/unity_fixture.c index c3dda796..0047bd36 100644 --- a/extras/fixture/src/unity_fixture.c +++ b/extras/fixture/src/unity_fixture.c @@ -1,9 +1,9 @@ -/* Copyright (c) 2010 James Grenning and Contributed to Unity Project - * ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity_fixture.h" #include "unity_internals.h" diff --git a/extras/fixture/src/unity_fixture.h b/extras/fixture/src/unity_fixture.h index 65750662..0eb471e3 100644 --- a/extras/fixture/src/unity_fixture.h +++ b/extras/fixture/src/unity_fixture.h @@ -1,9 +1,10 @@ -/* Copyright (c) 2010 James Grenning and Contributed to Unity Project - * ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #ifndef UNITY_FIXTURE_H_ #define UNITY_FIXTURE_H_ diff --git a/extras/fixture/src/unity_fixture_internals.h b/extras/fixture/src/unity_fixture_internals.h index 1c51aa98..9e6f8b7c 100644 --- a/extras/fixture/src/unity_fixture_internals.h +++ b/extras/fixture/src/unity_fixture_internals.h @@ -1,9 +1,10 @@ -/* Copyright (c) 2010 James Grenning and Contributed to Unity Project - * ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #ifndef UNITY_FIXTURE_INTERNALS_H_ #define UNITY_FIXTURE_INTERNALS_H_ diff --git a/extras/fixture/test/main/AllTests.c b/extras/fixture/test/main/AllTests.c index 30242cb3..8b8e16ba 100644 --- a/extras/fixture/test/main/AllTests.c +++ b/extras/fixture/test/main/AllTests.c @@ -1,9 +1,9 @@ -/* Copyright (c) 2010 James Grenning and Contributed to Unity Project - * ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity_fixture.h" diff --git a/extras/fixture/test/template_fixture_tests.c b/extras/fixture/test/template_fixture_tests.c index 18bbb89e..ad7f0823 100644 --- a/extras/fixture/test/template_fixture_tests.c +++ b/extras/fixture/test/template_fixture_tests.c @@ -1,9 +1,10 @@ -/* Copyright (c) 2010 James Grenning and Contributed to Unity Project - * ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "unity_fixture.h" diff --git a/extras/fixture/test/unity_fixture_Test.c b/extras/fixture/test/unity_fixture_Test.c index 1422b489..e258fbaf 100644 --- a/extras/fixture/test/unity_fixture_Test.c +++ b/extras/fixture/test/unity_fixture_Test.c @@ -1,9 +1,10 @@ -/* Copyright (c) 2010 James Grenning and Contributed to Unity Project - * ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "unity_fixture.h" #include diff --git a/extras/fixture/test/unity_fixture_TestRunner.c b/extras/fixture/test/unity_fixture_TestRunner.c index 7b78c49c..0eb2bdb1 100644 --- a/extras/fixture/test/unity_fixture_TestRunner.c +++ b/extras/fixture/test/unity_fixture_TestRunner.c @@ -1,9 +1,10 @@ -/* Copyright (c) 2010 James Grenning and Contributed to Unity Project - * ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "unity_fixture.h" diff --git a/extras/memory/src/unity_memory.c b/extras/memory/src/unity_memory.c index e4dc6654..85abbc9f 100644 --- a/extras/memory/src/unity_memory.c +++ b/extras/memory/src/unity_memory.c @@ -1,8 +1,9 @@ -/* ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #include "unity_memory.h" diff --git a/extras/memory/src/unity_memory.h b/extras/memory/src/unity_memory.h index ccdb826f..ace96a5a 100644 --- a/extras/memory/src/unity_memory.h +++ b/extras/memory/src/unity_memory.h @@ -1,8 +1,9 @@ -/* ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #ifndef UNITY_MEMORY_OVERRIDES_H_ #define UNITY_MEMORY_OVERRIDES_H_ diff --git a/extras/memory/test/Makefile b/extras/memory/test/Makefile index f3f86ce6..790ab393 100644 --- a/extras/memory/test/Makefile +++ b/extras/memory/test/Makefile @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + CC = gcc ifeq ($(shell uname -s), Darwin) CC = clang diff --git a/extras/memory/test/unity_memory_Test.c b/extras/memory/test/unity_memory_Test.c index 6f832e27..163d24c0 100644 --- a/extras/memory/test/unity_memory_Test.c +++ b/extras/memory/test/unity_memory_Test.c @@ -1,8 +1,9 @@ -/* ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #include "unity_memory.h" diff --git a/extras/memory/test/unity_memory_TestRunner.c b/extras/memory/test/unity_memory_TestRunner.c index 4c91a599..92e98ff8 100644 --- a/extras/memory/test/unity_memory_TestRunner.c +++ b/extras/memory/test/unity_memory_TestRunner.c @@ -1,8 +1,9 @@ -/* ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #include "unity_memory.h" diff --git a/extras/memory/test/unity_output_Spy.c b/extras/memory/test/unity_output_Spy.c index 772fe0bd..69fcacc7 100644 --- a/extras/memory/test/unity_output_Spy.c +++ b/extras/memory/test/unity_output_Spy.c @@ -1,8 +1,9 @@ -/* ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #include "unity_output_Spy.h" diff --git a/extras/memory/test/unity_output_Spy.h b/extras/memory/test/unity_output_Spy.h index e2e401c4..739263cd 100644 --- a/extras/memory/test/unity_output_Spy.h +++ b/extras/memory/test/unity_output_Spy.h @@ -1,8 +1,9 @@ -/* ========================================== - * Unity Project - A Test Framework for C - * Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - * [Released under MIT License. Please refer to license.txt for details] - * ========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #ifndef UNITY_OUTPUT_SPY_H #define UNITY_OUTPUT_SPY_H diff --git a/library.json b/library.json index 914f5f68..839b5abd 100644 --- a/library.json +++ b/library.json @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + { "name": "Unity", "version": "2.6.0", diff --git a/platformio-build.py b/platformio-build.py index 66fea42f..51251ddd 100644 --- a/platformio-build.py +++ b/platformio-build.py @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + import os Import("env") diff --git a/src/unity.c b/src/unity.c index b105fa27..7fd703ab 100644 --- a/src/unity.c +++ b/src/unity.c @@ -1,8 +1,9 @@ /* ========================================================================= - Unity Project - A Test Framework for C - Copyright (c) 2007-21 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -============================================================================ */ + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" diff --git a/src/unity.h b/src/unity.h index 265e548d..8337c8c6 100644 --- a/src/unity.h +++ b/src/unity.h @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007-21 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #ifndef UNITY_FRAMEWORK_H #define UNITY_FRAMEWORK_H diff --git a/src/unity_internals.h b/src/unity_internals.h index 65938ff7..1214bf07 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007-21 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #ifndef UNITY_INTERNALS_H #define UNITY_INTERNALS_H diff --git a/test/.rubocop.yml b/test/.rubocop.yml index a3b811bd..a11c2461 100644 --- a/test/.rubocop.yml +++ b/test/.rubocop.yml @@ -1,4 +1,9 @@ -# This is the configuration used to check the rubocop source code. +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= #inherit_from: .rubocop_todo.yml diff --git a/test/Makefile b/test/Makefile index 5be0488f..917a8749 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,3 +1,9 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= CC = gcc ifeq ($(shell uname -s), Darwin) CC = clang diff --git a/test/rakefile b/test/rakefile index e5f3b748..7747f305 100644 --- a/test/rakefile +++ b/test/rakefile @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= $verbose = false $extra_paths = [] diff --git a/test/rakefile_helper.rb b/test/rakefile_helper.rb index 1a9fc334..61ce874e 100644 --- a/test/rakefile_helper.rb +++ b/test/rakefile_helper.rb @@ -1,8 +1,9 @@ -# ========================================== -# Unity Project - A Test Framework for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= require 'fileutils' require_relative '../auto/unity_test_summary' diff --git a/test/spec/generate_module_existing_file_spec.rb b/test/spec/generate_module_existing_file_spec.rb index 74e7fc84..0d5eb1b3 100644 --- a/test/spec/generate_module_existing_file_spec.rb +++ b/test/spec/generate_module_existing_file_spec.rb @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + require '../auto/generate_module.rb' require 'fileutils' diff --git a/test/targets/ansi.yml b/test/targets/ansi.yml index 81af4c7f..960a5bd8 100644 --- a/test/targets/ansi.yml +++ b/test/targets/ansi.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- colour: true :unity: diff --git a/test/targets/clang_file.yml b/test/targets/clang_file.yml index 964e8145..00617331 100644 --- a/test/targets/clang_file.yml +++ b/test/targets/clang_file.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- colour: true :unity: diff --git a/test/targets/clang_strict.yml b/test/targets/clang_strict.yml index f124e8fd..6ae19356 100644 --- a/test/targets/clang_strict.yml +++ b/test/targets/clang_strict.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- colour: true :unity: diff --git a/test/targets/gcc_32.yml b/test/targets/gcc_32.yml index ba388cf7..60deb062 100644 --- a/test/targets/gcc_32.yml +++ b/test/targets/gcc_32.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- colour: true :unity: diff --git a/test/targets/gcc_64.yml b/test/targets/gcc_64.yml index ed9eb4a8..b6f10f82 100644 --- a/test/targets/gcc_64.yml +++ b/test/targets/gcc_64.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- colour: true :unity: diff --git a/test/targets/gcc_auto_limits.yml b/test/targets/gcc_auto_limits.yml index 9cfda8d4..12a11fe0 100644 --- a/test/targets/gcc_auto_limits.yml +++ b/test/targets/gcc_auto_limits.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- colour: true :unity: diff --git a/test/targets/gcc_auto_stdint.yml b/test/targets/gcc_auto_stdint.yml index 66602ef7..94066139 100644 --- a/test/targets/gcc_auto_stdint.yml +++ b/test/targets/gcc_auto_stdint.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- colour: true :unity: diff --git a/test/targets/gcc_manual_math.yml b/test/targets/gcc_manual_math.yml index b1b5b82e..76fc9921 100644 --- a/test/targets/gcc_manual_math.yml +++ b/test/targets/gcc_manual_math.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- colour: true :unity: diff --git a/test/targets/hitech_picc18.yml b/test/targets/hitech_picc18.yml index b984edbd..493705be 100644 --- a/test/targets/hitech_picc18.yml +++ b/test/targets/hitech_picc18.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- :cmock: :plugins: [] diff --git a/test/targets/iar_arm_v4.yml b/test/targets/iar_arm_v4.yml index 9a1a2761..36b1a0c8 100644 --- a/test/targets/iar_arm_v4.yml +++ b/test/targets/iar_arm_v4.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- tools_root: C:\Program Files\IAR Systems\Embedded Workbench 4.0 Kickstart\ colour: true diff --git a/test/targets/iar_arm_v5.yml b/test/targets/iar_arm_v5.yml index d4b115f1..17b6b10d 100644 --- a/test/targets/iar_arm_v5.yml +++ b/test/targets/iar_arm_v5.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.3\ colour: true diff --git a/test/targets/iar_arm_v5_3.yml b/test/targets/iar_arm_v5_3.yml index d4b115f1..17b6b10d 100644 --- a/test/targets/iar_arm_v5_3.yml +++ b/test/targets/iar_arm_v5_3.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.3\ colour: true diff --git a/test/targets/iar_armcortex_LM3S9B92_v5_4.yml b/test/targets/iar_armcortex_LM3S9B92_v5_4.yml index 1703fe27..7bf92871 100644 --- a/test/targets/iar_armcortex_LM3S9B92_v5_4.yml +++ b/test/targets/iar_armcortex_LM3S9B92_v5_4.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- tools_root: C:\Program Files (x86)\IAR Systems\Embedded Workbench 5.4 Kickstart\ colour: true diff --git a/test/targets/iar_cortexm3_v5.yml b/test/targets/iar_cortexm3_v5.yml index 8b0978ff..e56286a4 100644 --- a/test/targets/iar_cortexm3_v5.yml +++ b/test/targets/iar_cortexm3_v5.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.4\ colour: true diff --git a/test/targets/iar_msp430.yml b/test/targets/iar_msp430.yml index 65872535..a1bd3ee4 100644 --- a/test/targets/iar_msp430.yml +++ b/test/targets/iar_msp430.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- tools_root: C:\Program Files\IAR Systems\Embedded Workbench 5.3 MSP430\ core_root: &1 diff --git a/test/targets/iar_sh2a_v6.yml b/test/targets/iar_sh2a_v6.yml index b4371cd0..c4469d62 100644 --- a/test/targets/iar_sh2a_v6.yml +++ b/test/targets/iar_sh2a_v6.yml @@ -1,3 +1,10 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + --- tools_root: C:\Program Files\IAR Systems\Embedded Workbench 6.0\ colour: true diff --git a/test/testdata/CException.h b/test/testdata/CException.h index 3872fa75..4f82afa1 100644 --- a/test/testdata/CException.h +++ b/test/testdata/CException.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #ifndef CEXCEPTION_H #define CEXCEPTION_H diff --git a/test/testdata/Defs.h b/test/testdata/Defs.h index 58678c12..470f8877 100644 --- a/test/testdata/Defs.h +++ b/test/testdata/Defs.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #ifndef DEF_H #define DEF_H diff --git a/test/testdata/cmock.h b/test/testdata/cmock.h index 33ddbfc5..af739308 100644 --- a/test/testdata/cmock.h +++ b/test/testdata/cmock.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #ifndef CMOCK_H #define CMOCK_H diff --git a/test/testdata/mockMock.h b/test/testdata/mockMock.h index 5c6829d7..3d728e4a 100644 --- a/test/testdata/mockMock.h +++ b/test/testdata/mockMock.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #ifndef MOCK_MOCK_H #define MOCK_MOCK_H diff --git a/test/testdata/testRunnerGenerator.c b/test/testdata/testRunnerGenerator.c index 475e2435..ab14c0e8 100644 --- a/test/testdata/testRunnerGenerator.c +++ b/test/testdata/testRunnerGenerator.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + /* This Test File Is Used To Verify Many Combinations Of Using the Generate Test Runner Script */ #include diff --git a/test/testdata/testRunnerGeneratorSmall.c b/test/testdata/testRunnerGeneratorSmall.c index 58bc65c0..15893d53 100644 --- a/test/testdata/testRunnerGeneratorSmall.c +++ b/test/testdata/testRunnerGeneratorSmall.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + /* This Test File Is Used To Verify Many Combinations Of Using the Generate Test Runner Script */ #include diff --git a/test/testdata/testRunnerGeneratorWithMocks.c b/test/testdata/testRunnerGeneratorWithMocks.c index d48692ed..a5b37b8c 100644 --- a/test/testdata/testRunnerGeneratorWithMocks.c +++ b/test/testdata/testRunnerGeneratorWithMocks.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + /* This Test File Is Used To Verify Many Combinations Of Using the Generate Test Runner Script */ #include diff --git a/test/tests/self_assessment_utils.h b/test/tests/self_assessment_utils.h index c8cb595d..670dddc8 100644 --- a/test/tests/self_assessment_utils.h +++ b/test/tests/self_assessment_utils.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #ifdef TEST_INSTANCES #include diff --git a/test/tests/test_generate_test_runner.rb b/test/tests/test_generate_test_runner.rb index 229b6abb..6766f5b6 100644 --- a/test/tests/test_generate_test_runner.rb +++ b/test/tests/test_generate_test_runner.rb @@ -1,8 +1,9 @@ -# ========================================== -# CMock Project - Automatic Mock Generation for C -# Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams -# [Released under MIT License. Please refer to license.txt for details] -# ========================================== +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= require '../auto/generate_test_runner.rb' diff --git a/test/tests/test_unity_arrays.c b/test/tests/test_unity_arrays.c index 2151eef9..e61e43d5 100644 --- a/test/tests/test_unity_arrays.c +++ b/test/tests/test_unity_arrays.c @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #define TEST_INSTANCES diff --git a/test/tests/test_unity_core.c b/test/tests/test_unity_core.c index c6ac8128..094d48a5 100644 --- a/test/tests/test_unity_core.c +++ b/test/tests/test_unity_core.c @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #define TEST_INSTANCES @@ -292,13 +293,15 @@ void testFailureCountIncrementsAndIsReturnedAtEnd(void) #ifndef USING_OUTPUT_SPY TEST_IGNORE(); #else + UNITY_UINT savedGetFlushSpyCalls = 0; UNITY_UINT savedFailures = Unity.TestFailures; Unity.CurrentTestFailed = 1; startPutcharSpy(); /* Suppress output */ startFlushSpy(); + savedGetFlushSpyCalls = getFlushSpyCalls(); UnityConcludeTest(); + TEST_ASSERT_EQUAL(0, savedGetFlushSpyCalls); endPutcharSpy(); - TEST_ASSERT_EQUAL(0, getFlushSpyCalls()); TEST_ASSERT_EQUAL(savedFailures + 1, Unity.TestFailures); #if defined(UNITY_OUTPUT_FLUSH) && defined(UNITY_OUTPUT_FLUSH_HEADER_DECLARATION) TEST_ASSERT_EQUAL(1, getFlushSpyCalls()); diff --git a/test/tests/test_unity_doubles.c b/test/tests/test_unity_doubles.c index 0ad9494d..64d59070 100644 --- a/test/tests/test_unity_doubles.c +++ b/test/tests/test_unity_doubles.c @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #define TEST_INSTANCES diff --git a/test/tests/test_unity_floats.c b/test/tests/test_unity_floats.c index 9e92f96a..4a2c2131 100644 --- a/test/tests/test_unity_floats.c +++ b/test/tests/test_unity_floats.c @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #define TEST_INSTANCES diff --git a/test/tests/test_unity_integers.c b/test/tests/test_unity_integers.c index d615e5f0..2a923a8d 100644 --- a/test/tests/test_unity_integers.c +++ b/test/tests/test_unity_integers.c @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #define TEST_INSTANCES diff --git a/test/tests/test_unity_integers_64.c b/test/tests/test_unity_integers_64.c index 6e83329e..2a1d3769 100644 --- a/test/tests/test_unity_integers_64.c +++ b/test/tests/test_unity_integers_64.c @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #define TEST_INSTANCES diff --git a/test/tests/test_unity_memory.c b/test/tests/test_unity_memory.c index b3cff131..4d0513a5 100644 --- a/test/tests/test_unity_memory.c +++ b/test/tests/test_unity_memory.c @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #define TEST_INSTANCES diff --git a/test/tests/test_unity_parameterized.c b/test/tests/test_unity_parameterized.c index aa9f9c16..a473a921 100644 --- a/test/tests/test_unity_parameterized.c +++ b/test/tests/test_unity_parameterized.c @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include #include diff --git a/test/tests/test_unity_parameterizedDemo.c b/test/tests/test_unity_parameterizedDemo.c index 83dfad66..6ee42c54 100644 --- a/test/tests/test_unity_parameterizedDemo.c +++ b/test/tests/test_unity_parameterizedDemo.c @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #include "unity.h" /* Support for Meta Test Rig */ diff --git a/test/tests/test_unity_strings.c b/test/tests/test_unity_strings.c index 964c5536..99ba4d53 100644 --- a/test/tests/test_unity_strings.c +++ b/test/tests/test_unity_strings.c @@ -1,8 +1,9 @@ -/* ========================================== - Unity Project - A Test Framework for C - Copyright (c) 2007 Mike Karlesky, Mark VanderVoord, Greg Williams - [Released under MIT License. Please refer to license.txt for details] -========================================== */ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ #include "unity.h" #define TEST_INSTANCES diff --git a/test/tests/types_for_test.h b/test/tests/types_for_test.h index 6da4e515..176926cf 100644 --- a/test/tests/types_for_test.h +++ b/test/tests/types_for_test.h @@ -1,3 +1,10 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + #pragma once typedef enum { From f1d953a651835acbd7b68c47d70db3935747d129 Mon Sep 17 00:00:00 2001 From: Fredrik Ellertsen Date: Wed, 20 Mar 2024 12:47:02 +0100 Subject: [PATCH 43/87] Fix shebang placement 671f8d2 introduced a license header to auto/extract_version.py before the shebang, causing builds to fail like this: ../subprojects/unity/meson.build:7:0: ERROR: Failed running '/path/to/extract_version.py', binary or interpreter not executable. --- auto/extract_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/extract_version.py b/auto/extract_version.py index 44cb3b41..ff7a6982 100755 --- a/auto/extract_version.py +++ b/auto/extract_version.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org @@ -5,7 +6,6 @@ # SPDX-License-Identifier: MIT # ========================================================================= -#!/usr/bin/env python3 import re import sys From 3cbe49900a6f0b061be4b9d992632c3cdab7b23a Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Sun, 31 Mar 2024 18:12:31 -0400 Subject: [PATCH 44/87] Don't call assertions until after we've concluded test framework tinkering in core test (#718) --- test/tests/test_unity_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/tests/test_unity_core.c b/test/tests/test_unity_core.c index 094d48a5..6638fb94 100644 --- a/test/tests/test_unity_core.c +++ b/test/tests/test_unity_core.c @@ -300,8 +300,8 @@ void testFailureCountIncrementsAndIsReturnedAtEnd(void) startFlushSpy(); savedGetFlushSpyCalls = getFlushSpyCalls(); UnityConcludeTest(); - TEST_ASSERT_EQUAL(0, savedGetFlushSpyCalls); endPutcharSpy(); + TEST_ASSERT_EQUAL(0, savedGetFlushSpyCalls); TEST_ASSERT_EQUAL(savedFailures + 1, Unity.TestFailures); #if defined(UNITY_OUTPUT_FLUSH) && defined(UNITY_OUTPUT_FLUSH_HEADER_DECLARATION) TEST_ASSERT_EQUAL(1, getFlushSpyCalls()); From 0ace9d8273bb99b229a8e76bfab157896dee913c Mon Sep 17 00:00:00 2001 From: sdimovv <36302090+sdimovv@users.noreply.github.com> Date: Sun, 7 Apr 2024 02:57:16 +0100 Subject: [PATCH 45/87] Cast line_num to allow compilation with `-WConversion` --- auto/run_test.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/auto/run_test.erb b/auto/run_test.erb index 68b33730..e334d657 100644 --- a/auto/run_test.erb +++ b/auto/run_test.erb @@ -2,7 +2,7 @@ static void run_test(UnityTestFunction func, const char* name, UNITY_LINE_TYPE line_num) { Unity.CurrentTestName = name; - Unity.CurrentTestLineNumber = line_num; + Unity.CurrentTestLineNumber = (UNITY_UINT) line_num; #ifdef UNITY_USE_COMMAND_LINE_ARGS if (!UnityTestMatches()) return; From 9b77170349e8ab025dac23dd37f0925bfe15e184 Mon Sep 17 00:00:00 2001 From: sdimovv <36302090+sdimovv@users.noreply.github.com> Date: Thu, 18 Apr 2024 14:25:55 +0100 Subject: [PATCH 46/87] Remove redundant line casts from `UNITY_TEST_ASSERT_*` macros --- src/unity_internals.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/unity_internals.h b/src/unity_internals.h index 1214bf07..ca962af1 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -875,11 +875,11 @@ int UnityTestMatches(void); * Test Asserts *-------------------------------------------------------*/ -#define UNITY_TEST_ASSERT(condition, line, message) do { if (condition) { /* nothing*/ } else { UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), (message)); } } while (0) -#define UNITY_TEST_ASSERT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) == NULL), (UNITY_LINE_TYPE)(line), (message)) -#define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) != NULL), (UNITY_LINE_TYPE)(line), (message)) -#define UNITY_TEST_ASSERT_EMPTY(pointer, line, message) UNITY_TEST_ASSERT(((pointer[0]) == 0), (UNITY_LINE_TYPE)(line), (message)) -#define UNITY_TEST_ASSERT_NOT_EMPTY(pointer, line, message) UNITY_TEST_ASSERT(((pointer[0]) != 0), (UNITY_LINE_TYPE)(line), (message)) +#define UNITY_TEST_ASSERT(condition, line, message) do { if (condition) { /* nothing*/ } else { UNITY_TEST_FAIL((line), (message)); } } while (0) +#define UNITY_TEST_ASSERT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) == NULL), (line), (message)) +#define UNITY_TEST_ASSERT_NOT_NULL(pointer, line, message) UNITY_TEST_ASSERT(((pointer) != NULL), (line), (message)) +#define UNITY_TEST_ASSERT_EMPTY(pointer, line, message) UNITY_TEST_ASSERT(((pointer[0]) == 0), (line), (message)) +#define UNITY_TEST_ASSERT_NOT_EMPTY(pointer, line, message) UNITY_TEST_ASSERT(((pointer[0]) != 0), (line), (message)) #define UNITY_TEST_ASSERT_EQUAL_INT(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) #define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) From e6f73b6ad0d7d42c7b60b2b9dd9317eb9dd54080 Mon Sep 17 00:00:00 2001 From: "Mr.UNIX" <99476714+mrunix00@users.noreply.github.com> Date: Fri, 26 Apr 2024 16:59:59 +0100 Subject: [PATCH 47/87] Update the year in README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 71488b3e..2ebf988e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Unity Test ![CI][] -__Copyright (c) 2007 - 2023 Unity Project by Mike Karlesky, Mark VanderVoord, and Greg Williams__ +__Copyright (c) 2007 - 2024 Unity Project by Mike Karlesky, Mark VanderVoord, and Greg Williams__ Welcome to the Unity Test Project, one of the main projects of ThrowTheSwitch.org. Unity Test is a unit testing framework built for C, with a focus on working with embedded toolchains. From 5ff17d6542684c146fbffd0d0509f925b34a17dc Mon Sep 17 00:00:00 2001 From: mchernosky Date: Fri, 26 Apr 2024 12:46:49 -0600 Subject: [PATCH 48/87] Label as static internal functions enabled by UNITY_USE_COMMAND_LINE_ARGS to prevent -Werror=missing-declarations --- src/unity.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/unity.c b/src/unity.c index 7fd703ab..c91c3853 100644 --- a/src/unity.c +++ b/src/unity.c @@ -2351,7 +2351,7 @@ int UnityParseOptions(int argc, char** argv) } /*-----------------------------------------------*/ -int IsStringInBiggerString(const char* longstring, const char* shortstring) +static int IsStringInBiggerString(const char* longstring, const char* shortstring) { const char* lptr = longstring; const char* sptr = shortstring; @@ -2396,7 +2396,7 @@ int IsStringInBiggerString(const char* longstring, const char* shortstring) } /*-----------------------------------------------*/ -int UnityStringArgumentMatches(const char* str) +static int UnityStringArgumentMatches(const char* str) { int retval; const char* ptr1; From 8e4c9b94cb334cc9c20217eb0d36f5ee8805a442 Mon Sep 17 00:00:00 2001 From: "Michael Gene Brockus (Dreamer)" <55331536+dreamer-coding-555@users.noreply.github.com> Date: Tue, 30 Apr 2024 14:24:34 -0600 Subject: [PATCH 49/87] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 339bd23a..f0b6d930 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,7 +27,7 @@ jobs: # Checks out repository under $GITHUB_WORKSPACE - name: Checkout Latest Repo - uses: actions/checkout@v2 + uses: actions/checkout@v4 # Run Tests - name: Run All Unit Tests From 18fb33921f1bb973c81a9ce740c52b92a152333d Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Wed, 12 Jun 2024 22:59:08 -0400 Subject: [PATCH 50/87] add strict match option as '-n' again. fix style while I'm at it. --- auto/generate_module.rb | 2 +- auto/generate_test_runner.rb | 6 +- auto/stylize_as_junit.rb | 7 +-- docs/UnityHelperScriptsGuide.md | 2 +- src/unity.c | 43 ++++++++----- test/tests/test_generate_test_runner.rb | 84 ++++++++++++++++++------- 6 files changed, 97 insertions(+), 47 deletions(-) diff --git a/auto/generate_module.rb b/auto/generate_module.rb index 4c91a131..27bdf820 100644 --- a/auto/generate_module.rb +++ b/auto/generate_module.rb @@ -160,7 +160,7 @@ def files_to_operate_on(module_name, pattern = nil) boilerplate: cfg[:boilerplate], includes: case (cfg[:inc]) when :src then (@options[:includes][:src] || []) | (pattern_traits[:inc].map { |f| format(f, module_name) }) - when :inc then (@options[:includes][:inc] || []) + when :inc then @options[:includes][:inc] || [] when :tst then (@options[:includes][:tst] || []) | (pattern_traits[:inc].map { |f| format("#{@options[:mock_prefix]}#{f}", module_name) }) end } diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 33cbff96..2f95fd2b 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -171,7 +171,7 @@ def find_tests(source) arg_elements_regex = /\s*(#{single_arg_regex_string})\s*,\s*/m args += type_and_args[i + 1].scan(args_regex).flatten.map do |arg_values_str| - ("#{arg_values_str},").scan(arg_elements_regex) + "#{arg_values_str},".scan(arg_elements_regex) end.reduce do |result, arg_range_expanded| result.product(arg_range_expanded) end.map do |arg_combinations| @@ -240,8 +240,8 @@ def create_header(output, mocks, testfile_includes = []) output.puts('#include "cmock.h"') unless mocks.empty? output.puts('}') if @options[:externcincludes] if @options[:defines] && !@options[:defines].empty? - output.puts("/* injected defines for unity settings, etc */") - @options[:defines].each do |d| + output.puts('/* injected defines for unity settings, etc */') + @options[:defines].each do |d| def_only = d.match(/(\w+).*/)[1] output.puts("#ifndef #{def_only}\n#define #{d}\n#endif /* #{def_only} */") end diff --git a/auto/stylize_as_junit.rb b/auto/stylize_as_junit.rb index b44979e2..9f3b91a6 100755 --- a/auto/stylize_as_junit.rb +++ b/auto/stylize_as_junit.rb @@ -1,3 +1,4 @@ +#!/usr/bin/ruby # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org @@ -5,17 +6,11 @@ # SPDX-License-Identifier: MIT # ========================================================================= -#!/usr/bin/ruby -# -# unity_to_junit.rb -# require 'fileutils' require 'optparse' require 'ostruct' require 'set' -require 'pp' - VERSION = 1.0 class ArgvParser diff --git a/docs/UnityHelperScriptsGuide.md b/docs/UnityHelperScriptsGuide.md index 01db2752..90e21939 100644 --- a/docs/UnityHelperScriptsGuide.md +++ b/docs/UnityHelperScriptsGuide.md @@ -225,7 +225,7 @@ These are the available options: | --------- | ------------------------------------------------- | | `-l` | List all tests and exit | | `-f NAME` | Filter to run only tests whose name includes NAME | -| `-n NAME` | (deprecated) alias of -f | +| `-n NAME` | Run only the test named NAME | | `-h` | show the Help menu that lists these options | | `-q` | Quiet/decrease verbosity | | `-v` | increase Verbosity | diff --git a/src/unity.c b/src/unity.c index c91c3853..04d716d7 100644 --- a/src/unity.c +++ b/src/unity.c @@ -2271,6 +2271,7 @@ int UnityEnd(void) char* UnityOptionIncludeNamed = NULL; char* UnityOptionExcludeNamed = NULL; int UnityVerbosity = 1; +int UnityStrictMatch = 0; /*-----------------------------------------------*/ int UnityParseOptions(int argc, char** argv) @@ -2278,6 +2279,7 @@ int UnityParseOptions(int argc, char** argv) int i; UnityOptionIncludeNamed = NULL; UnityOptionExcludeNamed = NULL; + UnityStrictMatch = 0; for (i = 1; i < argc; i++) { @@ -2289,6 +2291,7 @@ int UnityParseOptions(int argc, char** argv) return -1; case 'n': /* include tests with name including this string */ case 'f': /* an alias for -n */ + UnityStrictMatch = (argv[i][1] == 'n'); /* strictly match this string if -n */ if (argv[i][2] == '=') { UnityOptionIncludeNamed = &argv[i][3]; @@ -2336,7 +2339,7 @@ int UnityParseOptions(int argc, char** argv) UnityPrint("Options: "); UNITY_PRINT_EOL(); UnityPrint("-l List all tests and exit"); UNITY_PRINT_EOL(); UnityPrint("-f NAME Filter to run only tests whose name includes NAME"); UNITY_PRINT_EOL(); - UnityPrint("-n NAME (deprecated) alias of -f"); UNITY_PRINT_EOL(); + UnityPrint("-n NAME Run only the test named NAME"); UNITY_PRINT_EOL(); UnityPrint("-h show this Help menu"); UNITY_PRINT_EOL(); UnityPrint("-q Quiet/decrease verbosity"); UNITY_PRINT_EOL(); UnityPrint("-v increase Verbosity"); UNITY_PRINT_EOL(); @@ -2359,7 +2362,7 @@ static int IsStringInBiggerString(const char* longstring, const char* shortstrin if (*sptr == '*') { - return 1; + return UnityStrictMatch ? 0 : 1; } while (*lptr) @@ -2372,19 +2375,29 @@ static int IsStringInBiggerString(const char* longstring, const char* shortstrin lptr++; sptr++; - /* We're done if we match the entire string or up to a wildcard */ - if (*sptr == '*') - return 1; - if (*sptr == ',') - return 1; - if (*sptr == '"') - return 1; - if (*sptr == '\'') - return 1; - if (*sptr == ':') - return 2; - if (*sptr == 0) - return 1; + switch (*sptr) + { + case '*': /* we encountered a wild-card */ + return UnityStrictMatch ? 0 : 1; + + case ',': /* we encountered the end of match string */ + case '"': + case '\'': + case 0: + return (!UnityStrictMatch || (*lptr == 0)) ? 1 : 0; + + case ':': /* we encountered the end of a partial match */ + return 2; + + default: + break; + } + } + + // If we didn't match and we're on strict matching, we already know we failed + if (UnityStrictMatch) + { + return 0; } /* Otherwise we start in the long pointer 1 character further and try again */ diff --git a/test/tests/test_generate_test_runner.rb b/test/tests/test_generate_test_runner.rb index 6766f5b6..dd1c4c8e 100644 --- a/test/tests/test_generate_test_runner.rb +++ b/test/tests/test_generate_test_runner.rb @@ -740,7 +740,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n test_", + :cmdline_args => "-f test_", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses', 'test_NotBeConfusedByLongComplicatedStrings', @@ -758,7 +758,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n should_", + :cmdline_args => "-f should_", :expected => { :to_pass => [ 'should_RunTestsStartingWithShouldByDefault' ], :to_fail => [ ], @@ -772,7 +772,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n should_,test_", + :cmdline_args => "-f should_,test_", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses', 'test_NotBeConfusedByLongComplicatedStrings', @@ -790,7 +790,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n=testRunnerGeneratorSma*", + :cmdline_args => "-f=testRunnerGeneratorSma*", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses', 'spec_ThisTestPassesWhenNormalSetupRan', @@ -806,7 +806,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n testRunnerGeneratorSmall:*", + :cmdline_args => "-f testRunnerGeneratorSmall:*", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses', 'spec_ThisTestPassesWhenNormalSetupRan', @@ -822,7 +822,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n testRunnerGeneratorSmall:test_*", + :cmdline_args => "-f testRunnerGeneratorSmall:test_*", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses' ], :to_fail => [ 'test_ThisTestAlwaysFails' ], @@ -836,7 +836,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n testRunnerGeneratorSmall:te*", + :cmdline_args => "-f testRunnerGeneratorSmall:te*", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses' ], :to_fail => [ 'test_ThisTestAlwaysFails' ], @@ -850,7 +850,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n testRunnerGeneratorSm*:*", + :cmdline_args => "-f testRunnerGeneratorSm*:*", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses', 'spec_ThisTestPassesWhenNormalSetupRan', @@ -885,7 +885,7 @@ :cmdline_args => true, :includes => ['Defs.h'], }, - :cmdline_args => "-n test_ -x Ignored", + :cmdline_args => "-f test_ -x Ignored", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses', 'test_NotBeConfusedByLongComplicatedStrings', @@ -903,7 +903,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n ThisTestAlwaysPasses", + :cmdline_args => "-f ThisTestAlwaysPasses", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses' ], :to_fail => [ ], @@ -917,7 +917,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n testRunnerGenerator:ThisTestAlwaysPasses", + :cmdline_args => "-f testRunnerGenerator:ThisTestAlwaysPasses", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses' ], :to_fail => [ ], @@ -931,7 +931,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n testRunnerGenerator.c:ThisTestAlwaysPasses", + :cmdline_args => "-f testRunnerGenerator.c:ThisTestAlwaysPasses", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses' ], :to_fail => [ ], @@ -945,7 +945,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n \"testRunnerGenerator:ThisTestAlwaysPasses,test_ThisTestAlwaysFails\"", + :cmdline_args => "-f \"testRunnerGenerator:ThisTestAlwaysPasses,test_ThisTestAlwaysFails\"", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses' ], :to_fail => [ 'test_ThisTestAlwaysFails' ], @@ -959,7 +959,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n 'testRunnerGenerator:ThisTestAlwaysPasses,test_ThisTestAlwaysFails'", + :cmdline_args => "-f 'testRunnerGenerator:ThisTestAlwaysPasses,test_ThisTestAlwaysFails'", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses' ], :to_fail => [ 'test_ThisTestAlwaysFails' ], @@ -967,13 +967,55 @@ } }, + { :name => 'ArgsHandlePreciseMatch', + :testfile => 'testdata/testRunnerGenerator.c', + :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'], + :options => { + :cmdline_args => true, + }, + :cmdline_args => "-n 'test_ThisTestAlwaysPasses'", + :expected => { + :to_pass => [ 'test_ThisTestAlwaysPasses' ], + :to_fail => [ ], + :to_ignore => [ ], + } + }, + + { :name => 'ArgsHandlePreciseMatches', + :testfile => 'testdata/testRunnerGenerator.c', + :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'], + :options => { + :cmdline_args => true, + }, + :cmdline_args => "-n 'test_ThisTestAlwaysPasses,test_ThisTestAlwaysFails'", + :expected => { + :to_pass => [ 'test_ThisTestAlwaysPasses' ], + :to_fail => [ 'test_ThisTestAlwaysFails' ], + :to_ignore => [ ], + } + }, + + { :name => 'ArgsRequiresPreciseMatchNotPartial', + :testfile => 'testdata/testRunnerGenerator.c', + :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'], + :options => { + :cmdline_args => true, + }, + :cmdline_args => "-n ThisTestAlwaysPass", + :expected => { + :to_pass => [ ], + :to_fail => [ ], + :to_ignore => [ ], + } + }, + { :name => 'ArgsIncludeAValidTestForADifferentFile', :testfile => 'testdata/testRunnerGenerator.c', :testdefines => ['TEST', 'UNITY_USE_COMMAND_LINE_ARGS'], :options => { :cmdline_args => true, }, - :cmdline_args => "-n AnotherFile:ThisTestDoesNotExist", + :cmdline_args => "-f AnotherFile:ThisTestDoesNotExist", :expected => { :to_pass => [ ], :to_fail => [ ], @@ -987,7 +1029,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n ThisTestDoesNotExist", + :cmdline_args => "-f ThisTestDoesNotExist", :expected => { :to_pass => [ ], :to_fail => [ ], @@ -1015,7 +1057,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n testRunnerGenerator", + :cmdline_args => "-f testRunnerGenerator", :expected => { :to_pass => [ 'test_ThisTestAlwaysPasses', 'spec_ThisTestPassesWhenNormalSetupRan', @@ -1053,7 +1095,7 @@ :cmdline_args => true, :test_prefix => "paratest" }, - :cmdline_args => "-n ShouldHandleParameterizedTests", + :cmdline_args => "-f ShouldHandleParameterizedTests", :features => [ :parameterized ], :expected => { :to_pass => [ 'paratest_ShouldHandleParameterizedTests\(25\)', @@ -1124,7 +1166,7 @@ :options => { :cmdline_args => true, }, - :cmdline_args => "-n", + :cmdline_args => "-f", :expected => { :to_pass => [ ], :to_fail => [ ], @@ -1164,7 +1206,7 @@ "Options:", "-l List all tests and exit", "-f NAME Filter to run only tests whose name includes NAME", - "-n NAME \\(deprecated\\) alias of -f", + "-n NAME Run only the test named NAME", "-h show this Help menu", "-q Quiet/decrease verbosity", "-v increase Verbosity", @@ -1188,7 +1230,7 @@ "Options:", "-l List all tests and exit", "-f NAME Filter to run only tests whose name includes NAME", - "-n NAME \\(deprecated\\) alias of -f", + "-n NAME Run only the test named NAME", "-h show this Help menu", "-q Quiet/decrease verbosity", "-v increase Verbosity", From c546414657673c9e0bef646ee33e7005d180a85b Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Thu, 1 Aug 2024 16:01:09 -0400 Subject: [PATCH 51/87] - Protect against people not defining UNITY_USE_COMMAND)LINES_ARGS but enabling cmd_lines in test runner generator. (Cherry-pick PR 739) - Fix UNITY_NORETURN usage (Cherry-pick PR 742) - Other standards and formatting tweaks. --- auto/generate_test_runner.rb | 2 + src/unity_internals.h | 71 ++++++++++++++++++------------ test/Makefile | 1 + test/tests/self_assessment_utils.h | 10 ++--- test/tests/test_unity_core.c | 7 +-- 5 files changed, 54 insertions(+), 37 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 2f95fd2b..45f0425a 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -402,6 +402,7 @@ def create_main(output, filename, tests, used_mocks) end output.puts("#{@options[:main_export_decl]} int #{main_name}(int argc, char** argv)") output.puts('{') + output.puts('#ifdef UNITY_USE_COMMAND_LINE_ARGS') output.puts(' int parse_status = UnityParseOptions(argc, argv);') output.puts(' if (parse_status != 0)') output.puts(' {') @@ -424,6 +425,7 @@ def create_main(output, filename, tests, used_mocks) output.puts(' }') output.puts(' return parse_status;') output.puts(' }') + output.puts('#endif') else main_return = @options[:omit_begin_end] ? 'void' : 'int' if main_name != 'main' diff --git a/src/unity_internals.h b/src/unity_internals.h index ca962af1..192f7ffa 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -47,38 +47,51 @@ #define UNITY_FUNCTION_ATTR(a) /* ignore */ #endif -#ifndef UNITY_NORETURN - #if defined(__cplusplus) - #if __cplusplus >= 201103L +/* UNITY_NORETURN is only required if we have setjmp.h. */ +#ifndef UNITY_EXCLUDE_SETJMP_H + #ifndef UNITY_NORETURN + #if defined(__cplusplus) + #if __cplusplus >= 201103L + #define UNITY_NORETURN [[ noreturn ]] + #endif + #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && __STDC_VERSION__ < 202311L + /* _Noreturn keyword is used from C11 but deprecated in C23. */ + #if defined(_WIN32) && defined(_MSC_VER) + /* We are using MSVC compiler on Windows platform. */ + /* Not all Windows SDKs supports , but compiler can support C11: */ + /* https://devblogs.microsoft.com/cppblog/c11-and-c17-standard-support-arriving-in-msvc/ */ + /* Not sure, that Mingw compilers has Windows SDK headers at all. */ + #include + #endif + + /* Using Windows SDK predefined macro for detecting supported SDK with MSVC compiler. */ + /* Mingw GCC should work without that fixes. */ + /* Based on: */ + /* https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170 */ + /* NTDDI_WIN10_FE is equal to Windows 10 SDK 2104 */ + #if defined(_MSC_VER) && ((!defined(NTDDI_WIN10_FE)) || WDK_NTDDI_VERSION < NTDDI_WIN10_FE) + /* Based on tests and: */ + /* https://docs.microsoft.com/en-us/cpp/c-language/noreturn?view=msvc-170 */ + /* https://en.cppreference.com/w/c/language/_Noreturn */ + #define UNITY_NORETURN _Noreturn + #else /* Using newer Windows SDK or not MSVC compiler */ + #if defined(__GNUC__) + /* The header collides with __attribute(noreturn)__ from GCC. */ + #define UNITY_NORETURN _Noreturn + #else + #include + #define UNITY_NORETURN noreturn + #endif + #endif + #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202311L + /* Since C23, the keyword _Noreturn has been replaced by the attribute noreturn, based on: */ + /* https://en.cppreference.com/w/c/language/attributes/noreturn */ #define UNITY_NORETURN [[ noreturn ]] #endif - #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L - #if defined(_WIN32) && defined(_MSC_VER) - /* We are using MSVC compiler on Windows platform. */ - /* Not all Windows SDKs supports , but compiler can support C11: */ - /* https://devblogs.microsoft.com/cppblog/c11-and-c17-standard-support-arriving-in-msvc/ */ - /* Not sure, that Mingw compilers has Windows SDK headers at all. */ - #include - #endif - - /* Using Windows SDK predefined macro for detecting supported SDK with MSVC compiler. */ - /* Mingw GCC should work without that fixes. */ - /* Based on: */ - /* https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt?view=msvc-170 */ - /* NTDDI_WIN10_FE is equal to Windows 10 SDK 2104 */ - #if defined(_MSC_VER) && ((!defined(NTDDI_WIN10_FE)) || WDK_NTDDI_VERSION < NTDDI_WIN10_FE) - /* Based on tests and: */ - /* https://docs.microsoft.com/en-us/cpp/c-language/noreturn?view=msvc-170 */ - /* https://en.cppreference.com/w/c/language/_Noreturn */ - #define UNITY_NORETURN _Noreturn - #else /* Using newer Windows SDK or not MSVC compiler */ - #include - #define UNITY_NORETURN noreturn - #endif #endif -#endif -#ifndef UNITY_NORETURN - #define UNITY_NORETURN UNITY_FUNCTION_ATTR(__noreturn__) + #ifndef UNITY_NORETURN + #define UNITY_NORETURN UNITY_FUNCTION_ATTR(__noreturn__) + #endif #endif /*------------------------------------------------------- diff --git a/test/Makefile b/test/Makefile index 917a8749..82b61af9 100644 --- a/test/Makefile +++ b/test/Makefile @@ -17,6 +17,7 @@ CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror #CFLAGS += -Wconversion #disabled because if falsely complains about the isinf and isnan macros CFLAGS += -Wno-switch-enum -Wno-double-promotion CFLAGS += -Wno-poison-system-directories +CFLAGS += -Wno-covered-switch-default CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstrict-overflow \ -Wstrict-prototypes -Wswitch-default -Wundef #DEBUG = -O0 -g diff --git a/test/tests/self_assessment_utils.h b/test/tests/self_assessment_utils.h index 670dddc8..39953e36 100644 --- a/test/tests/self_assessment_utils.h +++ b/test/tests/self_assessment_utils.h @@ -69,8 +69,8 @@ static const UNITY_DOUBLE d_zero = 0.0; #define SPY_BUFFER_MAX 40 static char putcharSpyBuffer[SPY_BUFFER_MAX]; #endif -static int indexSpyBuffer; -static int putcharSpyEnabled; +static UNITY_COUNTER_TYPE indexSpyBuffer; +static UNITY_COUNTER_TYPE putcharSpyEnabled; void startPutcharSpy(void) { @@ -108,8 +108,8 @@ void putcharSpy(int c) } /* This is for counting the calls to the flushSpy */ -static int flushSpyEnabled; -static int flushSpyCalls = 0; +static UNITY_COUNTER_TYPE flushSpyEnabled; +static UNITY_COUNTER_TYPE flushSpyCalls = 0; void startFlushSpy(void) { @@ -123,7 +123,7 @@ void endFlushSpy(void) flushSpyEnabled = 0; } -int getFlushSpyCalls(void) +UNITY_COUNTER_TYPE getFlushSpyCalls(void) { return flushSpyCalls; } diff --git a/test/tests/test_unity_core.c b/test/tests/test_unity_core.c index 6638fb94..e4a3fdd9 100644 --- a/test/tests/test_unity_core.c +++ b/test/tests/test_unity_core.c @@ -293,8 +293,9 @@ void testFailureCountIncrementsAndIsReturnedAtEnd(void) #ifndef USING_OUTPUT_SPY TEST_IGNORE(); #else - UNITY_UINT savedGetFlushSpyCalls = 0; - UNITY_UINT savedFailures = Unity.TestFailures; + int failures = 0; + UNITY_COUNTER_TYPE savedGetFlushSpyCalls = 0; + UNITY_COUNTER_TYPE savedFailures = Unity.TestFailures; Unity.CurrentTestFailed = 1; startPutcharSpy(); /* Suppress output */ startFlushSpy(); @@ -311,7 +312,7 @@ void testFailureCountIncrementsAndIsReturnedAtEnd(void) endFlushSpy(); startPutcharSpy(); /* Suppress output */ - int failures = UnityEnd(); + failures = UnityEnd(); Unity.TestFailures--; endPutcharSpy(); TEST_ASSERT_EQUAL(savedFailures + 1, failures); From f8be3a5eba649dded41ee54dc66a2247787919ea Mon Sep 17 00:00:00 2001 From: Franz-Josef Grosch <8401442+schorg@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:40:05 +0200 Subject: [PATCH 52/87] Update unity_config.h Corrected the #define for 64-bit support in example unity_config.h file --- examples/unity_config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/unity_config.h b/examples/unity_config.h index 98931aba..a9845f88 100644 --- a/examples/unity_config.h +++ b/examples/unity_config.h @@ -109,7 +109,7 @@ * There can be a significant size and speed impact to enabling 64-bit support * on small targets, so don't define it if you don't need it. */ -/* #define UNITY_INCLUDE_64 */ +/* #define UNITY_SUPPORT_64 */ /* *************************** FLOATING POINT TYPES **************************** From 6ebcd6065cf1b24f46d130a6fb62105e735d4b7a Mon Sep 17 00:00:00 2001 From: David Beitey Date: Fri, 23 Aug 2024 10:46:32 +1000 Subject: [PATCH 53/87] Add changelog entry for NOT float/double tests This is from https://github.com/ThrowTheSwitch/Unity/commit/244edf6c1692515936cdb94c68c865299a896e09, an addition in v2.6.0. --- docs/UnityChangeLog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/UnityChangeLog.md b/docs/UnityChangeLog.md index 9c3bb7bf..f93f9ec6 100644 --- a/docs/UnityChangeLog.md +++ b/docs/UnityChangeLog.md @@ -24,6 +24,7 @@ New Features: - Add Unity BDD plugin - Add `UNITY_INCLUDE_EXEC_TIME` option to report test times - Allow user to override test abort underlying mechanism + - Add `NOT_EQUAL*` and `NOT_WITHIN*` checks for floats and doubles Significant Bugfixes: From 1a29024cc7ca8193864684d70c5646f7ba4614ae Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Wed, 1 Jan 2025 11:46:30 -0500 Subject: [PATCH 54/87] It's a New Year --- LICENSE.txt | 2 +- auto/__init__.py | 2 +- auto/colour_prompt.rb | 2 +- auto/colour_reporter.rb | 2 +- auto/extract_version.py | 2 +- auto/generate_config.yml | 2 +- auto/generate_module.rb | 2 +- auto/generate_test_runner.rb | 3 +-- auto/parse_output.rb | 3 ++- auto/stylize_as_junit.py | 3 ++- auto/stylize_as_junit.rb | 2 +- auto/test_file_filter.rb | 2 +- auto/type_sanitizer.rb | 2 +- auto/unity_test_summary.py | 3 ++- auto/unity_test_summary.rb | 2 +- auto/yaml_helper.rb | 2 +- examples/example_1/src/ProductionCode.c | 3 +-- examples/example_1/src/ProductionCode.h | 3 +-- examples/example_1/src/ProductionCode2.c | 3 +-- examples/example_1/src/ProductionCode2.h | 3 +-- examples/example_1/test/TestProductionCode.c | 3 +-- examples/example_1/test/TestProductionCode2.c | 3 +-- examples/example_2/src/ProductionCode.c | 3 +-- examples/example_2/src/ProductionCode.h | 3 +-- examples/example_2/src/ProductionCode2.c | 3 +-- examples/example_2/src/ProductionCode2.h | 3 +-- examples/example_2/test/TestProductionCode.c | 2 +- examples/example_2/test/TestProductionCode2.c | 2 +- .../example_2/test/test_runners/TestProductionCode2_Runner.c | 2 +- .../example_2/test/test_runners/TestProductionCode_Runner.c | 2 +- examples/example_2/test/test_runners/all_tests.c | 2 +- examples/example_3/helper/UnityHelper.c | 2 +- examples/example_3/helper/UnityHelper.h | 2 +- examples/example_3/rakefile.rb | 2 +- examples/example_3/rakefile_helper.rb | 2 +- examples/example_3/src/ProductionCode.c | 3 +-- examples/example_3/src/ProductionCode.h | 3 +-- examples/example_3/src/ProductionCode2.c | 3 +-- examples/example_3/src/ProductionCode2.h | 3 +-- examples/example_3/target_gcc_32.yml | 2 +- examples/example_3/test/TestProductionCode.c | 3 +-- examples/example_3/test/TestProductionCode2.c | 3 +-- examples/example_4/src/ProductionCode.c | 3 +-- examples/example_4/src/ProductionCode.h | 3 +-- examples/example_4/src/ProductionCode2.c | 3 +-- examples/example_4/src/ProductionCode2.h | 3 +-- examples/example_4/test/TestProductionCode.c | 3 +-- examples/example_4/test/TestProductionCode2.c | 3 +-- examples/unity_config.h | 2 +- extras/bdd/src/unity_bdd.h | 2 +- extras/bdd/test/test_bdd.c | 2 +- extras/fixture/src/unity_fixture.c | 2 +- extras/fixture/src/unity_fixture.h | 3 +-- extras/fixture/src/unity_fixture_internals.h | 3 +-- extras/fixture/test/main/AllTests.c | 2 +- extras/fixture/test/template_fixture_tests.c | 3 +-- extras/fixture/test/unity_fixture_Test.c | 3 +-- extras/fixture/test/unity_fixture_TestRunner.c | 3 +-- extras/memory/src/unity_memory.c | 2 +- extras/memory/src/unity_memory.h | 2 +- extras/memory/test/unity_memory_Test.c | 2 +- extras/memory/test/unity_memory_TestRunner.c | 2 +- extras/memory/test/unity_output_Spy.c | 2 +- extras/memory/test/unity_output_Spy.h | 2 +- src/unity.c | 2 +- src/unity.h | 2 +- src/unity_internals.h | 2 +- test/rakefile_helper.rb | 2 +- test/spec/generate_module_existing_file_spec.rb | 3 +-- test/targets/ansi.yml | 2 +- test/targets/clang_file.yml | 2 +- test/targets/clang_strict.yml | 2 +- test/targets/gcc_32.yml | 2 +- test/targets/gcc_64.yml | 2 +- test/targets/gcc_auto_limits.yml | 2 +- test/targets/gcc_auto_stdint.yml | 2 +- test/targets/gcc_manual_math.yml | 2 +- test/targets/hitech_picc18.yml | 2 +- test/targets/iar_arm_v4.yml | 2 +- test/targets/iar_arm_v5.yml | 2 +- test/targets/iar_arm_v5_3.yml | 2 +- test/targets/iar_armcortex_LM3S9B92_v5_4.yml | 2 +- test/targets/iar_cortexm3_v5.yml | 2 +- test/targets/iar_msp430.yml | 2 +- test/targets/iar_sh2a_v6.yml | 2 +- test/testdata/CException.h | 2 +- test/testdata/Defs.h | 2 +- test/testdata/cmock.h | 2 +- test/testdata/mockMock.h | 2 +- test/testdata/testRunnerGenerator.c | 2 +- test/testdata/testRunnerGeneratorSmall.c | 2 +- test/testdata/testRunnerGeneratorWithMocks.c | 2 +- test/tests/self_assessment_utils.h | 2 +- test/tests/test_generate_test_runner.rb | 2 +- test/tests/test_unity_arrays.c | 2 +- test/tests/test_unity_core.c | 2 +- test/tests/test_unity_doubles.c | 2 +- test/tests/test_unity_floats.c | 2 +- test/tests/test_unity_integers.c | 2 +- test/tests/test_unity_integers_64.c | 2 +- test/tests/test_unity_memory.c | 2 +- test/tests/test_unity_parameterized.c | 2 +- test/tests/test_unity_parameterizedDemo.c | 2 +- test/tests/test_unity_strings.c | 2 +- test/tests/types_for_test.h | 2 +- 105 files changed, 108 insertions(+), 134 deletions(-) diff --git a/LICENSE.txt b/LICENSE.txt index ecca34ce..3e3aad5b 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, Greg Williams +Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/auto/__init__.py b/auto/__init__.py index 793090f9..15f87c39 100644 --- a/auto/__init__.py +++ b/auto/__init__.py @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/colour_prompt.rb b/auto/colour_prompt.rb index 57b495a0..566efe9e 100644 --- a/auto/colour_prompt.rb +++ b/auto/colour_prompt.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/colour_reporter.rb b/auto/colour_reporter.rb index 273ea3b6..cac748f8 100644 --- a/auto/colour_reporter.rb +++ b/auto/colour_reporter.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/extract_version.py b/auto/extract_version.py index ff7a6982..7c2f3d30 100755 --- a/auto/extract_version.py +++ b/auto/extract_version.py @@ -2,7 +2,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/generate_config.yml b/auto/generate_config.yml index d0fccec7..d1cd9b20 100644 --- a/auto/generate_config.yml +++ b/auto/generate_config.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/generate_module.rb b/auto/generate_module.rb index 27bdf820..d335cab2 100644 --- a/auto/generate_module.rb +++ b/auto/generate_module.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 45f0425a..2c2d5956 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -1,9 +1,8 @@ #!/usr/bin/ruby - # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/parse_output.rb b/auto/parse_output.rb index 7a5b7a5e..1711337a 100644 --- a/auto/parse_output.rb +++ b/auto/parse_output.rb @@ -1,9 +1,10 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= + #============================================================ # Author: John Theofanopoulos # A simple parser. Takes the output files generated during the diff --git a/auto/stylize_as_junit.py b/auto/stylize_as_junit.py index a60c472e..020ec440 100644 --- a/auto/stylize_as_junit.py +++ b/auto/stylize_as_junit.py @@ -2,9 +2,10 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= + import sys import os from glob import glob diff --git a/auto/stylize_as_junit.rb b/auto/stylize_as_junit.rb index 9f3b91a6..23d89a65 100755 --- a/auto/stylize_as_junit.rb +++ b/auto/stylize_as_junit.rb @@ -2,7 +2,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/test_file_filter.rb b/auto/test_file_filter.rb index c922cdd2..f9c8d904 100644 --- a/auto/test_file_filter.rb +++ b/auto/test_file_filter.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/type_sanitizer.rb b/auto/type_sanitizer.rb index 0cf9563c..cfadb0dc 100644 --- a/auto/type_sanitizer.rb +++ b/auto/type_sanitizer.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/unity_test_summary.py b/auto/unity_test_summary.py index a7d24bad..43e5af7c 100644 --- a/auto/unity_test_summary.py +++ b/auto/unity_test_summary.py @@ -2,9 +2,10 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= + import sys import os import re diff --git a/auto/unity_test_summary.rb b/auto/unity_test_summary.rb index 0d7f1838..33c8d7a3 100644 --- a/auto/unity_test_summary.rb +++ b/auto/unity_test_summary.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/auto/yaml_helper.rb b/auto/yaml_helper.rb index 32746db7..6d1bf7ae 100644 --- a/auto/yaml_helper.rb +++ b/auto/yaml_helper.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/examples/example_1/src/ProductionCode.c b/examples/example_1/src/ProductionCode.c index 6be26aca..8a52aff0 100644 --- a/examples/example_1/src/ProductionCode.c +++ b/examples/example_1/src/ProductionCode.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode.h" int Counter = 0; diff --git a/examples/example_1/src/ProductionCode.h b/examples/example_1/src/ProductionCode.h index 5aaa8bbc..d8929bfb 100644 --- a/examples/example_1/src/ProductionCode.h +++ b/examples/example_1/src/ProductionCode.h @@ -1,10 +1,9 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - int FindFunction_WhichIsBroken(int NumberToFind); int FunctionWhichReturnsLocalVariable(void); diff --git a/examples/example_1/src/ProductionCode2.c b/examples/example_1/src/ProductionCode2.c index ea12cd71..ff8a537f 100644 --- a/examples/example_1/src/ProductionCode2.c +++ b/examples/example_1/src/ProductionCode2.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode2.h" char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction) diff --git a/examples/example_1/src/ProductionCode2.h b/examples/example_1/src/ProductionCode2.h index 63f8b0f5..5204543f 100644 --- a/examples/example_1/src/ProductionCode2.h +++ b/examples/example_1/src/ProductionCode2.h @@ -1,9 +1,8 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction); diff --git a/examples/example_1/test/TestProductionCode.c b/examples/example_1/test/TestProductionCode.c index 44441fd1..ceb6d8b5 100644 --- a/examples/example_1/test/TestProductionCode.c +++ b/examples/example_1/test/TestProductionCode.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode.h" #include "unity.h" diff --git a/examples/example_1/test/TestProductionCode2.c b/examples/example_1/test/TestProductionCode2.c index cb6e4444..32bbfdf0 100644 --- a/examples/example_1/test/TestProductionCode2.c +++ b/examples/example_1/test/TestProductionCode2.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode2.h" #include "unity.h" diff --git a/examples/example_2/src/ProductionCode.c b/examples/example_2/src/ProductionCode.c index e30851a7..b84c4276 100644 --- a/examples/example_2/src/ProductionCode.c +++ b/examples/example_2/src/ProductionCode.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode.h" int Counter = 0; diff --git a/examples/example_2/src/ProductionCode.h b/examples/example_2/src/ProductionCode.h index 5aaa8bbc..d8929bfb 100644 --- a/examples/example_2/src/ProductionCode.h +++ b/examples/example_2/src/ProductionCode.h @@ -1,10 +1,9 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - int FindFunction_WhichIsBroken(int NumberToFind); int FunctionWhichReturnsLocalVariable(void); diff --git a/examples/example_2/src/ProductionCode2.c b/examples/example_2/src/ProductionCode2.c index bd6f4ce8..80040187 100644 --- a/examples/example_2/src/ProductionCode2.c +++ b/examples/example_2/src/ProductionCode2.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode2.h" char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction) diff --git a/examples/example_2/src/ProductionCode2.h b/examples/example_2/src/ProductionCode2.h index 63f8b0f5..5204543f 100644 --- a/examples/example_2/src/ProductionCode2.h +++ b/examples/example_2/src/ProductionCode2.h @@ -1,9 +1,8 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction); diff --git a/examples/example_2/test/TestProductionCode.c b/examples/example_2/test/TestProductionCode.c index 0e05a0db..9635f32a 100644 --- a/examples/example_2/test/TestProductionCode.c +++ b/examples/example_2/test/TestProductionCode.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/examples/example_2/test/TestProductionCode2.c b/examples/example_2/test/TestProductionCode2.c index de6c3242..d0233c0a 100644 --- a/examples/example_2/test/TestProductionCode2.c +++ b/examples/example_2/test/TestProductionCode2.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/examples/example_2/test/test_runners/TestProductionCode2_Runner.c b/examples/example_2/test/test_runners/TestProductionCode2_Runner.c index c528c80f..eaa057fd 100644 --- a/examples/example_2/test/test_runners/TestProductionCode2_Runner.c +++ b/examples/example_2/test/test_runners/TestProductionCode2_Runner.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/examples/example_2/test/test_runners/TestProductionCode_Runner.c b/examples/example_2/test/test_runners/TestProductionCode_Runner.c index b65e6695..f0acf24f 100644 --- a/examples/example_2/test/test_runners/TestProductionCode_Runner.c +++ b/examples/example_2/test/test_runners/TestProductionCode_Runner.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/examples/example_2/test/test_runners/all_tests.c b/examples/example_2/test/test_runners/all_tests.c index 6cd4ef95..5376dbe2 100644 --- a/examples/example_2/test/test_runners/all_tests.c +++ b/examples/example_2/test/test_runners/all_tests.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/examples/example_3/helper/UnityHelper.c b/examples/example_3/helper/UnityHelper.c index 12110176..17830959 100644 --- a/examples/example_3/helper/UnityHelper.c +++ b/examples/example_3/helper/UnityHelper.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/examples/example_3/helper/UnityHelper.h b/examples/example_3/helper/UnityHelper.h index 573f26c9..6ebf8604 100644 --- a/examples/example_3/helper/UnityHelper.h +++ b/examples/example_3/helper/UnityHelper.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/examples/example_3/rakefile.rb b/examples/example_3/rakefile.rb index 48de0d05..a1eb35a4 100644 --- a/examples/example_3/rakefile.rb +++ b/examples/example_3/rakefile.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/examples/example_3/rakefile_helper.rb b/examples/example_3/rakefile_helper.rb index 9b57e814..55885741 100644 --- a/examples/example_3/rakefile_helper.rb +++ b/examples/example_3/rakefile_helper.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/examples/example_3/src/ProductionCode.c b/examples/example_3/src/ProductionCode.c index e30851a7..b84c4276 100644 --- a/examples/example_3/src/ProductionCode.c +++ b/examples/example_3/src/ProductionCode.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode.h" int Counter = 0; diff --git a/examples/example_3/src/ProductionCode.h b/examples/example_3/src/ProductionCode.h index 5aaa8bbc..d8929bfb 100644 --- a/examples/example_3/src/ProductionCode.h +++ b/examples/example_3/src/ProductionCode.h @@ -1,10 +1,9 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - int FindFunction_WhichIsBroken(int NumberToFind); int FunctionWhichReturnsLocalVariable(void); diff --git a/examples/example_3/src/ProductionCode2.c b/examples/example_3/src/ProductionCode2.c index bd6f4ce8..80040187 100644 --- a/examples/example_3/src/ProductionCode2.c +++ b/examples/example_3/src/ProductionCode2.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode2.h" char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction) diff --git a/examples/example_3/src/ProductionCode2.h b/examples/example_3/src/ProductionCode2.h index 63f8b0f5..5204543f 100644 --- a/examples/example_3/src/ProductionCode2.h +++ b/examples/example_3/src/ProductionCode2.h @@ -1,9 +1,8 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction); diff --git a/examples/example_3/target_gcc_32.yml b/examples/example_3/target_gcc_32.yml index 3fa10040..a3d123d4 100644 --- a/examples/example_3/target_gcc_32.yml +++ b/examples/example_3/target_gcc_32.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/examples/example_3/test/TestProductionCode.c b/examples/example_3/test/TestProductionCode.c index a74e9eab..7f48ea76 100644 --- a/examples/example_3/test/TestProductionCode.c +++ b/examples/example_3/test/TestProductionCode.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode.h" #include "unity.h" diff --git a/examples/example_3/test/TestProductionCode2.c b/examples/example_3/test/TestProductionCode2.c index 43907d4f..7ab3926e 100644 --- a/examples/example_3/test/TestProductionCode2.c +++ b/examples/example_3/test/TestProductionCode2.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode2.h" #include "unity.h" diff --git a/examples/example_4/src/ProductionCode.c b/examples/example_4/src/ProductionCode.c index 6be26aca..8a52aff0 100644 --- a/examples/example_4/src/ProductionCode.c +++ b/examples/example_4/src/ProductionCode.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode.h" int Counter = 0; diff --git a/examples/example_4/src/ProductionCode.h b/examples/example_4/src/ProductionCode.h index 5aaa8bbc..d8929bfb 100644 --- a/examples/example_4/src/ProductionCode.h +++ b/examples/example_4/src/ProductionCode.h @@ -1,10 +1,9 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - int FindFunction_WhichIsBroken(int NumberToFind); int FunctionWhichReturnsLocalVariable(void); diff --git a/examples/example_4/src/ProductionCode2.c b/examples/example_4/src/ProductionCode2.c index ea12cd71..ff8a537f 100644 --- a/examples/example_4/src/ProductionCode2.c +++ b/examples/example_4/src/ProductionCode2.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode2.h" char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction) diff --git a/examples/example_4/src/ProductionCode2.h b/examples/example_4/src/ProductionCode2.h index 63f8b0f5..5204543f 100644 --- a/examples/example_4/src/ProductionCode2.h +++ b/examples/example_4/src/ProductionCode2.h @@ -1,9 +1,8 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - char* ThisFunctionHasNotBeenTested(int Poor, char* LittleFunction); diff --git a/examples/example_4/test/TestProductionCode.c b/examples/example_4/test/TestProductionCode.c index 15a19fcd..a7cf1449 100644 --- a/examples/example_4/test/TestProductionCode.c +++ b/examples/example_4/test/TestProductionCode.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode.h" #include "unity.h" diff --git a/examples/example_4/test/TestProductionCode2.c b/examples/example_4/test/TestProductionCode2.c index 479a1a67..168564e1 100644 --- a/examples/example_4/test/TestProductionCode2.c +++ b/examples/example_4/test/TestProductionCode2.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "ProductionCode2.h" #include "unity.h" diff --git a/examples/unity_config.h b/examples/unity_config.h index a9845f88..efd91232 100644 --- a/examples/unity_config.h +++ b/examples/unity_config.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/extras/bdd/src/unity_bdd.h b/extras/bdd/src/unity_bdd.h index 129b7bc3..feff492c 100644 --- a/extras/bdd/src/unity_bdd.h +++ b/extras/bdd/src/unity_bdd.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/extras/bdd/test/test_bdd.c b/extras/bdd/test/test_bdd.c index 548ba97c..f86e5abd 100644 --- a/extras/bdd/test/test_bdd.c +++ b/extras/bdd/test/test_bdd.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/extras/fixture/src/unity_fixture.c b/extras/fixture/src/unity_fixture.c index 0047bd36..9b3fce27 100644 --- a/extras/fixture/src/unity_fixture.c +++ b/extras/fixture/src/unity_fixture.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/extras/fixture/src/unity_fixture.h b/extras/fixture/src/unity_fixture.h index 0eb471e3..ed6ff482 100644 --- a/extras/fixture/src/unity_fixture.h +++ b/extras/fixture/src/unity_fixture.h @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #ifndef UNITY_FIXTURE_H_ #define UNITY_FIXTURE_H_ diff --git a/extras/fixture/src/unity_fixture_internals.h b/extras/fixture/src/unity_fixture_internals.h index 9e6f8b7c..f8f83d2d 100644 --- a/extras/fixture/src/unity_fixture_internals.h +++ b/extras/fixture/src/unity_fixture_internals.h @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #ifndef UNITY_FIXTURE_INTERNALS_H_ #define UNITY_FIXTURE_INTERNALS_H_ diff --git a/extras/fixture/test/main/AllTests.c b/extras/fixture/test/main/AllTests.c index 8b8e16ba..d5eec4be 100644 --- a/extras/fixture/test/main/AllTests.c +++ b/extras/fixture/test/main/AllTests.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/extras/fixture/test/template_fixture_tests.c b/extras/fixture/test/template_fixture_tests.c index ad7f0823..2397f105 100644 --- a/extras/fixture/test/template_fixture_tests.c +++ b/extras/fixture/test/template_fixture_tests.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "unity_fixture.h" static int data = -1; diff --git a/extras/fixture/test/unity_fixture_Test.c b/extras/fixture/test/unity_fixture_Test.c index e258fbaf..d2785d3c 100644 --- a/extras/fixture/test/unity_fixture_Test.c +++ b/extras/fixture/test/unity_fixture_Test.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "unity_fixture.h" #include #include diff --git a/extras/fixture/test/unity_fixture_TestRunner.c b/extras/fixture/test/unity_fixture_TestRunner.c index 0eb2bdb1..ec92663f 100644 --- a/extras/fixture/test/unity_fixture_TestRunner.c +++ b/extras/fixture/test/unity_fixture_TestRunner.c @@ -1,11 +1,10 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ - #include "unity_fixture.h" TEST_GROUP_RUNNER(UnityFixture) diff --git a/extras/memory/src/unity_memory.c b/extras/memory/src/unity_memory.c index 85abbc9f..e9eaae35 100644 --- a/extras/memory/src/unity_memory.c +++ b/extras/memory/src/unity_memory.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/extras/memory/src/unity_memory.h b/extras/memory/src/unity_memory.h index ace96a5a..70a7f25f 100644 --- a/extras/memory/src/unity_memory.h +++ b/extras/memory/src/unity_memory.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/extras/memory/test/unity_memory_Test.c b/extras/memory/test/unity_memory_Test.c index 163d24c0..b66e6deb 100644 --- a/extras/memory/test/unity_memory_Test.c +++ b/extras/memory/test/unity_memory_Test.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/extras/memory/test/unity_memory_TestRunner.c b/extras/memory/test/unity_memory_TestRunner.c index 92e98ff8..0a8ed3da 100644 --- a/extras/memory/test/unity_memory_TestRunner.c +++ b/extras/memory/test/unity_memory_TestRunner.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/extras/memory/test/unity_output_Spy.c b/extras/memory/test/unity_output_Spy.c index 69fcacc7..044c5def 100644 --- a/extras/memory/test/unity_output_Spy.c +++ b/extras/memory/test/unity_output_Spy.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/extras/memory/test/unity_output_Spy.h b/extras/memory/test/unity_output_Spy.h index 739263cd..3c2e9b97 100644 --- a/extras/memory/test/unity_output_Spy.h +++ b/extras/memory/test/unity_output_Spy.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/src/unity.c b/src/unity.c index 04d716d7..7fa2dc63 100644 --- a/src/unity.c +++ b/src/unity.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/src/unity.h b/src/unity.h index 8337c8c6..e390ff16 100644 --- a/src/unity.h +++ b/src/unity.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/src/unity_internals.h b/src/unity_internals.h index 192f7ffa..562f5b6d 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/rakefile_helper.rb b/test/rakefile_helper.rb index 61ce874e..80a4976d 100644 --- a/test/rakefile_helper.rb +++ b/test/rakefile_helper.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/spec/generate_module_existing_file_spec.rb b/test/spec/generate_module_existing_file_spec.rb index 0d5eb1b3..f4dd13e3 100644 --- a/test/spec/generate_module_existing_file_spec.rb +++ b/test/spec/generate_module_existing_file_spec.rb @@ -1,11 +1,10 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= - require '../auto/generate_module.rb' require 'fileutils' diff --git a/test/targets/ansi.yml b/test/targets/ansi.yml index 960a5bd8..fcc24557 100644 --- a/test/targets/ansi.yml +++ b/test/targets/ansi.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/clang_file.yml b/test/targets/clang_file.yml index 00617331..f962ced3 100644 --- a/test/targets/clang_file.yml +++ b/test/targets/clang_file.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/clang_strict.yml b/test/targets/clang_strict.yml index 6ae19356..1c82f624 100644 --- a/test/targets/clang_strict.yml +++ b/test/targets/clang_strict.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/gcc_32.yml b/test/targets/gcc_32.yml index 60deb062..3375e4ee 100644 --- a/test/targets/gcc_32.yml +++ b/test/targets/gcc_32.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/gcc_64.yml b/test/targets/gcc_64.yml index b6f10f82..55223ceb 100644 --- a/test/targets/gcc_64.yml +++ b/test/targets/gcc_64.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/gcc_auto_limits.yml b/test/targets/gcc_auto_limits.yml index 12a11fe0..9159b385 100644 --- a/test/targets/gcc_auto_limits.yml +++ b/test/targets/gcc_auto_limits.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/gcc_auto_stdint.yml b/test/targets/gcc_auto_stdint.yml index 94066139..18221609 100644 --- a/test/targets/gcc_auto_stdint.yml +++ b/test/targets/gcc_auto_stdint.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/gcc_manual_math.yml b/test/targets/gcc_manual_math.yml index 76fc9921..22e69aa6 100644 --- a/test/targets/gcc_manual_math.yml +++ b/test/targets/gcc_manual_math.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/hitech_picc18.yml b/test/targets/hitech_picc18.yml index 493705be..547cb2b5 100644 --- a/test/targets/hitech_picc18.yml +++ b/test/targets/hitech_picc18.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/iar_arm_v4.yml b/test/targets/iar_arm_v4.yml index 36b1a0c8..26a0f462 100644 --- a/test/targets/iar_arm_v4.yml +++ b/test/targets/iar_arm_v4.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/iar_arm_v5.yml b/test/targets/iar_arm_v5.yml index 17b6b10d..afd51775 100644 --- a/test/targets/iar_arm_v5.yml +++ b/test/targets/iar_arm_v5.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/iar_arm_v5_3.yml b/test/targets/iar_arm_v5_3.yml index 17b6b10d..afd51775 100644 --- a/test/targets/iar_arm_v5_3.yml +++ b/test/targets/iar_arm_v5_3.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/iar_armcortex_LM3S9B92_v5_4.yml b/test/targets/iar_armcortex_LM3S9B92_v5_4.yml index 7bf92871..b4aa5d8e 100644 --- a/test/targets/iar_armcortex_LM3S9B92_v5_4.yml +++ b/test/targets/iar_armcortex_LM3S9B92_v5_4.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/iar_cortexm3_v5.yml b/test/targets/iar_cortexm3_v5.yml index e56286a4..e27b0f6b 100644 --- a/test/targets/iar_cortexm3_v5.yml +++ b/test/targets/iar_cortexm3_v5.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/iar_msp430.yml b/test/targets/iar_msp430.yml index a1bd3ee4..041ebdaf 100644 --- a/test/targets/iar_msp430.yml +++ b/test/targets/iar_msp430.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/targets/iar_sh2a_v6.yml b/test/targets/iar_sh2a_v6.yml index c4469d62..21761d4b 100644 --- a/test/targets/iar_sh2a_v6.yml +++ b/test/targets/iar_sh2a_v6.yml @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/testdata/CException.h b/test/testdata/CException.h index 4f82afa1..0c11eaaa 100644 --- a/test/testdata/CException.h +++ b/test/testdata/CException.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/testdata/Defs.h b/test/testdata/Defs.h index 470f8877..aa5ed670 100644 --- a/test/testdata/Defs.h +++ b/test/testdata/Defs.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/testdata/cmock.h b/test/testdata/cmock.h index af739308..440220d0 100644 --- a/test/testdata/cmock.h +++ b/test/testdata/cmock.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/testdata/mockMock.h b/test/testdata/mockMock.h index 3d728e4a..ca65fc93 100644 --- a/test/testdata/mockMock.h +++ b/test/testdata/mockMock.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/testdata/testRunnerGenerator.c b/test/testdata/testRunnerGenerator.c index ab14c0e8..c10a96e6 100644 --- a/test/testdata/testRunnerGenerator.c +++ b/test/testdata/testRunnerGenerator.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/testdata/testRunnerGeneratorSmall.c b/test/testdata/testRunnerGeneratorSmall.c index 15893d53..bc9f7fcf 100644 --- a/test/testdata/testRunnerGeneratorSmall.c +++ b/test/testdata/testRunnerGeneratorSmall.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/testdata/testRunnerGeneratorWithMocks.c b/test/testdata/testRunnerGeneratorWithMocks.c index a5b37b8c..adc2a295 100644 --- a/test/testdata/testRunnerGeneratorWithMocks.c +++ b/test/testdata/testRunnerGeneratorWithMocks.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/self_assessment_utils.h b/test/tests/self_assessment_utils.h index 39953e36..6051bda8 100644 --- a/test/tests/self_assessment_utils.h +++ b/test/tests/self_assessment_utils.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/test_generate_test_runner.rb b/test/tests/test_generate_test_runner.rb index dd1c4c8e..79a2e48e 100644 --- a/test/tests/test_generate_test_runner.rb +++ b/test/tests/test_generate_test_runner.rb @@ -1,7 +1,7 @@ # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org -# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams # SPDX-License-Identifier: MIT # ========================================================================= diff --git a/test/tests/test_unity_arrays.c b/test/tests/test_unity_arrays.c index e61e43d5..f852c269 100644 --- a/test/tests/test_unity_arrays.c +++ b/test/tests/test_unity_arrays.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/test_unity_core.c b/test/tests/test_unity_core.c index e4a3fdd9..866f2ab1 100644 --- a/test/tests/test_unity_core.c +++ b/test/tests/test_unity_core.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/test_unity_doubles.c b/test/tests/test_unity_doubles.c index 64d59070..b9e70cff 100644 --- a/test/tests/test_unity_doubles.c +++ b/test/tests/test_unity_doubles.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/test_unity_floats.c b/test/tests/test_unity_floats.c index 4a2c2131..006c76ab 100644 --- a/test/tests/test_unity_floats.c +++ b/test/tests/test_unity_floats.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/test_unity_integers.c b/test/tests/test_unity_integers.c index 2a923a8d..1b8c6e30 100644 --- a/test/tests/test_unity_integers.c +++ b/test/tests/test_unity_integers.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/test_unity_integers_64.c b/test/tests/test_unity_integers_64.c index 2a1d3769..6fb0957f 100644 --- a/test/tests/test_unity_integers_64.c +++ b/test/tests/test_unity_integers_64.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/test_unity_memory.c b/test/tests/test_unity_memory.c index 4d0513a5..d4897de4 100644 --- a/test/tests/test_unity_memory.c +++ b/test/tests/test_unity_memory.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/test_unity_parameterized.c b/test/tests/test_unity_parameterized.c index a473a921..b9550986 100644 --- a/test/tests/test_unity_parameterized.c +++ b/test/tests/test_unity_parameterized.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/test_unity_parameterizedDemo.c b/test/tests/test_unity_parameterizedDemo.c index 6ee42c54..6de6e686 100644 --- a/test/tests/test_unity_parameterizedDemo.c +++ b/test/tests/test_unity_parameterizedDemo.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/test_unity_strings.c b/test/tests/test_unity_strings.c index 99ba4d53..6a421135 100644 --- a/test/tests/test_unity_strings.c +++ b/test/tests/test_unity_strings.c @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ diff --git a/test/tests/types_for_test.h b/test/tests/types_for_test.h index 176926cf..66828b95 100644 --- a/test/tests/types_for_test.h +++ b/test/tests/types_for_test.h @@ -1,7 +1,7 @@ /* ========================================================================= Unity - A Test Framework for C ThrowTheSwitch.org - Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams SPDX-License-Identifier: MIT ========================================================================= */ From cbcd08fa7de711053a3deec6339ee89cad5d2697 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Wed, 1 Jan 2025 11:53:54 -0500 Subject: [PATCH 55/87] Add release notes and bump version. --- docs/UnityChangeLog.md | 18 +++++++++++++++++- src/unity.h | 2 +- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/docs/UnityChangeLog.md b/docs/UnityChangeLog.md index f93f9ec6..a9fec00f 100644 --- a/docs/UnityChangeLog.md +++ b/docs/UnityChangeLog.md @@ -13,7 +13,23 @@ Prior to 2008, the project was an internal project and not released to the publi ## Log -### Unity 2.6.0 () +### Unity 2.6.1 (Jan 2025) + +New Features: + + - Add `-n` comand line option as strict matcher again + +Significant Bugfixes: + + - Protect against problems when mis-matched command line options selected + +Other: + + - Protect against Conversion warnings in gcc + - Remove Redundant line-casts + - Make more internal functions static + +### Unity 2.6.0 (Mar 2024) New Features: diff --git a/src/unity.h b/src/unity.h index e390ff16..9e2a97b7 100644 --- a/src/unity.h +++ b/src/unity.h @@ -11,7 +11,7 @@ #define UNITY_VERSION_MAJOR 2 #define UNITY_VERSION_MINOR 6 -#define UNITY_VERSION_BUILD 0 +#define UNITY_VERSION_BUILD 1 #define UNITY_VERSION ((UNITY_VERSION_MAJOR << 16) | (UNITY_VERSION_MINOR << 8) | UNITY_VERSION_BUILD) #ifdef __cplusplus From 459d53a82159bbce0315b777e599cf7d179250f1 Mon Sep 17 00:00:00 2001 From: Koy Rehme Date: Wed, 8 Jan 2025 15:35:32 -0700 Subject: [PATCH 56/87] New command line options --- extras/fixture/src/unity_fixture.c | 65 +++++++++++++++----- extras/fixture/src/unity_fixture_internals.h | 3 + 2 files changed, 54 insertions(+), 14 deletions(-) diff --git a/extras/fixture/src/unity_fixture.c b/extras/fixture/src/unity_fixture.c index 9b3fce27..cd0df2ca 100644 --- a/extras/fixture/src/unity_fixture.c +++ b/extras/fixture/src/unity_fixture.c @@ -46,21 +46,25 @@ int UnityMain(int argc, const char* argv[], void (*runAllTests)(void)) return (int)Unity.TestFailures; } -static int selected(const char* filter, const char* name) +static int selected(const char* filter, const char* select, const char* name) { - if (filter == 0) + if (filter == 0 && select == 0) return 1; - return strstr(name, filter) ? 1 : 0; + if (filter && strstr(name, filter)) + return 1; + if (select && strcmp(name, select) == 0) + return 1; + return 0; } static int testSelected(const char* test) { - return selected(UnityFixture.NameFilter, test); + return selected(UnityFixture.NameFilter, UnityFixture.Name, test); } static int groupSelected(const char* group) { - return selected(UnityFixture.GroupFilter, group); + return selected(UnityFixture.GroupFilter, UnityFixture.Group, group); } void UnityTestRunner(unityfunction* setup, @@ -96,17 +100,20 @@ void UnityTestRunner(unityfunction* setup, Unity.NumberOfTests++; UnityPointer_Init(); - UNITY_EXEC_TIME_START(); + if (!UnityFixture.DryRun) { + UNITY_EXEC_TIME_START(); - if (TEST_PROTECT()) - { - setup(); - testBody(); - } - if (TEST_PROTECT()) - { - teardown(); + if (TEST_PROTECT()) + { + setup(); + testBody(); + } + if (TEST_PROTECT()) + { + teardown(); + } } + if (TEST_PROTECT()) { UnityPointer_UndoAllSets(); @@ -183,8 +190,11 @@ int UnityGetCommandLineOptions(int argc, const char* argv[]) int i; UnityFixture.Verbose = 0; UnityFixture.Silent = 0; + UnityFixture.DryRun = 0; UnityFixture.GroupFilter = 0; + UnityFixture.Group = 0; UnityFixture.NameFilter = 0; + UnityFixture.Name = 0; UnityFixture.RepeatCount = 1; if (argc == 1) @@ -207,10 +217,16 @@ int UnityGetCommandLineOptions(int argc, const char* argv[]) UNITY_PRINT_EOL(); UnityPrint(" -s Silent mode: minimal output showing only test failures"); UNITY_PRINT_EOL(); + UnityPrint(" -d Dry run all tests"); + UNITY_PRINT_EOL(); UnityPrint(" -g NAME Only run tests in groups that contain the string NAME"); UNITY_PRINT_EOL(); + UnityPrint(" -G NAME Only run tests in groups named NAME"); + UNITY_PRINT_EOL(); UnityPrint(" -n NAME Only run tests whose name contains the string NAME"); UNITY_PRINT_EOL(); + UnityPrint(" -N NAME Only run tests named NAME"); + UNITY_PRINT_EOL(); UnityPrint(" -r NUMBER Repeatedly run all tests NUMBER times"); UNITY_PRINT_EOL(); UnityPrint(" -h, --help Display this help message"); @@ -237,6 +253,11 @@ int UnityGetCommandLineOptions(int argc, const char* argv[]) UnityFixture.Silent = 1; i++; } + else if (strcmp(argv[i], "-d") == 0) + { + UnityFixture.DryRun = 1; + i++; + } else if (strcmp(argv[i], "-g") == 0) { i++; @@ -245,6 +266,14 @@ int UnityGetCommandLineOptions(int argc, const char* argv[]) UnityFixture.GroupFilter = argv[i]; i++; } + else if (strcmp(argv[i], "-G") == 0) + { + i++; + if (i >= argc) + return 1; + UnityFixture.Group= argv[i]; + i++; + } else if (strcmp(argv[i], "-n") == 0) { i++; @@ -253,6 +282,14 @@ int UnityGetCommandLineOptions(int argc, const char* argv[]) UnityFixture.NameFilter = argv[i]; i++; } + else if (strcmp(argv[i], "-N") == 0) + { + i++; + if (i >= argc) + return 1; + UnityFixture.Name = argv[i]; + i++; + } else if (strcmp(argv[i], "-r") == 0) { UnityFixture.RepeatCount = 2; diff --git a/extras/fixture/src/unity_fixture_internals.h b/extras/fixture/src/unity_fixture_internals.h index f8f83d2d..6a552c1f 100644 --- a/extras/fixture/src/unity_fixture_internals.h +++ b/extras/fixture/src/unity_fixture_internals.h @@ -17,9 +17,12 @@ struct UNITY_FIXTURE_T { int Verbose; int Silent; + int DryRun; unsigned int RepeatCount; const char* NameFilter; + const char* Name; const char* GroupFilter; + const char* Group; }; extern struct UNITY_FIXTURE_T UnityFixture; From df0b5d90b80a00a2f5b2d33670a994401cfd4973 Mon Sep 17 00:00:00 2001 From: "Rehme, Koy" Date: Sat, 18 Jan 2025 17:45:21 -0700 Subject: [PATCH 57/87] Add unit tests for new switches --- extras/fixture/test/unity_fixture_Test.c | 45 +++++++++++++++++++ .../fixture/test/unity_fixture_TestRunner.c | 3 ++ 2 files changed, 48 insertions(+) diff --git a/extras/fixture/test/unity_fixture_Test.c b/extras/fixture/test/unity_fixture_Test.c index d2785d3c..f5103ff1 100644 --- a/extras/fixture/test/unity_fixture_Test.c +++ b/extras/fixture/test/unity_fixture_Test.c @@ -90,23 +90,32 @@ TEST_GROUP(UnityCommandOptions); static int savedVerbose; static unsigned int savedRepeat; +static int savedDryRun; static const char* savedName; static const char* savedGroup; +static const char* savedNameExact; +static const char* savedGroupExact; TEST_SETUP(UnityCommandOptions) { savedVerbose = UnityFixture.Verbose; savedRepeat = UnityFixture.RepeatCount; + savedDryRun = UnityFixture.DryRun; savedName = UnityFixture.NameFilter; savedGroup = UnityFixture.GroupFilter; + savedNameExact = UnityFixture.Name; + savedGroupExact = UnityFixture.Group; } TEST_TEAR_DOWN(UnityCommandOptions) { UnityFixture.Verbose = savedVerbose; UnityFixture.RepeatCount= savedRepeat; + UnityFixture.DryRun = savedDryRun; UnityFixture.NameFilter = savedName; UnityFixture.GroupFilter = savedGroup; + UnityFixture.Name= savedNameExact; + UnityFixture.Group= savedGroup; } @@ -118,8 +127,11 @@ TEST(UnityCommandOptions, DefaultOptions) { UnityGetCommandLineOptions(1, noOptions); TEST_ASSERT_EQUAL(0, UnityFixture.Verbose); + TEST_ASSERT_EQUAL(0, UnityFixture.DryRun); TEST_ASSERT_POINTERS_EQUAL(0, UnityFixture.GroupFilter); TEST_ASSERT_POINTERS_EQUAL(0, UnityFixture.NameFilter); + TEST_ASSERT_POINTERS_EQUAL(0, UnityFixture.Group); + TEST_ASSERT_POINTERS_EQUAL(0, UnityFixture.Name); TEST_ASSERT_EQUAL(1, UnityFixture.RepeatCount); } @@ -134,6 +146,17 @@ TEST(UnityCommandOptions, OptionVerbose) TEST_ASSERT_EQUAL(1, UnityFixture.Verbose); } +static const char* dryRun[] = { + "testrunner.exe", + "-d" +}; + +TEST(UnityCommandOptions, OptionDryRun) +{ + TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(2, dryRun)); + TEST_ASSERT_EQUAL(1, UnityFixture.DryRun); +} + static const char* group[] = { "testrunner.exe", "-g", "groupname" @@ -156,6 +179,28 @@ TEST(UnityCommandOptions, OptionSelectTestByName) STRCMP_EQUAL("testname", UnityFixture.NameFilter); } +static const char* groupExact[] = { + "testrunner.exe", + "-G", "groupname" +}; + +TEST(UnityCommandOptions, OptionSelectTestByGroupExact) +{ + TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(3, groupExact)); + STRCMP_EQUAL("groupname", UnityFixture.Group); +} + +static const char* nameExact[] = { + "testrunner.exe", + "-N", "testname" +}; + +TEST(UnityCommandOptions, OptionSelectTestByNameExact) +{ + TEST_ASSERT_EQUAL(0, UnityGetCommandLineOptions(3, nameExact)); + STRCMP_EQUAL("testname", UnityFixture.Name); +} + static const char* repeat[] = { "testrunner.exe", "-r", "99" diff --git a/extras/fixture/test/unity_fixture_TestRunner.c b/extras/fixture/test/unity_fixture_TestRunner.c index ec92663f..07099d36 100644 --- a/extras/fixture/test/unity_fixture_TestRunner.c +++ b/extras/fixture/test/unity_fixture_TestRunner.c @@ -19,8 +19,11 @@ TEST_GROUP_RUNNER(UnityCommandOptions) { RUN_TEST_CASE(UnityCommandOptions, DefaultOptions); RUN_TEST_CASE(UnityCommandOptions, OptionVerbose); + RUN_TEST_CASE(UnityCommandOptions, OptionDryRun); RUN_TEST_CASE(UnityCommandOptions, OptionSelectTestByGroup); RUN_TEST_CASE(UnityCommandOptions, OptionSelectTestByName); + RUN_TEST_CASE(UnityCommandOptions, OptionSelectTestByGroupExact); + RUN_TEST_CASE(UnityCommandOptions, OptionSelectTestByNameExact); RUN_TEST_CASE(UnityCommandOptions, OptionSelectRepeatTestsDefaultCount); RUN_TEST_CASE(UnityCommandOptions, OptionSelectRepeatTestsSpecificCount); RUN_TEST_CASE(UnityCommandOptions, MultipleOptions); From cdf1d0297effc2736ee847e557b4275b4f02310b Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Mon, 17 Feb 2025 09:14:39 -0500 Subject: [PATCH 58/87] Create FUNDING.yml --- .github/FUNDING.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000..5aa51266 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,13 @@ +github: ThrowTheSwitch +#patreon: # Replace with a single Patreon username +#open_collective: # Replace with a single Open Collective username +#ko_fi: # Replace with a single Ko-fi username +#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel +#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry +#liberapay: # Replace with a single Liberapay username +#issuehunt: # Replace with a single IssueHunt username +#lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry +#polar: # Replace with a single Polar username +#buy_me_a_coffee: # Replace with a single Buy Me a Coffee username +#thanks_dev: # Replace with a single thanks.dev username +#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] From 0921c263f4fcef5da10531db61ec6eac89137a70 Mon Sep 17 00:00:00 2001 From: Ross Smyth Date: Wed, 5 Mar 2025 16:22:40 -0500 Subject: [PATCH 59/87] Allow the memory extra and fixture extra to be enabled seperatly. --- meson.build | 7 +++---- meson_options.txt | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/meson.build b/meson.build index 6585129c..e16bce09 100644 --- a/meson.build +++ b/meson.build @@ -34,14 +34,13 @@ unity_inc = [] subdir('src') if build_fixture - # Building the fixture extension implies building the memory - # extension. - build_memory = true subdir('extras/fixture/src') endif -if build_memory +if build_memory.enabled() or (build_memory.auto() and build_fixture) subdir('extras/memory/src') +else + unity_args += '-DUNITY_FIXTURE_NO_EXTRAS' endif if support_double diff --git a/meson_options.txt b/meson_options.txt index 8e66784b..069b19d1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,3 @@ -option('extension_fixture', type: 'boolean', value: 'false', description: 'Whether to enable the fixture extension.') -option('extension_memory', type: 'boolean', value: 'false', description: 'Whether to enable the memory extension.') -option('support_double', type: 'boolean', value: 'false', description: 'Whether to enable double precision floating point assertions.') +option('extension_fixture', type: 'boolean', value: false, description: 'Whether to enable the fixture extension.') +option('extension_memory', type: 'feature', value: 'auto', description: 'Whether to enable the memory extension. By default this is automatically enabled when extension_fixture is enabled.') +option('support_double', type: 'boolean', value: false, description: 'Whether to enable double precision floating point assertions.') From 8badc0e070f47f275b50885b6eacad06d917022d Mon Sep 17 00:00:00 2001 From: Ross Smyth Date: Wed, 5 Mar 2025 16:31:13 -0500 Subject: [PATCH 60/87] Add fixture help message option for UNITY_CUSTOM_HELP_MSG --- meson.build | 4 ++++ meson_options.txt | 1 + 2 files changed, 5 insertions(+) diff --git a/meson.build b/meson.build index e16bce09..419e09ea 100644 --- a/meson.build +++ b/meson.build @@ -26,6 +26,7 @@ project('unity', 'c', build_fixture = get_option('extension_fixture') build_memory = get_option('extension_memory') support_double = get_option('support_double') +fixture_help_message = get_option('fixture_help_message') unity_args = [] unity_src = [] @@ -35,6 +36,9 @@ subdir('src') if build_fixture subdir('extras/fixture/src') + if fixture_help_message != '' + unity_args += '-DUNITY_CUSTOM_HELP_MSG=' + fixture_help_message + endif endif if build_memory.enabled() or (build_memory.auto() and build_fixture) diff --git a/meson_options.txt b/meson_options.txt index 069b19d1..264480cf 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,3 +1,4 @@ option('extension_fixture', type: 'boolean', value: false, description: 'Whether to enable the fixture extension.') option('extension_memory', type: 'feature', value: 'auto', description: 'Whether to enable the memory extension. By default this is automatically enabled when extension_fixture is enabled.') option('support_double', type: 'boolean', value: false, description: 'Whether to enable double precision floating point assertions.') +option('fixture_help_message', type: 'string', description: 'If the fixture extension is enabled, this allows a custom help message to be defined.') From b0bcdb56c18ce8695c38742af757bbf116e649f5 Mon Sep 17 00:00:00 2001 From: James Raphael Tiovalen Date: Tue, 30 Jan 2024 17:45:53 +0800 Subject: [PATCH 61/87] Add support for randomizing test execution order This commit reintroduces the option to shuffle the test execution order into the test runner. This has been tested with the temp_sensor example project in Ceedling. Unit tests have also been successfully executed. Signed-off-by: James Raphael Tiovalen --- auto/generate_test_runner.rb | 96 ++++++++++++++++++++++++++++++--- docs/UnityHelperScriptsGuide.md | 16 ++++++ 2 files changed, 106 insertions(+), 6 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 2c2d5956..9fae0c1b 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -47,7 +47,9 @@ def self.default_options use_param_tests: false, use_system_files: true, include_extensions: '(?:hpp|hh|H|h)', - source_extensions: '(?:cpp|cc|ino|C|c)' + source_extensions: '(?:cpp|cc|ino|C|c)', + shuffle_tests: false, + rng_seed: 0 } end @@ -90,6 +92,7 @@ def run(input_file, output_file, options = nil) 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) + create_run_test_params_struct(output) create_externs(output, tests, used_mocks) create_mock_management(output, used_mocks) create_setup(output) @@ -99,6 +102,7 @@ def generate(input_file, output_file, tests, used_mocks, testfile_includes) create_reset(output) create_run_test(output) unless tests.empty? create_args_wrappers(output, tests) + create_shuffle_tests(output) if @options[:shuffle_tests] create_main(output, input_file, tests, used_mocks) end @@ -231,10 +235,34 @@ def find_setup_and_teardown(source) @options[:has_suite_teardown] ||= (source =~ /int\s+suiteTearDown\s*\(int\s+([a-zA-Z0-9_])+\s*\)/) end + def count_tests(tests) + if @options[:use_param_tests] + idx = 0 + tests.each do |test| + if (test[:args].nil? || test[:args].empty?) + idx += 1 + else + test[:args].each do |args| + idx += 1 + end + end + end + return idx + else + return tests.size + end + end + def create_header(output, mocks, testfile_includes = []) output.puts('/* AUTOGENERATED FILE. DO NOT EDIT. */') output.puts("\n/*=======Automagically Detected Files To Include=====*/") output.puts('extern "C" {') if @options[:externcincludes] + if @options[:shuffle_tests] + output.puts('#include ') + if @options[:rng_seed] == 0 + output.puts('#include ') + end + end output.puts("#include \"#{@options[:framework]}.h\"") output.puts('#include "cmock.h"') unless mocks.empty? output.puts('}') if @options[:externcincludes] @@ -270,6 +298,16 @@ def create_header(output, mocks, testfile_includes = []) output.puts('char* GlobalOrderError;') end + def create_run_test_params_struct(output) + output.puts("\n/*=======Structure Used By Test Runner=====*/") + output.puts('struct UnityRunTestParameters') + output.puts('{') + output.puts(' UnityTestFunction func;') + output.puts(' const char* name;') + output.puts(' UNITY_LINE_TYPE line_num;') + output.puts('};') + end + def create_externs(output, tests, _mocks) output.puts("\n/*=======External Functions This Runner Calls=====*/") output.puts("extern void #{@options[:setup_name]}(void);") @@ -392,6 +430,22 @@ def create_args_wrappers(output, tests) end 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)') + output.puts('{') + + # Use Fisher-Yates shuffle algorithm + output.puts(' for (int i = num_of_tests - 1; i > 0; i--)') + output.puts(' {') + output.puts(' int j = rand() % (i + 1);') + output.puts(' struct UnityRunTestParameters temp = run_test_params_arr[i];') + output.puts(' run_test_params_arr[i] = run_test_params_arr[j];') + output.puts(' run_test_params_arr[j] = temp;') + output.puts(' }') + output.puts('}') + end + def create_main(output, filename, tests, used_mocks) output.puts("\n/*=======MAIN=====*/") main_name = @options[:main_name].to_sym == :auto ? "main_#{filename.gsub('.c', '')}" : (@options[:main_name]).to_s @@ -439,18 +493,46 @@ def create_main(output, filename, tests, used_mocks) else output.puts(" UnityBegin(\"#{filename.gsub(/\\/, '\\\\\\')}\");") end + if @options[:shuffle_tests] + output.puts + if @options[:rng_seed] == 0 + output.puts(' srand(time(NULL));') + else + output.puts(" srand(#{@options[:rng_seed]});") + end + end + output.puts + output.puts(" int number_of_tests = #{count_tests(tests)};") + output.puts(' struct UnityRunTestParameters run_test_params_arr[number_of_tests];') + output.puts + idx = 0 tests.each do |test| if (!@options[:use_param_tests]) || test[:args].nil? || test[:args].empty? - output.puts(" run_test(#{test[:test]}, \"#{test[:test]}\", #{test[:line_number]});") + output.puts(" run_test_params_arr[#{idx}].func = #{test[:test]};") + output.puts(" run_test_params_arr[#{idx}].name = \"#{test[:test]}\";") + output.puts(" run_test_params_arr[#{idx}].line_num = #{test[:line_number]};") + idx += 1 else - test[:args].each.with_index(1) do |args, idx| - wrapper = "runner_args#{idx}_#{test[:test]}" + test[:args].each.with_index(1) do |args, arg_idx| + wrapper = "runner_args#{arg_idx}_#{test[:test]}" testname = "#{test[:test]}(#{args})".dump - output.puts(" run_test(#{wrapper}, #{testname}, #{test[:line_number]});") + output.puts(" run_test_params_arr[#{idx}].func = #{wrapper};") + output.puts(" run_test_params_arr[#{idx}].name = #{testname};") + output.puts(" run_test_params_arr[#{idx}].line_num = #{test[:line_number]};") + idx += 1 end end end output.puts + if @options[:shuffle_tests] + output.puts(' shuffleTests(run_test_params_arr, number_of_tests);') + output.puts + end + output.puts(' for (int i = 0; i < number_of_tests; i++)') + output.puts(' {') + output.puts(' run_test(run_test_params_arr[i].func, run_test_params_arr[i].name, run_test_params_arr[i].line_num);') + output.puts(' }') + output.puts output.puts(' CMock_Guts_MemFreeFinal();') unless used_mocks.empty? if @options[:has_suite_teardown] if @options[:omit_begin_end] @@ -536,7 +618,9 @@ def create_h_file(output, filename, tests, testfile_includes, used_mocks) ' --suite_teardown="" - code to execute for teardown of entire suite', ' --use_param_tests=1 - enable parameterized tests (disabled by default)', ' --omit_begin_end=1 - omit calls to UnityBegin and UNITY_END (disabled by default)', - ' --header_file="" - path/name of test header file to generate too'].join("\n") + ' --header_file="" - path/name of test header file to generate too', + ' --shuffle_tests=1 - enable shuffling of the test execution order (disabled by default)', + ' --rng_seed=1 - seed value for randomization of test execution order'].join("\n") exit 1 end diff --git a/docs/UnityHelperScriptsGuide.md b/docs/UnityHelperScriptsGuide.md index 90e21939..9a8941c2 100644 --- a/docs/UnityHelperScriptsGuide.md +++ b/docs/UnityHelperScriptsGuide.md @@ -277,6 +277,22 @@ Unity test state setup and cleanup. This option can also be specified at the command prompt as `--omit_begin_end` +##### `:shuffle_tests` + +If `true`, the test execution order will be shuffled. Is `false` by default. + +This option can also be specified at the command prompt as `--shuffle_tests` + +##### `:rng_seed` + +If set to some positive integer value, said value will be used as the seed value passed +to the `srand` function. Otherwise, if not set to any value, `time(NULL)` will be used +as the seed value. + +Only applicable if `:shuffle_tests` is set to `true`. + +This option can also be specified at the command prompt as `--rng_seed` + #### Parameterized tests provided macros Unity provides support for few param tests generators, that can be combined From 19da6e196b41ef8a679e451f2b3143d396f896d0 Mon Sep 17 00:00:00 2001 From: Costas Akrivoulis Date: Sun, 23 Mar 2025 22:20:34 -0700 Subject: [PATCH 62/87] Fix minor typo --- docs/ThrowTheSwitchCodingStandard.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/ThrowTheSwitchCodingStandard.md b/docs/ThrowTheSwitchCodingStandard.md index 517b8fb6..607c456c 100644 --- a/docs/ThrowTheSwitchCodingStandard.md +++ b/docs/ThrowTheSwitchCodingStandard.md @@ -90,7 +90,7 @@ Take a look through the file names in Ceedling and you'll get a good idea of wha Why use preprocess when you can use preprocessinator? Or what better describes a module in charge of invoking tasks during releases than release_invoker? Don't get carried away. -The names are still descriptive and fulfil the above requirements, but they don't feel stale. +The names are still descriptive and fulfill the above requirements, but they don't feel stale. ## C and C++ Details @@ -184,4 +184,4 @@ Good enough? *Find The Latest of This And More at [ThrowTheSwitch.org][]* -[ThrowTheSwitch.org]: https://throwtheswitch.org \ No newline at end of file +[ThrowTheSwitch.org]: https://throwtheswitch.org From c359bf37b07a897e7e48c3149ff2f37e2ec27bc8 Mon Sep 17 00:00:00 2001 From: ml-physec <206103694+ml-physec@users.noreply.github.com> Date: Wed, 16 Apr 2025 19:21:33 +0200 Subject: [PATCH 63/87] Initial implementation --- src/unity.c | 106 +++++++++++++++++++++++++++++++----------- src/unity_internals.h | 70 ++++++++++++++++++++++++++-- 2 files changed, 146 insertions(+), 30 deletions(-) diff --git a/src/unity.c b/src/unity.c index 7fa2dc63..dd15222f 100644 --- a/src/unity.c +++ b/src/unity.c @@ -61,14 +61,24 @@ const char UNITY_PROGMEM UnityStrErrShorthand[] = "Unity Shorth const char UNITY_PROGMEM UnityStrErrFloat[] = "Unity Floating Point Disabled"; const char UNITY_PROGMEM UnityStrErrDouble[] = "Unity Double Precision Disabled"; const char UNITY_PROGMEM UnityStrErr64[] = "Unity 64-bit Support Disabled"; +const char UNITY_PROGMEM UnityStrErrDetailStack[] = "Unity Detail Stack Support Disabled"; static const char UNITY_PROGMEM UnityStrBreaker[] = "-----------------------"; static const char UNITY_PROGMEM UnityStrResultsTests[] = " Tests "; static const char UNITY_PROGMEM UnityStrResultsFailures[] = " Failures "; static const char UNITY_PROGMEM UnityStrResultsIgnored[] = " Ignored "; #ifndef UNITY_EXCLUDE_DETAILS +#ifdef UNITY_DETAIL_STACK_SIZE +static const char* UNITY_PROGMEM UnityStrDetailLabels[] = UNITY_DETAIL_LABEL_NAMES; +static const UNITY_COUNTER_TYPE UNITY_PROGMEM UnityStrDetailLabelsCount = sizeof(UnityStrDetailLabels) / sizeof(const char*); +static const char UNITY_PROGMEM UnityStrErrDetailStackEmpty[] = " Detail Stack Empty"; +static const char UNITY_PROGMEM UnityStrErrDetailStackFull[] = " Detail Stack Full"; +static const char UNITY_PROGMEM UnityStrErrDetailStackLabel[] = " Detail Label Outside Of UNITY_DETAIL_LABEL_NAMES: "; +static const char UNITY_PROGMEM UnityStrErrDetailStackPop[] = " Detail Pop With Unexpected Arguments"; +#else static const char UNITY_PROGMEM UnityStrDetail1Name[] = UNITY_DETAIL1_NAME " "; static const char UNITY_PROGMEM UnityStrDetail2Name[] = " " UNITY_DETAIL2_NAME " "; #endif +#endif /*----------------------------------------------- * Pretty Printers & Test Result Output Handlers *-----------------------------------------------*/ @@ -574,6 +584,28 @@ static void UnityAddMsgIfSpecified(const char* msg) UNITY_PRINT_TEST_CONTEXT(); #endif #ifndef UNITY_EXCLUDE_DETAILS +#ifdef UNITY_DETAIL_STACK_SIZE + { + UNITY_COUNTER_TYPE c; + for (c = 0; (c < Unity.CurrentDetailStackSize) && (c < UNITY_DETAIL_STACK_SIZE); c++) { + const char* label; + if ((Unity.CurrentDetailStackLabels[c] == UNITY_DETAIL_NONE) || (Unity.CurrentDetailStackLabels[c] > UnityStrDetailLabelsCount)) { + break; + } + label = UnityStrDetailLabels[Unity.CurrentDetailStackLabels[c]]; + UnityPrint(UnityStrSpacer); + if ((label[0] == '#') && (label[1] != 0)) { + UnityPrint(label + 2); + UNITY_OUTPUT_CHAR(' '); + UnityPrintNumberByStyle(Unity.CurrentDetailStackValues[c], label[1]); + } else if (Unity.CurrentDetailStackValues[c] != 0){ + UnityPrint(label); + UNITY_OUTPUT_CHAR(' '); + UnityPrint((const char*)Unity.CurrentDetailStackValues[c]); + } + } + } +#else if (Unity.CurrentDetail1) { UnityPrint(UnityStrSpacer); @@ -585,6 +617,7 @@ static void UnityAddMsgIfSpecified(const char* msg) UnityPrint(Unity.CurrentDetail2); } } +#endif #endif if (msg) { @@ -2127,32 +2160,7 @@ void UnityFail(const char* msg, const UNITY_LINE_TYPE line) UnityTestResultsBegin(Unity.TestFile, line); UnityPrint(UnityStrFail); - if (msg != NULL) - { - UNITY_OUTPUT_CHAR(':'); - -#ifdef UNITY_PRINT_TEST_CONTEXT - UNITY_PRINT_TEST_CONTEXT(); -#endif -#ifndef UNITY_EXCLUDE_DETAILS - if (Unity.CurrentDetail1) - { - UnityPrint(UnityStrDetail1Name); - UnityPrint(Unity.CurrentDetail1); - if (Unity.CurrentDetail2) - { - UnityPrint(UnityStrDetail2Name); - UnityPrint(Unity.CurrentDetail2); - } - UnityPrint(UnityStrSpacer); - } -#endif - if (msg[0] != ' ') - { - UNITY_OUTPUT_CHAR(' '); - } - UnityPrint(msg); - } + UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -2195,7 +2203,13 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int Unity.CurrentTestName = FuncName; Unity.CurrentTestLineNumber = (UNITY_LINE_TYPE)FuncLineNum; Unity.NumberOfTests++; + #ifndef UNITY_EXCLUDE_DETAILS + #ifdef UNITY_DETAIL_STACK_SIZE + Unity.CurrentDetailStackSize = 0; + #else UNITY_CLR_DETAILS(); + #endif + #endif UNITY_EXEC_TIME_START(); if (TEST_PROTECT()) { @@ -2263,6 +2277,46 @@ int UnityEnd(void) return (int)(Unity.TestFailures); } +/*----------------------------------------------- + * Details Stack + *-----------------------------------------------*/ +#ifndef UNITY_EXCLUDE_DETAILS +#ifdef UNITY_DETAIL_STACK_SIZE +void UnityPushDetail(UNITY_DETAIL_LABEL_TYPE label, UNITY_DETAIL_VALUE_TYPE value, const UNITY_LINE_TYPE line) { + if (Unity.CurrentDetailStackSize >= UNITY_DETAIL_STACK_SIZE) { + UnityTestResultsFailBegin(line); + UnityPrint(UnityStrErrDetailStackFull); + UnityAddMsgIfSpecified(NULL); + UNITY_FAIL_AND_BAIL; + } + if (label >= UnityStrDetailLabelsCount) { + UnityTestResultsFailBegin(line); + UnityPrint(UnityStrErrDetailStackLabel); + UnityPrintNumberUnsigned(label); + UnityAddMsgIfSpecified(NULL); + UNITY_FAIL_AND_BAIL; + } + Unity.CurrentDetailStackLabels[Unity.CurrentDetailStackSize] = label; + Unity.CurrentDetailStackValues[Unity.CurrentDetailStackSize++] = value; +} +void UnityPopDetail(UNITY_DETAIL_LABEL_TYPE label, UNITY_DETAIL_VALUE_TYPE value, const UNITY_LINE_TYPE line) { + if (Unity.CurrentDetailStackSize == 0) { + UnityTestResultsFailBegin(line); + UnityPrint(UnityStrErrDetailStackEmpty); + UnityAddMsgIfSpecified(NULL); + UNITY_FAIL_AND_BAIL; + } + if ((Unity.CurrentDetailStackLabels[Unity.CurrentDetailStackSize-1] != label) || (Unity.CurrentDetailStackValues[Unity.CurrentDetailStackSize-1] != value)) { + UnityTestResultsFailBegin(line); + UnityPrint(UnityStrErrDetailStackPop); + UnityAddMsgIfSpecified(NULL); + UNITY_FAIL_AND_BAIL; + } + Unity.CurrentDetailStackSize--; +} +#endif +#endif + /*----------------------------------------------- * Command Line Argument Support *-----------------------------------------------*/ diff --git a/src/unity_internals.h b/src/unity_internals.h index 562f5b6d..2c8ed9ad 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -512,13 +512,30 @@ typedef enum UNITY_ARRAY_UNKNOWN } UNITY_FLAGS_T; +#ifndef UNITY_EXCLUDE_DETAILS +#ifdef UNITY_DETAIL_STACK_SIZE +#ifndef UNITY_DETAIL_LABEL_TYPE +#define UNITY_DETAIL_LABEL_TYPE uint8_t +#endif +#ifndef UNITY_DETAIL_VALUE_TYPE +#define UNITY_DETAIL_VALUE_TYPE UNITY_PTR_TO_INT +#endif +#endif +#endif + struct UNITY_STORAGE_T { const char* TestFile; const char* CurrentTestName; #ifndef UNITY_EXCLUDE_DETAILS +#ifdef UNITY_DETAIL_STACK_SIZE + UNITY_DETAIL_LABEL_TYPE CurrentDetailStackLabels[UNITY_DETAIL_STACK_SIZE]; + UNITY_DETAIL_VALUE_TYPE CurrentDetailStackValues[UNITY_DETAIL_STACK_SIZE]; + UNITY_COUNTER_TYPE CurrentDetailStackSize; +#else const char* CurrentDetail1; const char* CurrentDetail2; +#endif #endif UNITY_LINE_TYPE CurrentTestLineNumber; UNITY_COUNTER_TYPE NumberOfTests; @@ -561,10 +578,6 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int #define UNITY_SET_DETAIL(d1) #define UNITY_SET_DETAILS(d1,d2) #else -#define UNITY_CLR_DETAILS() do { Unity.CurrentDetail1 = 0; Unity.CurrentDetail2 = 0; } while (0) -#define UNITY_SET_DETAIL(d1) do { Unity.CurrentDetail1 = (d1); Unity.CurrentDetail2 = 0; } while (0) -#define UNITY_SET_DETAILS(d1,d2) do { Unity.CurrentDetail1 = (d1); Unity.CurrentDetail2 = (d2); } while (0) - #ifndef UNITY_DETAIL1_NAME #define UNITY_DETAIL1_NAME "Function" #endif @@ -572,6 +585,47 @@ void UnityDefaultTestRun(UnityTestFunction Func, const char* FuncName, const int #ifndef UNITY_DETAIL2_NAME #define UNITY_DETAIL2_NAME "Argument" #endif + +#ifdef UNITY_DETAIL_STACK_SIZE +/* stack based implementation */ +#ifndef UNITY_DETAIL_LABEL_NAMES +/* Note: If the label name string starts with '#', the second byte is interpreted as UNITY_DISPLAY_STYLE_T, + * and the detail value will be printed as number (e.g. "#\x24Line" to output "Line "). + * Otherwise, the detail value must be a pointer to a string that is valid until it is pop'ed. + */ +#define UNITY_DETAIL_LABEL_NAMES {0, UNITY_DETAIL1_NAME, UNITY_DETAIL2_NAME} +typedef enum +{ + UNITY_DETAIL_NONE = 0, + UNITY_DETAIL_D1 = 1, + UNITY_DETAIL_D2 = 2 +} UNITY_DETAIL_LABEL_T; +#endif +void UnityPushDetail(UNITY_DETAIL_LABEL_TYPE label, UNITY_DETAIL_VALUE_TYPE value, const UNITY_LINE_TYPE line); +void UnityPopDetail(UNITY_DETAIL_LABEL_TYPE label, UNITY_DETAIL_VALUE_TYPE value, const UNITY_LINE_TYPE line); + +#define UNITY_CLR_DETAILS() do { \ + if(Unity.CurrentDetailStackSize && \ + Unity.CurrentDetailStackLabels[Unity.CurrentDetailStackSize - 1] == UNITY_DETAIL_D2) { \ + Unity.CurrentDetailStackLabels[--Unity.CurrentDetailStackSize] = UNITY_DETAIL_NONE;} \ + if(Unity.CurrentDetailStackSize && \ + Unity.CurrentDetailStackLabels[Unity.CurrentDetailStackSize - 1] == UNITY_DETAIL_D1) { \ + Unity.CurrentDetailStackLabels[--Unity.CurrentDetailStackSize] = UNITY_DETAIL_NONE;} \ + } while (0) +#define UNITY_SET_DETAIL(d1) do { UNITY_CLR_DETAILS(); \ + UnityPushDetail(UNITY_DETAIL_D1, (UNITY_DETAIL_VALUE_TYPE)(d1), __LINE__); \ + } while (0) +#define UNITY_SET_DETAILS(d1,d2) do { UNITY_CLR_DETAILS(); \ + UnityPushDetail(UNITY_DETAIL_D1, (UNITY_DETAIL_VALUE_TYPE)(d1), __LINE__); \ + UnityPushDetail(UNITY_DETAIL_D2, (UNITY_DETAIL_VALUE_TYPE)(d2), __LINE__); \ + } while (0) + +#else +/* just two hardcoded slots */ +#define UNITY_CLR_DETAILS() do { Unity.CurrentDetail1 = 0; Unity.CurrentDetail2 = 0; } while (0) +#define UNITY_SET_DETAIL(d1) do { Unity.CurrentDetail1 = (d1); Unity.CurrentDetail2 = 0; } while (0) +#define UNITY_SET_DETAILS(d1,d2) do { Unity.CurrentDetail1 = (d1); Unity.CurrentDetail2 = (d2); } while (0) +#endif #endif #ifdef UNITY_PRINT_TEST_CONTEXT @@ -1179,5 +1233,13 @@ int UnityTestMatches(void); #define UNITY_TEST_ASSERT_DOUBLE_IS_NOT_DETERMINATE(actual, line, message) UnityAssertDoubleSpecial((UNITY_DOUBLE)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_FLOAT_IS_NOT_DET) #endif +#if !defined(UNITY_EXCLUDE_DETAILS) && defined(UNITY_DETAIL_STACK_SIZE) +#define UNITY_DETAIL_PUSH(label, value) UnityPushDetail((UNITY_DETAIL_LABEL_TYPE)(label), (UNITY_DETAIL_VALUE_TYPE)(value), __LINE__) +#define UNITY_DETAIL_POP(label, value) UnityPopDetail((UNITY_DETAIL_LABEL_TYPE)(label), (UNITY_DETAIL_VALUE_TYPE)(value), __LINE__) +#else +#define UNITY_DETAIL_PUSH(label, value) UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDetailStack) +#define UNITY_DETAIL_POP(label, value) UNITY_TEST_FAIL((UNITY_LINE_TYPE)(line), UnityStrErrDetailStack) +#endif + /* End of UNITY_INTERNALS_H */ #endif From bfc785c6656c90f7d6a22396bd57adadf7d1cf48 Mon Sep 17 00:00:00 2001 From: ml-physec <206103694+ml-physec@users.noreply.github.com> Date: Wed, 16 Apr 2025 19:21:48 +0200 Subject: [PATCH 64/87] Add example --- examples/example_5/makefile | 63 +++++++++++++++++++ examples/example_5/readme.txt | 38 +++++++++++ examples/example_5/src/ProductionCode.c | 56 +++++++++++++++++ examples/example_5/src/ProductionCode.h | 16 +++++ examples/example_5/subprojects/unity.wrap | 3 + examples/example_5/test/TestProductionCode.c | 45 +++++++++++++ .../test_runners/TestProductionCode_Runner.c | 48 ++++++++++++++ examples/example_5/test/unity_detail_config.h | 18 ++++++ 8 files changed, 287 insertions(+) create mode 100644 examples/example_5/makefile create mode 100644 examples/example_5/readme.txt create mode 100644 examples/example_5/src/ProductionCode.c create mode 100644 examples/example_5/src/ProductionCode.h create mode 100644 examples/example_5/subprojects/unity.wrap create mode 100644 examples/example_5/test/TestProductionCode.c create mode 100644 examples/example_5/test/test_runners/TestProductionCode_Runner.c create mode 100644 examples/example_5/test/unity_detail_config.h diff --git a/examples/example_5/makefile b/examples/example_5/makefile new file mode 100644 index 00000000..82d39ad1 --- /dev/null +++ b/examples/example_5/makefile @@ -0,0 +1,63 @@ +# ========================================================================= +# Unity - A Test Framework for C +# ThrowTheSwitch.org +# Copyright (c) 2007-24 Mike Karlesky, Mark VanderVoord, & Greg Williams +# SPDX-License-Identifier: MIT +# ========================================================================= + +#We try to detect the OS we are running on, and adjust commands as needed +ifeq ($(OS),Windows_NT) + ifeq ($(shell uname -s),) # not in a bash-like shell + CLEANUP = del /F /Q + MKDIR = mkdir + else # in a bash-like shell, like msys + CLEANUP = rm -f + MKDIR = mkdir -p + endif + TARGET_EXTENSION=.exe +else + CLEANUP = rm -f + MKDIR = mkdir -p + TARGET_EXTENSION=.out +endif + +C_COMPILER=gcc +ifeq ($(shell uname -s), Darwin) +C_COMPILER=clang +endif + +UNITY_ROOT=../.. + +CFLAGS=-std=c89 +CFLAGS += -Wall +CFLAGS += -Wextra +CFLAGS += -Wpointer-arith +CFLAGS += -Wcast-align +CFLAGS += -Wwrite-strings +CFLAGS += -Wswitch-default +CFLAGS += -Wunreachable-code +CFLAGS += -Winit-self +CFLAGS += -Wmissing-field-initializers +CFLAGS += -Wno-unknown-pragmas +CFLAGS += -Wstrict-prototypes +CFLAGS += -Wundef +CFLAGS += -Wold-style-definition +#CFLAGS += -Wno-misleading-indentation + + +TARGET_BASE1=test1 +TARGET1 = $(TARGET_BASE1)$(TARGET_EXTENSION) +SRC_FILES1=$(UNITY_ROOT)/src/unity.c src/ProductionCode.c test/TestProductionCode.c test/test_runners/TestProductionCode_Runner.c +INC_DIRS=-Isrc -I$(UNITY_ROOT)/src +SYMBOLS=-include"test/unity_detail_config.h" -DUNIT_TESTING + +all: clean default + +default: $(SRC_FILES1) + $(C_COMPILER) $(CFLAGS) $(INC_DIRS) $(SYMBOLS) $(SRC_FILES1) -o $(TARGET1) + - ./$(TARGET1) +clean: + $(CLEANUP) $(TARGET1) $(TARGET2) + +ci: CFLAGS += -Werror +ci: default diff --git a/examples/example_5/readme.txt b/examples/example_5/readme.txt new file mode 100644 index 00000000..c84468eb --- /dev/null +++ b/examples/example_5/readme.txt @@ -0,0 +1,38 @@ +Example 5 +========= + +Demonstrate Details Stack usage to implement something similar to a stacktrace. +This allows locating the error source much faster in branching/iterating code. + +Build and run with Make +--- +Just run `make`. + +Output +--- +Below the output is annotated with source of the elements. + +``` +test/TestProductionCode.c:36:test_BitExtractor:FAIL: Expected 0 Was 1. During call BitExtractor. During call BitExtractor_down. Bit Position 6. Bit Mask 0x02. Unexpected bit value +``` + +| String | Source | +|-----------------------------|---------------------------------------------------------------------------| +| `test/TestProductionCode.c` | `Unity.TestFile` | +| `36` | `UNITY_TEST_ASSERT_EQUAL_INT` line | +| `test_BitExtractor` | `RUN_TEST` name | +| `FAIL` | `UnityStrFail` | +| `Expected 1 Was 0` | `UnityAssertEqualNumber` | +| `During call` | Detail 0, Label | +| `BitExtractor` | Detail 0, Value | +| `During call` | Detail 0, Label | +| `BitExtractor` | Detail 0, Value | +| `During call` | Detail 1, Label | +| `BitExtractor_down` | Detail 1, Value | +| `Bit Position` | Detail 2, Label (literal starts with #\x18, so value is printed as INT32) | +| `6` | Detail 2 Value | +| `Bit Mask` | Detail 2, Label (literal starts with #\x41, so value is printed as HEX8) | +| `0x02` | Detail 2 Value | +| `Unexpected bit value` | `UNITY_TEST_ASSERT_EQUAL_INT` message | + +While this example is a bit contrived, the source of the error can be clearly located to be within the `test_BitExtractor->BitExtractor->BitExtractor_down` diff --git a/examples/example_5/src/ProductionCode.c b/examples/example_5/src/ProductionCode.c new file mode 100644 index 00000000..c6e2b0cd --- /dev/null +++ b/examples/example_5/src/ProductionCode.c @@ -0,0 +1,56 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + +#include "ProductionCode.h" + +#include + +#ifdef UNIT_TESTING +#include "unity.h" +#else +/* No-Op when not testing */ +#define UNITY_DETAIL_PUSH +#define UNITY_DETAIL_POP +#endif + +static void BitExtractor_up(uint8_t input, callback_t cb) +{ + int32_t pos; + UNITY_DETAIL_PUSH(UNITY_DETAIL_CALL, __FUNCTION__); + for(pos=0; pos<8; pos++) { + UNITY_DETAIL_PUSH(UNITY_DETAIL_BIT_POS, pos); + UNITY_DETAIL_PUSH(UNITY_DETAIL_BIT_MASK, 1<>pos); + cb(pos, !!(input & (0x80>>pos))); + UNITY_DETAIL_POP(UNITY_DETAIL_BIT_MASK, 0x80>>pos); + UNITY_DETAIL_POP(UNITY_DETAIL_BIT_POS, pos); + } + UNITY_DETAIL_POP(UNITY_DETAIL_CALL, __FUNCTION__); +} +void BitExtractor(bit_direction_t dir, uint8_t input, callback_t cb) +{ + UNITY_DETAIL_PUSH(UNITY_DETAIL_CALL, __FUNCTION__); + if(dir == BIT_DIRECTION_UP) { + BitExtractor_up(input, cb); + } else { + BitExtractor_down(input, cb); + } + UNITY_DETAIL_POP(UNITY_DETAIL_CALL, __FUNCTION__); +} diff --git a/examples/example_5/src/ProductionCode.h b/examples/example_5/src/ProductionCode.h new file mode 100644 index 00000000..67de534b --- /dev/null +++ b/examples/example_5/src/ProductionCode.h @@ -0,0 +1,16 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + +#include + +typedef void callback_t(int position, int bit_value); +typedef enum { + BIT_DIRECTION_UP, + BIT_DIRECTION_DOWN, +} bit_direction_t; + +void BitExtractor(bit_direction_t dir, uint8_t input, callback_t cb); diff --git a/examples/example_5/subprojects/unity.wrap b/examples/example_5/subprojects/unity.wrap new file mode 100644 index 00000000..6df241bd --- /dev/null +++ b/examples/example_5/subprojects/unity.wrap @@ -0,0 +1,3 @@ +[wrap-git] +url = https://github.com/ThrowTheSwitch/Unity.git +revision = head diff --git a/examples/example_5/test/TestProductionCode.c b/examples/example_5/test/TestProductionCode.c new file mode 100644 index 00000000..38692ad5 --- /dev/null +++ b/examples/example_5/test/TestProductionCode.c @@ -0,0 +1,45 @@ +/* ========================================================================= + Unity - A Test Framework for C + ThrowTheSwitch.org + Copyright (c) 2007-25 Mike Karlesky, Mark VanderVoord, & Greg Williams + SPDX-License-Identifier: MIT +========================================================================= */ + +#include "ProductionCode.h" +#include "unity.h" + +const int* current_expected_bits = NULL; +UNITY_LINE_TYPE current_vector_line = 0; +typedef struct { + UNITY_LINE_TYPE line; + uint8_t value; + bit_direction_t dir; + int expected_bits[8]; +} test_vector_t; + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + +static void be_bit_tester(int position, int value) { + UNITY_TEST_ASSERT_EQUAL_INT(current_expected_bits[position], value, current_vector_line, "Unexpected bit value"); +} + +void test_BitExtractor(void) +{ + const test_vector_t test_vectors[] = { + {__LINE__, 7, BIT_DIRECTION_UP, {1,1,1,0,0,0,0,0}}, + {__LINE__, 7, BIT_DIRECTION_DOWN, {0,0,0,0,0,1,0,1}}, + {0} + }; + const test_vector_t* tv; + for (tv = test_vectors; tv->line; tv++) { + current_vector_line = tv->line; + current_expected_bits = tv->expected_bits; + BitExtractor(tv->dir, tv->value, be_bit_tester); + } +} diff --git a/examples/example_5/test/test_runners/TestProductionCode_Runner.c b/examples/example_5/test/test_runners/TestProductionCode_Runner.c new file mode 100644 index 00000000..564eea31 --- /dev/null +++ b/examples/example_5/test/test_runners/TestProductionCode_Runner.c @@ -0,0 +1,48 @@ +/* AUTOGENERATED FILE. DO NOT EDIT. */ + +/*=======Test Runner Used To Run Each Test Below=====*/ +#define RUN_TEST(TestFunc, TestLineNum) \ +{ \ + Unity.CurrentTestName = #TestFunc; \ + Unity.CurrentTestLineNumber = TestLineNum; \ + Unity.NumberOfTests++; \ + if (TEST_PROTECT()) \ + { \ + setUp(); \ + TestFunc(); \ + } \ + if (TEST_PROTECT()) \ + { \ + tearDown(); \ + } \ + UnityConcludeTest(); \ +} + +/*=======Automagically Detected Files To Include=====*/ +#include "unity.h" +#include +#include +#include "ProductionCode.h" + +/*=======External Functions This Runner Calls=====*/ +extern void setUp(void); +extern void tearDown(void); +extern void test_BitExtractor(void); + + +/*=======Test Reset Option=====*/ +void resetTest(void); +void resetTest(void) +{ + tearDown(); + setUp(); +} + + +/*=======MAIN=====*/ +int main(void) +{ + UnityBegin("test/TestProductionCode.c"); + RUN_TEST(test_BitExtractor, 32); + return UNITY_END(); +} diff --git a/examples/example_5/test/unity_detail_config.h b/examples/example_5/test/unity_detail_config.h new file mode 100644 index 00000000..0305a66e --- /dev/null +++ b/examples/example_5/test/unity_detail_config.h @@ -0,0 +1,18 @@ +#define UNITY_DETAIL_STACK_SIZE 5 +#define LABEL_AS_INT32 "#\x18" /*UNITY_DISPLAY_STYLE_INT32 = 0x18 */ +#define LABEL_AS_HEX8 "#\x41" /* UNITY_DISPLAY_STYLE_HEX8 = 0x41 */ +#define UNITY_DETAIL_LABEL_NAMES { 0, \ + UNITY_DETAIL1_NAME, \ + UNITY_DETAIL2_NAME, \ + "During call", \ + LABEL_AS_INT32 "Bit Position", \ + LABEL_AS_HEX8 "Bit Mask", \ +} +typedef enum { + UNITY_DETAIL_NONE = 0, + UNITY_DETAIL_D1 = 1, + UNITY_DETAIL_D2 = 2, + UNITY_DETAIL_CALL, + UNITY_DETAIL_BIT_POS, + UNITY_DETAIL_BIT_MASK, +} UNITY_DETAIL_LABEL_T; From 69478185a3c909113d2ca032a3f5c14cd2f160ba Mon Sep 17 00:00:00 2001 From: yahyayozo Date: Sat, 19 Apr 2025 18:54:28 +0100 Subject: [PATCH 65/87] [Docs] Fix typos in docs files --- README.md | 2 +- docs/UnityConfigurationGuide.md | 2 +- docs/UnityHelperScriptsGuide.md | 24 ++++++++++++------------ src/unity.h | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 2ebf988e..6be02aa5 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Like INT, there are variants for different sizes also. Compares two integers for equality and display errors as hexadecimal. Like the other integer comparisons, you can specify the size... -here the size will also effect how many nibbles are shown (for example, `HEX16` will show 4 nibbles). +here the size will also affect how many nibbles are shown (for example, `HEX16` will show 4 nibbles). TEST_ASSERT_EQUAL(expected, actual) diff --git a/docs/UnityConfigurationGuide.md b/docs/UnityConfigurationGuide.md index 0b735f7a..c2027fcc 100644 --- a/docs/UnityConfigurationGuide.md +++ b/docs/UnityConfigurationGuide.md @@ -33,7 +33,7 @@ In either case, you've got a couple choices for configuring these options: Unfortunately, it doesn't usually work well to just #define these things in the test itself. These defines need to take effect where ever unity.h is included. -This would be test test, the test runner (if you're generating one), and from unity.c when it's compiled. +This would be the test, the test runner (if you're generating one), and from unity.c when it's compiled. ## The Options diff --git a/docs/UnityHelperScriptsGuide.md b/docs/UnityHelperScriptsGuide.md index 9a8941c2..30841cf9 100644 --- a/docs/UnityHelperScriptsGuide.md +++ b/docs/UnityHelperScriptsGuide.md @@ -94,12 +94,12 @@ UnityTestRunnerGenerator.new.run(testfile, runner_name, options) ``` If you have multiple files to generate in a build script (such as a Rakefile), you might want to instantiate a generator object with your options and call it to generate each runner afterwards. -Like thus: +Like this: ```Ruby gen = UnityTestRunnerGenerator.new(options) test_files.each do |f| - gen.run(f, File.basename(f,'.c')+"Runner.c" + gen.run(f, File.basename(f,'.c')+"Runner.c") end ``` @@ -205,7 +205,7 @@ Few usage examples can be found in `/test/tests/test_unity_parameterized.c` file You should define `UNITY_SUPPORT_TEST_CASES` macro for tests success compiling, if you enable current option. -You can see list of supported macros list in the +You can see a list of supported macros in the [Parameterized tests provided macros](#parameterized-tests-provided-macros) section that follows. @@ -299,7 +299,7 @@ Unity provides support for few param tests generators, that can be combined with each other. You must define test function as usual C function with usual C arguments, and test generator will pass what you tell as a list of arguments. -Let's show how all of them works on the following test function definitions: +Let's show how all of them work on the following test function definitions: ```C /* Place your test generators here, usually one generator per one or few lines */ @@ -401,17 +401,17 @@ TEST_CASE(4, 6, 30) Test matix is an advanced generator. It single call can be converted to zero, one or few `TEST_CASE` equivalent commands. -That generator will create tests for all cobinations of the provided list. Each argument has to be given as a list of one or more elements in the format `[, , ..., , ]`. +That generator will create tests for all combinations of the provided list. Each argument has to be given as a list of one or more elements in the format `[, , ..., , ]`. -All parameters supported by the `TEST_CASE` is supported as arguments: +All parameters supported by the `TEST_CASE` are supported as arguments: - Numbers incl type specifiers e.g. `<1>`, `<1u>`, `<1l>`, `<2.3>`, or `<2.3f>` -- Strings incl string concatianion e.g. `<"string">`, or `<"partial" "string">` +- Strings incl string concatenation e.g. `<"string">`, or `<"partial" "string">` - Chars e.g. `<'c'>` - Enums e.g. `` - Elements of arrays e.g. `` -Let's use our `test_demoParamFunction` test for checking, what ranges -will be generated for our single `TEST_RANGE` row: +Let's use our `test_demoParamFunction` test for checking what ranges +will be generated for our single `TEST_MATRIX` row: ```C TEST_MATRIX([3, 4, 7], [10, 8, 2, 1],[30u, 20.0f]) @@ -450,11 +450,11 @@ As we can see: | Parameter | Format | Count of values | |---|---|---| -| `a` | `[3, 4, 7]` | 2 | +| `a` | `[3, 4, 7]` | 3 | | `b` | `[10, 8, 2, 1]` | 4 | | `c` | `[30u, 20.0f]` | 2 | -We totally have 2 * 4 * 2 = 16 equal test cases, that can be written as following: +We totally have 3 * 4 * 2 = 24 equal test cases, that can be written as following: ```C TEST_CASE(3, 10, 30u) @@ -516,7 +516,7 @@ ruby unity_test_summary.rb build/test/ ~/projects/myproject/ Or, if you're more of a Windows sort of person: ```Shell -ruby unity_test_summary.rb build\teat\ C:\projects\myproject\ +ruby unity_test_summary.rb build\test\ C:\projects\myproject\ ``` When configured correctly, you'll see a final summary, like so: diff --git a/src/unity.h b/src/unity.h index 9e2a97b7..3d176da9 100644 --- a/src/unity.h +++ b/src/unity.h @@ -45,7 +45,7 @@ int suiteTearDown(int num_failures); * Test Reset and Verify *-------------------------------------------------------*/ -/* These functions are intended to be called before during tests in order +/* These functions are intended to be called before or during tests in order * to support complex test loops, etc. Both are NOT built into Unity. Instead * the test runner generator will create them. resetTest will run teardown and * setup again, verifying any end-of-test needs between. verifyTest will only From 3fb2484313aa550c274203fe59457bf33f76596b Mon Sep 17 00:00:00 2001 From: Roland Stahn Date: Tue, 27 May 2025 14:33:15 +0200 Subject: [PATCH 66/87] Add IAR specific mapping for UNITY_NORETURN --- src/unity_internals.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/unity_internals.h b/src/unity_internals.h index 562f5b6d..97fc9b49 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -87,6 +87,13 @@ /* Since C23, the keyword _Noreturn has been replaced by the attribute noreturn, based on: */ /* https://en.cppreference.com/w/c/language/attributes/noreturn */ #define UNITY_NORETURN [[ noreturn ]] + #elif defined(__IAR_SYSTEMS_ICC__) && (__IAR_SYSTEMS_ICC__ >= 8) + /* For IAR compilers supporting at least C99 use the IAR specific '__noreturn' keyword */ + /* Based on tests and: */ + /* https://wwwfiles.iar.com/arm/webic/doc/EWARM_DevelopmentGuide.ENU.pdf */ + /* https://wwwfiles.iar.com/AVR/webic/doc/EWAVR_CompilerGuide.pdf */ + /* https://wwwfiles.iar.com/msp430/webic/doc/EW430_CompilerReference.pdf */ + #define UNITY_NORETURN __noreturn #endif #endif #ifndef UNITY_NORETURN From 5edda03c780eca28f3af3218eade98af14cf3c00 Mon Sep 17 00:00:00 2001 From: Roland Stahn Date: Wed, 28 May 2025 09:55:17 +0200 Subject: [PATCH 67/87] Cleanup definition of UNITY_COMPARISON_T in unity_internals.h remove unused values UNITY_WITHIN and UNITY_UNKNOWN update value UNITY_NOT_EQUAL --- src/unity_internals.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/unity_internals.h b/src/unity_internals.h index 97fc9b49..d12e3a7a 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -487,14 +487,12 @@ typedef enum typedef enum { - UNITY_WITHIN = 0x0, UNITY_EQUAL_TO = 0x1, UNITY_GREATER_THAN = 0x2, UNITY_GREATER_OR_EQUAL = 0x2 + UNITY_EQUAL_TO, UNITY_SMALLER_THAN = 0x4, UNITY_SMALLER_OR_EQUAL = 0x4 + UNITY_EQUAL_TO, - UNITY_NOT_EQUAL = 0x0, - UNITY_UNKNOWN + UNITY_NOT_EQUAL = 0x6 } UNITY_COMPARISON_T; #ifndef UNITY_EXCLUDE_FLOAT From 50c37200b9f5c422c332615b171e033d88d2b1e8 Mon Sep 17 00:00:00 2001 From: Roland Stahn Date: Wed, 28 May 2025 10:07:04 +0200 Subject: [PATCH 68/87] Fix definition of UNITY_NOT_EQUAL in unity_internals.h --- src/unity_internals.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unity_internals.h b/src/unity_internals.h index d12e3a7a..f83fdc6e 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -492,7 +492,7 @@ typedef enum UNITY_GREATER_OR_EQUAL = 0x2 + UNITY_EQUAL_TO, UNITY_SMALLER_THAN = 0x4, UNITY_SMALLER_OR_EQUAL = 0x4 + UNITY_EQUAL_TO, - UNITY_NOT_EQUAL = 0x6 + UNITY_NOT_EQUAL = 0x8 } UNITY_COMPARISON_T; #ifndef UNITY_EXCLUDE_FLOAT From bcb0746186d752665b6d2debd960f94a84d090c7 Mon Sep 17 00:00:00 2001 From: Buccno Date: Thu, 5 Jun 2025 11:00:57 +0300 Subject: [PATCH 69/87] fix: Correct UINT max value handling --- src/unity.c | 41 ++++++++++++++++++++++++++++-------- src/unity_internals.h | 49 ++++++++++++++++++++++++------------------- 2 files changed, 60 insertions(+), 30 deletions(-) diff --git a/src/unity.c b/src/unity.c index 7fa2dc63..5f719aad 100644 --- a/src/unity.c +++ b/src/unity.c @@ -223,10 +223,6 @@ void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T UnityPrintNumber(number); } } - else if ((style & UNITY_DISPLAY_RANGE_UINT) == UNITY_DISPLAY_RANGE_UINT) - { - UnityPrintNumberUnsigned((UNITY_UINT)number); - } else { UNITY_OUTPUT_CHAR('0'); @@ -235,6 +231,14 @@ void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T } } +void UnityPrintUintNumberByStyle(const UNITY_UINT number, const UNITY_DISPLAY_STYLE_T style) +{ + if ((style & UNITY_DISPLAY_RANGE_UINT) == UNITY_DISPLAY_RANGE_UINT) + { + UnityPrintNumberUnsigned(number); + } +} + /*-----------------------------------------------*/ void UnityPrintNumber(const UNITY_INT number_to_print) { @@ -709,11 +713,11 @@ void UnityAssertBits(const UNITY_INT mask, } /*-----------------------------------------------*/ -void UnityAssertEqualNumber(const UNITY_INT expected, - const UNITY_INT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style) +void UnityAssertEqualIntNumber(const UNITY_INT expected, + const UNITY_INT actual, + const char* msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style) { RETURN_IF_FAIL_OR_IGNORE; @@ -729,6 +733,25 @@ void UnityAssertEqualNumber(const UNITY_INT expected, } } +void UnityAssertEqualUintNumber(const UNITY_UINT expected, + const UNITY_UINT actual, + const char* msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style) +{ + RETURN_IF_FAIL_OR_IGNORE; + + if (expected != actual) + { + UnityTestResultsFailBegin(lineNumber); + UnityPrint(UnityStrExpected); + UnityPrintUintNumberByStyle(expected, style); + UnityPrint(UnityStrWas); + UnityPrintUintNumberByStyle(actual, style); + UnityAddMsgIfSpecified(msg); + UNITY_FAIL_AND_BAIL; + } +} /*-----------------------------------------------*/ void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold, const UNITY_INT actual, diff --git a/src/unity_internals.h b/src/unity_internals.h index f83fdc6e..7311e544 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -596,6 +596,7 @@ void UnityPrintF(const UNITY_LINE_TYPE line, const char* format, ...); void UnityPrintLen(const char* string, const UNITY_UINT32 length); void UnityPrintMask(const UNITY_UINT mask, const UNITY_UINT number); void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style); +void UnityPrintUintNumberByStyle(const UNITY_UINT number, const UNITY_DISPLAY_STYLE_T style); void UnityPrintNumber(const UNITY_INT number_to_print); void UnityPrintNumberUnsigned(const UNITY_UINT number); void UnityPrintNumberHex(const UNITY_UINT number, const char nibbles_to_print); @@ -612,11 +613,17 @@ void UnityPrintFloat(const UNITY_DOUBLE input_number); * convention and will pull in file and line information * for you. */ -void UnityAssertEqualNumber(const UNITY_INT expected, - const UNITY_INT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style); +void UnityAssertEqualIntNumber(const UNITY_INT expected, + const UNITY_INT actual, + const char* msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style); + +void UnityAssertEqualUintNumber(const UNITY_UINT expected, + const UNITY_UINT actual, + const char* msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style); void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold, const UNITY_INT actual, @@ -899,18 +906,18 @@ int UnityTestMatches(void); #define UNITY_TEST_ASSERT_EMPTY(pointer, line, message) UNITY_TEST_ASSERT(((pointer[0]) == 0), (line), (message)) #define UNITY_TEST_ASSERT_NOT_EMPTY(pointer, line, message) UNITY_TEST_ASSERT(((pointer[0]) != 0), (line), (message)) -#define UNITY_TEST_ASSERT_EQUAL_INT(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_EQUAL_UINT(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_EQUAL_CHAR(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) +#define UNITY_TEST_ASSERT_EQUAL_INT(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) +#define UNITY_TEST_ASSERT_EQUAL_INT8(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) +#define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) +#define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) +#define UNITY_TEST_ASSERT_EQUAL_UINT(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(expected), (UNITY_UINT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) +#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) +#define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) +#define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) +#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) +#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) +#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) +#define UNITY_TEST_ASSERT_EQUAL_CHAR(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) #define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message) UnityAssertBits((UNITY_INT)(mask), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line)) #define UNITY_TEST_ASSERT_NOT_EQUAL_INT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) @@ -1005,7 +1012,7 @@ int UnityTestMatches(void); #define UNITY_TEST_ASSERT_CHAR_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT8 )(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message) UnityAssertEqualNumber((UNITY_PTR_TO_INT)(expected), (UNITY_PTR_TO_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER) +#define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_PTR_TO_INT)(expected), (UNITY_PTR_TO_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER) #define UNITY_TEST_ASSERT_EQUAL_STRING(expected, actual, line, message) UnityAssertEqualString((const char*)(expected), (const char*)(actual), (message), (UNITY_LINE_TYPE)(line)) #define UNITY_TEST_ASSERT_EQUAL_STRING_LEN(expected, actual, len, line, message) UnityAssertEqualStringLen((const char*)(expected), (const char*)(actual), (UNITY_UINT32)(len), (message), (UNITY_LINE_TYPE)(line)) #define UNITY_TEST_ASSERT_EQUAL_MEMORY(expected, actual, len, line, message) UnityAssertEqualMemory((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(len), 1, (message), (UNITY_LINE_TYPE)(line), UNITY_ARRAY_TO_ARRAY) @@ -1043,9 +1050,9 @@ int UnityTestMatches(void); #define UNITY_TEST_ASSERT_EACH_EQUAL_CHAR(expected, actual, num_elements, line, message) UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT8 )(expected), 1), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR, UNITY_ARRAY_TO_VAL) #ifdef UNITY_SUPPORT_64 -#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message) UnityAssertEqualNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) +#define UNITY_TEST_ASSERT_EQUAL_INT64(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) +#define UNITY_TEST_ASSERT_EQUAL_UINT64(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) +#define UNITY_TEST_ASSERT_EQUAL_HEX64(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) #define UNITY_TEST_ASSERT_EQUAL_INT64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64, UNITY_ARRAY_TO_ARRAY) #define UNITY_TEST_ASSERT_EQUAL_UINT64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64, UNITY_ARRAY_TO_ARRAY) #define UNITY_TEST_ASSERT_EQUAL_HEX64_ARRAY(expected, actual, num_elements, line, message) UnityAssertEqualIntArray((UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64, UNITY_ARRAY_TO_ARRAY) From ac52c4182a8c8105a3cddd6593423701aea879d7 Mon Sep 17 00:00:00 2001 From: burakutkuc Date: Fri, 13 Jun 2025 16:25:22 +0300 Subject: [PATCH 70/87] fix: Fail when values are equal but equality is not allowed. Handled HEX asserts as unsigned; applied the same unsigned logic across all integer-based comparisons. --- src/unity.c | 160 +++++++++++++++---------- src/unity_internals.h | 264 ++++++++++++++++++++++-------------------- 2 files changed, 239 insertions(+), 185 deletions(-) diff --git a/src/unity.c b/src/unity.c index 5f719aad..fc6cd710 100644 --- a/src/unity.c +++ b/src/unity.c @@ -185,7 +185,7 @@ void UnityPrintLen(const char* string, const UNITY_UINT32 length) } /*-----------------------------------------------*/ -void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style) +void UnityPrintIntNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style) { if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT) { @@ -223,12 +223,6 @@ void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T UnityPrintNumber(number); } } - else - { - UNITY_OUTPUT_CHAR('0'); - UNITY_OUTPUT_CHAR('x'); - UnityPrintNumberHex((UNITY_UINT)number, (char)((style & 0xF) * 2)); - } } void UnityPrintUintNumberByStyle(const UNITY_UINT number, const UNITY_DISPLAY_STYLE_T style) @@ -237,6 +231,12 @@ void UnityPrintUintNumberByStyle(const UNITY_UINT number, const UNITY_DISPLAY_ST { UnityPrintNumberUnsigned(number); } + else + { + UNITY_OUTPUT_CHAR('0'); + UNITY_OUTPUT_CHAR('x'); + UnityPrintNumberHex((UNITY_UINT)number, (char)((style & 0xF) * 2)); + } } /*-----------------------------------------------*/ @@ -725,9 +725,9 @@ void UnityAssertEqualIntNumber(const UNITY_INT expected, { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(expected, style); + UnityPrintIntNumberByStyle(expected, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(actual, style); + UnityPrintIntNumberByStyle(actual, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -753,40 +753,62 @@ void UnityAssertEqualUintNumber(const UNITY_UINT expected, } } /*-----------------------------------------------*/ -void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold, - const UNITY_INT actual, - const UNITY_COMPARISON_T compare, - const char *msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style) +void UnityAssertIntGreaterOrLessOrEqualNumber(const UNITY_INT threshold, + const UNITY_INT actual, + const UNITY_COMPARISON_T compare, + const char *msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style) { int failed = 0; RETURN_IF_FAIL_OR_IGNORE; - if ((threshold == actual) && (compare & UNITY_EQUAL_TO)) { return; } - if ((threshold == actual)) { failed = 1; } + if ((threshold == actual) && !(compare & UNITY_EQUAL_TO)) { failed = 1; } - if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT) - { - if ((actual > threshold) && (compare & UNITY_SMALLER_THAN)) { failed = 1; } - if ((actual < threshold) && (compare & UNITY_GREATER_THAN)) { failed = 1; } - } - else /* UINT or HEX */ + if ((actual > threshold) && (compare & UNITY_SMALLER_THAN)) { failed = 1; } + if ((actual < threshold) && (compare & UNITY_GREATER_THAN)) { failed = 1; } + + if (failed) { - if (((UNITY_UINT)actual > (UNITY_UINT)threshold) && (compare & UNITY_SMALLER_THAN)) { failed = 1; } - if (((UNITY_UINT)actual < (UNITY_UINT)threshold) && (compare & UNITY_GREATER_THAN)) { failed = 1; } + UnityTestResultsFailBegin(lineNumber); + UnityPrint(UnityStrExpected); + UnityPrintIntNumberByStyle(actual, style); + if (compare & UNITY_GREATER_THAN) { UnityPrint(UnityStrGt); } + if (compare & UNITY_SMALLER_THAN) { UnityPrint(UnityStrLt); } + if (compare & UNITY_EQUAL_TO) { UnityPrint(UnityStrOrEqual); } + if (compare == UNITY_NOT_EQUAL) { UnityPrint(UnityStrNotEqual); } + UnityPrintIntNumberByStyle(threshold, style); + UnityAddMsgIfSpecified(msg); + UNITY_FAIL_AND_BAIL; } +} + +void UnityAssertUintGreaterOrLessOrEqualNumber(const UNITY_UINT threshold, + const UNITY_UINT actual, + const UNITY_COMPARISON_T compare, + const char *msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style) +{ + int failed = 0; + RETURN_IF_FAIL_OR_IGNORE; + + if ((threshold == actual) && !(compare & UNITY_EQUAL_TO)) { failed = 1; } + + /* UINT or HEX */ + if ((actual > threshold) && (compare & UNITY_SMALLER_THAN)) { failed = 1; } + if ((actual < threshold) && (compare & UNITY_GREATER_THAN)) { failed = 1; } if (failed) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(actual, style); + UnityPrintUintNumberByStyle(actual, style); if (compare & UNITY_GREATER_THAN) { UnityPrint(UnityStrGt); } if (compare & UNITY_SMALLER_THAN) { UnityPrint(UnityStrLt); } if (compare & UNITY_EQUAL_TO) { UnityPrint(UnityStrOrEqual); } if (compare == UNITY_NOT_EQUAL) { UnityPrint(UnityStrNotEqual); } - UnityPrintNumberByStyle(threshold, style); + UnityPrintUintNumberByStyle(threshold, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -900,9 +922,9 @@ void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected, UnityPrint(UnityStrElement); UnityPrintNumberUnsigned(num_elements - elements - 1); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(expect_val, style); + UnityPrintIntNumberByStyle(expect_val, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(actual_val, style); + UnityPrintIntNumberByStyle(actual_val, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -1400,47 +1422,65 @@ void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual, #endif /* not UNITY_EXCLUDE_DOUBLE */ /*-----------------------------------------------*/ -void UnityAssertNumbersWithin(const UNITY_UINT delta, - const UNITY_INT expected, - const UNITY_INT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style) +void UnityAssertIntNumbersWithin(const UNITY_UINT delta, + const UNITY_INT expected, + const UNITY_INT actual, + const char* msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style) { RETURN_IF_FAIL_OR_IGNORE; - if ((style & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT) + if (actual > expected) { - if (actual > expected) - { - Unity.CurrentTestFailed = (((UNITY_UINT)actual - (UNITY_UINT)expected) > delta); - } - else - { - Unity.CurrentTestFailed = (((UNITY_UINT)expected - (UNITY_UINT)actual) > delta); - } + Unity.CurrentTestFailed = (((UNITY_UINT)actual - (UNITY_UINT)expected) > delta); } else { - if ((UNITY_UINT)actual > (UNITY_UINT)expected) - { - Unity.CurrentTestFailed = (((UNITY_UINT)actual - (UNITY_UINT)expected) > delta); - } - else - { - Unity.CurrentTestFailed = (((UNITY_UINT)expected - (UNITY_UINT)actual) > delta); - } + Unity.CurrentTestFailed = (((UNITY_UINT)expected - (UNITY_UINT)actual) > delta); + } + + if (Unity.CurrentTestFailed) + { + UnityTestResultsFailBegin(lineNumber); + UnityPrint(UnityStrDelta); + UnityPrintIntNumberByStyle((UNITY_INT)delta, style); + UnityPrint(UnityStrExpected); + UnityPrintIntNumberByStyle(expected, style); + UnityPrint(UnityStrWas); + UnityPrintIntNumberByStyle(actual, style); + UnityAddMsgIfSpecified(msg); + UNITY_FAIL_AND_BAIL; + } +} + +void UnityAssertUintNumbersWithin(const UNITY_UINT delta, + const UNITY_UINT expected, + const UNITY_UINT actual, + const char* msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style) +{ + RETURN_IF_FAIL_OR_IGNORE; + + if (actual > expected) + { + Unity.CurrentTestFailed = ((actual - expected) > delta); + } + else + { + Unity.CurrentTestFailed = ((expected - actual) > delta); } if (Unity.CurrentTestFailed) { UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrDelta); - UnityPrintNumberByStyle((UNITY_INT)delta, style); + UnityPrintUintNumberByStyle(delta, style); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(expected, style); + UnityPrintUintNumberByStyle(expected, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(actual, style); + UnityPrintUintNumberByStyle(actual, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -1591,13 +1631,13 @@ void UnityAssertNumbersArrayWithin(const UNITY_UINT delta, } UnityTestResultsFailBegin(lineNumber); UnityPrint(UnityStrDelta); - UnityPrintNumberByStyle((UNITY_INT)delta, style); + UnityPrintIntNumberByStyle((UNITY_INT)delta, style); UnityPrint(UnityStrElement); UnityPrintNumberUnsigned(num_elements - elements - 1); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(expect_val, style); + UnityPrintIntNumberByStyle(expect_val, style); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(actual_val, style); + UnityPrintIntNumberByStyle(actual_val, style); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } @@ -1828,9 +1868,9 @@ void UnityAssertEqualMemory(UNITY_INTERNAL_PTR expected, UnityPrint(UnityStrByte); UnityPrintNumberUnsigned(length - bytes - 1); UnityPrint(UnityStrExpected); - UnityPrintNumberByStyle(*ptr_exp, UNITY_DISPLAY_STYLE_HEX8); + UnityPrintIntNumberByStyle(*ptr_exp, UNITY_DISPLAY_STYLE_HEX8); UnityPrint(UnityStrWas); - UnityPrintNumberByStyle(*ptr_act, UNITY_DISPLAY_STYLE_HEX8); + UnityPrintIntNumberByStyle(*ptr_act, UNITY_DISPLAY_STYLE_HEX8); UnityAddMsgIfSpecified(msg); UNITY_FAIL_AND_BAIL; } diff --git a/src/unity_internals.h b/src/unity_internals.h index 7311e544..19766982 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -595,7 +595,7 @@ void UnityPrintF(const UNITY_LINE_TYPE line, const char* format, ...); void UnityPrintLen(const char* string, const UNITY_UINT32 length); void UnityPrintMask(const UNITY_UINT mask, const UNITY_UINT number); -void UnityPrintNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style); +void UnityPrintIntNumberByStyle(const UNITY_INT number, const UNITY_DISPLAY_STYLE_T style); void UnityPrintUintNumberByStyle(const UNITY_UINT number, const UNITY_DISPLAY_STYLE_T style); void UnityPrintNumber(const UNITY_INT number_to_print); void UnityPrintNumberUnsigned(const UNITY_UINT number); @@ -625,12 +625,19 @@ void UnityAssertEqualUintNumber(const UNITY_UINT expected, const UNITY_LINE_TYPE lineNumber, const UNITY_DISPLAY_STYLE_T style); -void UnityAssertGreaterOrLessOrEqualNumber(const UNITY_INT threshold, - const UNITY_INT actual, - const UNITY_COMPARISON_T compare, - const char *msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style); +void UnityAssertIntGreaterOrLessOrEqualNumber(const UNITY_INT threshold, + const UNITY_INT actual, + const UNITY_COMPARISON_T compare, + const char *msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style); + +void UnityAssertUintGreaterOrLessOrEqualNumber(const UNITY_UINT threshold, + const UNITY_UINT actual, + const UNITY_COMPARISON_T compare, + const char *msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style); void UnityAssertEqualIntArray(UNITY_INTERNAL_PTR expected, UNITY_INTERNAL_PTR actual, @@ -672,12 +679,19 @@ void UnityAssertEqualMemory( UNITY_INTERNAL_PTR expected, const UNITY_LINE_TYPE lineNumber, const UNITY_FLAGS_T flags); -void UnityAssertNumbersWithin(const UNITY_UINT delta, - const UNITY_INT expected, - const UNITY_INT actual, - const char* msg, - const UNITY_LINE_TYPE lineNumber, - const UNITY_DISPLAY_STYLE_T style); +void UnityAssertIntNumbersWithin(const UNITY_UINT delta, + const UNITY_INT expected, + const UNITY_INT actual, + const char* msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style); + +void UnityAssertUintNumbersWithin(const UNITY_UINT delta, + const UNITY_UINT expected, + const UNITY_UINT actual, + const char* msg, + const UNITY_LINE_TYPE lineNumber, + const UNITY_DISPLAY_STYLE_T style); void UnityAssertNumbersArrayWithin(const UNITY_UINT delta, UNITY_INTERNAL_PTR expected, @@ -911,105 +925,105 @@ int UnityTestMatches(void); #define UNITY_TEST_ASSERT_EQUAL_INT16(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) #define UNITY_TEST_ASSERT_EQUAL_INT32(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) #define UNITY_TEST_ASSERT_EQUAL_UINT(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(expected), (UNITY_UINT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) +#define UNITY_TEST_ASSERT_EQUAL_UINT8(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(UNITY_UINT8)(expected), (UNITY_UINT)(UNITY_UINT8)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) #define UNITY_TEST_ASSERT_EQUAL_UINT16(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) #define UNITY_TEST_ASSERT_EQUAL_UINT32(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT16)(expected), (UNITY_INT)(UNITY_INT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT32)(expected), (UNITY_INT)(UNITY_INT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) +#define UNITY_TEST_ASSERT_EQUAL_HEX8(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(UNITY_UINT8)(expected), (UNITY_UINT)(UNITY_UINT8)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) +#define UNITY_TEST_ASSERT_EQUAL_HEX16(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) +#define UNITY_TEST_ASSERT_EQUAL_HEX32(expected, actual, line, message) UnityAssertEqualUintNumber((UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) #define UNITY_TEST_ASSERT_EQUAL_CHAR(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_INT)(UNITY_INT8 )(expected), (UNITY_INT)(UNITY_INT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) #define UNITY_TEST_ASSERT_BITS(mask, expected, actual, line, message) UnityAssertBits((UNITY_INT)(mask), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line)) -#define UNITY_TEST_ASSERT_NOT_EQUAL_INT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_NOT_EQUAL_INT8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_NOT_EQUAL_INT16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_NOT_EQUAL_INT32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_NOT_EQUAL_UINT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_NOT_EQUAL_UINT8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_NOT_EQUAL_UINT16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_NOT_EQUAL_UINT32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_NOT_EQUAL_HEX8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_NOT_EQUAL_HEX16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_NOT_EQUAL_HEX32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_NOT_EQUAL_CHAR(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) - -#define UNITY_TEST_ASSERT_GREATER_THAN_INT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_GREATER_THAN_INT8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_GREATER_THAN_INT16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_GREATER_THAN_INT32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_GREATER_THAN_UINT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_GREATER_THAN_UINT8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_GREATER_THAN_UINT16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_GREATER_THAN_UINT32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_GREATER_THAN_HEX8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_GREATER_THAN_HEX16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_GREATER_THAN_HEX32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_GREATER_THAN_CHAR(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) - -#define UNITY_TEST_ASSERT_SMALLER_THAN_INT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_SMALLER_THAN_INT8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_SMALLER_THAN_INT16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_SMALLER_THAN_INT32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_SMALLER_THAN_CHAR(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) - -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT) (threshold), (UNITY_INT) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 ) (threshold), (UNITY_INT)(UNITY_INT8 ) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16) (threshold), (UNITY_INT)(UNITY_INT16) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32) (threshold), (UNITY_INT)(UNITY_INT32) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT) (threshold), (UNITY_INT) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_CHAR(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 ) (threshold), (UNITY_INT)(UNITY_INT8 ) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) - -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT) (threshold), (UNITY_INT) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 ) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT) (threshold), (UNITY_INT) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT8 )(threshold), (UNITY_INT)(UNITY_UINT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT16)(threshold), (UNITY_INT)(UNITY_UINT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX32(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_UINT32)(threshold), (UNITY_INT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_CHAR(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 ) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) - -#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin( (delta), (UNITY_INT) (expected), (UNITY_INT) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 ) (expected), (UNITY_INT)(UNITY_INT8 ) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_INT16) (expected), (UNITY_INT)(UNITY_INT16) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_INT32_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_INT32) (expected), (UNITY_INT)(UNITY_INT32) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) -#define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin( (delta), (UNITY_INT) (expected), (UNITY_INT) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) -#define UNITY_TEST_ASSERT_UINT8_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) -#define UNITY_TEST_ASSERT_UINT16_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) -#define UNITY_TEST_ASSERT_UINT32_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) -#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) -#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) -#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_INT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) -#define UNITY_TEST_ASSERT_CHAR_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 ) (expected), (UNITY_INT)(UNITY_INT8 ) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) - -#define UNITY_TEST_ASSERT_INT_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin( (delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_INT8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT8 )(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_INT16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_INT32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_UINT_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin( (delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_UINT8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT8 )(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_UINT16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_UINT32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_HEX8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT8 )(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_HEX16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_HEX32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_CHAR_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT8 )(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_NOT_EQUAL_INT(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) +#define UNITY_TEST_ASSERT_NOT_EQUAL_INT8(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) +#define UNITY_TEST_ASSERT_NOT_EQUAL_INT16(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) +#define UNITY_TEST_ASSERT_NOT_EQUAL_INT32(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) +#define UNITY_TEST_ASSERT_NOT_EQUAL_UINT(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) +#define UNITY_TEST_ASSERT_NOT_EQUAL_UINT8(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT8 )(threshold), (UNITY_UINT)(UNITY_UINT8 )(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) +#define UNITY_TEST_ASSERT_NOT_EQUAL_UINT16(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT16)(threshold), (UNITY_UINT)(UNITY_UINT16)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) +#define UNITY_TEST_ASSERT_NOT_EQUAL_UINT32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) +#define UNITY_TEST_ASSERT_NOT_EQUAL_HEX8(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT8 )(threshold), (UNITY_UINT)(UNITY_UINT8 )(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) +#define UNITY_TEST_ASSERT_NOT_EQUAL_HEX16(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT16)(threshold), (UNITY_UINT)(UNITY_UINT16)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) +#define UNITY_TEST_ASSERT_NOT_EQUAL_HEX32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) +#define UNITY_TEST_ASSERT_NOT_EQUAL_CHAR(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) + +#define UNITY_TEST_ASSERT_GREATER_THAN_INT(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) +#define UNITY_TEST_ASSERT_GREATER_THAN_INT8(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) +#define UNITY_TEST_ASSERT_GREATER_THAN_INT16(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) +#define UNITY_TEST_ASSERT_GREATER_THAN_INT32(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) +#define UNITY_TEST_ASSERT_GREATER_THAN_UINT(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) +#define UNITY_TEST_ASSERT_GREATER_THAN_UINT8(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT8 )(threshold), (UNITY_UINT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) +#define UNITY_TEST_ASSERT_GREATER_THAN_UINT16(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT16)(threshold), (UNITY_UINT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) +#define UNITY_TEST_ASSERT_GREATER_THAN_UINT32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) +#define UNITY_TEST_ASSERT_GREATER_THAN_HEX8(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT8 )(threshold), (UNITY_UINT)(UNITY_UINT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) +#define UNITY_TEST_ASSERT_GREATER_THAN_HEX16(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT16)(threshold), (UNITY_UINT)(UNITY_UINT16)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) +#define UNITY_TEST_ASSERT_GREATER_THAN_HEX32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) +#define UNITY_TEST_ASSERT_GREATER_THAN_CHAR(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) + +#define UNITY_TEST_ASSERT_SMALLER_THAN_INT(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) +#define UNITY_TEST_ASSERT_SMALLER_THAN_INT8(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) +#define UNITY_TEST_ASSERT_SMALLER_THAN_INT16(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) +#define UNITY_TEST_ASSERT_SMALLER_THAN_INT32(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) +#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) +#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT8(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT8 )(threshold), (UNITY_UINT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) +#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT16(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT16)(threshold), (UNITY_UINT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) +#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) +#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX8(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT8 )(threshold), (UNITY_UINT)(UNITY_UINT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) +#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX16(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT16)(threshold), (UNITY_UINT)(UNITY_UINT16)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) +#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) +#define UNITY_TEST_ASSERT_SMALLER_THAN_CHAR(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 )(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) + +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT) (threshold), (UNITY_INT) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT8(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 ) (threshold), (UNITY_INT)(UNITY_INT8 ) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT16(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16) (threshold), (UNITY_INT)(UNITY_INT16) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT32(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32) (threshold), (UNITY_INT)(UNITY_INT32) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT) (threshold), (UNITY_UINT) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT8(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT8 )(threshold), (UNITY_UINT)(UNITY_UINT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT16(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT16)(threshold), (UNITY_UINT)(UNITY_UINT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX8(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT8 )(threshold), (UNITY_UINT)(UNITY_UINT8 )(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX16(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT16)(threshold), (UNITY_UINT)(UNITY_UINT16)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_CHAR(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 ) (threshold), (UNITY_INT)(UNITY_INT8 ) (actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) + +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT) (threshold), (UNITY_INT) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT8(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 ) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT16(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT16)(threshold), (UNITY_INT)(UNITY_INT16) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT32(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT32)(threshold), (UNITY_INT)(UNITY_INT32) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT) (threshold), (UNITY_UINT) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT8(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT8 )(threshold), (UNITY_UINT)(UNITY_UINT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT16(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT16)(threshold), (UNITY_UINT)(UNITY_UINT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX8(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT8 )(threshold), (UNITY_UINT)(UNITY_UINT8 )(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX16(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT16)(threshold), (UNITY_UINT)(UNITY_UINT16)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_CHAR(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 ) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) + +#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin( (delta), (UNITY_INT) (expected), (UNITY_INT) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) +#define UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 ) (expected), (UNITY_INT)(UNITY_INT8 ) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) +#define UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_INT16) (expected), (UNITY_INT)(UNITY_INT16) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) +#define UNITY_TEST_ASSERT_INT32_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_INT32) (expected), (UNITY_INT)(UNITY_INT32) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) +#define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin( (delta), (UNITY_UINT) (expected), (UNITY_UINT) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) +#define UNITY_TEST_ASSERT_UINT8_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((UNITY_UINT8 )(delta), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) +#define UNITY_TEST_ASSERT_UINT16_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((UNITY_UINT16)(delta), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) +#define UNITY_TEST_ASSERT_UINT32_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((UNITY_UINT32)(delta), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32) +#define UNITY_TEST_ASSERT_HEX8_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((UNITY_UINT8 )(delta), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8) +#define UNITY_TEST_ASSERT_HEX16_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((UNITY_UINT16)(delta), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16) +#define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((UNITY_UINT32)(delta), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) +#define UNITY_TEST_ASSERT_CHAR_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 ) (expected), (UNITY_INT)(UNITY_INT8 ) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) + +#define UNITY_TEST_ASSERT_INT_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertIntNumbersWithin( (delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_INT8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertIntNumbersWithin((UNITY_UINT8)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_INT16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertIntNumbersWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_INT32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertIntNumbersWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_UINT_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin( (delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_UINT8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT8)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_UINT16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_UINT32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_HEX8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_HEX16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_HEX32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_CHAR_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertIntNumbersWithin((UNITY_UINT8)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR, UNITY_ARRAY_TO_ARRAY) #define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_PTR_TO_INT)(expected), (UNITY_PTR_TO_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER) @@ -1059,24 +1073,24 @@ int UnityTestMatches(void); #define UNITY_TEST_ASSERT_EACH_EQUAL_INT64(expected, actual, num_elements, line, message) UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT64)(expected), 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64, UNITY_ARRAY_TO_VAL) #define UNITY_TEST_ASSERT_EACH_EQUAL_UINT64(expected, actual, num_elements, line, message) UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT64)(expected), 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64, UNITY_ARRAY_TO_VAL) #define UNITY_TEST_ASSERT_EACH_EQUAL_HEX64(expected, actual, num_elements, line, message) UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT64)(expected), 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64, UNITY_ARRAY_TO_VAL) -#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message) UnityAssertNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) -#define UNITY_TEST_ASSERT_NOT_EQUAL_INT64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_NOT_EQUAL_UINT64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_NOT_EQUAL_HEX64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) -#define UNITY_TEST_ASSERT_GREATER_THAN_INT64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) -#define UNITY_TEST_ASSERT_SMALLER_THAN_INT64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64(threshold, actual, line, message) UnityAssertGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) +#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((delta), (expected), (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) +#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((delta), (expected), (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) +#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((delta), (expected), (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) +#define UNITY_TEST_ASSERT_NOT_EQUAL_INT64(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) +#define UNITY_TEST_ASSERT_NOT_EQUAL_UINT64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) +#define UNITY_TEST_ASSERT_NOT_EQUAL_HEX64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) +#define UNITY_TEST_ASSERT_GREATER_THAN_INT64(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) +#define UNITY_TEST_ASSERT_GREATER_THAN_UINT64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) +#define UNITY_TEST_ASSERT_GREATER_THAN_HEX64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_GREATER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_INT64(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_UINT64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) +#define UNITY_TEST_ASSERT_GREATER_OR_EQUAL_HEX64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_GREATER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) +#define UNITY_TEST_ASSERT_SMALLER_THAN_INT64(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) +#define UNITY_TEST_ASSERT_SMALLER_THAN_UINT64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) +#define UNITY_TEST_ASSERT_SMALLER_THAN_HEX64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_SMALLER_THAN, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_INT64(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_UINT64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) +#define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) #define UNITY_TEST_ASSERT_INT64_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT64)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64, UNITY_ARRAY_TO_ARRAY) #define UNITY_TEST_ASSERT_UINT64_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT64)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64, UNITY_ARRAY_TO_ARRAY) #define UNITY_TEST_ASSERT_HEX64_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT64)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64, UNITY_ARRAY_TO_ARRAY) From 6a3fc440e33b577a6948669f5457096242538e1e Mon Sep 17 00:00:00 2001 From: burakutkuc Date: Fri, 13 Jun 2025 16:43:35 +0300 Subject: [PATCH 71/87] fix: Add casts in function-like macros for type safety --- src/unity_internals.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/unity_internals.h b/src/unity_internals.h index 19766982..445363d9 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -1073,9 +1073,9 @@ int UnityTestMatches(void); #define UNITY_TEST_ASSERT_EACH_EQUAL_INT64(expected, actual, num_elements, line, message) UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT64)(expected), 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64, UNITY_ARRAY_TO_VAL) #define UNITY_TEST_ASSERT_EACH_EQUAL_UINT64(expected, actual, num_elements, line, message) UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_UINT64)(expected), 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64, UNITY_ARRAY_TO_VAL) #define UNITY_TEST_ASSERT_EACH_EQUAL_HEX64(expected, actual, num_elements, line, message) UnityAssertEqualIntArray(UnityNumToPtr((UNITY_INT)(UNITY_INT64)(expected), 8), (UNITY_INTERNAL_PTR)(actual), (UNITY_UINT32)(num_elements), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64, UNITY_ARRAY_TO_VAL) -#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((delta), (expected), (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) -#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((delta), (expected), (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) -#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((delta), (expected), (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) +#define UNITY_TEST_ASSERT_INT64_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((delta), (UNITY_INT)(expected), (UNITY_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) +#define UNITY_TEST_ASSERT_UINT64_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((delta), (UNITY_UINT)(expected), (UNITY_UINT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) +#define UNITY_TEST_ASSERT_HEX64_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((delta), (UNITY_UINT)(expected), (UNITY_UINT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) #define UNITY_TEST_ASSERT_NOT_EQUAL_INT64(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(threshold), (UNITY_INT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT64) #define UNITY_TEST_ASSERT_NOT_EQUAL_UINT64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT64) #define UNITY_TEST_ASSERT_NOT_EQUAL_HEX64(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(threshold), (UNITY_UINT)(actual), UNITY_NOT_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX64) From 4c8dab0edd16ce6a4b7b628430de1cd42d03f31a Mon Sep 17 00:00:00 2001 From: Ross Smyth Date: Mon, 10 Mar 2025 16:00:38 -0400 Subject: [PATCH 72/87] Fix meson pkg-config generation The pkg-config file does not include the subdir in its build flags, so files will fail to find the Unity headers. --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 6585129c..9489aef4 100644 --- a/meson.build +++ b/meson.build @@ -64,10 +64,10 @@ unity_dep = declare_dependency( if not meson.is_subproject() pkg = import('pkgconfig') pkg.generate( - name: meson.project_name(), + unity_lib, version: meson.project_version(), - libraries: [ unity_lib ], - description: 'C Unit testing framework.' + subdirs: 'unity', + extra_cflags: unity_args, ) endif From e4942f1a21cc9a7478092ff2d84c7abb10b80512 Mon Sep 17 00:00:00 2001 From: Ross Smyth Date: Wed, 25 Jun 2025 14:42:32 -0400 Subject: [PATCH 73/87] Fix up shebangs in the auto directory --- auto/generate_test_runner.rb | 2 +- auto/stylize_as_junit.py | 2 +- auto/stylize_as_junit.rb | 2 +- auto/unity_test_summary.py | 2 +- auto/unity_test_summary.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/auto/generate_test_runner.rb b/auto/generate_test_runner.rb index 2c2d5956..5b902295 100755 --- a/auto/generate_test_runner.rb +++ b/auto/generate_test_runner.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/env ruby # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org diff --git a/auto/stylize_as_junit.py b/auto/stylize_as_junit.py index 020ec440..49e8aff7 100644 --- a/auto/stylize_as_junit.py +++ b/auto/stylize_as_junit.py @@ -1,4 +1,4 @@ -#! python3 +#!/usr/bin/env python3 # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org diff --git a/auto/stylize_as_junit.rb b/auto/stylize_as_junit.rb index 23d89a65..e003918a 100755 --- a/auto/stylize_as_junit.rb +++ b/auto/stylize_as_junit.rb @@ -1,4 +1,4 @@ -#!/usr/bin/ruby +#!/usr/bin/env ruby # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org diff --git a/auto/unity_test_summary.py b/auto/unity_test_summary.py index 43e5af7c..60f5fd41 100644 --- a/auto/unity_test_summary.py +++ b/auto/unity_test_summary.py @@ -1,4 +1,4 @@ -#! python3 +#!/usr/bin/env python3 # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org diff --git a/auto/unity_test_summary.rb b/auto/unity_test_summary.rb index 33c8d7a3..f6a64dea 100644 --- a/auto/unity_test_summary.rb +++ b/auto/unity_test_summary.rb @@ -1,3 +1,4 @@ +#!/usr/bin/env ruby # ========================================================================= # Unity - A Test Framework for C # ThrowTheSwitch.org @@ -5,7 +6,6 @@ # SPDX-License-Identifier: MIT # ========================================================================= -# !/usr/bin/ruby # # unity_test_summary.rb # From 442a060acd1e3cae383093fbee182345f7e644ae Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 2 Jul 2025 21:12:45 -0400 Subject: [PATCH 74/87] Fix clang errors in makefile --- test/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Makefile b/test/Makefile index 82b61af9..532cc400 100644 --- a/test/Makefile +++ b/test/Makefile @@ -12,6 +12,8 @@ ifeq ($(findstring clang, $(CC)), clang) E = -Weverything CFLAGS += $E -Wno-unknown-warning-option -Wno-missing-prototypes CFLAGS += -Wno-unused-macros -Wno-padded -Wno-missing-noreturn +CFLAGS += -Wno-unsafe-buffer-usage -Wno-reserved-identifier +CFLAGS += -Wno-extra-semi-stmt endif CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror #CFLAGS += -Wconversion #disabled because if falsely complains about the isinf and isnan macros From 1638627cb5ac3c24c9840ea837c9115119158a02 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 2 Jul 2025 21:12:40 -0400 Subject: [PATCH 75/87] Fix -Wextra-semi-stmt error with proper macro hygiene "empty expression statement has no effect; remove unnecessary ';'" These macros were not properly wrapped --- test/Makefile | 1 - test/tests/self_assessment_utils.h | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/Makefile b/test/Makefile index 532cc400..2275e3b8 100644 --- a/test/Makefile +++ b/test/Makefile @@ -13,7 +13,6 @@ E = -Weverything CFLAGS += $E -Wno-unknown-warning-option -Wno-missing-prototypes CFLAGS += -Wno-unused-macros -Wno-padded -Wno-missing-noreturn CFLAGS += -Wno-unsafe-buffer-usage -Wno-reserved-identifier -CFLAGS += -Wno-extra-semi-stmt endif CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror #CFLAGS += -Wconversion #disabled because if falsely complains about the isinf and isnan macros diff --git a/test/tests/self_assessment_utils.h b/test/tests/self_assessment_utils.h index 6051bda8..f764ca95 100644 --- a/test/tests/self_assessment_utils.h +++ b/test/tests/self_assessment_utils.h @@ -133,19 +133,19 @@ void flushSpy(void) if (flushSpyEnabled){ flushSpyCalls++; } } -#define TEST_ASSERT_EQUAL_PRINT_NUMBERS(expected, actual) { \ +#define TEST_ASSERT_EQUAL_PRINT_NUMBERS(expected, actual) do { \ startPutcharSpy(); UnityPrintNumber((actual)); endPutcharSpy(); \ TEST_ASSERT_EQUAL_STRING((expected), getBufferPutcharSpy()); \ - } + } while (0) -#define TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS(expected, actual) { \ +#define TEST_ASSERT_EQUAL_PRINT_UNSIGNED_NUMBERS(expected, actual) do { \ startPutcharSpy(); UnityPrintNumberUnsigned((actual)); endPutcharSpy(); \ TEST_ASSERT_EQUAL_STRING((expected), getBufferPutcharSpy()); \ - } + } while (0) -#define TEST_ASSERT_EQUAL_PRINT_FLOATING(expected, actual) { \ +#define TEST_ASSERT_EQUAL_PRINT_FLOATING(expected, actual) do { \ startPutcharSpy(); UnityPrintFloat((actual)); endPutcharSpy(); \ TEST_ASSERT_EQUAL_STRING((expected), getBufferPutcharSpy()); \ - } + } while (0) #endif From 8bac36463ddb0c112979e6724091eabe1746defb Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 2 Jul 2025 21:27:10 -0400 Subject: [PATCH 76/87] Fix reserved-identifier errors These are reserved by the standard --- test/Makefile | 2 +- test/tests/test_unity_core.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/Makefile b/test/Makefile index 2275e3b8..3c3c7510 100644 --- a/test/Makefile +++ b/test/Makefile @@ -12,7 +12,7 @@ ifeq ($(findstring clang, $(CC)), clang) E = -Weverything CFLAGS += $E -Wno-unknown-warning-option -Wno-missing-prototypes CFLAGS += -Wno-unused-macros -Wno-padded -Wno-missing-noreturn -CFLAGS += -Wno-unsafe-buffer-usage -Wno-reserved-identifier +CFLAGS += -Wno-unsafe-buffer-usage endif CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror #CFLAGS += -Wconversion #disabled because if falsely complains about the isinf and isnan macros diff --git a/test/tests/test_unity_core.c b/test/tests/test_unity_core.c index 866f2ab1..921f535d 100644 --- a/test/tests/test_unity_core.c +++ b/test/tests/test_unity_core.c @@ -61,7 +61,7 @@ void testUnitySizeInitializationReminder(void) #ifndef UNITY_EXCLUDE_SETJMP_H jmp_buf AbortFrame; #endif - } _Expected_Unity; + } Expected_Unity; #else struct { const char* TestFile; @@ -81,7 +81,7 @@ void testUnitySizeInitializationReminder(void) #ifndef UNITY_EXCLUDE_SETJMP_H jmp_buf AbortFrame; #endif - } _Expected_Unity; + } Expected_Unity; #endif /* Compare our fake structure's size to the actual structure's size. They @@ -89,7 +89,7 @@ void testUnitySizeInitializationReminder(void) * * This accounts for alignment, padding, and packing issues that might come * up between different architectures. */ - TEST_ASSERT_EQUAL_MESSAGE(sizeof(_Expected_Unity), sizeof(Unity), message); + TEST_ASSERT_EQUAL_MESSAGE(sizeof(Expected_Unity), sizeof(Unity), message); } void testPassShouldEndImmediatelyWithPass(void) From faaaaa4fca1dec9cf959c8180682fc9794650ec1 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 2 Jul 2025 21:34:02 -0400 Subject: [PATCH 77/87] Fix Wmissing-noreturn errors --- test/Makefile | 2 +- test/tests/test_unity_core.c | 8 ++++---- test/tests/test_unity_floats.c | 9 +++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/test/Makefile b/test/Makefile index 3c3c7510..fac16ee9 100644 --- a/test/Makefile +++ b/test/Makefile @@ -11,7 +11,7 @@ endif ifeq ($(findstring clang, $(CC)), clang) E = -Weverything CFLAGS += $E -Wno-unknown-warning-option -Wno-missing-prototypes -CFLAGS += -Wno-unused-macros -Wno-padded -Wno-missing-noreturn +CFLAGS += -Wno-unused-macros -Wno-padded CFLAGS += -Wno-unsafe-buffer-usage endif CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror diff --git a/test/tests/test_unity_core.c b/test/tests/test_unity_core.c index 921f535d..1f5a9a76 100644 --- a/test/tests/test_unity_core.c +++ b/test/tests/test_unity_core.c @@ -92,19 +92,19 @@ void testUnitySizeInitializationReminder(void) TEST_ASSERT_EQUAL_MESSAGE(sizeof(Expected_Unity), sizeof(Unity), message); } -void testPassShouldEndImmediatelyWithPass(void) +UNITY_FUNCTION_ATTR(noreturn) void testPassShouldEndImmediatelyWithPass(void) { TEST_PASS(); TEST_FAIL_MESSAGE("We should have passed already and finished this test"); } -void testPassShouldEndImmediatelyWithPassAndMessage(void) +UNITY_FUNCTION_ATTR(noreturn) void testPassShouldEndImmediatelyWithPassAndMessage(void) { TEST_PASS_MESSAGE("Woohoo! This Automatically Passes!"); TEST_FAIL_MESSAGE("We should have passed already and finished this test"); } -void testMessageShouldDisplayMessageWithoutEndingAndGoOnToPass(void) +UNITY_FUNCTION_ATTR(noreturn) void testMessageShouldDisplayMessageWithoutEndingAndGoOnToPass(void) { TEST_MESSAGE("This is just a message"); TEST_MESSAGE("This is another message"); @@ -282,7 +282,7 @@ void testProtection(void) TEST_ASSERT_EQUAL(3, mask); } -void testIgnoredAndThenFailInTearDown(void) +UNITY_FUNCTION_ATTR(noreturn) void testIgnoredAndThenFailInTearDown(void) { SetToOneToFailInTearDown = 1; TEST_IGNORE(); diff --git a/test/tests/test_unity_floats.c b/test/tests/test_unity_floats.c index 006c76ab..9744c134 100644 --- a/test/tests/test_unity_floats.c +++ b/test/tests/test_unity_floats.c @@ -1208,6 +1208,9 @@ void testNotEqualFloatEachEqualLengthZero(void) #endif } +#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || defined(UNITY_INCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY) +UNITY_FUNCTION_ATTR(noreturn) +#endif void testFloatPrinting(void) { #if defined(UNITY_EXCLUDE_FLOAT_PRINT) || defined(UNITY_INCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY) @@ -1257,6 +1260,9 @@ void testFloatPrinting(void) #endif } +#if defined(UNITY_EXCLUDE_FLOAT_PRINT) || defined(UNITY_INCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY) +UNITY_FUNCTION_ATTR(noreturn) +#endif void testFloatPrintingRoundTiesToEven(void) { #if defined(UNITY_EXCLUDE_FLOAT_PRINT) || defined(UNITY_INCLUDE_DOUBLE) || !defined(USING_OUTPUT_SPY) @@ -1368,6 +1374,9 @@ static void printFloatValue(float f) #endif #endif +#if !defined(UNITY_TEST_ALL_FLOATS_PRINT_OK) || !defined(USING_OUTPUT_SPY) +UNITY_FUNCTION_ATTR(noreturn) +#endif void testFloatPrintingRandomSamples(void) { #if !defined(UNITY_TEST_ALL_FLOATS_PRINT_OK) || !defined(USING_OUTPUT_SPY) From 6decd7aa29f3c6d996e7a5c1cd9207fe633f96e5 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 2 Jul 2025 21:38:12 -0400 Subject: [PATCH 78/87] Wno-unused-macros and Wno-padded don't emit anything --- test/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index fac16ee9..c5a26abf 100644 --- a/test/Makefile +++ b/test/Makefile @@ -11,7 +11,6 @@ endif ifeq ($(findstring clang, $(CC)), clang) E = -Weverything CFLAGS += $E -Wno-unknown-warning-option -Wno-missing-prototypes -CFLAGS += -Wno-unused-macros -Wno-padded CFLAGS += -Wno-unsafe-buffer-usage endif CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror From 4a59f29362bedf0bc1ca7636a1cd086c205074be Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 2 Jul 2025 21:43:20 -0400 Subject: [PATCH 79/87] Fix -Wmissing-prototypes errors This one was a bit tough, but I think this works fine. --- test/Makefile | 2 +- test/tests/self_assessment_utils.h | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index c5a26abf..b0b96995 100644 --- a/test/Makefile +++ b/test/Makefile @@ -10,7 +10,7 @@ CC = clang endif ifeq ($(findstring clang, $(CC)), clang) E = -Weverything -CFLAGS += $E -Wno-unknown-warning-option -Wno-missing-prototypes +CFLAGS += $E -Wno-unknown-warning-option CFLAGS += -Wno-unsafe-buffer-usage endif CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror diff --git a/test/tests/self_assessment_utils.h b/test/tests/self_assessment_utils.h index f764ca95..24b755f1 100644 --- a/test/tests/self_assessment_utils.h +++ b/test/tests/self_assessment_utils.h @@ -72,6 +72,11 @@ static char putcharSpyBuffer[SPY_BUFFER_MAX]; static UNITY_COUNTER_TYPE indexSpyBuffer; static UNITY_COUNTER_TYPE putcharSpyEnabled; +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wmissing-prototypes" +#endif + void startPutcharSpy(void) { indexSpyBuffer = 0; @@ -133,6 +138,10 @@ void flushSpy(void) if (flushSpyEnabled){ flushSpyCalls++; } } +#ifdef __clang__ +#pragma clang diagnostic pop +#endif + #define TEST_ASSERT_EQUAL_PRINT_NUMBERS(expected, actual) do { \ startPutcharSpy(); UnityPrintNumber((actual)); endPutcharSpy(); \ TEST_ASSERT_EQUAL_STRING((expected), getBufferPutcharSpy()); \ @@ -149,3 +158,10 @@ void flushSpy(void) } while (0) #endif + +// The reason this isn't folded into the above diagnostic is to semi-isolate +// the header contents from the user content it is included into. +#ifdef __clang__ +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wmissing-prototypes" +#endif From 12705bf83fd02a05e11c57288a11b8ccd15794f0 Mon Sep 17 00:00:00 2001 From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com> Date: Wed, 2 Jul 2025 22:27:44 -0400 Subject: [PATCH 80/87] Remove warning without emits --- test/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/test/Makefile b/test/Makefile index b0b96995..35c2822b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -16,7 +16,6 @@ endif CFLAGS += -std=c99 -pedantic -Wall -Wextra -Werror #CFLAGS += -Wconversion #disabled because if falsely complains about the isinf and isnan macros CFLAGS += -Wno-switch-enum -Wno-double-promotion -CFLAGS += -Wno-poison-system-directories CFLAGS += -Wno-covered-switch-default CFLAGS += -Wbad-function-cast -Wcast-qual -Wold-style-definition -Wshadow -Wstrict-overflow \ -Wstrict-prototypes -Wswitch-default -Wundef From eb79bce1b5b242ff580ccc99d8d4660625e8ffa9 Mon Sep 17 00:00:00 2001 From: Mark VanderVoord Date: Wed, 9 Jul 2025 17:00:30 -0400 Subject: [PATCH 81/87] Bump version to encapsulate recent changes. --- src/unity.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/unity.h b/src/unity.h index 3d176da9..7c749c2c 100644 --- a/src/unity.h +++ b/src/unity.h @@ -11,7 +11,7 @@ #define UNITY_VERSION_MAJOR 2 #define UNITY_VERSION_MINOR 6 -#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 From f96b64f5521c2f87fa6b9745c107ce162971b7d8 Mon Sep 17 00:00:00 2001 From: burakutkuc Date: Thu, 10 Jul 2025 13:35:15 +0300 Subject: [PATCH 82/87] fix: fixed error from regression test results; removed the unnecessary int-uint distinction for hex values in the "array within" feature. --- src/unity_internals.h | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/unity_internals.h b/src/unity_internals.h index 445363d9..c17b86a8 100644 --- a/src/unity_internals.h +++ b/src/unity_internals.h @@ -999,10 +999,10 @@ int UnityTestMatches(void); #define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_HEX32(threshold, actual, line, message) UnityAssertUintGreaterOrLessOrEqualNumber((UNITY_UINT)(UNITY_UINT32)(threshold), (UNITY_UINT)(UNITY_UINT32)(actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) #define UNITY_TEST_ASSERT_SMALLER_OR_EQUAL_CHAR(threshold, actual, line, message) UnityAssertIntGreaterOrLessOrEqualNumber((UNITY_INT)(UNITY_INT8 )(threshold), (UNITY_INT)(UNITY_INT8 ) (actual), UNITY_SMALLER_OR_EQUAL, (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) -#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin( (delta), (UNITY_INT) (expected), (UNITY_INT) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) -#define UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 ) (expected), (UNITY_INT)(UNITY_INT8 ) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) -#define UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT16)(delta), (UNITY_INT)(UNITY_INT16) (expected), (UNITY_INT)(UNITY_INT16) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) -#define UNITY_TEST_ASSERT_INT32_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT32)(delta), (UNITY_INT)(UNITY_INT32) (expected), (UNITY_INT)(UNITY_INT32) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) +#define UNITY_TEST_ASSERT_INT_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin( (delta), (UNITY_INT) (expected), (UNITY_INT) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT) +#define UNITY_TEST_ASSERT_INT8_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 ) (expected), (UNITY_INT)(UNITY_INT8 ) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8) +#define UNITY_TEST_ASSERT_INT16_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT16 )(delta), (UNITY_INT)(UNITY_INT16) (expected), (UNITY_INT)(UNITY_INT16) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16) +#define UNITY_TEST_ASSERT_INT32_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT32 )(delta), (UNITY_INT)(UNITY_INT32) (expected), (UNITY_INT)(UNITY_INT32) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32) #define UNITY_TEST_ASSERT_UINT_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin( (delta), (UNITY_UINT) (expected), (UNITY_UINT) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT) #define UNITY_TEST_ASSERT_UINT8_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((UNITY_UINT8 )(delta), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT8 )(expected), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT8 )(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8) #define UNITY_TEST_ASSERT_UINT16_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((UNITY_UINT16)(delta), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT16)(expected), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT16)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16) @@ -1012,18 +1012,18 @@ int UnityTestMatches(void); #define UNITY_TEST_ASSERT_HEX32_WITHIN(delta, expected, actual, line, message) UnityAssertUintNumbersWithin((UNITY_UINT32)(delta), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT32)(expected), (UNITY_UINT)(UNITY_UINT)(UNITY_UINT32)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32) #define UNITY_TEST_ASSERT_CHAR_WITHIN(delta, expected, actual, line, message) UnityAssertIntNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INT)(UNITY_INT8 ) (expected), (UNITY_INT)(UNITY_INT8 ) (actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR) -#define UNITY_TEST_ASSERT_INT_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertIntNumbersWithin( (delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_INT8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertIntNumbersWithin((UNITY_UINT8)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_INT16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertIntNumbersWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_INT32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertIntNumbersWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_UINT_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin( (delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_UINT8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT8)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_UINT16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_UINT32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_HEX8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT8 )(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_HEX16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_HEX32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertUintNumbersWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32, UNITY_ARRAY_TO_ARRAY) -#define UNITY_TEST_ASSERT_CHAR_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertIntNumbersWithin((UNITY_UINT8)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_INT_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin( (delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_INT8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT8 )(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT8, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_INT16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT16, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_INT32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_INT32, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_UINT_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin( (delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_UINT8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT8 )(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT8, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_UINT16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT16, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_UINT32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_UINT32, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_HEX8_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT8 )(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX8, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_HEX16_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT16)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX16, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_HEX32_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT32)(delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_HEX32, UNITY_ARRAY_TO_ARRAY) +#define UNITY_TEST_ASSERT_CHAR_ARRAY_WITHIN(delta, expected, actual, num_elements, line, message) UnityAssertNumbersArrayWithin((UNITY_UINT8)( delta), (UNITY_INTERNAL_PTR)(expected), (UNITY_INTERNAL_PTR)(actual), ((UNITY_UINT32)(num_elements)), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_CHAR, UNITY_ARRAY_TO_ARRAY) #define UNITY_TEST_ASSERT_EQUAL_PTR(expected, actual, line, message) UnityAssertEqualIntNumber((UNITY_PTR_TO_INT)(expected), (UNITY_PTR_TO_INT)(actual), (message), (UNITY_LINE_TYPE)(line), UNITY_DISPLAY_STYLE_POINTER) From 25e9af9edd9ec1776c664022eef9353e279e5137 Mon Sep 17 00:00:00 2001 From: ml-physec <206103694+ml-physec@users.noreply.github.com> Date: Thu, 7 Aug 2025 13:44:02 +0200 Subject: [PATCH 83/87] Update detail-stack implementation after #784 --- examples/example_5/test/TestProductionCode.c | 2 +- src/unity.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/examples/example_5/test/TestProductionCode.c b/examples/example_5/test/TestProductionCode.c index 38692ad5..ab3d3e29 100644 --- a/examples/example_5/test/TestProductionCode.c +++ b/examples/example_5/test/TestProductionCode.c @@ -33,7 +33,7 @@ void test_BitExtractor(void) { const test_vector_t test_vectors[] = { {__LINE__, 7, BIT_DIRECTION_UP, {1,1,1,0,0,0,0,0}}, - {__LINE__, 7, BIT_DIRECTION_DOWN, {0,0,0,0,0,1,0,1}}, + {__LINE__, 7, BIT_DIRECTION_DOWN, {0,0,0,0,0,1,0,1}}, /* intentionally wrong to demonstrate detail output */ {0} }; const test_vector_t* tv; diff --git a/src/unity.c b/src/unity.c index c22bdae3..3ea455d0 100644 --- a/src/unity.c +++ b/src/unity.c @@ -601,7 +601,11 @@ static void UnityAddMsgIfSpecified(const char* msg) if ((label[0] == '#') && (label[1] != 0)) { UnityPrint(label + 2); UNITY_OUTPUT_CHAR(' '); - UnityPrintNumberByStyle(Unity.CurrentDetailStackValues[c], label[1]); + if ((label[1] & UNITY_DISPLAY_RANGE_INT) == UNITY_DISPLAY_RANGE_INT) { + UnityPrintIntNumberByStyle((UNITY_INT)Unity.CurrentDetailStackValues[c], label[1]); + } else { + UnityPrintUintNumberByStyle((UNITY_UINT)Unity.CurrentDetailStackValues[c], label[1]); + } } else if (Unity.CurrentDetailStackValues[c] != 0){ UnityPrint(label); UNITY_OUTPUT_CHAR(' '); From 864b4ea554d75e63d1b96e1d8bf0c92ac35fa122 Mon Sep 17 00:00:00 2001 From: Roland Marchand Date: Thu, 25 Sep 2025 21:22:51 -0400 Subject: [PATCH 84/87] Convert C++ comments to ANSI C style --- src/unity.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/unity.c b/src/unity.c index 3ea455d0..9e8b3a15 100644 --- a/src/unity.c +++ b/src/unity.c @@ -2037,7 +2037,7 @@ static enum UnityLengthModifier UnityLengthModifierGet(const char *pch, int *len } case 'h': { - // short and char are converted to int + /* short and char are converted to int */ length_mod = UNITY_LENGTH_MODIFIER_NONE; if (pch[1] == 'h') { @@ -2054,7 +2054,7 @@ static enum UnityLengthModifier UnityLengthModifierGet(const char *pch, int *len case 't': case 'L': { - // Not supported, but should gobble up the length specifier anyway + /* Not supported, but should gobble up the length specifier anyway */ length_mod = UNITY_LENGTH_MODIFIER_NONE; *length = 1; break; @@ -2515,7 +2515,7 @@ static int IsStringInBiggerString(const char* longstring, const char* shortstrin } } - // If we didn't match and we're on strict matching, we already know we failed + /* If we didn't match and we're on strict matching, we already know we failed */ if (UnityStrictMatch) { return 0; From 3240ac98116ecd58b333a78b3ca2073349b9eaf6 Mon Sep 17 00:00:00 2001 From: savashn Date: Mon, 27 Oct 2025 10:06:33 +0300 Subject: [PATCH 85/87] add table of contents in docs --- docs/UnityAssertionsReference.md | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/docs/UnityAssertionsReference.md b/docs/UnityAssertionsReference.md index 0a0e51b6..90a3e5fd 100644 --- a/docs/UnityAssertionsReference.md +++ b/docs/UnityAssertionsReference.md @@ -1,5 +1,35 @@ # Unity Assertions Reference +## Table of Contents + +1. [Background and Overview](#background-and-overview) + 1. [Super Condensed Version](#super-condensed-version) + 2. [Unity Is Several Things But Mainly It’s Assertions](#unity-is-several-things-but-mainly-its-assertions) + 3. [What’s an Assertion?](#whats-an-assertion) + 4. [Unity’s Assertions: Helpful Messages _and_ Free Source Code Documentation](#unitys-assertions-helpful-messages-and-free-source-code-documentation) +2. [Assertion Conventions and Configurations](#assertion-conventions-and-configurations) + 1. [Naming and Parameter Conventions](#naming-and-parameter-conventions) + 2. [TEST_ASSERT_EACH_EQUAL_X Variants](#test_assert_each_equal_x-variants) + 3. [Configuration](#configuration) +3. [The Assertions in All Their Blessed Glory](#the-assertions-in-all-their-blessed-glory) + 1. [Basic Fail, Pass and Ignore](#basic-fail-pass-and-ignore) + 2. [Boolean](#boolean) + 3. [Signed and Unsigned Integers (of all sizes)](#signed-and-unsigned-integers-of-all-sizes) + 4. [Unsigned Integers (of all sizes) in Hexadecimal](#unsigned-integers-of-all-sizes-in-hexadecimal) + 5. [Characters](#characters) + 6. [Masked and Bit-level Assertions](#masked-and-bit-level-assertions) + 7. [Integer Less Than / Greater Than](#integer-less-than--greater-than) + 8. [Integer Ranges (of all sizes)](#integer-ranges-of-all-sizes) + 9. [Structs and Strings](#structs-and-strings) + 10. [Arrays](#arrays) + 11. [Integer Array Ranges (of all sizes)](#integer-array-ranges-of-all-sizes) + 12. [Each Equal (Arrays to Single Value)](#each-equal-arrays-to-single-value) + 13. [Floating Point (If enabled)](#floating-point-if-enabled) + 14. [Double (If enabled)](#double-if-enabled) +4. [Advanced Asserting: Details On Tricky Assertions](#advanced-asserting-details-on-tricky-assertions) + 1. [How do the EQUAL assertions work for FLOAT and DOUBLE?](#how-do-the-equal-assertions-work-for-float-and-double) + 2. [How do we deal with targets with non-standard int sizes?](#how-do-we-deal-with-targets-with-non-standard-int-sizes) + ## Background and Overview ### Super Condensed Version From 18c4e9376778a007ed71d1aba75d37d886ad0023 Mon Sep 17 00:00:00 2001 From: James Browning Date: Wed, 12 Nov 2025 04:48:49 -0800 Subject: [PATCH 86/87] Try build Unity w/ -UUNITY_EXCLUDE_FLOAT_PRINT --- src/unity.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/unity.c b/src/unity.c index 9e8b3a15..e031ebbd 100644 --- a/src/unity.c +++ b/src/unity.c @@ -1110,6 +1110,7 @@ void UnityAssertFloatsWithin(const UNITY_FLOAT delta, } } +#ifndef UNITY_EXCLUDE_FLOAT_PRINT /*-----------------------------------------------*/ void UnityAssertFloatsNotWithin(const UNITY_FLOAT delta, const UNITY_FLOAT expected, @@ -1163,6 +1164,7 @@ void UnityAssertGreaterOrLessFloat(const UNITY_FLOAT threshold, UNITY_FAIL_AND_BAIL; } } +#endif // UNITY_EXCLUDE_FLOAT_PRINT /*-----------------------------------------------*/ void UnityAssertFloatSpecial(const UNITY_FLOAT actual, @@ -1337,6 +1339,7 @@ void UnityAssertDoublesWithin(const UNITY_DOUBLE delta, } } +#ifndef UNITY_EXCLUDE_FLOAT_PRINT /*-----------------------------------------------*/ void UnityAssertDoublesNotWithin(const UNITY_DOUBLE delta, const UNITY_DOUBLE expected, @@ -1390,6 +1393,7 @@ void UnityAssertGreaterOrLessDouble(const UNITY_DOUBLE threshold, UNITY_FAIL_AND_BAIL; } } +#endif // UNITY_EXCLUDE_FLOAT_PRINT /*-----------------------------------------------*/ void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual, From 747c2ee73f44de813c9b719e39531d6e8dc026c3 Mon Sep 17 00:00:00 2001 From: James Browning Date: Wed, 12 Nov 2025 05:19:20 -0800 Subject: [PATCH 87/87] Misadress style CI bot failure, my bad --- src/unity.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/unity.c b/src/unity.c index e031ebbd..8be0d033 100644 --- a/src/unity.c +++ b/src/unity.c @@ -1164,7 +1164,7 @@ void UnityAssertGreaterOrLessFloat(const UNITY_FLOAT threshold, UNITY_FAIL_AND_BAIL; } } -#endif // UNITY_EXCLUDE_FLOAT_PRINT +#endif /* ! UNITY_EXCLUDE_FLOAT_PRINT */ /*-----------------------------------------------*/ void UnityAssertFloatSpecial(const UNITY_FLOAT actual, @@ -1393,7 +1393,7 @@ void UnityAssertGreaterOrLessDouble(const UNITY_DOUBLE threshold, UNITY_FAIL_AND_BAIL; } } -#endif // UNITY_EXCLUDE_FLOAT_PRINT +#endif /* ! UNITY_EXCLUDE_FLOAT_PRINT */ /*-----------------------------------------------*/ void UnityAssertDoubleSpecial(const UNITY_DOUBLE actual,