test-unit 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a340ad8305720bf34c90d9d88612f087feaec21
-  data.tar.gz: fadfe8512c5ee8a5b4e52c296da11abdfdd3569d
+  metadata.gz: f581555a5f5e042d125194d870c79a4e8fd4c78e
+  data.tar.gz: a35bda12604b51db52009764c5439e657c3964a7
 SHA512:
-  metadata.gz: a1a2ed9f115b3984ec88efc7f0183fff3050708421c5e6e14335f13d612b0d481d988e512132a1a9204d09e586786b972ce20fb05c12b35af6587b2bbce688ec
-  data.tar.gz: df04299b2354a4f6e7a75ed42725c8103b2b9b96fc6fa58b1bb388dff1a35e501e9090f5140f74fde3c62dac863b5d093e3d95023e3205da0149fc1a79940fdf
+  metadata.gz: 90dd03711e6fe149f451de04c211ec5248a63cb8915a551444920f4b5f0a06f361af028613ac178f05b7f268461d06a3b465b90bf9cd62d51d368aa45deded4c
+  data.tar.gz: bfc59126ae597c329b5819a91556ce55710bba21f2a443838f596fe31d4f6366715a2eb533abcbd8c4e7ca016046d9ac04c12d8b53953241a359da7303ddd3e6

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # News
 
+## 3.0.7 - 2014-11-14 {#version-3-0-7}
+
+It's a minor update release.
+
+### Fixes
+
+  * Fixed a bug that teardown blocks aren't called with sub class to
+    parent class order.
+    [GitHub#85][Reported by TOMITA Masahiro]
+
+### Thanks
+
+  * TOMITA Masahiro
+
 ## 3.0.6 - 2014-11-09 {#version-3-0-6}
 
 It's a minor update release.

data/lib/test/unit/fixture.rb

@@ -41,15 +41,25 @@ module Test
         end
 
         def before_callbacks(type)
-          target_test_cases.inject([]) do |callbacks, ancestor|
-            callbacks | ancestor.fixture[type].before_callbacks
+          prepend_callbacks = []
+          append_callbacks = []
+          target_test_cases.each do |ancestor|
+            prepend_callbacks << ancestor.fixture[type].before_prepend_callbacks
+            append_callbacks << ancestor.fixture[type].before_append_callbacks
           end
+
+          merge_callbacks(prepend_callbacks, append_callbacks)
         end
 
         def after_callbacks(type)
-          target_test_cases.inject([]) do |callbacks, ancestor|
-            callbacks | ancestor.fixture[type].after_callbacks
+          prepend_callbacks = []
+          append_callbacks = []
+          target_test_cases.each do |ancestor|
+            prepend_callbacks << ancestor.fixture[type].after_prepend_callbacks
+            append_callbacks << ancestor.fixture[type].after_append_callbacks
           end
+
+          merge_callbacks(prepend_callbacks, append_callbacks)
         end
 
         private
@@ -65,13 +75,26 @@ module Test
           end
           interested_ancestors.reverse
         end
+
+        def merge_callbacks(prepend_callbacks, append_callbacks)
+          all_callbacks = []
+          prepend_callbacks.reverse_each do |callbacks|
+            all_callbacks.concat(callbacks)
+          end
+          append_callbacks.each do |callbacks|
+            all_callbacks.concat(callbacks)
+          end
+          all_callbacks
+        end
       end
 
       class HookPoint
         def initialize(default_options)
           @default_options = default_options
-          @before_callbacks = []
-          @after_callbacks = []
+          @before_prepend_callbacks = []
+          @before_append_callbacks = []
+          @after_prepend_callbacks = []
+          @after_append_callbacks = []
           @unregistered_callbacks = []
         end
 
@@ -89,27 +112,27 @@ module Test
           end
           before_how = options[:before]
           after_how = options[:after]
-          if before_how
-            @before_callbacks = add_callback(@before_callbacks,
-                                             method_name_or_callback,
-                                             before_how)
-          else
-            @after_callbacks = add_callback(@after_callbacks,
-                                            method_name_or_callback,
-                                            after_how)
-          end
+          add_callback(method_name_or_callback, before_how, after_how)
         end
 
         def unregister(method_name_or_callback)
           @unregistered_callbacks << method_name_or_callback
         end
 
-        def before_callbacks
-          @before_callbacks - @unregistered_callbacks
+        def before_prepend_callbacks
+          @before_prepend_callbacks - @unregistered_callbacks
+        end
+
+        def before_append_callbacks
+          @before_append_callbacks - @unregistered_callbacks
         end
 
-        def after_callbacks
-          @after_callbacks - @unregistered_callbacks
+        def after_prepend_callbacks
+          @after_prepend_callbacks - @unregistered_callbacks
+        end
+
+        def after_append_callbacks
+          @after_append_callbacks - @unregistered_callbacks
         end
 
         private
@@ -122,12 +145,21 @@ module Test
             [:prepend, :append].include?(options[key])
         end
 
-        def add_callback(callbacks, method_name_or_callback, how)
-          case how
+        def add_callback(method_name_or_callback, before_how, after_how)
+          case before_how
           when :prepend
-            [method_name_or_callback] | callbacks
+            @before_prepend_callbacks =
+              [method_name_or_callback] | @before_prepend_callbacks
           when :append
-            callbacks | [method_name_or_callback]
+            @before_append_callbacks |= [method_name_or_callback]
+          else
+            case after_how
+            when :prepend
+              @after_prepend_callbacks =
+                [method_name_or_callback] | @after_prepend_callbacks
+            when :append
+              @after_append_callbacks |= [method_name_or_callback]
+            end
           end
         end
       end

data/lib/test/unit/version.rb

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

data/test/test-fixture.rb

@@ -513,6 +513,28 @@ class TestUnitFixture < Test::Unit::TestCase
                              test_case)
     end
 
