test-unit 2.5.1 → 2.5.2

data/README.textile

@@ -50,8 +50,13 @@ h2. License
 
 This software is distributed under the same terms as ruby.
 
-Exception: lib/test/unit/diff.rb is a dual license of the
-Ruby license and PSF license.
+Exception:
+
+  * lib/test/unit/diff.rb is a double license of the Ruby license and
+    PSF license.
+
+  * lib/test-unit.rb is a dual license of the Ruby license and LGPLv2.1
+    or later.
 
 h2. Authors
 

data/Rakefile

@@ -248,7 +248,7 @@ task :publish => ["html:publish", "reference:publish"]
 
 desc "Tag the current revision."
 task :tag do
-  sh("git tag -a #{version} -m 'release #{version}!!!'")
+  sh("git tag -a #{spec.version} -m 'release #{spec.version}!!!'")
 end
 
 namespace :release do

data/lib/test-unit.rb

@@ -1,3 +1,22 @@
+# Copyright (C) 2012  Kouhei Sutou <kou@clear-code.com>
+#
+# License: Ruby's or LGPLv2.1 or later
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301 USA
+
 module Test
   module Unit
     autoload :TestCase, "test/unit/testcase"

data/lib/test/unit.rb

@@ -308,19 +308,190 @@ module Test # :nodoc:
   #
 
   module Unit
-    # Set true when Test::Unit has run.  If set to true Test::Unit
-    # will not automatically run at exit.
-    #
-    # @deprecated Use Test::Unit::AutoRunner.need_auto_run= instead.
-    def self.run=(have_run)
-      AutoRunner.need_auto_run = (not have_run)
-    end
+    class << self
+      # Set true when Test::Unit has run.  If set to true Test::Unit
+      # will not automatically run at exit.
+      #
+      # @deprecated Use Test::Unit::AutoRunner.need_auto_run= instead.
+      def run=(have_run)
+        AutoRunner.need_auto_run = (not have_run)
+      end
+
+      # Already tests have run?
+      #
+      # @deprecated Use Test::Unit::AutoRunner.need_auto_run? instead.
+      def run?
+        not AutoRunner.need_auto_run?
+      end
+
+      # @api private
+      @@at_start_hooks = []
+
+      # Regsiter a hook that is run before running tests.
+      # To register multiple hooks, call this method multiple times.
+      #
+      # Here is an example test case:
+      #   Test::Unit.at_start do
+      #     # ...
+      #   end
+      #
+      #   class TestMyClass1 < Test::Unit::TestCase
+      #     class << self
+      #       def startup
+      #         # ...
+      #       end
+      #     end
+      #
+      #     def setup
+      #       # ...
+      #     end
+      #
+      #     def test_my_class1
+      #       # ...
+      #     end
+      #
+      #     def test_my_class2
+      #       # ...
+      #     end
+      #   end
+      #
+      #   class TestMyClass2 < Test::Unit::TestCase
+      #     class << self
+      #       def startup
+      #         # ...
+      #       end
+      #     end
+      #
+      #     def setup
+      #       # ...
+      #     end
+      #
+      #     def test_my_class1
+      #       # ...
+      #     end
+      #
+      #     def test_my_class2
+      #       # ...
+      #     end
+      #   end
+      #
+      # Here is a call order:
+      # * at_start
+      # * TestMyClass1.startup
+      # * TestMyClass1#setup
+      # * TestMyClass1#test_my_class1
+      # * TestMyClass1#setup
+      # * TestMyClass1#test_my_class2
+      # * TestMyClass2#setup
+      # * TestMyClass2#test_my_class1
+      # * TestMyClass2#setup
+      # * TestMyClass2#test_my_class2
+      #
+      # @example
+      #   Test::Unit.at_start do
+      #     puts "Start!"
+      #   end
+      #
+      # @yield A block that is run before running tests.
+      # @yieldreturn [void]
+      # @return [void]
+      #
+      # @since 2.5.2
+      def at_start(&hook)
+        @@at_start_hooks << hook
+      end
+
+      # @api private
+      def run_at_start_hooks
+        @@at_start_hooks.each do |hook|
+          hook.call
+        end
+      end
+
+      # @api private
+      @@at_exit_hooks = []
+
+      # Regsiter a hook that is run after running tests.
+      # To register multiple hooks, call this method multiple times.
+      #
+      # Here is an example test case:
+      #   Test::Unit.at_exit do
+      #     # ...
+      #   end
+      #
+      #   class TestMyClass1 < Test::Unit::TestCase
+      #     class << self
+      #       def shutdown
+      #         # ...
+      #       end
+      #     end
+      #
+      #     def teardown
+      #       # ...
+      #     end
+      #
+      #     def test_my_class1
+      #       # ...
+      #     end
+      #
+      #     def test_my_class2
+      #       # ...
+      #     end
+      #   end
+      #
+      #   class TestMyClass2 < Test::Unit::TestCase
+      #     class << self
+      #       def shutdown
+      #         # ...
+      #       end
+      #     end
+      #
+      #     def teardown
+      #       # ...
+      #     end
+      #
+      #     def test_my_class1
+      #       # ...
+      #     end
+      #
+      #     def test_my_class2
+      #       # ...
+      #     end
+      #   end
+      #
+      # Here is a call order:
+      # * TestMyClass1#test_my_class1
+      # * TestMyClass1#teardown
+      # * TestMyClass1#test_my_class2
+      # * TestMyClass1#teardown
+      # * TestMyClass1.shutdown
+      # * TestMyClass2#test_my_class1
+      # * TestMyClass2#teardown
+      # * TestMyClass2#test_my_class2
+      # * TestMyClass2#teardown
+      # * TestMyClass2.shutdown
+      # * at_exit
+      #
+      # @example
+      #   Test::Unit.at_exit do
+      #     puts "Exit!"
+      #   end
+      #
+      # @yield A block that is run after running tests.
+      # @yieldreturn [void]
+      # @return [void]
+      #
+      # @since 2.5.2
+      def at_exit(&hook)
+        @@at_exit_hooks << hook
+      end
 
