test-unit 3.1.5 → 3.6.1

data/lib/test/unit/fixture.rb

@@ -24,9 +24,11 @@ module Test
         attr_reader :teardown
         def initialize(test_case)
           @test_case = test_case
-          @setup = HookPoint.new(:after => :append)
-          @cleanup = HookPoint.new(:before => :prepend)
-          @teardown = HookPoint.new(:before => :prepend)
+          @setup = HookPoint.new(@test_case, :setup, :after => :append)
+          @cleanup = HookPoint.new(@test_case, :cleanup, :before => :prepend)
+          @teardown = HookPoint.new(@test_case, :teardown, :before => :prepend)
+          @cached_before_callbacks = {}
+          @cached_after_callbacks = {}
         end
 
         def [](type)
@@ -41,6 +43,19 @@ module Test
         end
 
         def before_callbacks(type)
+          @cached_before_callbacks[type] ||= collect_before_callbacks(type)
+        end
+
+        def after_callbacks(type)
+          @cached_after_callbacks[type] ||= collect_after_callbacks(type)
+        end
+
+        private
+        def target_test_cases
+          @cached_target_test_cases ||= collect_target_test_cases
+        end
+
+        def collect_before_callbacks(type)
           prepend_callbacks = []
           append_callbacks = []
           target_test_cases.each do |ancestor|
@@ -51,7 +66,7 @@ module Test
           merge_callbacks(prepend_callbacks, append_callbacks)
         end
 
-        def after_callbacks(type)
+        def collect_after_callbacks(type)
           prepend_callbacks = []
           append_callbacks = []
           target_test_cases.each do |ancestor|
@@ -62,11 +77,6 @@ module Test
           merge_callbacks(prepend_callbacks, append_callbacks)
         end
 
-        private
-        def target_test_cases
-          @cached_target_test_cases ||= collect_target_test_cases
-        end
-
         def collect_target_test_cases
           ancestors = @test_case.ancestors
           base_index = ancestors.index(::Test::Unit::Fixture)
@@ -89,8 +99,11 @@ module Test
       end
 
       class HookPoint
-        def initialize(default_options)
+        def initialize(test_case, type, default_options)
+          @test_case = test_case
+          @type = type
           @default_options = default_options
+          @callbacks = {}
           @before_prepend_callbacks = []
           @before_append_callbacks = []
           @after_prepend_callbacks = []
@@ -112,11 +125,32 @@ module Test
           end
           before_how = options[:before]
           after_how = options[:after]
-          add_callback(method_name_or_callback, before_how, after_how)
+          if method_name_or_callback.respond_to?(:call)
+            callback = method_name_or_callback
+            method_name = callback_method_name(callback)
+            @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
+          end
+          add_callback(method_name, before_how, after_how)
         end
 
         def unregister(method_name_or_callback)
-          @unregistered_callbacks << method_name_or_callback
+          if method_name_or_callback.respond_to?(:call)
+            callback = method_name_or_callback
+            method_name = callback_method_name(callback)
+          else
+            method_name = method_name_or_callback
+          end
+          @unregistered_callbacks << method_name
         end
 
         def before_prepend_callbacks
@@ -145,6 +179,10 @@ module Test
             [:prepend, :append].include?(options[key])
         end
 
+        def callback_method_name(callback)
+          "#{@type}_#{callback.object_id}"
+        end
+
         def add_callback(method_name_or_callback, before_how, after_how)
           case before_how
           when :prepend
@@ -208,38 +246,50 @@ module Test
       end
 
       private
-      def run_fixture(type, options={})
-        [
+      def run_fixture(type, options={}, &block)
+        fixtures = [
           self.class.fixture.before_callbacks(type),
           type,
           self.class.fixture.after_callbacks(type),
-        ].flatten.each do |method_name_or_callback|
-          run_fixture_callback(method_name_or_callback, options)
+        ].flatten
+        if block
+          runner = create_fixtures_runner(fixtures, options, &block)
+          runner.call
+        else
+          fixtures.each do |method_name|
+            run_fixture_callback(method_name, options)
+          end
         end
       end
 
-      def run_fixture_callback(method_name_or_callback, options)
-        if method_name_or_callback.respond_to?(:call)
-          callback = lambda do
-            instance_eval(&method_name_or_callback)
-          end
+      def create_fixtures_runner(fixtures, options, &block)
+        if fixtures.empty?
+          block
         else
-          return unless respond_to?(method_name_or_callback, true)
-          callback = lambda do
-            __send__(method_name_or_callback)
+          last_fixture = fixtures.pop
+          create_fixtures_runner(fixtures, options) do
+            block_is_called = false
+            run_fixture_callback(last_fixture, options) do
+              block_is_called = true
+              block.call
+            end
+            block.call unless block_is_called
           end
         end
+      end
 
+      def run_fixture_callback(method_name, options, &block)
+        return unless respond_to?(method_name, true)
         begin
-          callback.call
+          __send__(method_name, &block)
         rescue Exception
           raise unless options[:handle_exception]
           raise unless handle_exception($!)
         end
       end
 
-      def run_setup
-        run_fixture(:setup)
+      def run_setup(&block)
+        run_fixture(:setup, &block)
       end
 
       def run_cleanup

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

@@ -1,5 +1,3 @@
-require "fileutils"
-
 module Test
   module Unit
     module Priority
@@ -148,15 +146,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-2023  Sutou Kouhei <kou@clear-code.com>
+
 module Test
   module Unit
     AutoRunner.register_runner(:console) do |auto_runner|
@@ -16,7 +18,7 @@ module Test
         ["verbose", UI::Console::OutputLevel::VERBOSE],
       ]
       opts.on('-v', '--verbose=[LEVEL]', output_levels,
-              "Set the output level (default is verbose).",
+              "Set the output level (default is normal).",
               "(#{auto_runner.keyword_display(output_levels)})") do |level|
         level ||= output_levels.assoc("verbose")[1]
         auto_runner.runner_options[:output_level] = level
@@ -49,11 +51,28 @@ module Test
         auto_runner.runner_options[:progress_row_max] = max
       end
 
+      progress_styles = [
+        ["inplace", :inplace],
+        ["mark", :mark],
+        ["fault-only", :fault_only],
+      ]
+      opts.on("--progress-style=STYLE", progress_styles,
+              "Uses STYLE as progress style",
+              "(#{auto_runner.keyword_display(progress_styles)}") do |style|
+        auto_runner.runner_options[:progress_style] = style
+      end
+
       opts.on("--no-show-detail-immediately",
               "Shows not passed test details immediately.",
               "(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,9 +5,18 @@
 #   * 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:
+      class << self
+        def test_method?(test_case, method_name)
+          /\Atest./ =~ method_name.to_s or
+            test_case.find_attribute(method_name, :test)
+        end
+      end
+
       def initialize(test_case)
         @test_case = test_case
       end
@@ -15,14 +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)
+          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
@@ -34,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?
@@ -47,8 +69,7 @@ module Test
         methods |= @test_case.public_instance_methods(false)
         method_names = methods.collect(&:to_s)
         test_names = method_names.find_all do |method_name|
-          /\Atest./ =~ method_name or
-            @test_case.find_attribute(method_name, :test)
+          self.class.test_method?(@test_case, method_name)
         end
         __send__("sort_test_names_in_#{@test_case.test_order}_order", test_names)
       end