test-unit 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93aaef767a30d0882b6048299d858f799ea416bfdccc9daef7d2686b5a913f98
-  data.tar.gz: 00a5b7f5ccfe50603d4d1b926424b3d8336c21b3126e0dc324b17f156a48ef6a
+  metadata.gz: 4b605100d1823a7003414a1197ac8b6412a2711439591fb1772fbdbe66bda324
+  data.tar.gz: 799422c8a9fa294365e3a6b6b2b7fa7e5352882bd10df2b877ed751f1383ff69
 SHA512:
-  metadata.gz: a8edd6f065bf74bd4ead4dc49c6a96a635c92cfec4f7089202e658361a715d003b2c0422b58f8e97a84f7fa4ec90b137343e4737ef81741c32cb53c1191c182b
-  data.tar.gz: be3541d1116d75979c82060d17278e40397adc8df4dea96b982fc5b61583749b975d1cdfcfbc634dc1f4045c8d7994575897e38ccc78c785049ea6673d973f67
+  metadata.gz: a91dd90de4e2e044234710e53d175be3db38af3497b2e04c84b9876b06a95f14f0636bfd68b20905d964969aeac0a92bb22a91f86a5413d18e8e636473778573
+  data.tar.gz: eb2ae248c0be1740915e9f31631a8c7d3e2d5e3dbf1d93b92bb55880bb7038eacf4351d0120e9e78f7c893fbef14035835cbad703f00e237eaa41346f2f9e0ee

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # News
 
+## 3.3.2 - 2019-04-11 {#version-3-3-2}
+
+### Fixes
+
+  * Fixed a bug that `Test::Unit::Collector::Load` doesn't load test
+    files under sub directories when these files have the same base
+    name as test files in upper directories.
+    [Reported by Kenta Murata]
+
+### Thanks
+
+  * Kenta Murata
+
 ## 3.3.1 - 2019-03-27 {#version-3-3-1}
 
 ### Improvements

data/lib/test/unit/collector/load.rb

@@ -111,7 +111,7 @@ module Test
           return if @program_file == expanded_path.to_s
           add_load_path(expanded_path.dirname) do
             begin
-              require(path.basename.to_s)
+              require(expanded_path.to_s)
             rescue LoadError
               @require_failed_infos << {:path => expanded_path, :exception => $!}
             end
@@ -131,8 +131,6 @@ module Test
           return yield if path.nil?
 
           path = path.to_s
-          return yield if $LOAD_PATH.index(path)
-
           begin
             $LOAD_PATH.unshift(path)
             yield

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = "3.3.1"
+    VERSION = "3.3.2"
   end
 end

data/test/collector/test-load.rb

@@ -20,7 +20,9 @@ class TestUnitCollectorLoad < Test::Unit::TestCase
 
   setup
   def setup_top_level_test_cases
-    @test_case1 = @test_dir + "test_case1.rb"
+    @test_case1_base_name = "test_case1.rb"
+
+    @test_case1 = @test_dir + @test_case1_base_name
     @test_case2 = @test_dir + "test_case2.rb"
     @no_load_test_case3 = @test_dir + "case3.rb"
 
@@ -66,10 +68,25 @@ EOT
     @sub_test_dir = @test_dir + "sub"
     @sub_test_dir.mkpath
 
+    @sub_test_case1 = @sub_test_dir + @test_case1_base_name
     @sub_test_case4 = @sub_test_dir + "test_case4.rb"
     @no_load_sub_test_case5 = @sub_test_dir + "case5.rb"
     @sub_test_case6 = @sub_test_dir + "test_case6.rb"
 
+    @sub_test_case1.open("w") do |test_case|
+      test_case.puts(<<-TEST_CASE)
+module #{@temporary_test_cases_module_name}
+  class SubTestCase1 < Test::Unit::TestCase
+    def test1_1
+    end
+
+    def test1_2
+    end
+  end
+end
+      TEST_CASE
+    end
+
     @sub_test_case4.open("w") do |test_case|
       test_case.puts(<<-EOT)
 module #{@temporary_test_cases_module_name}
