test-unit 3.1.5 → 3.6.1

data/lib/test/unit/collector/dir.rb

@@ -25,9 +25,9 @@ module Test
           basedir = @base
           $:.push(basedir) if basedir
           if(from.empty?)
-            recursive_collect('.', find_test_cases)
+            suite = recursive_collect('.', find_test_cases)
           elsif(from.size == 1)
-            recursive_collect(from.first, find_test_cases)
+            suite = recursive_collect(from.first, find_test_cases)
           else
             suites = []
             from.each do |f|
@@ -38,6 +38,8 @@ module Test
             sort(suites).each{|s| suite << s}
             suite
           end
+          adjust_ractor_tests(suite)
+          suite
         ensure
           $:.delete_at($:.rindex(basedir)) if basedir
         end

data/lib/test/unit/collector/load.rb

@@ -10,6 +10,7 @@ module Test
         include Collector
 
         attr_reader :patterns, :excludes, :base
+        attr_reader :default_test_paths
 
         def initialize
           super
@@ -18,6 +19,7 @@ module Test
           @patterns = [/\Atest[_\-].+\.rb\z/m, /[_\-]test\.rb\z/]
           @excludes = []
           @base = nil
+          @default_test_paths = []
           @require_failed_infos = []
         end
 
@@ -26,11 +28,19 @@ module Test
           @base = base
         end
 
+        def default_test_paths=(paths)
+          @default_test_paths = paths.collect do |path|
+            Pathname(path)
+          end
+        end
+
         def collect(*froms)
           add_load_path(@base) do
+            froms = @default_test_paths if froms.empty?
             froms = ["."] if froms.empty?
             test_suites = []
-            already_gathered = find_test_cases
+            already_gathered = {}
+            find_test_cases(already_gathered)
             froms.each do |from|
               from = resolve_path(from)
               if from.directory?
@@ -51,16 +61,19 @@ module Test
               test_suite = test_suites.first
             end
 
+            adjust_ractor_tests(test_suite)
+
             test_suite
           end
         end
 
-        def find_test_cases(ignore=[])
+        def find_test_cases(already_gathered)
           test_cases = []
           TestCase::DESCENDANTS.each do |test_case|
-            test_cases << test_case unless ignore.include?(test_case)
+            next if already_gathered.key?(test_case)
+            test_cases << test_case
+            already_gathered[test_case] = true
           end
-          ignore.concat(test_cases)
           test_cases
         end
 
@@ -102,7 +115,7 @@ module Test
           return if @program_file == expanded_path.to_s
           add_load_path(expanded_path.dirname) do
             begin
-              require(path.basename.to_s)
+              require(expanded_path.to_s)
             rescue LoadError
               @require_failed_infos << {:path => expanded_path, :exception => $!}
             end
@@ -155,11 +168,11 @@ module Test
           return if @require_failed_infos.empty?
 
           require_failed_infos = @require_failed_infos
-          require_failed_omissions = Class.new(Test::Unit::TestCase)
-          require_failed_omissions.class_eval do
+          require_failed_errors = Class.new(Test::Unit::TestCase)
+          require_failed_errors.class_eval do
             class << self
               def name
-                "RequireFailedOmissions"
+                "RequireFailedErrors"
               end
             end
 
@@ -169,21 +182,18 @@ module Test
               normalized_path = normalized_path.gsub(/\A_+/, '')
               exception = info[:exception]
               define_method("test_require_#{normalized_path}") do
-                @require_failed_exception = exception
-                omit("failed to load: <#{path}>: <#{exception.message}>")
+                raise(exception.class,
+                      "failed to load <#{path}>: #{exception.message}",
+                      exception.backtrace)
               end
             end
 
             def priority
               100
             end
-
-            def filter_backtrace(location)
-              super(@require_failed_exception.backtrace)
-            end
           end
 
-          add_suite(test_suites, require_failed_omissions.suite)
+          add_suite(test_suites, require_failed_errors.suite)
         end
       end
     end

data/lib/test/unit/collector/objectspace.rb

@@ -26,6 +26,7 @@ module Test
             end
           end
           sort(sub_suites).each{|s| suite << s}
+          adjust_ractor_tests(suite)
           suite
         end
       end

data/lib/test/unit/collector.rb

@@ -68,6 +68,37 @@ module Test
           suite << sub_suite
         end
       end