-    # Already tests have run?
-    #
-    # @deprecated Use Test::Unit::AutoRunner.need_auto_run? instead.
-    def self.run?
-      not AutoRunner.need_auto_run?
+      # @api private
+      def run_at_exit_hooks
+        @@at_exit_hooks.each do |hook|
+          hook.call
+        end
+      end
     end
   end
 end

data/lib/test/unit/assertions.rb

@@ -1379,11 +1379,14 @@ EOT
         end
       end
 
-      ##
-      # Called whenever an assertion is made.  Define this in classes that
-      # include Test::Unit::Assertions to record assertion counts.
-
-      private
+      public
+      # Called whenever an assertion is made. Define this in classes
+      # that include Test::Unit::Assertions to record assertion
+      # counts.
+      #
+      # This is a public API for developers who extend test-unit.
+      #
+      # @return [void]
       def add_assertion
       end
 
@@ -1615,7 +1618,7 @@ EOT
 
           class << self
             def target?(object)
-              object.is_a?(Hash) or object == ENV
+              object.is_a?(Hash) or ENV.equal?(object)
             end
           end
 

data/lib/test/unit/autorunner.rb

@@ -259,6 +259,23 @@ module Test
             end
           end
 
+          o.on('--location=LOCATION', String,
+               "Runs tests that defined in LOCATION.",
+               "LOCATION is one of PATH:LINE, PATH or LINE") do |location|
+            if /\A\d+\z/ =~ location
+              path = nil
+              line = location.to_i
+            else
+              path, line, = location.split(/:(\d+)/, 2)
+              line = line.to_i unless line.nil?
+            end
+            @filters << lambda do |test|
+              test.class.test_defined?(:path => path,
+                                       :line => line,
+                                       :method_name => test.method_name)
+            end
+          end
+
           priority_filter = Proc.new do |test|
             if @filters == [priority_filter]
               Priority::Checker.new(test).need_to_run?

data/lib/test/unit/collector.rb

@@ -15,11 +15,27 @@ module Test
       end
 
       def add_suite(destination, suite)
-        to_delete = suite.tests.find_all {|t| !include?(t)}
+        to_delete = suite.tests.find_all do |test|
+          test.is_a?(TestCase) and !include?(test)
+        end
         to_delete.each {|t| suite.delete(t)}
         destination << suite unless suite.empty?
       end
 
+      def add_test_cases(suite, test_cases)
+        children_map = {}
+        test_cases.each do |descendant_test_case|
+          parent = descendant_test_case.ancestors[1]
+          children_map[parent] ||= []
+          children_map[parent] << descendant_test_case
+        end
+
+        root_test_cases = children_map.keys - test_cases
+        root_test_cases.each do |root_test_case|
+          add_test_case(suite, root_test_case, children_map)
+        end
+      end
+
       def include?(test)
         return true if(@filters.empty?)
         @filters.each do |filter|
@@ -33,6 +49,22 @@ module Test
           [suite.priority, suite.name || suite.to_s]
         end
       end
+
+      private
+      def add_test_case(suite, test_case, children_map)
+        children = children_map[test_case]
+        return if children.nil?
+
+        sub_suites = []
+        children.each do |child|
+          sub_suite = child.suite
+          add_test_case(sub_suite, child, children_map)
+          add_suite(sub_suites, sub_suite)
+        end
+        sort(sub_suites).each do |sub_suite|
+          suite << sub_suite
+        end
+      end
     end
   end
 end

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

@@ -10,11 +10,7 @@ module Test
 
         def collect(name=NAME)
           suite = TestSuite.new(name)
-          sub_suites = []
-          TestCase::DESCENDANTS.each do |descendant_test_case|
-            add_suite(sub_suites, descendant_test_case.suite)
-          end
-          sort(sub_suites).each {|s| suite << s}
+          add_test_cases(suite, TestCase::DESCENDANTS)
           suite
         end
       end

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

@@ -106,9 +106,7 @@ module Test
             rescue LoadError
               @require_failed_infos << {:path => expanded_path, :exception => $!}
             end