+    def test_nested
+      called = []
+      parent_test_case = Class.new(Test::Unit::TestCase) do
+        teardown do
+          called << :parent
+        end
+      end
+
+      child_test_case = Class.new(parent_test_case) do
+        teardown do
+          called << :child
+        end
+
+        def test_nothing
+        end
+      end
+
+      run_test_nothing(child_test_case)
+      assert_equal([:child, :parent],
+                   called)
+    end
+
     private
     def assert_teardown_customizable(expected, parent, options)
       test_case = Class.new(parent || Test::Unit::TestCase) do
@@ -607,9 +629,14 @@ class TestUnitFixture < Test::Unit::TestCase
   end
 
   private
-  def assert_called_fixtures(expected, test_case)
+  def run_test_nothing(test_case)
     test = test_case.new("test_nothing")
     test.run(Test::Unit::TestResult.new) {}
+    test
+  end
+
+  def assert_called_fixtures(expected, test_case)
+    test = run_test_nothing(test_case)
     assert_equal(expected, test.called_ids)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-09 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: power_assert
@@ -234,44 +234,44 @@ signing_key:
 specification_version: 4
 summary: An xUnit family unit testing framework for Ruby.
 test_files:
+- test/test-test-case.rb
 - test/test-assertions.rb
-- test/test-color.rb
 - test/test-code-snippet.rb
 - test/test-test-suite-creator.rb
+- test/test-fault-location-detector.rb
+- test/test-omission.rb
 - test/test-test-result.rb
+- test/collector/test-descendant.rb
+- test/collector/test_dir.rb
+- test/collector/test-load.rb
+- test/collector/test_objectspace.rb
+- test/test-color.rb
+- test/test-attribute-matcher.rb
 - test/test-error.rb
-- test/test-failure.rb
-- test/run-test.rb
+- test/test-diff.rb
 - test/test-pending.rb
-- test/test-color-scheme.rb
-- test/test-attribute-matcher.rb
-- test/testunit-test-util.rb
-- test/test-data.rb
-- test/ui/test_testrunmediator.rb
-- test/util/test-method-owner-finder.rb
-- test/util/test-output.rb
-- test/util/test_observable.rb
+- test/test-emacs-runner.rb
 - test/util/test_backtracefilter.rb
 - test/util/test_procwrapper.rb
-- test/test-omission.rb
-- test/test-test-case.rb
-- test/test-fixture.rb
+- test/util/test-output.rb
+- test/util/test_observable.rb
+- test/util/test-method-owner-finder.rb
+- test/test-data.rb
+- test/fixtures/no-header.tsv
+- test/fixtures/header-label.csv
 - test/fixtures/no-header.csv
 - test/fixtures/header-label.tsv
 - test/fixtures/plus.csv
-- test/fixtures/no-header.tsv
-- test/fixtures/header-label.csv
 - test/fixtures/header.csv
 - test/fixtures/header.tsv
-- test/collector/test-descendant.rb
-- test/collector/test_objectspace.rb
-- test/collector/test-load.rb
-- test/collector/test_dir.rb
-- test/test-priority.rb
 - test/test-test-suite.rb
-- test/test-diff.rb
-- test/test-emacs-runner.rb
+- test/test-color-scheme.rb
+- test/test-priority.rb
 - test/test-attribute.rb
-- test/test-fault-location-detector.rb
+- test/run-test.rb
+- test/test-fixture.rb
 - test/test-notification.rb
+- test/test-failure.rb
+- test/testunit-test-util.rb
+- test/ui/test_testrunmediator.rb
 has_rdoc: