test-unit 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf2bacf30a66a56af147ea9e94da6e0494a2651d
-  data.tar.gz: dc496f0ff48c039ce45d31d9b0aeda8c8fe3207c
+  metadata.gz: 82214fb59acb16827aacf60b960cefc080128e3d
+  data.tar.gz: 2639d42836d7ca114f9acb65e1e6c67136672acc
 SHA512:
-  metadata.gz: ea2f7f667dbc1ebb99e234c2634f2b8ed4651d1d56704a5ab800d4f0fd285d97309a4ed4920020ef37cdc4eb8316c114d75045e33ba20652ee04e4d565ae519b
-  data.tar.gz: c8301808c3e979ee04682074550643a7b0ae214bba5eb60f4c9808be7d86ff2faa7eaded9829e47e9f841fd76257d37bdb1b294163faad401bc9150fe4c1a671
+  metadata.gz: 814c6f16fe4e256ad788617cb627441b93ce32c20a3b8972e5e4e799534a8c3350ff77ecdef0bc13ab6fcb5b532b7efec814717f2cfee6fbbabdfd04829f5b4c
+  data.tar.gz: a6301d7b7e109157505e354dd3c43393921f51b10bbddd5f44e26f1e2689b8c7be9059da74d61be8bfc73fc626ae3f9d601292ccbb1ce9d80f14bb0f21fe5327

data/doc/text/news.md

@@ -1,5 +1,19 @@
 # News
 
