test-unit 2.4.7 → 2.4.8

data/README.textile

@@ -9,7 +9,7 @@ test-unit - Improved version of Test::Unit bundled in Ruby
 
 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) will be improved actively.
+Test::Unit (test-unit) is improved actively.
 
 h2. Features
 

data/lib/test-unit.rb

@@ -1 +1,3 @@
-require "test/unit"
+module Test
+  autoload :Unit, "test/unit"
+end

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

@@ -189,18 +189,25 @@ module Test
           end
 
           def output_fault_backtrace(fault)
+            snippet_is_shown = false
             backtrace = fault.location
+            # workaround for test-spec. :<
+            # see also GitHub:#22
+            backtrace ||= []
             backtrace.each_with_index do |entry, i|
               output(entry)
-              output_code_snippet(entry, fault_color(fault)) if i.zero?
+              next if snippet_is_shown
+              snippet_is_shown = output_code_snippet(entry, fault_color(fault))
             end
           end
 
           def output_code_snippet(entry, target_line_color=nil)
-            return unless /\A(.*):(\d+)/ =~ entry
+            return false unless /\A(.*):(\d+)/ =~ entry
             file = $1
             line_number = $2.to_i
             lines = @code_snippet_fetcher.fetch(file, line_number)
+            return false if lines.empty?
+
             max_n = lines.collect {|n, line, attributes| n}.max
             digits = (Math.log10(max_n) + 1).truncate
             lines.each do |n, line, attributes|
@@ -214,7 +221,7 @@ module Test
               output("  %2s %*d: %s" % [current_line_mark, digits, n, line],
                      line_color)
             end
-            nl
+            true
           end
 
           def output_fault_message(fault)

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '2.4.7'
+    VERSION = '2.4.8'
   end
 end

data/test/test-code-snippet.rb

@@ -0,0 +1,37 @@
+require "test-unit"
+require "testunit-test-util"
+
+class TestCodeSnippet < Test::Unit::TestCase
+  include TestUnitTestUtil
+
+  class TestJRuby < self
+    def test_error_inside_jruby
+      jruby_only_test
+
+      backtrace = backtrace_from_jruby
+      no_rb_entries = backtrace.find_all do |(file, _, _)|
+        File.extname(file) != ".rb"
+      end
+
+      fetcher = Test::Unit::CodeSnippetFetcher.new
+      snippets = no_rb_entries.collect do |(file, line, _)|
+        fetcher.fetch(file, line)
+      end
+      assert_equal([[]] * no_rb_entries.size,
+                   snippets)
+    end
+
+    private
+    def backtrace_from_jruby
+      begin
+        java.util.Vector.new(-1)
+      rescue Exception
+        $@.collect do |entry|
+          entry.split(/:/, 3)
+        end
+      else
+        flunk("failed to raise an exception from JRuby.")
+      end
+    end
+  end
+end

data/test/testunit-test-util.rb

@@ -1,5 +1,13 @@
 module TestUnitTestUtil
   private
+  def jruby_only_test
+    begin
+      require "java"
+    rescue LoadError
+      omit("test for JRuby")
+    end
+  end
+
   def assert_fault_messages(expected, faults)
     assert_equal(expected, faults.collect {|fault| fault.message})
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 4
-  - 7
-  version: 2.4.7
+  - 8
+  version: 2.4.8
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-10 00:00:00 Z
+date: 2012-03-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -63,7 +63,7 @@ dependencies:
 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) will be improved actively.
+  Test::Unit (test-unit) is improved actively.
 
 email: 
 - kou@cozmixng.org
@@ -140,6 +140,7 @@ files:
 - 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