test-unit 2.5.0 → 2.5.1

data/Rakefile

@@ -7,45 +7,15 @@ require "yaml"
 require "rubygems"
 require "rake/clean"
 require "yard"
-require "jeweler"
-require "./lib/test/unit/version.rb"
+require "bundler/gem_helper"
 
 task :default => :test
 
-def cleanup_white_space(entry)
-  entry.gsub(/(\A\n+|\n+\z)/, '') + "\n"
-end
-
-version = Test::Unit::VERSION.dup
-ENV["VERSION"] = version
-spec = nil
-Jeweler::Tasks.new do |_spec|
-  spec = _spec
-  spec.name = "test-unit"
-  spec.version = version
-  spec.rubyforge_project = "test-unit"
-  spec.homepage = "http://test-unit.rubyforge.org/"
-  spec.authors = ["Kouhei Sutou", "Haruka Yoshihara"]
-  spec.email = ["kou@cozmixng.org", "yoshihara@clear-code.com"]
-  entries = File.read("README.textile").split(/^h2\.\s(.*)$/)
-  description = cleanup_white_space(entries[entries.index("Description") + 1])
-  spec.summary, spec.description, = description.split(/\n\n+/, 3)
-  spec.license = "Ruby's and PSFL (lib/test/unit/diff.rb)"
-  spec.files = FileList["lib/**/*.rb",
-                        "bin/*",
-                        "sample/*.rb",
-                        "test/**/*",
-                        "README.textile",
-                        "TODO",
-                        "Rakefile",
-                        "COPYING",
-                        "GPL",
-                        "PSFL"]
-end
+base_dir = File.dirname(__FILE__)
 
-Rake::Task["release"].prerequisites.clear
-Jeweler::RubygemsDotOrgTasks.new do
-end
+helper = Bundler::GemHelper.new(base_dir)
+helper.install
+spec = helper.gemspec
 
 reference_base_dir = Pathname.new("doc/reference")
 doc_en_dir = reference_base_dir + "en"

data/lib/test/unit/testsuite.rb

@@ -50,7 +50,7 @@ module Test
         run_startup(result)
         while test = @tests.shift
           @n_tests += test.size
-          test.run(result, &progress_block)
+          run_test(test, result, &progress_block)
           @passed = false unless test.passed?
         end
         run_shutdown(result)
@@ -110,6 +110,40 @@ module Test
         end
       end
 
+      def run_test(test, result)
+        finished_is_yielded = false
+        finished_object_is_yielded = false
+        previous_event_name = nil
+        test.run(result) do |event_name, *args|
+          case previous_event_name
+          when Test::Unit::TestCase::STARTED
+            if event_name != Test::Unit::TestCase::STARTED_OBJECT
+              yield(Test::Unit::TestCase::STARTED_OBJECT, test)
+            end
+          when Test::Unit::TestCase::FINISHED
+            if event_name != Test::Unit::TestCase::FINISHED_OBJECT
+              yield(Test::Unit::TestCase::FINISHED_OBJECT, test)
+            end
+            finished_object_is_yielded = true
+          end
+
+          case event_name
+          when Test::Unit::TestCase::STARTED
+            finished_is_yielded = false
+            finished_object_is_yielded = false
+          when Test::Unit::TestCase::FINISHED
+            finished_is_yielded = true
+          end
+
+          previous_event_name = event_name
+          yield(event_name, *args)
+        end
+
+        if finished_is_yielded and not finished_object_is_yielded
+          yield(Test::Unit::TestCase::FINISHED_OBJECT, test)
+        end
+      end
+
       def run_shutdown(result)
         return if @test_case.nil? or !@test_case.respond_to?(:shutdown)
         begin

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

@@ -169,25 +169,37 @@ module Test
           end
 
           def output_fault_in_detail(fault)
