test-unit 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0f3d6b7558b8c2dd32e218231b2b826791440da
-  data.tar.gz: 07aabaaba099bf99ad12491d9b747fa121f9ecf3
+  metadata.gz: 9aab3e867096b99241299d05bac77a6219b889c9
+  data.tar.gz: d37423596384fbe1101e39631bd78460c0f474bd
 SHA512:
-  metadata.gz: 2f810e4cb4ac200999a8afe12c91557855fefb446ac3f2fb6cffe17e973efb02f4840a4ae6cbf01996a21cc0f64e93c3288c895398f9fdb37e76cdadf25ead0a
-  data.tar.gz: 36725fd11eb881311aa7f8bd67e6a00ff3de6784448ecaa2cdaa5b7041df4045fbf52262fc1aa879e70cef58f9f94cff56fa1d9eb66067108ba3657fb884a1a9
+  metadata.gz: dfb885607b6ee435b859c3dfe65b9e4fde45322707139d8005b9b61357c8917e3ca4b2ede42ed9d279877380473bfb99063b712769535aee536ee6f54e810c7f
+  data.tar.gz: bae2d82bc3c5ba69d70f26ecc977574f5c9d017ddc1d88002939496ce1a6426e9799d50e7d9dbad645187e392447b0626776c761470f97112e1a54070ac6472b

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # News
 
+## 3.1.1 - 2015-05-29 {#version-3-1-1}
+
+It's a bug fix release.
+
+### Fixes
+
+  * Fixed a bug that `--location` detects tests not only in sub test
+    case but also parent test case.
+    [GitHub#105][Reported by wanabe]
+
+### Thanks
+
+  * wanabe
+
 ## 3.1.0 - 2015-05-28 {#version-3-1-0}
 
 It's a bug fix release.

data/lib/test/unit/testcase.rb

@@ -360,17 +360,16 @@ module Test
           query_line = query[:line]
           query_method_name = query[:method_name]
 
-          available_locations = method_locations
-          if query_path
-            available_locations = available_locations.find_all do |location|
-              location[:path].end_with?(query_path)
-            end
-          end
+          available_locations = target_method_locations(query_path)
           if query_line
-            available_location = available_locations.reverse.find do |location|
+            available_locations = available_locations.sort_by do |location|
+              -location[:line]
+            end
+            available_location = available_locations.find do |location|
               query_line >= location[:line]
             end
             return false if available_location.nil?
+            return false if available_location[:test_case] != self
             available_locations = [available_location]
           end
           if query_method_name
@@ -391,6 +390,25 @@ module Test
         def method_locations
           @@method_locations[self] ||= []
         end
+
+        # @private
+        def target_method_locations(path)
+          if path.nil?
+            self_location = method_locations.first
+            path = self_location[:path] if self_location
+          end
+          return [] if path.nil?
+
+          target_locations = []
+          @@method_locations.each do |test_case, locations|
+            locations.each do |location|
+              if location[:path].end_with?(path)
+                target_locations << location.merge(:test_case => test_case)
+              end
+            end
+          end
+          target_locations
+        end
       end
 
       attr_reader :method_name

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '3.1.0'
+    VERSION = '3.1.1'
   end
 end

data/test/test-test-case.rb

@@ -660,6 +660,28 @@ module Test
               end
               assert_true(test_case.test_defined?(:line => line_after))
             end
+
+            def test_child
+              child_test_case = nil
+              line_child = nil
+              parent_test_case = Class.new(TestCase) do
+                test "parent" do
+                end
+
+                child_test_case = Class.new(self) do
+                  line_child = __LINE__; test "child" do
+                  end
+                end
+              end
+              assert_equal([
+                             false,
+                             true,
+                           ],
+                           [
+                             parent_test_case.test_defined?(:line => line_child),
+                             child_test_case.test_defined?(:line => line_child),
+                           ])
+            end
           end
 
           class TestMethodStyle < self
@@ -691,6 +713,28 @@ module Test
               end
               assert_true(test_case.test_defined?(:line => line_after))
             end
+
+            def test_child
+              child_test_case = nil
+              line_child = nil
+              parent_test_case = Class.new(TestCase) do
+                test "parent" do
+                end
+
+                child_test_case = Class.new(self) do
+                  line_child = __LINE__; test "child" do
+                  end
+                end
+              end
+              assert_equal([
+                             false,
+                             true,
+                           ],
+                           [
+                             parent_test_case.test_defined?(:line => line_child),
+                             child_test_case.test_defined?(:line => line_child),
+                           ])
+            end
           end
         end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-28 00:00:00.000000000 Z
+date: 2015-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert