test-unit 2.0.1 → 2.0.2

data/History.txt

@@ -1,3 +1,22 @@
+=== 2.0.2 / 2008-12-21
+
+* 2 major enhancements
+
+  * re-support ruby 1.8.5.
+  * improve exception object comparison.
+
+* 3 bug fixes
+
+  * [#22723]: collector fails on anonymous classes
+  * [#22986]: Test names with '?' blow up on Windows
+  * [#22988]: don't create .test-result on non-priority mode.
+
+* Thanks
+
+  * Erik Hollensbe
+  * Daniel Berger
+  * Bill Lear
+
 === 2.0.1 / 2008-11-09
 
 * 19 major enhancements

data/Manifest.txt

@@ -41,6 +41,7 @@ lib/test/unit/ui/testrunner.rb
 lib/test/unit/ui/testrunnermediator.rb
 lib/test/unit/ui/testrunnerutilities.rb
 lib/test/unit/util/backtracefilter.rb
+lib/test/unit/util/method-owner-finder.rb
 lib/test/unit/util/observable.rb
 lib/test/unit/util/procwrapper.rb
 lib/test/unit/version.rb
@@ -73,6 +74,7 @@ test/test_testresult.rb
 test/test_testsuite.rb
 test/testunit-test-util.rb
 test/ui/test_testrunmediator.rb
+test/util/test-method-owner-finder.rb
 test/util/test_backtracefilter.rb
 test/util/test_observable.rb
 test/util/test_procwrapper.rb

data/README.txt

@@ -44,5 +44,7 @@ This software is distributed under the same terms as ruby.
 
 == Thanks
 
-* Daniel Berger: suggestions.
+* Daniel Berger: Suggestions and bug reports.
 * Designing Patterns: Suggestions.
+* Erik Hollensbe: Suggestions.
+* Bill Lear: A suggestion.

data/TODO

@@ -1 +1,2 @@
 * mock.
+* data-driven test.

data/lib/test/unit/assertions.rb

@@ -4,6 +4,7 @@
 
 require 'test/unit/assertionfailederror'
 require 'test/unit/util/backtracefilter'
+require 'test/unit/util/method-owner-finder'
 require 'test/unit/diff'
 
 module Test
@@ -909,9 +910,7 @@ EOM
           end
 
           def inspect
-            inspect_method = @exception.method(:inspect)
-            if inspect_method.respond_to?(:owner) and
-                inspect_method.owner == Exception
+            if default_inspect?
               "#{@exception.class.inspect}(#{@exception.message.inspect})"
             else
               @exception.inspect
@@ -921,6 +920,18 @@ EOM
           def method_missing(name, *args, &block)
             @exception.send(name, *args, &block)
           end
+
+          private
+          def default_inspect?
+            inspect_method = @exception.method(:inspect)
+            if inspect_method.respond_to?(:owner) and
+                inspect_method.owner == Exception
+              true
+            else
+              default_inspect_method = Exception.instance_method(:inspect)
+              default_inspect_method.bind(@exception).call == @exception.inspect
+            end
+          end
         end
 
         def initialize(test_case, expected_exceptions)
@@ -987,15 +998,18 @@ EOM
 
         def expected_object?(actual_exception)
           @expected_objects.any? do |expected_object|
-            equal_method = expected_object.method(:==)
-            if equal_method.respond_to?(:owner) and
-                (equal_method.owner == Kernel or
-                 equal_method.owner == Exception)
-              expected_object.class == actual_exception.class and
-                expected_object.message == actual_exception.message
-            else
-              expected_object == actual_exception
-            end
+            expected_object == actual_exception or
+              fallback_exception_object_equal(expected_object, actual_exception)
+          end
+        end
+
+        def fallback_exception_object_equal(expected_object, actual_exception)
+          owner = Util::MethodOwnerFinder.find(expected_object, :==)
+          if owner == Kernel or owner == Exception
+            expected_object.class == actual_exception.class and
+              expected_object.message == actual_exception.message
+          else
+            false
           end
         end
       end

data/lib/test/unit/autorunner.rb

@@ -196,8 +196,10 @@ module Test
           o.on("--[no-]priority-mode",
                "Runs some tests based on their priority.") do |priority_mode|
             if priority_mode
+              Priority.enable
               @filters |= [priority_filter]
             else
+              Priority.disable
               @filters -= [priority_filter]
             end
           end

data/lib/test/unit/collector.rb

@@ -36,7 +36,7 @@ module Test
       end
 
       def sort(suites)
-        suites.sort_by{|s| s.name}
+        suites.sort_by {|suite| suite.name || suite.to_s}
       end
     end
   end

data/lib/test/unit/fixture.rb

@@ -90,17 +90,14 @@ module Test
         end
 
         def add_fixture_method_name(how, variable_name, method_name)
-          unless self.instance_variable_defined?(variable_name)
-            self.instance_variable_set(variable_name, [])
-          end
-          methods = self.instance_variable_get(variable_name)
+          methods = instance_eval("#{variable_name} ||= []")
 
           if how == :prepend
             methods = [method_name] | methods
           else
             methods = methods | [method_name]
           end
-          self.instance_variable_set(variable_name, methods)
+          instance_variable_set(variable_name, methods)
         end
 
         def registered_methods_variable_name(fixture, order)
@@ -144,15 +141,9 @@ module Test
           interested_ancestors.inject([]) do |result, ancestor|
             if ancestor.is_a?(Class)
               ancestor.class_eval do
-                methods = []
-                unregistered_methods = []
-                if instance_variable_defined?(methods_variable)
-                  methods = instance_variable_get(methods_variable)
-                end
-                if instance_variable_defined?(unregistered_methods_variable)
-                  unregistered_methods =
-                    instance_variable_get(unregistered_methods_variable)
-                end
+                methods = instance_eval("#{methods_variable} ||= []")
+                unregistered_methods =
+                  instance_eval("#{unregistered_methods_variable} ||= []")
                 (result | methods) - unregistered_methods
               end
             else

data/lib/test/unit/priority.rb

@@ -13,6 +13,19 @@ module Test
             teardown :priority_teardown, :after => :append
           end
         end
+
+        @@enabled = false
+        def enabled?
+          @@enabled
+        end
+
+        def enable
+          @@enabled = true
+        end
+
+        def disable
+          @@enabled = false
+        end
       end
 
       class Checker
@@ -90,7 +103,7 @@ module Test
         def result_dir
           components = [".test-result",
                         @test.class.name || "AnonymousTestCase",
-                        @test.method_name.to_s]
+                        escaped_method_name]
           parent_directories = [File.dirname($0), Dir.pwd]
           if Process.respond_to?(:uid)
             parent_directories << File.join(Dir.tmpdir, Process.uid.to_s)
@@ -112,7 +125,7 @@ module Test
         end
 
         def escaped_method_name
-          @method_name.to_s.gsub(/[!?=]$/) do |matched|
+          @test.method_name.to_s.gsub(/[!?=]$/) do |matched|
             case matched
             when "!"
               ".destructive"
@@ -135,10 +148,12 @@ module Test
       end
 
       def priority_setup
+        return unless Priority.enabled?
         Checker.new(self).setup
       end
 
       def priority_teardown
+        return unless Priority.enabled?
         Checker.new(self).teardown
       end
     end

data/lib/test/unit/testcase.rb

@@ -17,6 +17,7 @@ require 'test/unit/priority'
 require 'test/unit/testsuite'
 require 'test/unit/assertionfailederror'
 require 'test/unit/util/backtracefilter'
+require 'test/unit/util/method-owner-finder'
 
 module Test
   module Unit
@@ -192,11 +193,9 @@ module Test
         throw :invalid_test unless respond_to?(test_method_name)
         test_method = method(test_method_name)
         throw :invalid_test if test_method.arity > 0
-        if test_method.respond_to?(:owner)
-          if test_method.owner.class != Module and
-              self.class != test_method.owner
-            throw :invalid_test
-          end
+        owner = Util::MethodOwnerFinder.find(self, test_method_name)
+        if owner.class != Module and self.class != owner
+          throw :invalid_test
         end
         @method_name = test_method_name
         @test_passed = true

data/lib/test/unit/util/method-owner-finder.rb

@@ -0,0 +1,28 @@
+module Test
+  module Unit
+    module Util
+      module MethodOwnerFinder
+        module_function
+        def find(object, method_name)
+          method = object.method(method_name)
+          return method.owner if method.respond_to?(:owner)
+
+          if /\((.+?)\)\#/ =~ method.to_s
+            owner_name = $1
+            if /\A#</ =~ owner_name
+              ObjectSpace.each_object(Module) do |mod|
+                return mod if mod.to_s == owner_name
+              end
+            else
+              owner_name.split(/::/).inject(Object) do |parent, name|
+                parent.const_get(name)
+              end
+            end
+          else
+            object.class
+          end
+        end
+      end
+    end
+  end
+end

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.1'
+    VERSION = '2.0.2'
   end
 end

data/test/test-priority.rb

@@ -86,4 +86,34 @@ class TestUnitPriority < Test::Unit::TestCase
     end
     assert_in_delta(expected, n_need_to_run.to_f / n, delta)
   end
+
+  class SpecialNameTestCase < Test::Unit::TestCase
+    class << self
+      def suite
+        Test::Unit::TestSuite.new(name)
+      end
+    end
+
+    def test_question?
+    end
+
+    def test_exclamation!
+    end
+
+    def test_equal=
+    end
+  end
+
+  def test_escaped?
+    assert_escaped_name("test_question.predicate", "test_question?")
+    assert_escaped_name("test_exclamation.destructive", "test_exclamation!")
+    assert_escaped_name("test_equal.equal", "test_equal=")
+  end
+
+  def assert_escaped_name(expected, test_method_name)
+    checker = Checker.new(SpecialNameTestCase.new(test_method_name))
+    passed_file = checker.send(:passed_file)
+    method_name_component = File.basename(File.dirname(passed_file))
+    assert_equal(expected, method_name_component)
+  end
 end

data/test/util/test-method-owner-finder.rb

@@ -0,0 +1,38 @@
+require 'test/unit'
+
+require 'test/unit/util/method-owner-finder'
+
+class TestUnitMethodOwnerFinder < Test::Unit::TestCase
+  def test_find
+    assert_equal(Exception, find(RuntimeError.new, :inspect))
+    assert_equal(Exception, find(Exception.new, :inspect))
+
+    anonymous_class = Class.new do
+    end
+    assert_equal(Kernel, find(anonymous_class.new, :inspect))
+
+    anonymous_parent_class = Class.new do
+      def inspect
+        super + " by anonymous parent class"
+      end
+    end
+    anonymous_sub_class = Class.new(anonymous_parent_class) do
+    end
+    assert_equal(anonymous_parent_class, find(anonymous_sub_class.new, :inspect))
+
+    anonymous_module = Module.new do
+      def inspect
+        super + " by anonymous module"
+      end
+    end
+    anonymous_include_class = Class.new do
+      include anonymous_module
+    end
+    assert_equal(anonymous_module, find(anonymous_include_class.new, :inspect))
+  end
+
+  private
+  def find(object, method_name)
+    Test::Unit::Util::MethodOwnerFinder.find(object, method_name)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-09 00:00:00 +09:00
+date: 2008-12-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,6 +79,7 @@ files:
 - lib/test/unit/ui/testrunnermediator.rb
 - lib/test/unit/ui/testrunnerutilities.rb
 - lib/test/unit/util/backtracefilter.rb
+- lib/test/unit/util/method-owner-finder.rb
 - lib/test/unit/util/observable.rb
 - lib/test/unit/util/procwrapper.rb
 - lib/test/unit/version.rb
@@ -111,6 +112,7 @@ files:
 - test/test_testsuite.rb
 - test/testunit-test-util.rb
 - test/ui/test_testrunmediator.rb
+- test/util/test-method-owner-finder.rb
 - test/util/test_backtracefilter.rb
 - test/util/test_observable.rb
 - test/util/test_procwrapper.rb
@@ -137,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: test-unit
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Test::Unit 2.x - Improved version of Test::Unit bundled in Ruby 1.8.x