rroonga 1.0.8 → 1.0.9

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

@@ -90,13 +90,8 @@ module Test # :nodoc:
   # 
   # Test::Unit is copyright (c) 2000-2003 Nathaniel Talbott. It is free
   # software, and is distributed under the Ruby license. See the COPYING
-  # file.
+  # file in the standard Ruby distribution for details.
   # 
-  # Exception: lib/test/unit/diff.rb is copyright (c)
-  # 2008-2010 Kouhei Sutou and 2001-2008 Python Software
-  # Foundation. It is free software, and is distributed
-  # under the Ruby license and/or the PSF license. See the
-  # COPYING file and PSFL file.
   # 
   # == Warranty
   # 

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

@@ -1,6 +1,6 @@
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
-#             Copyright (c) 2009-2010 Kouhei Sutou. All rights reserved.
+#             Copyright (c) 2009 Kouhei Sutou.
 # License:: Ruby license.
 
 require 'test/unit/assertionfailederror'
@@ -80,23 +80,10 @@ module Test
       public
       def assert_equal(expected, actual, message=nil)
         diff = AssertionMessage.delayed_diff(expected, actual)
-        if expected.respond_to?(:encoding) and
-            actual.respond_to?(:encoding) and
-            expected.encoding != actual.encoding
-          format = <<EOT
-<?>(?) expected but was
-<?>(?).?
-EOT
-          full_message = build_message(message, format,
-                                       expected, expected.encoding.name,
-                                       actual, actual.encoding.name,
-                                       diff)
-        else
-          full_message = build_message(message, <<EOT, expected, actual, diff)
+        full_message = build_message(message, <<EOT, expected, actual, diff)
 <?> expected but was
 <?>.?
 EOT
-        end
         begin
           assert_block(full_message) { expected == actual }
         rescue AssertionFailedError => failure
@@ -552,73 +539,18 @@ EOT
       public
       def assert_in_delta(expected_float, actual_float, delta, message="")
         _wrap_assertion do
-          _assert_in_delta_validate_arguments(expected_float,
-                                              actual_float,
-                                              delta)
-          full_message = _assert_in_delta_message(expected_float,
-                                                  actual_float,
-                                                  delta,
-                                                  message)
-          assert_block(full_message) do
-            (expected_float.to_f - actual_float.to_f).abs <= delta.to_f
-          end
-        end
-      end
-
-      # :stopdoc:
-      private
-      def _assert_in_delta_validate_arguments(expected_float,
-                                              actual_float,
-                                              delta)
-        {
-          expected_float => "first float",
-          actual_float => "second float",
-          delta => "delta"
-        }.each do |float, name|
-          assert_respond_to(float, :to_f,
-                            "The arguments must respond to to_f; " +
-                            "the #{name} did not")
-        end
-        assert_operator(delta, :>=, 0.0, "The delta should not be negative")
-      end
-
-      def _assert_in_delta_message(expected_float, actual_float, delta,
-                                   message)
-        format = <<-EOT
-<?> expected but was
-<?> (tolerance <?>).
+          {expected_float => "first float", actual_float => "second float", delta => "delta"}.each do |float, name|
+            assert_respond_to(float, :to_f, "The arguments must respond to to_f; the #{name} did not")
+          end
+          assert_operator(delta, :>=, 0.0, "The delta should not be negative")
+          full_message = build_message(message, <<EOT, expected_float, actual_float, delta)
+<?> and
+<?> expected to be within
+<?> of each other.
 EOT
-        arguments = [expected_float, actual_float, delta]
-        normalized_expected = expected_float.to_f
-        normalized_actual = actual_float.to_f
-        normalized_delta = delta.to_f
-        relation_format = nil
-        relation_arguments = nil
-        if normalized_actual < normalized_expected - normalized_delta
-          relation_format = "<<?> < <?>-<?>(?) <= <?>+<?>(?)>"
-          relation_arguments = [actual_float,
-                                expected_float, delta, expected_float - delta,
-                                expected_float, delta, expected_float + delta]
-        elsif normalized_expected - normalized_delta < normalized_actual
-          relation_format = "<<?>-<?>(?) <= <?>+<?>(?) < <?>>"
-          relation_arguments = [expected_float, delta, expected_float - delta,
-                                expected_float, delta, expected_float + delta,
-                                actual_float]
+          assert_block(full_message) { (expected_float.to_f - actual_float.to_f).abs <= delta.to_f }
         end
-
-        if relation_format
-          format << <<-EOT
-
-Relation:
-#{relation_format}
-EOT
-          arguments.concat(relation_arguments)
-        end
-
-        build_message(message, format, *arguments)
       end
-      public
-      # :startdoc:
 
       ##
       # Passes if the method send returns a true value.
@@ -914,42 +846,6 @@ EOT
         end
       end
 