+## 3.0.5 - 2014-11-08 {#version-3-0-5}
+
+It's a minor update release.
+
+### Fixes
+
+  * Fixed a bug that startup/shutdown of parent test case isn't called
+    when the test case includes one or more modules.
+    [GitHub#83][Reported by Chadderton Odwazny]
+
+### Thanks
+
+  * Chadderton Odwazny
+
 ## 3.0.4 - 2014-11-01 {#version-3-0-4}
 
 It's a minor update release.

data/lib/test/unit/collector.rb

@@ -24,10 +24,13 @@ module Test
 
       def add_test_cases(suite, test_cases)
         children_map = {}
-        test_cases.each do |descendant_test_case|
-          parent = descendant_test_case.ancestors[1]
+        test_cases.each do |test_case|
+          ancestor_classes = test_case.ancestors.find_all do |ancestor|
+            ancestor.is_a?(Class)
+          end
+          parent = ancestor_classes[1]
           children_map[parent] ||= []
-          children_map[parent] << descendant_test_case
+          children_map[parent] << test_case
         end
 
         root_test_cases = children_map.keys - test_cases

data/lib/test/unit/version.rb

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

data/test/collector/test-descendant.rb

@@ -5,129 +5,174 @@ class TestUnitCollectorDescendant < Test::Unit::TestCase
   def setup
     @previous_descendants = Test::Unit::TestCase::DESCENDANTS.dup
     Test::Unit::TestCase::DESCENDANTS.clear
+  end
+
+  def teardown
+    Test::Unit::TestCase::DESCENDANTS.replace(@previous_descendants)
+  end
+
+  private
+  def assert_collect(expected, *collect_args)
+    collector = Test::Unit::Collector::Descendant.new
+    yield(collector) if block_given?
+    assert_equal(expected, collector.send(:collect, *collect_args))
+  end
+
+  def default_name
+    Test::Unit::Collector::Descendant::NAME
+  end
 
-    @test_case1 = Class.new(Test::Unit::TestCase) do
-      def self.name
-        "test-case1"
+  def empty_suite(name=nil)
+    Test::Unit::TestSuite.new(name || default_name)
+  end
+
+  class TestCollect < self
+    def setup
+      super
+
+      @test_case1 = Class.new(Test::Unit::TestCase) do
+        def self.name
+          "test-case1"
+        end
+
+        def test_1
+        end
+
+        def test_2
+        end
       end
 
-      def test_1
+      @test_case2 = Class.new(Test::Unit::TestCase) do
+        def self.name
+          "test-case2"
+        end
+
+        def test_0
+        end
       end
 
-      def test_2
+      @no_test_case = Class.new do
+        def self.name
+          "no-test-case"
+        end
+
+        def test_4
+        end
       end
     end
 
-    @test_case2 = Class.new(Test::Unit::TestCase) do
-      def self.name
-        "test-case2"
-      end
+    def test_basic
+      assert_collect(full_suite("name"), "name")
 
-      def test_0
+      assert_collect(full_suite("name"), "name") do |collector|
+        collector.filter = []
       end
     end
 
-    @no_test_case = Class.new do
-      def self.name
-        "no-test-case"
+    def test_filtered
+      assert_collect(empty_suite) do |collector|
+        collector.filter = Proc.new {false}
       end
 
-      def test_4
+      assert_collect(full_suite) do |collector|
+        collector.filter = Proc.new {true}
       end
-    end
-  end
 
-  def teardown
-    Test::Unit::TestCase::DESCENDANTS.replace(@previous_descendants)
-  end
+      assert_collect(full_suite) do |collector|
+        collector.filter = Proc.new {nil}
+      end
 
-  def test_basic_collection
-    assert_collect(full_suite("name"), "name")
+      assert_collect(empty_suite) do |collector|
+        collector.filter = [Proc.new {false}, Proc.new {true}]
+      end
 
-    assert_collect(full_suite("name"), "name") do |collector|
-      collector.filter = []
-    end
-  end
+      assert_collect(empty_suite) do |collector|
+        collector.filter = [Proc.new {true}, Proc.new {false}]
+      end
 
-  def test_filtered_collection
-    assert_collect(empty_suite) do |collector|
-      collector.filter = Proc.new {false}
-    end
+      assert_collect(empty_suite) do |collector|
+        collector.filter = [Proc.new {nil}, Proc.new {false}]
+      end
 
-    assert_collect(full_suite) do |collector|
-      collector.filter = Proc.new {true}
-    end
+      assert_collect(full_suite) do |collector|
+        collector.filter = [Proc.new {nil}, Proc.new {true}]
+      end
 
-    assert_collect(full_suite) do |collector|
-      collector.filter = Proc.new {nil}
-    end
+      expected = empty_suite
+      suite1 = Test::Unit::TestSuite.new(@test_case1.name)
+      suite1 << @test_case1.new("test_1")
+      suite2 = Test::Unit::TestSuite.new(@test_case2.name)
+      suite2 << @test_case2.new("test_0")
+      expected << suite1 << suite2
+      assert_collect(expected) do |collector|
+        collector.filter = Proc.new do |test|
+          ['test_1', 'test_0'].include?(test.method_name)
+        end
+      end
 
-    assert_collect(empty_suite) do |collector|
-      collector.filter = [Proc.new {false}, Proc.new {true}]
+      suite1 = Test::Unit::TestSuite.new(@test_case1.name)
+      suite1 << @test_case1.new("test_1")
+      suite2 = Test::Unit::TestSuite.new(@test_case2.name)
+      suite2 << @test_case2.new("test_0")
+      assert_collect(empty_suite) do |collector|
+        filters = [Proc.new {|test| test.method_name == 'test_1' ? true : nil},
+                   Proc.new {|test| test.method_name == 'test_0' ? true : nil},
+                   Proc.new {false}]
+        collector.filter = filters
+      end
     end
 
-    assert_collect(empty_suite) do |collector|
-      collector.filter = [Proc.new {true}, Proc.new {false}]
-    end
+    private
+    def full_suite(name=nil)
+      sub_suite1 = Test::Unit::TestSuite.new(@test_case1.name)
+      sub_suite1 << @test_case1.new('test_1')
+      sub_suite1 << @test_case1.new('test_2')
 
-    assert_collect(empty_suite) do |collector|
-      collector.filter = [Proc.new {nil}, Proc.new {false}]
-    end
+      sub_suite2 = Test::Unit::TestSuite.new(@test_case2.name)
+      sub_suite2 << @test_case2.new('test_0')
 
-    assert_collect(full_suite) do |collector|
-      collector.filter = [Proc.new {nil}, Proc.new {true}]
+      suite = empty_suite(name)
+      suite << sub_suite1
+      suite << sub_suite2
+      suite
     end
+  end
 
-    expected = empty_suite
-    suite1 = Test::Unit::TestSuite.new(@test_case1.name)
-    suite1 << @test_case1.new("test_1")
-    suite2 = Test::Unit::TestSuite.new(@test_case2.name)
-    suite2 << @test_case2.new("test_0")
-    expected << suite1 << suite2
-    assert_collect(expected) do |collector|
-      collector.filter = Proc.new do |test|
-        ['test_1', 'test_0'].include?(test.method_name)
+  class TestModule < self
+    def test_included_in_child
+      tests = Module.new do
+        def test_in_module
+        end
       end
-    end
 
-    suite1 = Test::Unit::TestSuite.new(@test_case1.name)
-    suite1 << @test_case1.new("test_1")
-    suite2 = Test::Unit::TestSuite.new(@test_case2.name)
-    suite2 << @test_case2.new("test_0")
-    assert_collect(empty_suite) do |collector|
-      filters = [Proc.new {|test| test.method_name == 'test_1' ? true : nil},
-                 Proc.new {|test| test.method_name == 'test_0' ? true : nil},
-                 Proc.new {false}]
-      collector.filter = filters
-    end
-  end
+      parent_test_case = Class.new(Test::Unit::TestCase) do
+        class << self
+          def name
+            "Parent"
+          end
+        end
+      end
 
-  private
-  def assert_collect(expected, *collect_args)
-    collector = Test::Unit::Collector::Descendant.new
-    yield(collector) if block_given?
-    assert_equal(expected, collector.send(:collect, *collect_args))
-  end
+      child_test_case = Class.new(parent_test_case) do
+        include tests
 
-  def default_name
-    Test::Unit::Collector::Descendant::NAME
-  end
+        class << self
+          def name
+            "Child"
+          end
+        end
+      end
 
-  def empty_suite(name=nil)
-    Test::Unit::TestSuite.new(name || default_name)
-  end
+      child_suite = Test::Unit::TestSuite.new(child_test_case.name)
+      child_suite << child_test_case.new("test_in_module")
 
-  def full_suite(name=nil)
-    sub_suite1 = Test::Unit::TestSuite.new(@test_case1.name)
-    sub_suite1 << @test_case1.new('test_1')
-    sub_suite1 << @test_case1.new('test_2')
+      parent_suite = Test::Unit::TestSuite.new(parent_test_case.name)
+      parent_suite << child_suite
 
-    sub_suite2 = Test::Unit::TestSuite.new(@test_case2.name)
-    sub_suite2 << @test_case2.new('test_0')
+      suite = empty_suite("all")
+      suite << parent_suite
 
-    suite = empty_suite(name)
-    suite << sub_suite1
-    suite << sub_suite2
-    suite
+      assert_collect(suite, "all")
+    end
   end
 end

data/test/test-test-case.rb

@@ -159,6 +159,18 @@ module Test
         end
       end
 
+      def jruby?
+        defined?(JRUBY_VERSION)
+      end
+
+      def rubinius?
+        false # TODO
+      end
+
+      def cruby?
+        (not jruby?) and (not rubinius?)
+      end
+
       def test_add_error
         test_case = @tc_failure_error.new(:test_error)
         assert do
@@ -180,15 +192,16 @@ module Test
             :location  => normalize_location(fault.location),
           }
         end
+        location = []
+        location << "#{__FILE__}:0:in `/'" if cruby?
+        location << "#{__FILE__}:0:in `test_error'"
+        location << "#{__FILE__}:0:in `#{__method__}'"
         assert_equal([
                        {
                          :class     => Error,
                          :message   => "ZeroDivisionError: divided by 0",
                          :test_name => "test_error(TC_FailureError)",
-                         :location  => [
-                           "#{__FILE__}:0:in `test_error'",
-                           "#{__FILE__}:0:in `#{__method__}'",
-                         ],
+                         :location  => location,
                        },
                      ],
                      fault_details)

metadata

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