-            find_test_cases(already_gathered).each do |test_case|
-              add_suite(test_suites, test_case.suite)
-            end
+            add_test_cases(test_suites, find_test_cases(already_gathered))
           end
         end
 

data/lib/test/unit/color-scheme.rb

@@ -17,56 +17,62 @@ module Test
         @@default_for_8_colors = nil
         def default_for_8_colors
           @@default_for_8_colors ||=
-            new("pass" => Color.new("green", :foreground => false) +
+            new("pass" => Color.new("green", :background => true) +
                           Color.new("white", :bold => true),
-                "failure" => Color.new("red", :foreground => false) +
+                "failure" => Color.new("red", :background => true) +
                              Color.new("white", :bold => true),
-                "pending" => Color.new("magenta", :bold => true),
-                "omission" => Color.new("blue", :bold => true),
-                "notification" => Color.new("cyan", :bold => true),
-                "error" => Color.new("yellow", :bold => true) +
-                           Color.new("black", :foreground => false),
-                "case" => Color.new("white", :bold => true) +
-                          Color.new("blue", :foreground => false),
-                "suite" => Color.new("white", :bold => true) +
-                           Color.new("green", :foreground => false),
-                "diff-inserted-tag" => Color.new("red", :bold => true),
-                "diff-deleted-tag" => Color.new("green", :bold => true),
-                "diff-difference-tag" => Color.new("cyan", :bold => true),
-                "diff-inserted" => Color.new("red", :foreground => false) +
+                "pending" => Color.new("magenta", :background => true) +
+                             Color.new("white", :bold => true),
+                "omission" => Color.new("blue", :background => true) +
+                             Color.new("white", :bold => true),
+                "notification" => Color.new("cyan", :background => true) +
+                                  Color.new("white", :bold => true),
+                "error" => Color.new("black", :background => true) +
+                           Color.new("yellow", :bold => true),
+                "case" => Color.new("blue", :background => true) +
+                          Color.new("white", :bold => true),
+                "suite" => Color.new("green", :background => true) +
+                           Color.new("white", :bold => true),
+                "diff-inserted-tag" => Color.new("red", :background => true) +
+                                       Color.new("black", :bold => true),
+                "diff-deleted-tag" => Color.new("green", :background => true) +
+                                      Color.new("black", :bold => true),
+                "diff-difference-tag" => Color.new("cyan", :background => true) +
+                                         Color.new("white", :bold => true),
+                "diff-inserted" => Color.new("red", :background => true) +
                                    Color.new("white", :bold => true),
-                "diff-deleted" =>  Color.new("green", :foreground => false) +
+                "diff-deleted" =>  Color.new("green", :background => true) +
                                    Color.new("white", :bold => true))
         end
 
         @@default_for_256_colors = nil
         def default_for_256_colors
           @@default_for_256_colors ||=
-            new("pass" => Color.new("030", :foreground => false) +
+            new("pass" => Color.new("030", :background => true) +
                           Color.new("555", :bold => true),
-                "failure" => Color.new("300", :foreground => false) +
+                "failure" => Color.new("300", :background => true) +
                              Color.new("555", :bold => true),
-                "pending" => Color.new("303", :foreground => false) +
+                "pending" => Color.new("303", :background => true) +
                               Color.new("555", :bold => true),
-                "omission" => Color.new("001", :foreground => false) +
+                "omission" => Color.new("001", :background => true) +
                               Color.new("555", :bold => true),
-                "notification" => Color.new("011", :foreground => false) +
+                "notification" => Color.new("011", :background => true) +
                                   Color.new("555", :bold => true),
-                "error" => Color.new("550", :bold => true) +
-                           Color.new("000", :foreground => false),
-                "case" => Color.new("220", :foreground => false) +
+                "error" => Color.new("000", :background => true) +
+                           Color.new("550", :bold => true),
+                "case" => Color.new("220", :background => true) +
                           Color.new("555", :bold => true),
-                "suite" => Color.new("110", :foreground => false) +
+                "suite" => Color.new("110", :background => true) +
                            Color.new("555", :bold => true),
-                "diff-inserted-tag" => Color.new("500", :foreground => false) +
+                "diff-inserted-tag" => Color.new("500", :background => true) +
                                        Color.new("000", :bold => true),
-                "diff-deleted-tag" => Color.new("050", :foreground => false) +
+                "diff-deleted-tag" => Color.new("050", :background => true) +
                                       Color.new("000", :bold => true),
-                "diff-difference-tag" => Color.new("005", :foreground => false) +
+                "diff-difference-tag" => Color.new("005", :background => true) +
                                          Color.new("555", :bold => true),
-                "diff-inserted" => Color.new("300", :foreground => false) +
+                "diff-inserted" => Color.new("300", :background => true) +
                                    Color.new("555", :bold => true),
-                "diff-deleted" =>  Color.new("030", :foreground => false) +
+                "diff-deleted" =>  Color.new("030", :background => true) +
                                    Color.new("555", :bold => true))
         end