-      ##
-      # Passes if +path+ exists.
-      #
-      # Example:
-      #   assert_path_exist("/tmp")          # -> pass
-      #   assert_path_exist("/bin/sh")       # -> pass
-      #   assert_path_exist("/nonexistent")  # -> fail
-      def assert_path_exist(path, message=nil)
-        _wrap_assertion do
-          failure_message = build_message(message,
-                                          "<?> expected to exist",
-                                          path)
-          assert_block(failure_message) do
-            File.exist?(path)
-          end
-        end
-      end
-
-      ##
-      # Passes if +path+ doesn't exist.
-      #
-      # Example:
-      #   assert_path_not_exist("/nonexistent")  # -> pass
-      #   assert_path_not_exist("/tmp")          # -> fail
-      #   assert_path_not_exist("/bin/sh")       # -> fail
-      def assert_path_not_exist(path, message=nil)
-        _wrap_assertion do
-          failure_message = build_message(message,
-                                          "<?> expected to not exist",
-                                          path)
-          assert_block(failure_message) do
-            not File.exist?(path)
-          end
-        end
-      end
-
       ##
       # Builds a failure message.  +head+ is added before the +template+ and
       # +arguments+ replaces the '?'s positionally in the template.

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

@@ -99,7 +99,7 @@ module Test
 
       attr_reader :suite, :runner_options
       attr_accessor :filters, :to_run, :pattern, :exclude, :base, :workdir
-      attr_accessor :color_scheme, :listeners
+      attr_accessor :color_scheme
       attr_writer :runner, :collector
 
       def initialize(standalone)
@@ -113,7 +113,6 @@ module Test
         @runner_options = {}
         @default_arguments = []
         @workdir = nil
-        @listeners = []
         config_file = "test-unit.yml"
         if File.exist?(config_file)
           load_config(config_file)
@@ -301,8 +300,6 @@ module Test
         runner = @runner[self]
         return false if runner.nil?
         @runner_options[:color_scheme] ||= @color_scheme
-        @runner_options[:listeners] ||= []
-        @runner_options[:listeners].concat(@listeners)
         Dir.chdir(@workdir) if @workdir
         runner.run(suite, @runner_options).passed?
       end
@@ -345,7 +342,7 @@ module Test
       end
 
       def global_config_file
-        File.expand_path("~/.test-unit.yml")
+        File.expand_path("~/.test-unit.xml")
       rescue ArgumentError
         nil
       end

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

@@ -95,7 +95,7 @@ module Test
 
         def collect_file(path, test_suites, already_gathered)
           @program_file ||= File.expand_path($0)
-          return if @program_file == path.expand_path.to_s
+          return if @program_file == path.to_s
           add_load_path(path.expand_path.dirname) do
             require(path.to_s)
             find_test_cases(already_gathered).each do |test_case|

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

@@ -8,12 +8,8 @@ module Test
       class << self
         @@default = nil
         def default