+
+      def adjust_ractor_tests(suite)
+        return if suite.nil?
+        ractor_suites = extract_ractor_tests(suite)
+        ractor_suites.each do |ractor_suite|
+          suite << ractor_suite
+        end
+      end
+
+      def extract_ractor_tests(suite)
+        ractor_suites = []
+        ractor_tests = []
+        suite.tests.each do |test|
+          case test
+          when TestSuite
+            ractor_suites.concat(extract_ractor_tests(test))
+          else
+            next unless test[:ractor]
+            ractor_tests << test
+          end
+        end
+        unless ractor_tests.empty?
+          suite.delete_tests(ractor_tests)
+          ractor_suite = TestSuite.new(suite.name, suite.test_case)
+          ractor_tests.each do |ractor_test|
+            ractor_suite << ractor_test
+          end
+          ractor_suites << ractor_suite
+        end
+        ractor_suites
+      end
     end
   end
 end

data/lib/test/unit/color-scheme.rb

@@ -5,9 +5,25 @@ module Test
     class ColorScheme
       include Enumerable
 
+      TERM_256 = /
+        [+-]256color|
+        \A(?:
+          alacritty|
+          iTerm\s?\d*\.app|
+          kitty|
+          mintty|
+          ms-terminal|
+          nsterm-build\d+|
+          nsterm|
+          terminator|
+          terminology(?:-[0-9.]+)?|
+          termite|
+          vscode
+        )\z/x
+
       class << self
         def default
-          if available_colors == 256
+          if available_colors >= 256
             default_for_256_colors
           else
             default_for_8_colors
@@ -110,6 +126,7 @@ module Test
           guess_available_colors_from_vte_version_env ||
             guess_available_colors_from_colorterm_env ||
             guess_available_colors_from_term_env ||
+            guess_available_colors_from_github_actions_env ||
             8
         end
 
@@ -140,12 +157,22 @@ module Test
 
         def guess_available_colors_from_term_env
           case ENV["TERM"]
-          when /-256color\z/
+          when /[+-]direct/
+            2 ** 24
+          when TERM_256
             256
           else
             nil
           end
         end
+
+        def guess_available_colors_from_github_actions_env
+          if ENV["GITHUB_ACTIONS"] == "true"
+            2 ** 24
+          else
+            nil
+          end
+        end
       end
 
       def initialize(scheme_spec)

data/lib/test/unit/data-sets.rb

@@ -0,0 +1,127 @@
+module Test
+  module Unit
+    class DataSets
+      def initialize
+        @variables = []
+        @procs = []
+        @value_sets = []
+      end
+
+      def add(data_set, options=nil)
+        options ||= {}
+        if data_set.respond_to?(:call)
+          @procs << [data_set, options]
+        elsif data_set.is_a?(Array)
+          @variables << [data_set, options]
+        else
+          @value_sets << [data_set, options]
+        end
+      end
+
+      def <<(data_set)
+        add(data_set)
+      end
+
+      def have_keep?
+        each_data_set do |_, options|
+          return true if options[:keep]
+        end
+        false
+      end
+
+      def keep
+        new_data_sets = self.class.new
+        each_data_set do |data_set, options|
+          next if options.nil?
+          next unless options[:keep]
+          new_data_sets.add(data_set, options)
+        end
+        new_data_sets
+      end
+
+      def each
+        variables = @variables
+        value_sets = @value_sets
+        @procs.each do |proc, options|
+          data_set = proc.call
+          case data_set
+          when Array
+            variables += [[data_set, options]]
+          else
+            value_sets += [[data_set, options]]
+          end
+        end
+
+        value_sets.each do |values, _options|
+          values.each do |label, data|
+            yield(label, data)
+          end
+        end
+
+        each_pattern(variables) do |label, data|
+          yield(label, data)
+        end
+      end
+
+      def ==(other)
+        @variables == other.instance_variable_get(:@variables) and
+          @procs == other.instance_variable_get(:@procs) and
+          @value_sets == other.instance_variable_get(:@value_sets)
+      end
+
+      def eql?(other)
+        self == other
+      end
+
+      def hash
+        [@variables, @procs, @value_sets].hash
+      end
+
+      private
+      def each_data_set(&block)
+        @procs.each(&block)
+        @variables.each(&block)
+        @value_sets.each(&block)
+      end
+
+      def each_pattern(variables)
+        grouped_variables = variables.group_by do |_, options|
+          options[:group]
+        end
+        grouped_variables.each do |group, group_variables|
+          each_raw_pattern(group_variables) do |cell|
+            label = String.new
+            label << "group: #{group.inspect}" unless group.nil?
+            data = {}
+            cell.each do |variable, pattern, pattern_label|
+              label << ", " unless label.empty?
+              label << "#{variable}: #{pattern_label}"
+              data[variable] = pattern
+            end
+            yield(label, data)
+          end
+        end
+      end
+
+      def each_raw_pattern(variables, &block)
+        return if variables.empty?
+
+        sorted_variables = variables.sort_by do |(variable, _), _|
+          variable
+        end
+        all_patterns = sorted_variables.collect do |(variable, patterns), _|
+          if patterns.is_a?(Hash)
+            patterns.collect do |pattern_label, pattern|
+              [variable, pattern, pattern_label]
+            end
+          else
+            patterns.collect do |pattern|
+              [variable, pattern, pattern.inspect]
+            end
+          end
+        end
+        all_patterns[0].product(*all_patterns[1..-1], &block)
+      end
+    end
+  end
+end

