test-unit 3.2.5 → 3.4.7

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[1]
+            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]
+            keep_hook = lambda do |attr|
+              attr.merge(value: attr[:value].keep)
+            end
+            options = options.merge(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, the
-# PSF license and/or LGPLv2.1 or later. See the COPYING file, the PSFL
-# file and the LGPL file.
+# It is free software, and is distributed under (the new Ruby license
+# or BSDL) and the PSF license.
 
 module Test
   module Unit

data/lib/test/unit/fixture.rb

@@ -103,6 +103,7 @@ module Test
           @test_case = test_case
           @type = type
           @default_options = default_options
+          @callbacks = {}
           @before_prepend_callbacks = []
           @before_append_callbacks = []
           @after_prepend_callbacks = []
@@ -130,6 +131,11 @@ module Test
             @test_case.attribute(:source_location,
                                  callback.source_location,
                                  method_name)
+            # For Ruby 2.6 or earlier. callback may be GC-ed. If
+            # callback is GC-ed, callback_method_name may be
+            # duplicated because callback_method_name uses callback.object_id.
+            # See also: https://github.com/test-unit/test-unit/issues/179
+            @callbacks[callback] = true
             @test_case.__send__(:define_method, method_name, &callback)
           else
             method_name = method_name_or_callback

data/lib/test/unit/notification.rb

@@ -65,15 +65,17 @@ module Test
       # Notify some information.
       #
       # Example:
-      #   def test_notification
-      #     notify("I'm here!")
-      #     # Reached here
-      #     notify("Special!") if special_case?
-      #     # Reached here too
-      #   end
+      #
+      #     def test_notification
+      #       notify("I'm here!")
+      #       # Reached here
+      #       notify("Special!") if special_case?
+      #       # Reached here too
+      #     end
       #
       # options:
-      #   :backtrace override backtrace.
+      #
+      #     :backtrace override backtrace.
       def notify(message, options={}, &block)
         backtrace = filter_backtrace(options[:backtrace] || caller)
         notification = Notification.new(name, backtrace, message,

data/lib/test/unit/omission.rb

@@ -65,17 +65,18 @@ module Test
       # Omit the test or part of the test.
       #
       # Example:
-      #   def test_omission
-      #     omit
-      #     # Not reached here
-      #   end
       #
-      #   def test_omission_with_here
-      #     omit do
-      #       # Not ran here
+      #     def test_omission
+      #       omit
+      #       # Not reached here
+      #     end
+      #
+      #     def test_omission_with_here
+      #       omit do
+      #         # Not ran here
+      #       end
+      #       # Reached here
       #     end
-      #     # Reached here
-      #   end
       def omit(message=nil, &block)
         message ||= "omitted."
         if block_given?
@@ -91,20 +92,21 @@ module Test
       # true.
       #
       # Example:
-      #   def test_omission
-      #     omit_if("".empty?)
-      #     # Not reached here
-      #   end
       #
-      #   def test_omission_with_here
-      #     omit_if(true) do
-      #       # Not ran here
+      #     def test_omission
+      #       omit_if("".empty?)
+      #       # Not reached here
       #     end
-      #     omit_if(false) do
-      #       # Reached here
+      #
+      #     def test_omission_with_here
+      #       omit_if(true) do
+      #         # Not ran here
+      #       end
+      #       omit_if(false) do
+      #         # Reached here
+      #       end
+      #       # Reached here too
       #     end
-      #     # Reached here too
-      #   end
       def omit_if(condition, *args, &block)
         if condition
           omit(*args, &block)
@@ -117,20 +119,21 @@ module Test
       # not true.
       #
       # Example:
-      #   def test_omission
-      #     omit_unless("string".empty?)
-      #     # Not reached here
-      #   end
       #
-      #   def test_omission_with_here
-      #     omit_unless(true) do
-      #       # Reached here
+      #     def test_omission
+      #       omit_unless("string".empty?)
+      #       # Not reached here
       #     end
-      #     omit_unless(false) do
-      #       # Not ran here
+      #
+      #     def test_omission_with_here
+      #       omit_unless(true) do
+      #         # Reached here
+      #       end
+      #       omit_unless(false) do
+      #         # Not ran here
+      #       end
+      #       # Reached here too
       #     end
-      #     # Reached here too
-      #   end
       def omit_unless(condition, *args, &block)
         if condition
           block.call if block

data/lib/test/unit/pending.rb

@@ -65,19 +65,20 @@ module Test
       # Marks the test or part of the test is pending.
       #
       # Example:
-      #   def test_pending
-      #     pend
-      #     # Not reached here
-      #   end
       #
-      #   def test_pending_with_here
-      #     pend do
-      #       # Ran here
-      #       # Fails if the block doesn't raise any error.
-      #       # Because it means the block is passed unexpectedly.
+      #     def test_pending
+      #       pend
+      #       # Not reached here
+      #     end
+      #
+      #     def test_pending_with_here
+      #       pend do
+      #         # Ran here
+      #         # Fails if the block doesn't raise any error.
+      #         # Because it means the block is passed unexpectedly.
+      #       end
+      #       # Reached here
       #     end
-      #     # Reached here
-      #   end
       def pend(message=nil, &block)
         message ||= "pended."
         if block_given?

data/lib/test/unit/priority.rb

@@ -148,15 +148,19 @@ module Test
         end
 
         def escape_class_name(class_name)
-          class_name.gsub(/(?:[: \\\/])/, "_")
+          escape_name(class_name)
         end
 
         def escaped_method_name
-          @test.method_name.to_s.gsub(/(?:[: ]|[!?=]$)/) do |matched|
+          escape_name(@test.method_name.to_s)
+        end
+
+        def escape_name(name)
+          name.gsub(/(?:[: \/!?=])/) do |matched|
             case matched
             when ":"
               "_colon_"
-            when " "
+            when " ", "/"
               "_"
             when "!"
               ".destructive"

data/lib/test/unit/runner/console.rb

@@ -1,3 +1,5 @@
+# Copyright (C) 2008-2017  Kouhei Sutou <kou@clear-code.com>
+
 module Test
   module Unit
     AutoRunner.register_runner(:console) do |auto_runner|
@@ -54,6 +56,12 @@ module Test
               "(default is yes)") do |boolean|
         auto_runner.runner_options[:show_detail_immediately] = boolean
       end
+
+      opts.on("--[no-]reverse-output",
+              "Shows fault details in reverse.",
+              "(default is yes for tty output, no otherwise)") do |boolean|
+        auto_runner.runner_options[:reverse_output] = boolean
+      end
     end
   end
 end

data/lib/test/unit/test-suite-creator.rb

@@ -5,6 +5,8 @@
 #   * Copyright (c) 2011 Kouhei Sutou <tt><kou@clear-code.com></tt>
 # License:: Ruby license.
 
+require "test/unit/data-sets"
+
 module Test
   module Unit
     class TestSuiteCreator # :nodoc:
@@ -22,15 +24,11 @@ module Test
       def create
         suite = TestSuite.new(@test_case.name, @test_case)
         collect_test_names.each do |test_name|
-          data_sets = @test_case.find_attribute(test_name, :data,
-                                                :recursive => false)
+          data_sets = extract_data_sets(test_name)
           if data_sets
-            data_sets.each do |data_set|
-              data_set = data_set.call if data_set.respond_to?(:call)
-              data_set.each do |label, data|
-                append_test(suite, test_name) do |test|
-                  test.assign_test_data(label, data)
-                end
+            data_sets.each do |label, data|
+              append_test(suite, test_name) do |test|
+                test.assign_test_data(label, data)
               end
             end
           else
@@ -42,6 +40,22 @@ module Test
       end
 
       private
+      def extract_data_sets(test_name)
+        data_sets = @test_case.find_attribute(test_name,
+                                              :data,
+                                              :recursive => false)
+        data_method_name = "data_#{test_name}"
+        test = @test_case.new(test_name)
+        if test.respond_to?(data_method_name)
+          data_method = test.method(data_method_name)
+          if data_method.arity <= 0
+            data_sets ||= DataSets.new
+            data_sets << data_method
+          end
+        end
+        data_sets
+      end
+
       def append_test(suite, test_name)
         test = @test_case.new(test_name)
         yield(test) if block_given?