test-unit 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82214fb59acb16827aacf60b960cefc080128e3d
-  data.tar.gz: 2639d42836d7ca114f9acb65e1e6c67136672acc
+  metadata.gz: 7a340ad8305720bf34c90d9d88612f087feaec21
+  data.tar.gz: fadfe8512c5ee8a5b4e52c296da11abdfdd3569d
 SHA512:
-  metadata.gz: 814c6f16fe4e256ad788617cb627441b93ce32c20a3b8972e5e4e799534a8c3350ff77ecdef0bc13ab6fcb5b532b7efec814717f2cfee6fbbabdfd04829f5b4c
-  data.tar.gz: a6301d7b7e109157505e354dd3c43393921f51b10bbddd5f44e26f1e2689b8c7be9059da74d61be8bfc73fc626ae3f9d601292ccbb1ce9d80f14bb0f21fe5327
+  metadata.gz: a1a2ed9f115b3984ec88efc7f0183fff3050708421c5e6e14335f13d612b0d481d988e512132a1a9204d09e586786b972ce20fb05c12b35af6587b2bbce688ec
+  data.tar.gz: df04299b2354a4f6e7a75ed42725c8103b2b9b96fc6fa58b1bb388dff1a35e501e9090f5140f74fde3c62dac863b5d093e3d95023e3205da0149fc1a79940fdf

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # News
 
+## 3.0.6 - 2014-11-09 {#version-3-0-6}
+
+It's a minor update release.
+
+### Improvements
+
+  * Improved code snippet location.
+    [GitHub#84][Patch by Yuki Kurihara]
+
+### Thanks
+
+  * Yuki Kurihara
+
 ## 3.0.5 - 2014-11-08 {#version-3-0-5}
 
 It's a minor update release.

data/lib/test/unit/fault-location-detector.rb

@@ -2,6 +2,8 @@
 #
 # License: Ruby's
 
+require "English"
+
 module Test
   module Unit
     class FaultLocationDetector
@@ -18,6 +20,9 @@ module Test
         line_number = line_number.to_i
         if /\Ain `(.+?)'/ =~ context
           method_name = $1
+          if /\Ablock (?:\(.+?\) )?in / =~ method_name
+            method_name = $POSTMATCH
+          end
         else
           method_name = nil
         end

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '3.0.5'
+    VERSION = '3.0.6'
   end
 end

data/test/test-fault-location-detector.rb

@@ -24,14 +24,21 @@ class TestFaultLocationDetector < Test::Unit::TestCase
   def assert_detect(fault, target_line_number)
     detector = Test::Unit::FaultLocationDetector.new(fault, @fetcher)
 
-    expected = fault.location.collect do |backtrace_entry|
+    expected_backtrace_entries_until_detected = []
+    fault.location.each do |backtrace_entry|
+      expected_backtrace_entries_until_detected << backtrace_entry
       _, line_number, = detector.split_backtrace_entry(backtrace_entry)
-      [backtrace_entry, target_line_number == line_number]
+      break if target_line_number == line_number
     end
-    actual = fault.location.collect do |backtrace_entry|
-      [backtrace_entry, detector.target?(backtrace_entry)]
+
+    actual_backtrace_entries_until_detected = []
+    fault.location.each do |backtrace_entry|
+      actual_backtrace_entries_until_detected << backtrace_entry
+      break if detector.target?(backtrace_entry)
     end
-    assert_equal(expected, actual)
+
+    assert_equal(expected_backtrace_entries_until_detected,
+                 actual_backtrace_entries_until_detected)
   end
 
   module AlwaysFailAssertion
@@ -122,4 +129,35 @@ class TestFaultLocationDetector < Test::Unit::TestCase
       assert_detect(fault, test_case.target_line_number)
     end
   end
+
+  class TestInBlock < self
+    def test_in_block
+      test_case = Class.new(Test::Unit::TestCase) do
+        include AlwaysFailAssertion
+
+        class << self
+          def target_line_number
+            @@target_line_number
+          end
+
+          def target_line_number=(line_number)
+            @@target_line_number = line_number
+          end
+        end
+
+        def run_yield
+          yield
+        end
+
+        def test_failed
+          run_yield do
+            self.class.target_line_number = __LINE__; assert_always_failed
+          end
+        end
+      end
+
+      fault = run_test_case(test_case)
+      assert_detect(fault, test_case.target_line_number)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert