[pull] master from ThrowTheSwitch:master #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

pull wants to merge 102 commits into ufo2011:master from ThrowTheSwitch:master

.github/FUNDING.yml

-Original file line number
+Diff line change
@@ -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']

.github/workflows/main.yml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,16 +15,19 @@ 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

            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

            uses: actions/checkout@v2

            uses: actions/checkout@v4

          # Run Tests

          - name: Run All Unit Tests

LICENSE.txt

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,6 @@
  
    The MIT License (MIT)

    Copyright (c) <year> 2007-21 Mike Karlesky, Mark VanderVoord, Greg Williams

    Copyright (c) 2007-26 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

README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,6 +1,6 @@
  
    # Unity Test ![CI][]

    __Copyright (c) 2007 - 2021 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.

    @@ -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.

    @@ -54,7 +56,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 +74,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 affect how many nibbles are shown (for example, `HEX16` will show 4 nibbles).

        TEST_ASSERT_EQUAL(expected, actual)

    @@ -214,7 +217,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

    @@ -224,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

auto/__init__.py

-Original file line number
+Diff line change
@@ -0,0 +1,7 @@
+    # =========================================================================
+    #   Unity - A Test Framework for C
+    #   ThrowTheSwitch.org
+    #   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    #   SPDX-License-Identifier: MIT
+    # =========================================================================

auto/colour_prompt.rb

-Original file line number
+Diff line change
@@ -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-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    #   SPDX-License-Identifier: MIT
+    # =========================================================================
     if RUBY_PLATFORM =~ /(win|w)32$/
       begin
@@ Expand Down @@

auto/colour_reporter.rb

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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-26 Mike Karlesky, Mark VanderVoord, & Greg Williams

    #   SPDX-License-Identifier: MIT

    # =========================================================================

    require_relative 'colour_prompt'

    @@ -12,7 +13,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

auto/extract_version.py

-Original file line number
+Diff line change
@@ -1,4 +1,11 @@
     #!/usr/bin/env python3
+    # =========================================================================
+    #   Unity - A Test Framework for C
+    #   ThrowTheSwitch.org
+    #   Copyright (c) 2007-26 Mike Karlesky, Mark VanderVoord, & Greg Williams
+    #   SPDX-License-Identifier: MIT
+    # =========================================================================
     import re
     import sys
@@ Expand Down @@

auto/generate_config.yml

-Original file line number
+Diff line change
@@ -1,3 +1,10 @@
+    # =========================================================================
+    #   Unity - A Test Framework for C
+    #   ThrowTheSwitch.org
+    #   Copyright (c) 2007-26 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
@@ Expand Down @@

auto/generate_module.rb

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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-26 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.

    @@ -13,7 +14,7 @@
  
    require 'pathname'

    # TEMPLATE_TST

    TEMPLATE_TST ||= '#ifdef TEST

    TEMPLATE_TST ||= '#ifdef %5$s

    #include "unity.h"

    @@ -32,7 +33,7 @@
  
        TEST_IGNORE_MESSAGE("Need to Implement %1$s");

    }

    #endif // TEST

    #endif // %5$s

    '.freeze

    # TEMPLATE_SRC

    @@ -108,7 +109,8 @@ def self.default_options
  
          update_svn: false,

          boilerplates: {},

          test_prefix: 'Test',

          mock_prefix: 'Mock'

          mock_prefix: 'Mock',

          test_define: 'TEST'

        }

      end

    @@ -132,9 +134,9 @@ 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] }]

                 { 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,10 +156,11 @@ 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) })

                        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

            }

    @@ -168,18 +171,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

    @@ -212,7 +216,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]}\"`

    @@ -260,12 +265,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?

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[pull] master from ThrowTheSwitch:master #46

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

[pull] master from ThrowTheSwitch:master #46

Are you sure you want to change the base?

Uh oh!

[pull] master from ThrowTheSwitch:master #46

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!