test-unit 2.4.5 → 2.4.6

data/README.textile

@@ -28,6 +28,10 @@ h2. Features
   provides for installing all Test::Unit related gems
   easily.
 
+h2. How To
+
+* {file:doc/text/how-to.textile}
+
 h2. Install
 
 <pre>

data/lib/test-unit.rb

@@ -0,0 +1 @@
+require "test/unit"

data/lib/test/unit/autorunner.rb

@@ -359,6 +359,7 @@ module Test
       def run
         suite = @collector[self]
         return false if suite.nil?
+        return true if suite.empty?
         runner = @runner[self]
         return false if runner.nil?
         @runner_options[:color_scheme] ||= @color_scheme
@@ -421,5 +422,4 @@ end
 
 require 'test/unit/runner/console'
 require 'test/unit/runner/emacs'
-require 'test/unit/runner/tap'
 require 'test/unit/runner/xml'

data/lib/test/unit/code-snippet-fetcher.rb

@@ -0,0 +1,32 @@
+module Test
+  module Unit
+    class CodeSnippetFetcher
+      def initialize
+        @sources = {}
+      end
+
+      def fetch(file, line, options={})
+        n_context_line = options[:n_context_line] || 3
+        lines = source(file)
+        return [] if lines.nil?
+        min_line = [line - n_context_line, 1].max
+        max_line = [line + n_context_line, lines.length].min
+        window = min_line..max_line
+        window.collect do |n|
+          attributes = {:target_line? => (n == line)}
+          [n, lines[n - 1].chomp, attributes]
+        end
+      end
+
+      def source(file)
+        @sources[file] ||= read_source(file)
+      end
+
+      private
+      def read_source(file)
+        return nil unless File.exist?(file)
+        File.readlines(file)
+      end
+    end
+  end
+end

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

@@ -7,6 +7,7 @@
 # License:: Ruby license.
 
 require 'test/unit/color-scheme'
+require 'test/unit/code-snippet-fetcher'
 require 'test/unit/ui/testrunner'
 require 'test/unit/ui/testrunnermediator'
 require 'test/unit/ui/console/outputlevel'
@@ -44,6 +45,7 @@ module Test
             @top_level = true
             @current_output_level = NORMAL
             @faults = []
+            @code_snippet_fetcher = CodeSnippetFetcher.new
           end
 
           private
@@ -181,26 +183,32 @@ module Test
 
           def output_fault_backtrace(fault)
             backtrace = fault.location
-            if backtrace.size == 1
-              output(fault.test_name +
-                     backtrace[0].sub(/\A(.+:\d+).*/, ' [\\1]') +
-                     ":")
-            else
-              output(fault.test_name)
-              backtrace.each_with_index do |entry, i|
-                if i.zero?
-                  prefix = "["
-                  postfix = ""
-                elsif i == backtrace.size - 1
-                  prefix = " "
-                  postfix = "]:"
-                else
-                  prefix = " "
-                  postfix = ""
-                end
-                output("    #{prefix}#{entry}#{postfix}")
+            output(fault.test_name)
+            backtrace.each_with_index do |entry, i|
+              output(entry)
+              output_code_snippet(entry, fault_color(fault)) if i.zero?
+            end
+          end
+
+          def output_code_snippet(entry, target_line_color=nil)
+            return unless /\A(.*):(\d+)/ =~ entry
+            file = $1
+            line = $2.to_i
+            lines = @code_snippet_fetcher.fetch(file, line)
+            max_n = lines.collect {|n, line, attributes| n}.max
+            digits = (Math.log10(max_n) + 1).truncate
+            lines.each do |n, line, attributes|
+              if attributes[:target_line?]
+                line_color = target_line_color
+                current_line_mark = "=>"
+              else
+                line_color = nil
+                current_line_mark = ""
               end
+              output("  %2s %*d: %s" % [current_line_mark, digits, n, line],
+                     line_color)
             end
+            nl
           end
 
           def output_fault_message(fault)

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

@@ -22,20 +22,6 @@ module Test
             end
           end
 
-          def output_fault_backtrace(fault)
-            backtrace = fault.location
-            if backtrace.size == 1
-              output(fault.test_name +
-                     backtrace[0].sub(/\A(.+:\d+).*/, ' [\\1]') +
-                     ":")
-            else
-              output(fault.test_name)
-              backtrace.each do |entry|
-                output(entry)
-              end
-            end
-          end
-
           def format_fault_failure(failure)
             if failure.location.size == 1
               location = failure.location[0]

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '2.4.5'
+    VERSION = '2.4.6'
   end
 end

metadata

@@ -1,79 +1,94 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: test-unit
-version: !ruby/object:Gem::Version
-  version: 2.4.5
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 2
+  - 4
+  - 6
+  version: 2.4.6
 platform: ruby
-authors:
+authors: 
 - Kouhei Sutou
 - Haruka Yoshihara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &7305640 !ruby/object:Gem::Requirement
+
+date: 2012-02-09 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rake
   prerelease: false
-  version_requirements: *7305640
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &7318880 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *7318880
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &7317320 !ruby/object:Gem::Requirement
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: yard
+  prerelease: false
   type: :development
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: jeweler
   prerelease: false
-  version_requirements: *7317320
-description: ! 'Ruby 1.9.x bundles minitest not Test::Unit. Test::Unit
-
+  type: :development
+  requirement: *id003
+description: |
+  Ruby 1.9.x bundles minitest not Test::Unit. Test::Unit
   bundled in Ruby 1.8.x had not been improved but unbundled
-
   Test::Unit (test-unit 2) will be improved actively.
 
-'
-email:
+email: 
 - kou@cozmixng.org
 - yoshihara@clear-code.com
