test-unit 2.3.0 → 2.3.1

data/lib/test/unit/assertions.rb

@@ -116,7 +116,7 @@ EOT
           failure.inspected_expected = AssertionMessage.convert(expected)
           failure.inspected_actual = AssertionMessage.convert(actual)
           failure.user_message = message
-          raise
+          raise failure # For JRuby. :<
         end
       end
 
@@ -1019,7 +1019,7 @@ EOT
                                        expected, actual,
                                        expected, actual)
           assert_block(full_message) do
-            expected.send(operator, actual)
+            expected.__send__(operator, actual)
           end
         end
       end
@@ -1129,7 +1129,7 @@ EOT
       def assert_predicate(object, predicate, message=nil)
         _wrap_assertion do
           assert_respond_to(object, predicate, message)
-          actual = object.send(predicate)
+          actual = object.__send__(predicate)
           full_message = build_message(message,
                                        "<?>.? is true value expected but was\n" +
                                        "<?>",
@@ -1151,7 +1151,7 @@ EOT
       def assert_not_predicate(object, predicate, message=nil)
         _wrap_assertion do
           assert_respond_to(object, predicate, message)
-          actual = object.send(predicate)
+          actual = object.__send__(predicate)
           full_message = build_message(message,
                                        "<?>.? is false value expected but was\n" +
                                        "<?>",
@@ -1525,8 +1525,20 @@ EOM
         end
 
         class Inspector
-          def initialize(object)
+          include Comparable
+
+          class << self
+            def cached_new(object, inspected_objects)
+              inspected_objects[object.object_id] ||=
+                new(object, inspected_objects)
+            end
+          end
+
+          attr_reader :object
+          def initialize(object, inspected_objects={})
+            @inspected_objects = inspected_objects
             @object = object
+            @inspected_objects[@object.object_id] = self
             @inspect_target = inspect_target
           end
 
@@ -1543,12 +1555,20 @@ EOM
             @inspect_target.pretty_print_cycle(q)
           end
 
+          def <=>(other)
+            if other.is_a?(self.class)
+              @object <=> other.object
+            else
+              @object <=> other
+            end
+          end
+
           private
           def inspect_target
             if HashInspector.target?(@object)
-              HashInspector.new(@object)
+              HashInspector.new(@object, @inspected_objects)
             elsif ArrayInspector.target?(@object)
-              ArrayInspector.new(@object)
+              ArrayInspector.new(@object, @inspected_objects)
             else
               @object
             end
@@ -1562,8 +1582,14 @@ EOM
             end
           end
 
-          def initialize(hash)
-            @hash = hash
+          def initialize(hash, inspected_objects)
+            @inspected_objects = inspected_objects
+            @hash = {}
+            hash.each do |key, value|
+              key = Inspector.cached_new(key, @inspected_objects)
+              value = Inspector.cached_new(value, @inspected_objects)
+              @hash[key] = value
+            end
           end
 
           def inspect
@@ -1596,8 +1622,7 @@ EOM
             rescue ArgumentError
             end
             keys.each do |key|
-              yield(Inspector.new(key),
-                    Inspector.new(@hash[key]))
+              yield(key, @hash[key])
             end
           end
         end
@@ -1609,8 +1634,11 @@ EOM
             end
           end
 
-          def initialize(array)
-            @array = array
+          def initialize(array, inspected_objects)
+            @inspected_objects = inspected_objects
+            @array = array.collect do |element|
+              Inspector.cached_new(element, @inspected_objects)
+            end
           end
 
           def inspect
@@ -1629,10 +1657,8 @@ EOM
             @array.pretty_print_cycle(q)
           end
 
-          def each
-            @array.each do |element|
-              yield(Inspector.new(element))
-            end
+          def each(&block)
+            @array.each(&block)
           end
         end
 
@@ -1743,7 +1769,7 @@ EOM
           end
 
           def method_missing(name, *args, &block)
-            @exception.send(name, *args, &block)
+            @exception.__send__(name, *args, &block)
           end
 
           private
@@ -1799,10 +1825,10 @@ EOM
             elsif exception_type.is_a?(Exception)
               exception_objects << exception_type
             else
-              @test_case.send(:assert,
-                              Exception >= exception_type,
-                              "Should expect a class of exception, " +
-                              "#{exception_type}")
+              @test_case.__send__(:assert,
+                                  Exception >= exception_type,
+                                  "Should expect a class of exception, " +
+                                  "#{exception_type}")
               exception_classes << exception_type
             end
           end
@@ -1811,7 +1837,7 @@ EOM
 
         def expected_class?(actual_exception, equality)
           @expected_classes.any? do |expected_class|
-            actual_exception.send(equality, expected_class)
+            actual_exception.__send__(equality, expected_class)
           end
         end
 

data/lib/test/unit/attribute.rb

@@ -36,7 +36,7 @@ module Test
           return unless defined?(@current_attributes)
 
           attributes = {}
-          kept_attributes = {}
+          kept_attributes = StringifyKeyHash.new
           @current_attributes.each do |attribute_name, attribute|
             attributes[attribute_name] = attribute[:value]
             kept_attributes[attribute_name] = attribute if attribute[:keep]

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

@@ -102,7 +102,7 @@ module Test
           return if @program_file == expanded_path.to_s
           add_load_path(expanded_path.dirname) do
             begin
-              require(path.to_s)
+              require(path.basename.to_s)
             rescue LoadError
               @require_failed_infos << {:path => expanded_path, :exception => $!}
             end
@@ -121,10 +121,10 @@ module Test
         end
 
         def add_load_path(path)
-          $LOAD_PATH.push(path.to_s) if path
+          $LOAD_PATH.unshift(path.to_s) if path
           yield
         ensure
-          $LOAD_PATH.delete_at($LOAD_PATH.rindex(path.to_s)) if path
+          $LOAD_PATH.delete_at($LOAD_PATH.index(path.to_s)) if path
         end
 
         def excluded_directory?(base)

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

@@ -9,10 +9,11 @@ module Test
       require 'test/unit/ui/console/outputlevel'
 
       output_levels = [
-        [:silent, UI::Console::OutputLevel::SILENT],
-        [:progress, UI::Console::OutputLevel::PROGRESS_ONLY],
-        [:normal, UI::Console::OutputLevel::NORMAL],
-        [:verbose, UI::Console::OutputLevel::VERBOSE],
+        ["silent", UI::Console::OutputLevel::SILENT],
+        ["progress", UI::Console::OutputLevel::PROGRESS_ONLY],
+        ["important-only", UI::Console::OutputLevel::IMPORTANT_FAULTS_ONLY],
+        ["normal", UI::Console::OutputLevel::NORMAL],
+        ["verbose", UI::Console::OutputLevel::VERBOSE],
       ]
       opts.on('-v', '--verbose=[LEVEL]', output_levels,
               "Set the output level (default is verbose).",
@@ -47,6 +48,12 @@ module Test
               "(default is auto)") do |max|
         auto_runner.runner_options[:progress_row_max] = max
       end
+
+      opts.on("--[no-]show-detail-immediately",
+              "Shows not passed test details immediately.",
+              "(default is no)") do |boolean|
+        auto_runner.runner_options[:show_detail_immediately] = boolean
+      end
     end
   end
 end

data/lib/test/unit/testcase.rb

@@ -257,7 +257,7 @@ module Test
               message = "wrong number of arguments (#{n_arguments} for 1)"
               raise ArgumentError, message
             end
-            method_name = test_description
+            method_name = "test: #{test_description}"
             define_method(method_name, &block)
             description(test_description, method_name)
             attribute(:test, true, {}, method_name)

data/lib/test/unit/ui/console/outputlevel.rb

@@ -5,8 +5,9 @@ module Test
         module OutputLevel
           SILENT = 0
           PROGRESS_ONLY = 1
-          NORMAL = 2
-          VERBOSE = 3
+          IMPORTANT_FAULTS_ONLY = 2
+          NORMAL = 3
+          VERBOSE = 4
         end
       end
     end

data/lib/test/unit/ui/console/testrunner.rb

@@ -3,7 +3,7 @@
 # Author:: Nathaniel Talbott.
 # Copyright::
 #   * Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
-#   * Copyright (c) 2008-2009 Kouhei Sutou <kou@clear-code.com>
+#   * Copyright (c) 2008-2011 Kouhei Sutou <kou@clear-code.com>
 # License:: Ruby license.
 
 require 'test/unit/color-scheme'
@@ -37,13 +37,22 @@ module Test
             @progress_row = 0
             @progress_row_max = @options[:progress_row_max]
             @progress_row_max ||= guess_progress_row_max
+            @show_detail_immediately = @options[:show_detail_immediately]
             @already_outputted = false
             @indent = 0
             @top_level = true
+            @current_output_level = NORMAL
             @faults = []
           end
 
           private
+          def change_output_level(level)
+            old_output_level = @current_output_level
+            @current_output_level = level
+            yield
+            @current_output_level = old_output_level
+          end
+
           def setup_mediator
             super
             output_setup_end
@@ -75,6 +84,7 @@ module Test
           def add_fault(fault)
             @faults << fault
             output_progress(fault.single_character_display, fault_color(fault))
+            output_progress_in_detail(fault) if @show_detail_immediately
             @already_outputted = true if fault.critical?
           end
 
@@ -89,24 +99,66 @@ module Test
 
           def finished(elapsed_time)
             nl if output?(NORMAL) and !output?(VERBOSE)
-            @faults.each_with_index do |fault, index|
+            output_faults unless @show_detail_immediately
+            nl(IMPORTANT_FAULTS_ONLY)
+            change_output_level(IMPORTANT_FAULTS_ONLY) do
+              output_statistics(elapsed_time)
+            end
+          end
+
+          def output_faults
+            categorized_faults = categorize_faults
+            change_output_level(IMPORTANT_FAULTS_ONLY) do
+              output_faults_in_detail(categorized_faults[:need_detail_faults])
+            end
+            output_faults_in_short("Omissions", Omission,
+                                   categorized_faults[:omissions])
+            output_faults_in_short("Notifications", Notification,
+                                   categorized_faults[:notifications])
+          end
+
+          def max_digit(max_number)
+            (Math.log10(max_number) + 1).truncate
+          end
+
+          def output_faults_in_detail(faults)
+            return if faults.nil?
+            digit = max_digit(faults.size)
+            faults.each_with_index do |fault, index|
               nl
-              output_single("%3d) " % (index + 1))
+              output_single("%#{digit}d) " % (index + 1))
               output_fault(fault)
             end
+          end
+
+          def output_faults_in_short(label, fault_class, faults)
+            return if faults.nil?
+            digit = max_digit(faults.size)
             nl
-            output("Finished in #{elapsed_time} seconds.")
-            nl
-            output(@result, result_color)
-            output("%g%% passed" % @result.pass_percentage, result_color)
-            unless elapsed_time.zero?
-              nl
-              throuputs =
-                [
-                 "%.2f tests/s" % [@result.run_count / elapsed_time],
-                 "%.2f assertions/s" % [@result.assertion_count / elapsed_time],
-                ]
-              output(throuputs.join(", "))
+            output_single(label, fault_class_color(fault_class))
+            output(":")
+            faults.each_with_index do |fault, index|
+              output_single("%#{digit}d) " % (index + 1))
+              output_single(fault.message, fault_color(fault))
+              output(" [#{fault.test_name}]")
+              output(fault.location.first)
+            end
+          end
+
+          def categorize_faults
+            @faults.group_by do |fault|
+              categorize_fault(fault)
+            end
+          end
+
+          def categorize_fault(fault)
+            case fault
+            when Omission
+              :omissions
+            when Notification
+              :notifications
+            else
+              :need_detail_faults
             end
           end
 
@@ -198,6 +250,23 @@ module Test
             fault.long_display
           end
 
+          def output_statistics(elapsed_time)
+            output("Finished in #{elapsed_time} seconds.")
+            nl
+            output(@result, result_color)
+            output("%g%% passed" % @result.pass_percentage, result_color)
+            unless elapsed_time.zero?
+              nl
+              test_throughput = @result.run_count / elapsed_time
+              assertion_throughput = @result.assertion_count / elapsed_time
+              throughput = [
+                "%.2f tests/s" % test_throughput,
+                "%.2f assertions/s" % assertion_throughput,
+              ]
+              output(throughput.join(", "))
+            end
+          end
+
           def test_started(test)
             return unless output?(VERBOSE)
 
@@ -250,17 +319,17 @@ module Test
             end
           end
 
-          def nl(level=NORMAL)
+          def nl(level=nil)
             output("", nil, level)
           end
-          
-          def output(something, color=nil, level=NORMAL)
+
+          def output(something, color=nil, level=nil)
             return unless output?(level)
             output_single(something, color, level)
             @output.puts
           end
-          
-          def output_single(something, color=nil, level=NORMAL)
+
+          def output_single(something, color=nil, level=nil)
             return false unless output?(level)
             if @use_color and color
               something = "%s%s%s" % [color.escape_sequence,
@@ -283,8 +352,14 @@ module Test
             end
           end
 
+          def output_progress_in_detail(fault)
+            return if @output_level == SILENT
+            return unless categorize_fault(fault) == :need_detail_faults
+            output_fault(fault)
+          end
+
           def output?(level)
-            level <= @output_level
+            (level || @current_output_level) <= @output_level
           end
 
           def color(name)
@@ -295,7 +370,11 @@ module Test
           end
 
           def fault_color(fault)
-            color(fault.class.name.split(/::/).last.downcase)
+            fault_class_color(fault.class)
+          end
+
+          def fault_class_color(fault_class)
+            color(fault_class.name.split(/::/).last.downcase)
           end
 
           def result_color

data/lib/test/unit/version.rb

@@ -2,6 +2,6 @@
 # HACK: quick and dirty to get integrated into the new project - ryan
 module Test
   module Unit
-    VERSION = '2.3.0'
+    VERSION = '2.3.1'
   end
 end