data/lib/test/unit/data.rb

@@ -1,3 +1,5 @@
+require "test/unit/data-sets"
+
 module Test
   module Unit
     module Data
@@ -12,9 +14,12 @@ module Test
         #
         # Define test data in the test code.
         #
-        # @overload data(label, data)
+        # @overload data(label, data, options={})
         #   @param [String] label specify test case name.
         #   @param data specify test data.
+        #   @param [Hash] options specify options.
+        #   @option options [Boolean] :keep whether or not to use
+        #     this data in the following test methods
         #
         #   @example data(label, data)
         #     data("empty string", [true, ""])
@@ -24,9 +29,39 @@ module Test
         #       assert_equal(expected, target.empty?)
         #     end
         #
-        # @overload data(data_set)
+        # @overload data(variable, patterns, options={})
+        #   @param [Symbol] variable specify test pattern variable name.
+        #   @param [Array] patterns specify test patterns for the variable.
+        #   @param [Hash] options specify options.
+        #   @option options [Boolean] :keep whether or not to use
+        #     this data in the following test methods
+        #   @option options [Object] :group the test pattern group.
+        #     Test matrix is generated for each test pattern group separately.
+        #
+        #   @example data(variable, patterns)
+        #     data(:x, [1, 2, 3])
+        #     data(:y, ["a", "b"])
+        #     def test_patterns(data)
+        #       # 3 * 2 times executed
+        #       # 3: the number of patterns of :x
+        #       # 2: the number of patterns of :y
+        #       p data
+        #         # => {:x => 1, :y => "a"}
+        #         # => {:x => 1, :y => "b"}
+        #         # => {:x => 2, :y => "a"}
+        #         # => {:x => 2, :y => "b"}
+        #         # => {:x => 3, :y => "a"}
+        #         # => {:x => 3, :y => "b"}
+        #     end
+        #
+        #   Generates test matrix from variable and patterns pairs.
+        #
+        # @overload data(data_set, options={})
         #   @param [Hash] data_set specify test data as a Hash that
         #     key is test label and value is test data.
+        #   @param [Hash] options specify options.
+        #   @option options [Boolean] :keep whether or not to use
+        #     this data in the following test methods
         #
         #   @example data(data_set)
         #     data("empty string" => [true, ""],
@@ -36,9 +71,12 @@ module Test
         #       assert_equal(expected, target.empty?)
         #     end
         #
-        # @overload data(&block)
-        #   @yieldreturn [Hash] return test data set as a Hash that
-        #     key is test label and value is test data.
+        # @overload data(options={}, &block)
+        #   @param [Hash] options specify options.
+        #   @option options [Boolean] :keep whether or not to use
+        #     this data in the following test methods
+        #   @yieldreturn [Hash<String, Object>] return test data set
+        #     as a Hash that key is test label and value is test data.
         #
         #   @example data(&block)
         #     data do
@@ -52,22 +90,93 @@ module Test
         #       assert_equal(expected, target.empty?)
         #     end
         #
+        # @overload data(options={}, &block)
+        #   @param [Hash] options specify options.
+        #   @option options [Boolean] :keep whether or not to use
+        #     this data in the following test methods
+        #   @yieldreturn [Array<Symbol, Array>] return test data set
+        #     as an Array of variable and patterns.
+        #
+        #   @example data(&block)
+        #     data do
+        #       patterns = 3.times.to_a
+        #       [:x, patterns]
+        #     end
+        #     data do
+        #       patterns = []
+        #       character = "a"
+        #       2.times.each do
+        #         patterns << character
+        #         character = character.succ
+        #       end
+        #       [:y, patterns]
+        #     end
+        #     def test_patterns(data)
+        #       # 3 * 2 times executed
+        #       # 3: the number of patterns of :x
+        #       # 2: the number of patterns of :y
+        #       p data
+        #         # => {:x => 0, :y => "a"}
+        #         # => {:x => 0, :y => "b"}
+        #         # => {:x => 1, :y => "a"}
+        #         # => {:x => 1, :y => "b"}
+        #         # => {:x => 2, :y => "a"}
+        #         # => {:x => 2, :y => "b"}
+        #     end
+        #
+        #   Generates test matrix from variable and patterns pairs.
+        #
         def data(*arguments, &block)