-executables:
-- testrb
+executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.textile
 - TODO
-files:
+files: 
 - COPYING
 - GPL
 - PSFL
 - README.textile
 - Rakefile
 - TODO
-- bin/testrb
+- 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
@@ -94,7 +109,6 @@ files:
 - lib/test/unit/priority.rb
 - lib/test/unit/runner/console.rb
 - lib/test/unit/runner/emacs.rb
-- lib/test/unit/runner/tap.rb
 - lib/test/unit/runner/xml.rb
 - lib/test/unit/testcase.rb
 - lib/test/unit/testresult.rb
@@ -103,7 +117,6 @@ files:
 - lib/test/unit/ui/console/outputlevel.rb
 - lib/test/unit/ui/console/testrunner.rb
 - lib/test/unit/ui/emacs/testrunner.rb
-- lib/test/unit/ui/tap/testrunner.rb
 - lib/test/unit/ui/testrunner.rb
 - lib/test/unit/ui/testrunnermediator.rb
 - lib/test/unit/ui/testrunnerutilities.rb
@@ -143,7 +156,6 @@ files:
 - test/test_testresult.rb
 - test/test_testsuite.rb
 - test/testunit-test-util.rb
-- test/ui/test_tap.rb
 - test/ui/test_testrunmediator.rb
 - test/util/test-method-owner-finder.rb
 - test/util/test-output.rb
@@ -151,28 +163,37 @@ files:
 - test/util/test_observable.rb
 - test/util/test_procwrapper.rb
 homepage: http://test-unit.rubyforge.org/
-licenses:
+licenses: 
 - Ruby's and PSFL (lib/test/unit/diff.rb)
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: test-unit
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: test-unit 2 - Improved version of Test::Unit bundled in Ruby 1.8.x.
 test_files: []
+

data/bin/testrb

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-require 'test/unit'
-(r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
-  abort r.options.banner + " tests..."
-exit r.run

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

@@ -1,8 +0,0 @@
-module Test
-  module Unit
-    AutoRunner.register_runner(:tap) do |auto_runner|
-      require 'test/unit/ui/tap/testrunner'
-      Test::Unit::UI::Tap::TestRunner
-    end
-  end
-end

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

@@ -1,82 +0,0 @@
-#--
-#
-# Author:: Kouhei Sutou.
-# Copyright:: Copyright (c) 2009-2010 Kouhei Sutou <kou@clear-code.com>.
-# License:: Ruby license.
-
-require 'test/unit/ui/testrunner'
-require 'test/unit/ui/testrunnermediator'
-
-module Test
-  module Unit
-    module UI
-      module Tap
-
-        # Runs a Test::Unit::TestSuite and outputs result
-        # as TAP format.
-        class TestRunner < UI::TestRunner
-          def initialize(suite, options={})
-            super
-            @output = @options[:output] || STDOUT
-            @n_tests = 0
-            @already_outputted = false
-          end
-
-          # Begins the test run.
-          def start
-            result = super
-            def result.passed?
-              true # for prove commend :<
-            end
-            result
-          end
-
-          private
-          def attach_to_mediator
-            @mediator.add_listener(TestResult::FAULT, &method(:add_fault))
-            @mediator.add_listener(TestRunnerMediator::STARTED, &method(:started))
-            @mediator.add_listener(TestRunnerMediator::FINISHED, &method(:finished))
-            @mediator.add_listener(TestCase::STARTED, &method(:test_started))
-            @mediator.add_listener(TestCase::FINISHED, &method(:test_finished))
-          end
-
-          def add_fault(fault)
-            puts("not ok #{@n_tests} - #{fault.short_display}")
-            fault.long_display.each_line do |line|
-              puts("# #{line}")
-            end
-            @already_outputted = true
-          end
-
-          def started(result)
-            @result = result
-            puts("1..#{@suite.size}")
-          end
-
-          def finished(elapsed_time)
-            puts("# Finished in #{elapsed_time} seconds.")
-            @result.to_s.each_line do |line|
-              puts("# #{line}")
-            end
-          end
-
-          def test_started(name)
-            @n_tests += 1
-          end
-
-          def test_finished(name)
-            unless @already_outputted
-              puts("ok #{@n_tests} - #{name}")
-            end
-            @already_outputted = false
-          end
-
-          def puts(*args)
-            @output.puts(*args)
-            @output.flush
-          end
-        end
-      end
-    end
-  end
-end

data/test/ui/test_tap.rb

@@ -1,33 +0,0 @@
-require 'stringio'
-require 'test/unit/ui/tap/testrunner'
-
-class TestTap < Test::Unit::TestCase
-  def test_run
-    fail_line = nil
-    test_case = Class.new(Test::Unit::TestCase) do
-      def test_success
-        assert_equal(3, 1 + 2)
-      end
-
-      def test_fail; assert_equal(3, 1 - 2); end; fail_line = __LINE__
-    end
-    output = StringIO.new
-    runner = Test::Unit::UI::Tap::TestRunner.new(test_case.suite,
-                                                 :output => output)
-    result = runner.start; start_line = __LINE__
-    assert_equal(<<-EOR, output.string.gsub(/[\d\.]+ seconds/, "0.001 seconds"))
-1..2
-not ok 1 - test_fail(): <3> expected but was
-# Failure:
-# test_fail()
-#     [#{__FILE__}:#{fail_line}:in `test_fail'
-#      #{__FILE__}:#{start_line}:in `test_run']:
-# <3> expected but was
-# <-1>.
-ok 2 - test_success()
-# Finished in 0.001 seconds.
-# 2 tests, 2 assertions, 1 failures, 0 errors, 0 pendings, 0 omissions, 0 notifications
-EOR
-    assert_true(result.passed?)
-  end
-end