@@ -271,6 +288,9 @@ EOT
 
   def test_simple_collect
     assert_collect([:suite, {:name => @sub_test_dir.basename.to_s},
+                    [:suite, {:name => _test_case_name("SubTestCase1")},
+                     [:test, {:name => "test1_1"}],
+                     [:test, {:name => "test1_2"}]],
                     [:suite, {:name => _test_case_name("SubTestCase4")},
                      [:test, {:name => "test4_1"}],
                      [:test, {:name => "test4_2"}]],
@@ -302,6 +322,9 @@ EOT
                     [:suite, {:name => _test_case_name("TestCase2")},
                      [:test, {:name => "test2"}]],
                     [:suite, {:name => @sub_test_dir.basename.to_s},
+                     [:suite, {:name => _test_case_name("SubTestCase1")},
+                      [:test, {:name => "test1_1"}],
+                      [:test, {:name => "test1_2"}]],
                      [:suite, {:name => _test_case_name("SubTestCase4")},
                       [:test, {:name => "test4_1"}],
                       [:test, {:name => "test4_2"}]],
@@ -356,6 +379,9 @@ EOT
                     [:suite, {:name => _test_case_name("NoLoadSubTestCase5")},
                      [:test, {:name => "test5_1"}],
                      [:test, {:name => "test5_2"}]],
+                    [:suite, {:name => _test_case_name("SubTestCase1")},
+                     [:test, {:name => "test1_1"}],
+                     [:test, {:name => "test1_2"}]],
                     [:suite, {:name => _test_case_name("SubTestCase4")},
                      [:test, {:name => "test4_1"}],
                      [:test, {:name => "test4_2"}]],
@@ -370,7 +396,11 @@ EOT
     assert_collect([:suite, {:name => "."},
                     [:suite, {:name => _test_case_name("TestCase1")},
                      [:test, {:name => "test1_1"}],
-                     [:test, {:name => "test1_2"}]]]) do |collector|
+                     [:test, {:name => "test1_2"}]],
+                    [:suite, {:name => @sub_test_dir.basename.to_s},
+                     [:suite, {:name => _test_case_name("SubTestCase1")},
+                      [:test, {:name => "test1_1"}],
+                      [:test, {:name => "test1_2"}]]]]) do |collector|
       collector.filter = Proc.new do |test|
         !/\Atest1/.match(test.method_name).nil?
       end
@@ -381,6 +411,9 @@ EOT
     test_dirs = [@sub_test_dir.to_s, @sub2_test_dir.to_s]
     assert_collect([:suite, {:name => "[#{test_dirs.join(', ')}]"},
                     [:suite, {:name => @sub_test_dir.basename.to_s},
+                     [:suite, {:name => _test_case_name("SubTestCase1")},
+                      [:test, {:name => "test1_1"}],
+                      [:test, {:name => "test1_2"}]],
                      [:suite, {:name => _test_case_name("SubTestCase4")},
                       [:test, {:name => "test4_1"}],
                       [:test, {:name => "test4_2"}]],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert
@@ -232,48 +232,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: An xUnit family unit testing framework for Ruby.
 test_files:
-- test/test-code-snippet.rb
-- test/test-fault-location-detector.rb
-- test/test-attribute.rb
-- test/test-priority.rb
-- test/test-color-scheme.rb
-- test/test-failure.rb
-- test/test-color.rb
-- test/ui/test_testrunmediator.rb
-- test/test-attribute-matcher.rb
-- test/test-test-suite.rb
-- test/test-test-suite-creator.rb
+- test/util/test_procwrapper.rb
+- test/util/test_observable.rb
+- test/util/test-output.rb
+- test/util/test-method-owner-finder.rb
+- test/util/test_backtracefilter.rb
 - test/test-diff.rb
+- test/test-assertions.rb
+- test/testunit-test-util.rb
+- test/run-test.rb
 - test/test-emacs-runner.rb
-- test/test-data.rb
-- test/fixtures/header.csv
-- test/fixtures/header.tsv
-- test/fixtures/no-header.tsv
-- test/fixtures/plus.csv
+- test/test-color.rb
+- test/test-pending.rb
+- test/test-omission.rb
+- test/test-color-scheme.rb
+- test/test-test-result.rb
+- test/test-test-suite.rb
+- test/test-code-snippet.rb
+- test/test-test-case.rb
+- test/test-failure.rb
 - test/fixtures/no-header.csv
 - test/fixtures/header-label.tsv
+- test/fixtures/no-header.tsv
+- test/fixtures/header.csv
 - test/fixtures/header-label.csv
-- test/test-assertions.rb
-- test/test-test-result.rb
-- test/testunit-test-util.rb
+- test/fixtures/plus.csv
+- test/fixtures/header.tsv
+- test/ui/test_testrunmediator.rb
+- test/test-fixture.rb
+- test/test-priority.rb
+- test/test-test-suite-creator.rb
+- test/test-attribute.rb
+- test/test-notification.rb
+- test/test-attribute-matcher.rb
+- test/test-fault-location-detector.rb
+- test/collector/test-descendant.rb
+- test/collector/test_objectspace.rb
 - test/collector/test-load.rb
 - test/collector/test_dir.rb
-- test/collector/test_objectspace.rb
-- test/collector/test-descendant.rb
 - test/test-error.rb
-- test/run-test.rb
-- test/test-pending.rb
-- test/test-fixture.rb
-- test/util/test-output.rb
-- test/util/test-method-owner-finder.rb
-- test/util/test_observable.rb
-- test/util/test_procwrapper.rb
-- test/util/test_backtracefilter.rb
-- test/test-notification.rb
-- test/test-omission.rb
-- test/test-test-case.rb
+- test/test-data.rb