-            if fault.is_a?(Failure)
+            if fault.is_a?(Failure) and
+                fault.inspected_expected and fault.inspected_actual
               output_single(fault.label, fault_color(fault))
               output(":")
               output(fault.test_name)
               output_fault_backtrace(fault)
-              output_fault_message(fault)
+              output_failure_message(fault)
             else
               output_single(fault.label, fault_color(fault))
               if fault.is_a?(Error)
                 output(": #{fault.test_name}")
-                output(fault.message)
+                output_fault_message(fault)
               else
-                output(": #{fault.message}")
+                if fault.message.include?("\n")
+                  output(":")
+                  output_fault_message(fault)
+                else
+                  output(": #{fault.message}")
+                end
                 output(fault.test_name)
               end
               output_fault_backtrace(fault)
             end
           end
 
+          def output_fault_message(fault)
+            fault.message.each_line do |line|
+              output("  #{line.chomp}")
+            end
+          end
+
           def output_fault_backtrace(fault)
             snippet_is_shown = false
             backtrace = fault.location
@@ -224,42 +236,42 @@ module Test
             true
           end
 
-          def output_fault_message(fault)
-            if fault.expected.respond_to?(:encoding) and
-                fault.actual.respond_to?(:encoding) and
-                fault.expected.encoding != fault.actual.encoding
+          def output_failure_message(failure)
+            if failure.expected.respond_to?(:encoding) and
+                failure.actual.respond_to?(:encoding) and
+                failure.expected.encoding != failure.actual.encoding
               need_encoding = true
             else
               need_encoding = false
             end
-            output(fault.user_message) if fault.user_message
+            output(failure.user_message) if failure.user_message
             output_single("<")
-            output_single(fault.inspected_expected, color("pass"))
+            output_single(failure.inspected_expected, color("pass"))
             output_single(">")
             if need_encoding
               output_single("(")
-              output_single(fault.expected.encoding.name, color("pass"))
+              output_single(failure.expected.encoding.name, color("pass"))
               output_single(")")
             end
             output(" expected but was")
             output_single("<")
-            output_single(fault.inspected_actual, color("failure"))
+            output_single(failure.inspected_actual, color("failure"))
             output_single(">")
             if need_encoding
               output_single("(")
-              output_single(fault.actual.encoding.name, color("failure"))
+              output_single(failure.actual.encoding.name, color("failure"))
               output_single(")")
             end
             output("")
-            from, to = prepare_for_diff(fault.expected, fault.actual)
+            from, to = prepare_for_diff(failure.expected, failure.actual)
             if from and to
               from_lines = from.split(/\r?\n/)
               to_lines = to.split(/\r?\n/)
               if need_encoding
                 from_lines << ""
                 to_lines << ""
-                from_lines << "Encoding: #{fault.expected.encoding.name}"
-                to_lines << "Encoding: #{fault.actual.encoding.name}"
+                from_lines << "Encoding: #{failure.expected.encoding.name}"
+                to_lines << "Encoding: #{failure.actual.encoding.name}"
               end
               differ = ColorizedReadableDiffer.new(from_lines, to_lines, self)
               if differ.need_diff?

data/lib/test/unit/ui/testrunnermediator.rb

@@ -40,10 +40,7 @@ module Test
               notify_listeners(RESET, @suite.size)
               notify_listeners(STARTED, result)
 
-
-              @suite.run(result) do |channel, value|
-                notify_listeners(channel, value)
-              end
+              run_suite(result)
             end
           ensure
             elapsed_time = Time.now - start_time
@@ -53,10 +50,6 @@ module Test
           result
         end
 
-        # Just for backward compatibility.
-        # @see GitHub#28
-        alias_method :run_suite, :run
-
         private
         # A factory method to create the result the mediator
         # should run with. Can be overridden by subclasses if
@@ -95,6 +88,12 @@ module Test
                                    pass_assertion_listener)
           end
         end
+
+        def run_suite(result)
+          @suite.run(result) do |channel, value|
+            notify_listeners(channel, value)
+          end
+        end
       end
     end
   end

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '2.5.0'
+    VERSION = '2.5.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,10 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -29,7 +29,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -45,7 +45,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -72,97 +72,95 @@ email:
 - yoshihara@clear-code.com
 executables: []
 extensions: []
-extra_rdoc_files:
+extra_rdoc_files: []
+files:
 - README.textile
 - TODO
-files:
+- Rakefile
 - COPYING
 - GPL
 - PSFL
-- README.textile
-- Rakefile
-- TODO
 - lib/test-unit.rb
 - lib/test/unit.rb
-- lib/test/unit/assertionfailederror.rb
-- lib/test/unit/assertions.rb
 - lib/test/unit/attribute.rb
-- lib/test/unit/autorunner.rb
-- lib/test/unit/code-snippet-fetcher.rb
-- lib/test/unit/collector.rb
-- lib/test/unit/collector/descendant.rb
-- lib/test/unit/collector/dir.rb
-- lib/test/unit/collector/load.rb
-- lib/test/unit/collector/objectspace.rb
-- lib/test/unit/collector/xml.rb
-- lib/test/unit/color-scheme.rb
-- lib/test/unit/color.rb
 - lib/test/unit/data.rb
-- lib/test/unit/diff.rb
-- lib/test/unit/error.rb
-- lib/test/unit/exceptionhandler.rb
-- lib/test/unit/failure.rb
-- lib/test/unit/fixture.rb
-- lib/test/unit/notification.rb
-- lib/test/unit/omission.rb
-- lib/test/unit/pending.rb
-- lib/test/unit/priority.rb
-- lib/test/unit/runner/console.rb
+- lib/test/unit/color.rb
+- lib/test/unit/version.rb
 - lib/test/unit/runner/emacs.rb
+- lib/test/unit/runner/console.rb
 - lib/test/unit/runner/xml.rb
-- lib/test/unit/testcase.rb
-- lib/test/unit/testresult.rb
-- lib/test/unit/testsuite.rb
-- lib/test/unit/testsuitecreator.rb
-- lib/test/unit/ui/console/outputlevel.rb
-- lib/test/unit/ui/console/testrunner.rb
+- lib/test/unit/ui/testrunnerutilities.rb
 - lib/test/unit/ui/emacs/testrunner.rb
 - lib/test/unit/ui/testrunner.rb
-- lib/test/unit/ui/testrunnermediator.rb
-- lib/test/unit/ui/testrunnerutilities.rb
 - lib/test/unit/ui/xml/testrunner.rb
-- lib/test/unit/util/backtracefilter.rb
+- lib/test/unit/ui/console/outputlevel.rb
+- lib/test/unit/ui/console/testrunner.rb
+- lib/test/unit/ui/testrunnermediator.rb
+- lib/test/unit/assertionfailederror.rb
+- lib/test/unit/failure.rb
+- lib/test/unit/autorunner.rb
+- lib/test/unit/exceptionhandler.rb
+- lib/test/unit/assertions.rb
+- lib/test/unit/error.rb
+- lib/test/unit/omission.rb
+- lib/test/unit/fixture.rb
+- lib/test/unit/collector/descendant.rb
+- lib/test/unit/collector/load.rb
+- lib/test/unit/collector/xml.rb
+- lib/test/unit/collector/dir.rb
+- lib/test/unit/collector/objectspace.rb
+- lib/test/unit/code-snippet-fetcher.rb
+- lib/test/unit/testsuitecreator.rb
+- lib/test/unit/color-scheme.rb
+- lib/test/unit/testcase.rb
 - lib/test/unit/util/method-owner-finder.rb
-- lib/test/unit/util/observable.rb
 - lib/test/unit/util/output.rb
 - lib/test/unit/util/procwrapper.rb