-          @@default ||= new("pass" =>
-                              Color.new("green", :foreground => false) +
-                              Color.new("white", :bold => true),
-                            "failure" =>
-                              Color.new("red", :foreground => false) +
-                              Color.new("white", :bold => true),
+          @@default ||= new("success" => Color.new("green", :bold => true),
+                            "failure" => Color.new("red", :bold => true),
                             "pending" => Color.new("magenta", :bold => true),
                             "omission" => Color.new("blue", :bold => true),
                             "notification" => Color.new("cyan", :bold => true),

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

@@ -1,11 +1,4 @@
 # port of Python's difflib.
-#
-# Copyright (c) 2001-2008 Python Software Foundation; All Rights Reserved
-# Copyright (c) 2008-2010 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.
 
 module Test
   module Unit
@@ -724,16 +717,7 @@ module Test
 
       def diff(differ_class, from, to, options={})
         differ = differ_class.new(from.split(/\r?\n/), to.split(/\r?\n/))
-        lines = differ.diff(options)
-        if Object.const_defined?(:EncodingError)
-          begin
-            lines.join("\n")
-          rescue EncodingError
-            lines.collect {|line| line.force_encoding("ASCII-8BIT")}.join("\n")
-          end
-        else
-          lines.join("\n")
-        end
+        differ.diff(options).join("\n")
       end
     end
   end

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

@@ -19,7 +19,6 @@ require 'test/unit/priority'
 require 'test/unit/testsuite'
 require 'test/unit/assertionfailederror'
 require 'test/unit/util/backtracefilter'
-require 'test/unit/util/output'
 require 'test/unit/util/method-owner-finder'
 
 module Test
@@ -83,7 +82,6 @@ module Test
       include Priority
       include Assertions
       include Util::BacktraceFilter
-      include Util::Output
 
       STARTED = name + "::STARTED" # :nodoc:
       FINISHED = name + "::FINISHED" # :nodoc:
@@ -450,7 +448,6 @@ module Test
           notify("#{self.class}\##{@method_name} was redefined")
         end
         __send__(@method_name)
-        add_pass
       end
 
       def handle_exception(exception)
@@ -474,10 +471,6 @@ module Test
       def add_assertion
         current_result.add_assertion
       end
-
-      def add_pass
-        current_result.add_pass
-      end
     end
   end
 end

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

@@ -34,11 +34,11 @@ module Test
       CHANGED = "CHANGED"
       FAULT = "FAULT"
 
-      attr_reader :run_count, :pass_count, :assertion_count, :faults
+      attr_reader :run_count, :assertion_count, :faults
 
       # Constructs a new, empty TestResult.
       def initialize
-        @run_count, @pass_count, @assertion_count = 0, 0, 0
+        @run_count, @assertion_count = 0, 0
         @summary_generators = []
         @problem_checkers = []
         @faults = []
@@ -51,10 +51,6 @@ module Test
         notify_changed
       end
 
-      def add_pass
-        @pass_count += 1
-      end
-
       # Records an individual assertion.
       def add_assertion
         @assertion_count += 1
@@ -69,25 +65,6 @@ module Test
          *@summary_generators.collect {|generator| send(generator)}].join(", ")
       end
 
-      # Returnes a string that shows result status.
-      def status
-        if passed?
-          if pending_count > 0
-            "pending"
-          elsif omission_count > 0
-            "omission"
-          elsif notification_count > 0
-            "notification"
-          else
-            "pass"
-          end
-        elsif error_count > 0
-          "error"
-        elsif failure_count > 0
-          "failure"
-        end
-      end
-
       def to_s
         summary
       end
@@ -98,15 +75,6 @@ module Test
         @problem_checkers.all? {|checker| not send(checker)}
       end
 
-      def pass_percentage
-        n_tests = @run_count - omission_count
-        if n_tests.zero?
-          0
-        else
-          100.0 * (@pass_count / n_tests.to_f)
-        end
-      end
-
       private
       def notify_changed
         notify_listeners(CHANGED, self)

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

@@ -38,14 +38,23 @@ module Test
             @progress_row_max = @options[:progress_row_max]
             @progress_row_max ||= guess_progress_row_max
             @already_outputted = false
+            @n_successes = 0
+            @n_omissions = 0
             @indent = 0
             @top_level = true
             @faults = []
           end
 
+          # Begins the test run.
+          def start
+            setup_mediator
+            attach_to_mediator
+            return start_mediator
+          end
+
           private
           def setup_mediator
-            super
+            @mediator = create_mediator(@suite)
             output_setup_end
           end
 
@@ -55,6 +64,10 @@ module Test
             output("Loaded suite #{suite_name}")
           end
 
+          def create_mediator(suite)
+            return TestRunnerMediator.new(suite)
+          end
+          
           def attach_to_mediator
             @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
             @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
@@ -65,9 +78,14 @@ module Test
             @mediator.add_listener(TestSuite::FINISHED, &method(:test_suite_finished))
           end
           
+          def start_mediator
+            return @mediator.run_suite
+          end
+          
           def add_fault(fault)
             @faults << fault
             output_progress(fault.single_character_display, fault_color(fault))
+            @n_omissions += 1 if fault.is_a?(Omission)
             @already_outputted = true if fault.critical?
           end
           
@@ -91,7 +109,13 @@ module Test
             output("Finished in #{elapsed_time} seconds.")
             nl
             output(@result, result_color)
-            output("%g%% passed" % @result.pass_percentage, result_color)
+            n_tests = @result.run_count - @n_omissions
+            if n_tests.zero?
+              pass_percentage = 0
+            else
+              pass_percentage = 100.0 * (@n_successes / n_tests.to_f)
+            end
+            output("%g%% passed" % pass_percentage, result_color)
           end
 
           def output_fault(fault)
@@ -135,7 +159,7 @@ module Test
           def output_fault_message(fault)
             output(fault.user_message) if fault.user_message
             output_single("<")
-            output_single(fault.inspected_expected, color("pass"))
+            output_single(fault.inspected_expected, color("success"))
             output("> expected but was")
             output_single("<")
             output_single(fault.inspected_actual, color("failure"))
@@ -171,7 +195,8 @@ module Test
 
           def test_finished(name)
             unless @already_outputted
-              output_progress(".", color("pass"))
+              @n_successes += 1
+              output_progress(".", color("success"))
             end
             @already_outputted = false
 
@@ -247,10 +272,7 @@ module Test
           end
 
           def color(name)
-            _color = @color_scheme[name]
-            _color ||= @color_scheme["success"] if name == "pass"
-            _color ||= ColorScheme.default[name]
-            _color
+            @color_scheme[name] || ColorScheme.default[name]
           end
 
           def fault_color(fault)
@@ -258,7 +280,21 @@ module Test
           end
 
           def result_color
-            color(@result.status)
+            if @result.passed?
+              if @result.pending_count > 0
+                color("pending")
+              elsif @result.omission_count > 0
+                color("omission")
+              elsif @result.notification_count > 0
+                color("notification")
+              else
+                color("success")
+              end
+            elsif @result.error_count > 0
+              color("error")
+            elsif @result.failure_count > 0
+              color("failure")
+            end
           end
 
           def guess_color_availability