+          options = nil
           n_arguments = arguments.size
           case n_arguments
           when 0
             raise ArgumentError, "no block is given" unless block_given?
             data_set = block
           when 1
-            data_set = arguments[0]
+            if block_given?
+              data_set = block
+              options = arguments[0]
+            else
+              data_set = arguments[0]
+            end
           when 2
-            data_set = {arguments[0] => arguments[1]}
+            case arguments[0]
+            when String
+              data_set = {arguments[0] => arguments[1]}
+            when Hash
+              data_set = arguments[0]
+              options = arguments[1]
+            else
+              variable = arguments[0]
+              patterns = arguments[1]
+              data_set = [variable, patterns]
+            end
+          when 3
+            case arguments[0]
+            when String
+              data_set = {arguments[0] => arguments[1]}
+              options = arguments[2]
+            else
+              variable = arguments[0]
+              patterns = arguments[1]
+              data_set = [variable, patterns]
+              options = arguments[2]
+            end
           else
-            message = "wrong number arguments(#{n_arguments} for 1..2)"
+            message = "wrong number arguments(#{n_arguments} for 0..3)"
             raise ArgumentError, message
           end
-          current_data = current_attribute(:data)[:value] || []
-          attribute(:data, current_data + [data_set])
+          options ||= {}
+          data_sets = current_attribute(:data)[:value] || DataSets.new
+          data_sets.add(data_set, options)
+          if options[:keep] or data_sets.have_keep?
+            keep_hook = lambda do |attr|
+              attr.merge(value: attr[:value].keep)
+            end
+            options = options.merge(keep: true, keep_hook: keep_hook)
+          end
+          attribute(:data, data_sets, options)
         end
 
         # This method provides Data-Driven-Test functionality.
@@ -78,7 +187,7 @@ module Test
         #
         # @param [String] file_name full path to test data file.
         #   File format is automatically detected from filename extension.
-        # @raise [ArgumentError] if +file_name+ is not supported file format.
+        # @raise [ArgumentError] if `file_name` is not supported file format.
         # @see Loader#load
         #
         # @example Load data from CSV file
@@ -102,7 +211,7 @@ module Test
           #
           # @param [String] file_name full path to test data file.
           #   File format is automatically detected from filename extension.
-          # @raise [ArgumentError] if +file_name+ is not supported file format.
+          # @raise [ArgumentError] if `file_name` is not supported file format.
           # @see #load_csv
           # @see #load_tsv
           # @api private

data/lib/test/unit/diff.rb

@@ -3,9 +3,8 @@
 # Copyright (c) 2001-2008 Python Software Foundation; All Rights Reserved
 # Copyright (c) 2008-2011 Kouhei Sutou; All Rights Reserved
 #
-# It is free software, and is distributed under the Ruby
-# license and/or the PSF license. See the COPYING file and
-# PSFL file.
+# It is free software, and is distributed under (the new Ruby license
+# or BSDL) and the PSF license.
 
 module Test
   module Unit
@@ -269,7 +268,7 @@ module Test
 
         private
         def tag(mark, contents)
-          contents.collect {|content| "#{mark}#{content}"}
+          contents.collect {|content| mark + content}
         end
       end
 
@@ -450,7 +449,7 @@ module Test
 
         def tag(mark, contents)
           contents.each do |content|
-            @result << "#{mark}#{content}"
+            @result << (mark + content)
           end
         end
 
@@ -577,15 +576,15 @@ module Test
             to_width = compute_width(to_line, to_start, to_end)
             case tag
             when :replace
-              from_tags << "^" * from_width
-              to_tags << "^" * to_width
+              from_tags += "^" * from_width
+              to_tags += "^" * to_width
             when :delete
-              from_tags << "-" * from_width
+              from_tags += "-" * from_width
             when :insert
-              to_tags << "+" * to_width
+              to_tags += "+" * to_width
             when :equal
-              from_tags << " " * from_width
-              to_tags << " " * to_width
+              from_tags += " " * from_width
+              to_tags += " " * to_width
             else
               raise "unknown tag: #{tag}"
             end