test-unit 2.0.6 → 2.0.7

data/History.txt

@@ -1,3 +1,31 @@
+=== 2.0.7 / 2010-03-09
+
+* 4 major enhancements
+  * detect redefined test methods.
+  * [INTERFACE IMCOMPATIBLE] multiple --name and --testcase
+    options narrow down targets instead of adding targets.
+  * [#27764] accept custom test_order for each test case.
+    [Suggested by David MARCHALAND]
+  * [#27790] ignore omitted tests from 'n% passed' report.
+    [Suggested by Daniel Berger]
+
+* 2 minor enchancements
+  * [#27832] ignore .git directory. [Suggested by Daniel Berger]
+  * [#27792] require 'fileutils' and 'tmpdir' lazily for non-priority
+    mode users. [Suggested by David MARCHALAND]
+
+* 2n bug fixes
+  * [#27892] modify processed arguments array destructively.
+    [Reported by Bob Saveland]
+  * work without HOME environment variable.
+    [Reported by Champak Ch]
+
+* Thanks
+  * David MARCHALAND
+  * Daniel Berger
+  * Bob Saveland
+  * Champak Ch
+
 === 2.0.6 / 2010-01-09
 
 * 3 major enhancements

data/README.txt

@@ -51,5 +51,6 @@ This software is distributed under the same terms as ruby.
 * Diego Pettenò: A bug report.
 * Angelo Lakra: A bug report.
 * Mike Pomraning: A bug report.
-* David MARCHALAND: A bug report.
+* David MARCHALAND: Suggestions and bug reports.
 * Andrew Grimm: A bug report.
+* Champak Ch: A bug report.

data/lib/test/unit/autorunner.rb

@@ -117,27 +117,21 @@ module Test
         if File.exist?(config_file)
           load_config(config_file)
         else
-          global_config_file = File.expand_path("~/.test-unit.xml")
-          load_config(global_config_file) if File.exist?(global_config_file)
+          load_global_config
         end
         yield(self) if block_given?
       end
 
       def process_args(args = ARGV)
-        default_arguments = @default_arguments.dup
         begin
-          @default_arguments.concat(args)
-          options.order!(@default_arguments) {|arg| @to_run << arg}
+          args.unshift(*@default_arguments)
+          options.order!(args) {|arg| @to_run << arg}
         rescue OptionParser::ParseError => e
           puts e
           puts options
           exit(false)
-        else
-          @filters << proc{false} unless(@filters.empty?)
         end
         not @to_run.empty?
-      ensure
-        @default_arguments = default_arguments
       end
 
       def options
@@ -186,9 +180,9 @@ module Test
             n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
             case n
             when Regexp
-              @filters << proc{|t| n =~ t.method_name ? true : nil}
+              @filters << proc{|t| n =~ t.method_name ? true : false}
             else
-              @filters << proc{|t| n == t.method_name ? true : nil}
+              @filters << proc{|t| n == t.method_name}
             end
           end
 
@@ -198,17 +192,17 @@ module Test
             n = (%r{\A/(.*)/\Z} =~ n ? Regexp.new($1) : n)
             case n
             when Regexp
-              @filters << proc{|t| n =~ t.class.name ? true : nil}
+              @filters << proc{|t| n =~ t.class.name ? true : false}
             else
-              @filters << proc{|t| n == t.class.name ? true : nil}
+              @filters << proc{|t| n == t.class.name}
             end
           end
 
           priority_filter = Proc.new do |test|
-            if @filters.size > 2
-              nil
+            if @filters == [priority_filter]
+              Priority::Checker.new(test).need_to_run?
             else
-              Priority::Checker.new(test).need_to_run? or nil
+              nil
             end
           end
           o.on("--[no-]priority-mode",
@@ -346,6 +340,17 @@ module Test
       def default_collector
         self.class.collector(@standalone ? :load : :descendant)
       end
+
+      def global_config_file
+        File.expand_path("~/.test-unit.xml")
+      rescue ArgumentError
+        nil
+      end
+
+      def load_global_config
+        file = global_config_file
+        load_config(file) if file and File.exist?(file)
+      end
     end
   end
 end

data/lib/test/unit/collector.rb

@@ -23,14 +23,7 @@ module Test
       def include?(test)
         return true if(@filters.empty?)
         @filters.each do |filter|
-          result = filter[test]
-          if(result.nil?)
-            next
-          elsif(!result)
-            return false
-          else
-            return true
-          end
+          return false if filter[test] == false
         end
         true
       end

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

@@ -60,7 +60,7 @@ module Test
               next if(e == '.' || e == '..')
               e_name = dir_name ? @file.join(dir_name, e) : e
               if @file.directory?(realdir(e_name))
-                next if /\A(?:CVS|\.svn)\z/ =~ e
+                next if /\A(?:CVS|\.svn|\.git)\z/ =~ e
                 sub_suite = recursive_collect(e_name, already_gathered)
                 sub_suites << sub_suite unless(sub_suite.empty?)
               else

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

@@ -14,7 +14,7 @@ module Test
         def initialize
           super
           @system_excludes = [/~\z/, /\A\.\#/]
-          @system_directory_excludes = [/\A(?:CVS|\.svn)\z/]
+          @system_directory_excludes = [/\A(?:CVS|\.svn|\.git)\z/]
           @patterns = [/\Atest[_\-].+\.rb\z/m]
           @excludes = []
           @base = nil

data/lib/test/unit/error.rb

@@ -60,6 +60,10 @@ module Test
       def to_s
         long_display
       end
+
+      def critical?
+        true
+      end
     end
 
     module ErrorHandler

data/lib/test/unit/failure.rb

@@ -59,6 +59,10 @@ module Test
         long_display
       end
 
+      def critical?
+        true
+      end
+
       def diff
         @diff ||= compute_diff
       end

data/lib/test/unit/notification.rb

@@ -41,6 +41,10 @@ module Test
       def to_s
         long_display
       end
+
+      def critical?
+        false
+      end
     end
 
     class NotifiedError < StandardError
@@ -79,16 +83,16 @@ module Test
     module NotificationHandler
       class << self
         def included(base)
-          base.exception_handler(:handle_Notified_error)
+          base.exception_handler(:handle_notified_error)
         end
       end
 
       private
-      def handle_Notified_error(exception)
+      def handle_notified_error(exception)
         return false unless exception.is_a?(NotifiedError)
         notification = Notification.new(name,
-                                filter_backtrace(exception.backtrace),
-                                exception.message)
+                                        filter_backtrace(exception.backtrace),
+                                        exception.message)
         add_notification(notification)
         true
       end

data/lib/test/unit/omission.rb

@@ -41,6 +41,10 @@ module Test
       def to_s
         long_display
       end
+
+      def critical?
+        true
+      end
     end
 
     class OmittedError < StandardError

data/lib/test/unit/pending.rb

@@ -41,6 +41,10 @@ module Test
       def to_s
         long_display
       end
+
+      def critical?
+        true
+      end
     end
 
     class PendedError < StandardError

data/lib/test/unit/priority.rb

@@ -1,6 +1,3 @@
-require "fileutils"
-require "tmpdir"
-
 module Test
   module Unit
     module Priority
@@ -20,6 +17,8 @@ module Test
         end
 
         def enable
+          require "fileutils"
+          require "tmpdir"
           @@enabled = true
         end
 

data/lib/test/unit/testcase.rb

@@ -94,10 +94,15 @@ module Test
           DESCENDANTS << sub_class
         end
 
-        @@added_methods = []
+        @@added_methods = {}
         def method_added(name) # :nodoc:
           super
-          @@added_methods << name.to_s
+          added_methods = (@@added_methods[self] ||= [])
+          stringified_name = name.to_s
+          if added_methods.include?(stringified_name)
+            attribute(:redefined, true, {}, stringified_name)
+          end
+          added_methods << stringified_name
         end
 
         # Rolls up all of the test* methods in the fixture into
@@ -191,12 +196,12 @@ module Test
         def shutdown
         end
 
-        @@test_order = AVAILABLE_ORDERS.first
+        @@test_orders = {}
 
         # Returns the current test order. This returns
         # +:alphabetic+ by default.
         def test_order
-          @@test_order
+          @@test_orders[self] || AVAILABLE_ORDERS.first
         end
 
         # Sets the current test order.
@@ -209,7 +214,7 @@ module Test
         # [:defined]
         #   Tests are sorted in defined order.
         def test_order=(order)
-          @@test_order = order
+          @@test_orders[self] = order
         end
 
         # Defines a test in declarative syntax.
@@ -266,9 +271,10 @@ module Test
         end
 
         def sort_test_names_in_defined_order(test_names)
+          added_methods = @@added_methods[self]
           test_names.sort do |test1, test2|
-            test1_defined_order = @@added_methods.index(test1)
-            test2_defined_order = @@added_methods.index(test2)
+            test1_defined_order = added_methods.index(test1)
+            test2_defined_order = added_methods.index(test2)
             if test1_defined_order and test2_defined_order
               test1_defined_order <=> test2_defined_order
             elsif test1_defined_order
@@ -438,6 +444,9 @@ module Test
       end
 
       def run_test
+        if self.class.get_attribute(@method_name, :redefined)
+          notify("#{self.class}\##{@method_name} was redefined")
+        end
         __send__(@method_name)
       end
 

data/lib/test/unit/ui/console/testrunner.rb

@@ -39,6 +39,7 @@ module Test
             @progress_row_max ||= guess_progress_row_max
             @already_outputted = false
             @n_successes = 0
+            @n_omissions = 0
             @indent = 0
             @top_level = true
             @faults = []
@@ -84,7 +85,8 @@ module Test
           def add_fault(fault)
             @faults << fault
             output_progress(fault.single_character_display, fault_color(fault))
-            @already_outputted = true
+            @n_omissions += 1 if fault.is_a?(Omission)
+            @already_outputted = true if fault.critical?
           end
           
           def started(result)
@@ -107,7 +109,7 @@ module Test
             output("Finished in #{elapsed_time} seconds.")
             nl
             output(@result, result_color)
-            n_tests = @result.run_count
+            n_tests = @result.run_count - @n_omissions
             if n_tests.zero?
               pass_percentage = 0
             else

data/lib/test/unit/version.rb

@@ -2,6 +2,6 @@
 # HACK: quick and dirty to get integrated into the new project - ryan
 module Test
   module Unit
-    VERSION = '2.0.6'
+    VERSION = '2.0.7'
   end
 end

data/test/collector/test-descendant.rb

@@ -66,7 +66,7 @@ class TestUnitCollectorDescendant < Test::Unit::TestCase
       collector.filter = [Proc.new {false}, Proc.new {true}]
     end
 
-    assert_collect(full_suite) do |collector|
+    assert_collect(empty_suite) do |collector|
       collector.filter = [Proc.new {true}, Proc.new {false}]
     end
 
@@ -90,13 +90,11 @@ class TestUnitCollectorDescendant < Test::Unit::TestCase
       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|
+    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}]

data/test/collector/test-load.rb

@@ -196,6 +196,25 @@ EOT
     end
   end
 
+  setup
+  def setup_sub_git_test_cases
+    @sub_git_test_dir = @sub_test_dir + ".git"
+    @sub_git_test_dir.mkpath
+
+    @sub_git_test_case11 = @sub_git_test_dir + "test_case11.rb"
+
+    @sub_git_test_case11.open("w") do |test_case|
+      test_case.puts(<<-EOT)
+module #{@temporary_test_cases_module_name}
+  class SubGitTestCase11 < Test::Unit::TestCase
+    def test11
+    end
+  end
+end
+EOT
+    end
+  end
+
   def teardown
     @test_dir.rmtree if @test_dir.exist?
     ::Object.send(:remove_const, @temporary_test_cases_module_name)

data/test/collector/test_objectspace.rb

@@ -72,7 +72,7 @@ module Test
           assert_equal(empty_suite, @c.collect)
 
           @c.filter = [proc{true}, proc{false}]
-          assert_equal(full_suite, @c.collect)
+          assert_equal(empty_suite, @c.collect)
 
           @c.filter = [proc{nil}, proc{false}]
           assert_equal(empty_suite, @c.collect)
@@ -87,10 +87,12 @@ module Test
           assert_equal(expected, @c.collect)
 
           expected = TestSuite.new(ObjectSpace::NAME)
-          expected << (TestSuite.new(@tc1.name) << @tc1.new('test_1'))
-          expected << (TestSuite.new(@tc2.name) << @tc2.new('test_0'))
-          @c.filter = [proc{|t| t.method_name == 'test_1' ? true : nil}, proc{|t| t.method_name == 'test_0' ? true : nil}, proc{false}]
-          assert_equal(expected, @c.collect)
+          TestSuite.new(@tc1.name) << @tc1.new('test_1')
+          TestSuite.new(@tc2.name) << @tc2.new('test_0')
+          @c.filter = [proc{|t| t.method_name == 'test_1' ? true : nil},
+                       proc{|t| t.method_name == 'test_0' ? true : nil},
+                       proc{false}]
+          assert_equal(empty_suite, @c.collect)
         end
       end
     end

data/test/test-testcase.rb

@@ -7,6 +7,7 @@ require 'test/unit'
 module Test
   module Unit
     class TestTestCase < TestCase
+      self.test_order = :random
       def test_creation
         tc = Class.new(TestCase) do
           def test_with_arguments(arg1, arg2)
@@ -469,52 +470,68 @@ module Test
       end
 
       def test_defined_order
-        keep_test_order do
-          test_case = Class.new(Test::Unit::TestCase) do
-            def test_z
-            end
+        test_case = Class.new(Test::Unit::TestCase) do
+          def test_z
+          end
 
-            def test_1
-            end
+          def test_1
+          end
 
-            def test_a
-            end
+          def test_a
           end
+        end
 
-          assert_equal(["test_1", "test_a", "test_z"],
-                       test_case.suite.tests.collect {|test| test.method_name})
+        assert_equal(["test_1", "test_a", "test_z"],
+                     test_case.suite.tests.collect {|test| test.method_name})
 
-          test_case.test_order = :defined
-          assert_equal(["test_z", "test_1", "test_a"],
-                       test_case.suite.tests.collect {|test| test.method_name})
-        end
+        test_case.test_order = :defined
+        assert_equal(["test_z", "test_1", "test_a"],
+                     test_case.suite.tests.collect {|test| test.method_name})
       end
 
       def test_declarative_style
-        keep_test_order do
-          test_case = Class.new(Test::Unit::TestCase) do
-            test "declarative style test definition" do
-            end
+        test_case = Class.new(Test::Unit::TestCase) do
+          test "declarative style test definition" do
+          end
 
-            test "include parenthesis" do
-            end
+          test "include parenthesis" do
+          end
 
-            test "1 + 2 = 3" do
-            end
+          test "1 + 2 = 3" do
           end
+        end
 
-          test_case.test_order = :defined
+        test_case.test_order = :defined
 
-          assert_equal(["test_declarative_style_test_definition",
-                        "test_include_parenthesis",
-                        "test_1_2_3"],
-                       test_case.suite.tests.collect {|test| test.method_name})
+        assert_equal(["test_declarative_style_test_definition",
+                      "test_include_parenthesis",
+                      "test_1_2_3"],
+                     test_case.suite.tests.collect {|test| test.method_name})
+
+        assert_equal(["declarative style test definition",
+                      "include parenthesis",
+                      "1 + 2 = 3"],
+                     test_case.suite.tests.collect {|test| test.description})
+      end
+
+      def test_redefine_method
+        test_case = Class.new(Test::Unit::TestCase) do
+          def test_name
+          end
+          alias_method :test_name2, :test_name
 
-          assert_equal(["declarative style test definition",
-                        "include parenthesis",
-                        "1 + 2 = 3"],
-                       test_case.suite.tests.collect {|test| test.description})
+          def test_name
+          end
         end
+
+        suite = test_case.suite
+        assert_equal(["test_name", "test_name2"],
+                     suite.tests.collect {|test| test.method_name})
+        result = TestResult.new
+        suite.run(result) {}
+        assert_equal("2 tests, 0 assertions, 0 failures, " +
+                     "0 errors, 0 pendings, 0 omissions, 1 notifications",
+                     result.summary)
       end
 
       private
@@ -522,13 +539,6 @@ module Test
         add_assertion
         raise AssertionFailedError.new(message) unless passed
       end
-
-      def keep_test_order
-        order = TestCase.test_order
-        yield
-      ensure
-        TestCase.test_order = order
-      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -10,9 +10,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-09 00:00:00 +09:00
+date: 2010-03-09 00:00:00 +09:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: gemcutter
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.5.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -21,7 +41,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.5.0
     version: 
 description: |-
   Test::Unit 2.x - Improved version of Test::Unit bundled in