-- lib/test/unit/version.rb
-- sample/adder.rb
-- sample/subtracter.rb
-- sample/test_adder.rb
+- lib/test/unit/util/observable.rb
+- lib/test/unit/util/backtracefilter.rb
+- lib/test/unit/pending.rb
+- lib/test/unit/testresult.rb
+- lib/test/unit/collector.rb
+- lib/test/unit/diff.rb
+- lib/test/unit/priority.rb
+- lib/test/unit/notification.rb
+- lib/test/unit/testsuite.rb
 - sample/test_subtracter.rb
+- sample/subtracter.rb
 - sample/test_user.rb
+- sample/test_adder.rb
+- sample/adder.rb
+- test/testunit-test-util.rb
+- test/test-testcase.rb
+- test/ui/test_testrunmediator.rb
+- test/test_testresult.rb
+- test/test-pending.rb
+- test/test-emacs-runner.rb
+- test/test-fixture.rb
+- test/test-attribute.rb
+- test/test_failure.rb
+- test/test-data.rb
+- test/test_testsuite.rb
+- test/collector/test_objectspace.rb
 - test/collector/test-descendant.rb
-- test/collector/test-load.rb
 - test/collector/test_dir.rb
-- test/collector/test_objectspace.rb
-- test/fixtures/plus.csv
+- test/collector/test-load.rb
 - test/run-test.rb
 - test/test-assertions.rb
-- test/test-attribute.rb
-- test/test-code-snippet.rb
-- test/test-color-scheme.rb
-- test/test-color.rb
-- test/test-data.rb
-- test/test-diff.rb
-- test/test-emacs-runner.rb
-- test/test-fixture.rb
-- test/test-notification.rb
-- test/test-omission.rb
-- test/test-pending.rb
 - test/test-priority.rb
-- test/test-testcase.rb
-- test/test_error.rb
-- test/test_failure.rb
-- test/test_testresult.rb
-- test/test_testsuite.rb
-- test/testunit-test-util.rb
-- test/ui/test_testrunmediator.rb
-- test/util/test-method-owner-finder.rb
-- test/util/test-output.rb
 - test/util/test_backtracefilter.rb
 - test/util/test_observable.rb
 - test/util/test_procwrapper.rb
+- test/util/test-method-owner-finder.rb
+- test/util/test-output.rb
+- test/fixtures/plus.csv
+- test/test-code-snippet.rb
+- test/test_error.rb
+- test/test-diff.rb
+- test/test-notification.rb
+- test/test-color-scheme.rb
+- test/test-omission.rb
+- test/test-color.rb
 homepage: http://test-unit.rubyforge.org/
 licenses:
 - Ruby's and PSFL (lib/test/unit/diff.rb)
@@ -188,4 +186,36 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: test-unit - Improved version of Test::Unit bundled in Ruby 1.8.x.
-test_files: []
+test_files:
+- test/testunit-test-util.rb
+- test/test-testcase.rb
+- test/ui/test_testrunmediator.rb
+- test/test_testresult.rb
+- test/test-pending.rb
+- test/test-emacs-runner.rb
+- test/test-fixture.rb
+- test/test-attribute.rb
+- test/test_failure.rb
+- test/test-data.rb
+- test/test_testsuite.rb
+- test/collector/test_objectspace.rb
+- test/collector/test-descendant.rb
+- test/collector/test_dir.rb
+- test/collector/test-load.rb
+- test/run-test.rb
+- test/test-assertions.rb
+- test/test-priority.rb
+- test/util/test_backtracefilter.rb
+- test/util/test_observable.rb
+- test/util/test_procwrapper.rb
+- test/util/test-method-owner-finder.rb
+- test/util/test-output.rb
+- test/fixtures/plus.csv
+- test/test-code-snippet.rb
+- test/test_error.rb
+- test/test-diff.rb
+- test/test-notification.rb
+- test/test-color-scheme.rb
+- test/test-omission.rb
+- test/test-color.rb
+has_rdoc: