test-unit 2.0.2 → 2.0.3

data/History.txt

@@ -1,3 +1,29 @@
+=== 2.0.3 / 2009-07-19
+
+* 6 major enhancements
+  * add assert_predicate.
+  * add assert_not_predicate.
+  * [#24210] assert_kind_of supports an array of classes or modules.
+    [Daniel Berger]
+  * assert_instance_of supports an array of classes or modules.
+  * add --default-priority option.
+  * [#26627] add --order option. [Daniel Berger]
+
+* 4 minor enhancements
+  * use yellow foreground + black background for error.
+  * don't show diff for long string.
+  * accept "*term-color" TERM environment as colorizable terminal.
+    (e.g. Apple's Terminal)
+  * [#26268] add a workaround for test-spec's after_all. [Angelo Lakra]
+
+* 1 bug fix
+  * [#23586] re-support ruby 1.9.1. [Diego Pettenò]
+
+* Thanks
+  * Diego Pettenò
+  * Daniel Berger
+  * Angelo Lakra
+
 === 2.0.2 / 2008-12-21
 
 * 2 major enhancements

data/Manifest.txt

@@ -66,10 +66,10 @@ test/test-notification.rb
 test/test-omission.rb
 test/test-pending.rb
 test/test-priority.rb
+test/test-testcase.rb
 test/test_assertions.rb
 test/test_error.rb
 test/test_failure.rb
-test/test_testcase.rb
 test/test_testresult.rb
 test/test_testsuite.rb
 test/testunit-test-util.rb

data/README.txt

@@ -48,3 +48,5 @@ This software is distributed under the same terms as ruby.
 * Designing Patterns: Suggestions.
 * Erik Hollensbe: Suggestions.
 * Bill Lear: A suggestion.
+* Diego Pettenò: A bug report.
+* Angelo Lakra: A bug report.

data/Rakefile

@@ -1,12 +1,17 @@
 # -*- ruby -*-
 
 require 'rubygems'
+gem 'rdoc'
 require 'hoe'
 require './lib/test/unit/version.rb'
 
+ENV["NODOT"] = "yes"
+
 version = Test::Unit::VERSION
 ENV["VERSION"] = version
-Hoe.new('test-unit', version) do |p|
+Hoe.spec('test-unit') do |p|
+  Hoe::Test::SUPPORTED_TEST_FRAMEWORKS[:testunit2] = "test/run-test.rb"
+  p.version = version
   p.developer('Kouhei Sutou', 'kou@cozmixng.org')
   p.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
 

data/TODO

@@ -1,2 +1,5 @@
 * mock.
 * data-driven test.
+* port ruby trunk's assert_equal's intelligent inspection
+  when inspected expected and actual are same content
+  string.

data/lib/test/unit/assertions.rb

@@ -1,5 +1,6 @@
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+#             Copyright (c) 2009 Kouhei Sutou.
 # License:: Ruby license.
 
 require 'test/unit/assertionfailederror'
@@ -153,21 +154,43 @@ EOT
 
 
       ##
-      # Passes if +object+ .instance_of? +klass+
+      # Passes if +object+.instance_of?(+klass+). When +klass+ is
+      # an array of classes, it passes if any class
+      # satisfies +object.instance_of?(class).
       #
       # Example:
-      #   assert_instance_of String, 'foo'
+      #   assert_instance_of(String, 'foo')            # -> pass
+      #   assert_instance_of([Fixnum, NilClass], 100)  # -> pass
+      #   assert_instance_of([Numeric, NilClass], 100) # -> fail
 
       public
       def assert_instance_of(klass, object, message="")
         _wrap_assertion do
-          assert_equal(Class, klass.class, "assert_instance_of takes a Class as its first argument")
-          full_message = build_message(message, <<EOT, object, klass, object.class)
+          klasses = nil
+          klasses = klass if klass.is_a?(Array)
+          assert_block("The first parameter to assert_instance_of should be " +
+                       "a Class or an Array of Class.") do
+            if klasses
+              klasses.all? {|k| k.is_a?(Class)}
+            else
+              klass.is_a?(Class)
+            end
+          end
+          klass_message = AssertionMessage.maybe_container(klass) do |value|
+            "<#{value}>"
+          end
+          full_message = build_message(message, <<EOT, object, klass_message, object.class)
 <?> expected to be an instance of
-<?> but was
+? but was
 <?>.
 EOT
-          assert_block(full_message){object.instance_of?(klass)}
+          assert_block(full_message) do
+            if klasses
+              klasses.any? {|k| object.instance_of?(k)}
+            else
+              object.instance_of?(klass)
+            end
+          end
         end
       end
 
@@ -186,17 +209,45 @@ EOT
       end
 
       ##
-      # Passes if +object+ .kind_of? +klass+
+      # Passes if +object+.kind_of?(+klass+). When +klass+ is
+      # an array of classes or modules, it passes if any
+      # class or module satisfies +object.kind_of?(class_or_module).
       #
       # Example:
-      #   assert_kind_of Object, 'foo'
+      #   assert_kind_of(Object, 'foo')                # -> pass
+      #   assert_kind_of([Fixnum, NilClass], 100)      # -> pass
+      #   assert_kind_of([Fixnum, NilClass], "string") # -> fail
 
       public
       def assert_kind_of(klass, object, message="")
         _wrap_assertion do
-          assert(klass.kind_of?(Module), "The first parameter to assert_kind_of should be a kind_of Module.")
-          full_message = build_message(message, "<?>\nexpected to be kind_of\\?\n<?> but was\n<?>.", object, klass, object.class)
-          assert_block(full_message){object.kind_of?(klass)}
+          klasses = nil
+          klasses = klass if klass.is_a?(Array)
+          assert_block("The first parameter to assert_kind_of should be " +
+                       "a kind_of Module or an Array of a kind_of Module.") do
+            if klasses
+              klasses.all? {|k| k.kind_of?(Module)}
+            else
+              klass.kind_of?(Module)
+            end
+          end
+          klass_message = AssertionMessage.maybe_container(klass) do |value|
+            "<#{value}>"
+          end
+          full_message = build_message(message,
+                                       "<?> expected to be kind_of\\?\n" +
+                                       "? but was\n" +
+                                       "<?>.",
+                                       object,
+                                       klass_message,
+                                       object.class)
+          assert_block(full_message) do
+            if klasses
+              klasses.any? {|k| object.kind_of?(k)}
+            else
+              object.kind_of?(klass)
+            end
+          end
         end
       end
 
@@ -209,17 +260,18 @@ EOT
       public
       def assert_respond_to(object, method, message="")
         _wrap_assertion do
-          full_message = build_message(nil, "<?>\ngiven as the method name argument to #assert_respond_to must be a Symbol or #respond_to\\?(:to_str).", method)
-
+          full_message = build_message(message,
+                                       "<?>.kind_of\\?(Symbol) or\n" +
+                                       "<?>.respond_to\\?(:to_str) expected",
+                                       method, method)
           assert_block(full_message) do
-            method.kind_of?(Symbol) || method.respond_to?(:to_str)
+            method.kind_of?(Symbol) or method.respond_to?(:to_str)
           end
-          full_message = build_message(message, <<EOT, object, object.class, method)
-<?>
-of type <?>
-expected to respond_to\\?<?>.
-EOT
-          assert_block(full_message) { object.respond_to?(method) }
+          full_message = build_message(message,
+                                       "<?>.respond_to\\?(?) expected\n" +
+                                       "(Class: <?>)",
+                                       object, method, object.class)
+          assert_block(full_message) {object.respond_to?(method)}
         end
       end
 
@@ -693,6 +745,50 @@ EOT
         end
       end
 
+      ##
+      # Passes if +object+.+predicate+
+      #
+      # Example:
+      #   assert_predicate([], :empty?)  # -> pass
+      #   assert_predicate([1], :empty?) # -> fail
+      def assert_predicate(object, predicate, message=nil)
+        _wrap_assertion do
+          assert_respond_to(object, predicate, message)
+          actual = object.send(predicate)
+          full_message = build_message(message,
+                                       "<?>.? is true value expected but was\n" +
+                                       "<?>",
+                                       object,
+                                       AssertionMessage.literal(predicate),
+                                       actual)
+          assert_block(full_message) do
+            actual
+          end
+        end
+      end
+
+      ##
+      # Passes if +object+.+predicate+
+      #
+      # Example:
+      #   assert_not_predicate([1], :empty?) # -> pass
+      #   assert_not_predicate([], :empty?)  # -> fail
+      def assert_not_predicate(object, predicate, message=nil)
+        _wrap_assertion do
+          assert_respond_to(object, predicate, message)
+          actual = object.send(predicate)
+          full_message = build_message(message,
+                                       "<?>.? is false value expected but was\n" +
+                                       "<?>",
+                                       object,
+                                       AssertionMessage.literal(predicate),
+                                       actual)
+          assert_block(full_message) do
+            not actual
+          end
+        end
+      end
+
       ##
       # Builds a failure message.  +head+ is added before the +template+ and
       # +arguments+ replaces the '?'s positionally in the template.
@@ -780,6 +876,19 @@ EOT
             DelayedLiteral.new(block)
           end
 
+          def maybe_container(value, &formatter)
+            MaybeContainer.new(value, &formatter)
+          end
+
+          MAX_DIFF_TARGET_STRING_SIZE = 300
+          def diff_target_string?(string)
+            if string.respond_to?(:bytesize)
+              string.bytesize < MAX_DIFF_TARGET_STRING_SIZE
+            else
+              string.size < MAX_DIFF_TARGET_STRING_SIZE
+            end
+          end
+
           def delayed_diff(from, to)
             delayed_literal do
               if !from.is_a?(String) or !to.is_a?(String)
@@ -787,7 +896,9 @@ EOT
                 to = convert(to)
               end
 
-              diff = Diff.readable(from, to)
+              diff = nil
+              diff = "" if !diff_target_string?(from) or !diff_target_string?(to)
+              diff ||= Diff.readable(from, to)
               if /^[-+]/ !~ diff
                 diff = ""
               elsif /^[ ?]/ =~ diff or /(?:.*\n){2,}/ =~ diff
@@ -833,7 +944,7 @@ EOM
           def initialize(value)
             @value = value
           end
-          
+
           def inspect
             @value.to_s
           end
@@ -843,12 +954,30 @@ EOM
           def initialize(value)
             @value = value
           end
-          
+
           def inspect
             @value.call.to_s
           end
         end
 
+        class MaybeContainer
+          def initialize(value, &formatter)
+            @value = value
+            @formatter = formatter
+          end
+
+          def inspect
+            if @value.is_a?(Array)
+              values = @value.collect do |value|
+                @formatter.call(AssertionMessage.convert(value))
+              end
+              "[#{values.join(', ')}]"
+            else
+              @formatter.call(AssertionMessage.convert(@value))
+            end
+          end
+        end
+
         class Template
           def self.create(string)
             parts = (string ? string.scan(/(?=[^\\])\?|(?:\\\?|[^\?])+/m) : [])

data/lib/test/unit/autorunner.rb

@@ -1,4 +1,3 @@
-require 'test/unit'
 require 'test/unit/color-scheme'
 require 'optparse'
 
@@ -204,6 +203,13 @@ module Test
             end
           end
 
+          o.on("--default-priority=PRIORITY",
+               Priority.available_values,
+               "Uses PRIORITY as default priority",
+               "(#{keyword_display(Priority.available_values)})") do |priority|
+            Priority.default = priority
+          end
+
           o.on('-I', "--load-path=DIR[#{File::PATH_SEPARATOR}DIR...]",
                "Appends directory list to $LOAD_PATH.") do |dirs|
             $LOAD_PATH.concat(dirs.split(File::PATH_SEPARATOR))
@@ -221,6 +227,12 @@ module Test
             load_config(file)
           end
 
+          o.on("--order=ORDER", TestCase::AVAILABLE_ORDERS,
+               "Run tests in a test case in ORDER order.",
+               "(#{keyword_display(TestCase::AVAILABLE_ORDERS)})") do |order|
+            TestCase.test_order = order
+          end
+
           ADDITIONAL_OPTIONS.each do |option_builder|
             option_builder.call(self, o)
           end
@@ -252,10 +264,20 @@ module Test
       end
 
       def keyword_display(keywords)
-        keywords.collect do |keyword, _|
+        keywords = keywords.collect do |keyword, _|
           keyword.to_s
-        end.uniq.sort.collect do |keyword|
-          keyword.sub(/^(.)([A-Za-z]+)(?=\w*$)/, '\\1[\\2]')
+        end.uniq.sort
+
+        i = 0
+        keywords.collect do |keyword|
+          if (i > 0 and keyword[0] == keywords[i - 1][0]) or
+              ((i < keywords.size - 1) and (keyword[0] == keywords[i + 1][0]))
+            n = 2
+          else
+            n = 1
+          end
+          i += 1
+          keyword.sub(/^(.{#{n}})([A-Za-z]+)(?=\w*$)/, '\\1[\\2]')
         end.join(", ")
       end
 

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

@@ -13,7 +13,8 @@ module Test
                             "pending" => Color.new("magenta", :bold => true),
                             "omission" => Color.new("blue", :bold => true),
                             "notification" => Color.new("cyan", :bold => true),
-                            "error" => Color.new("yellow", :bold => true))
+                            "error" => Color.new("yellow", :bold => true) +
+                                       Color.new("black", :foreground => false))
         end
 
         @@schemes = {}
@@ -64,7 +65,7 @@ module Test
 
       private
       def make_color(color_spec)
-        if color_spec.is_a?(Color)
+        if color_spec.is_a?(Color) or color_spec.is_a?(MixColor)
           color_spec
         else
           color_name = nil

data/lib/test/unit/priority.rb

@@ -26,6 +26,19 @@ module Test
         def disable
           @@enabled = false
         end
+
+        @@default = :normal
+        def default
+          @@default || :normal
+        end
+
+        def default=(default)
+          @@default = default
+        end
+
+        def available_values
+          Checker.available_priorities
+        end
       end
 
       class Checker
@@ -36,7 +49,7 @@ module Test
           end
 
           def need_to_run?(test)
-            priority = test[:priority] || :normal
+            priority = test[:priority] || Priority.default
             if have_priority?(priority)
               send(priority_check_method_name(priority), test)
             else
@@ -44,6 +57,13 @@ module Test
             end
           end
 
+          def available_priorities
+            methods(false).collect do |name|
+              /\Arun_priority_(.+)\?\z/ =~ name.to_s
+              $1
+            end.compact
+          end
+
           def run_priority_must?(test)
             true
           end

data/lib/test/unit/testcase.rb

@@ -1,7 +1,9 @@
 #--
 #
 # Author:: Nathaniel Talbott.
-# Copyright:: Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+# Copyright::
+#   * Copyright (c) 2000-2003 Nathaniel Talbott. All rights reserved.
+#   * Copyright (c) 2008-2009 Kouhei Sutou <tt><kou@clear-code.com></tt>
 # License:: Ruby license.
 
 require 'test/unit/attribute'
@@ -60,14 +62,14 @@ module Test
     #   end
     #
     # Here is a call order:
-    #  * startup
-    #  * setup
-    #  * test_my_method1
-    #  * teardown
-    #  * setup
-    #  * test_my_method2
-    #  * teardown
-    #  * shutdown
+    # * startup
+    # * setup
+    # * test_my_method1
+    # * teardown
+    # * setup
+    # * test_my_method2
+    # * teardown
+    # * shutdown
     class TestCase
       include Attribute
       include Fixture
@@ -81,24 +83,29 @@ module Test
       include Assertions
       include Util::BacktraceFilter
 
-      STARTED = name + "::STARTED"
-      FINISHED = name + "::FINISHED"
+      STARTED = name + "::STARTED" # :nodoc:
+      FINISHED = name + "::FINISHED" # :nodoc:
 
-      DESCENDANTS = []
+      DESCENDANTS = [] # :nodoc:
+      AVAILABLE_ORDERS = [:alphabetic, :random, :defined] # :nodoc:
 
       class << self
-        def inherited(sub_class)
+        def inherited(sub_class) # :nodoc:
           DESCENDANTS << sub_class
         end
 
+        @@added_methods = []
+        def method_added(name) # :nodoc:
+          super
+          @@added_methods << name.to_s
+        end
+
         # Rolls up all of the test* methods in the fixture into
         # one suite, creating a new instance of the fixture for
         # each method.
         def suite
-          method_names = public_instance_methods(true).collect {|name| name.to_s}
-          tests = method_names.delete_if {|method_name| method_name !~ /^test./}
           suite = TestSuite.new(name, self)
-          tests.sort.each do |test|
+          collect_test_names.each do |test|
             catch(:invalid_test) do
               suite << new(test)
             end
@@ -137,11 +144,11 @@ module Test
         #   end
         #
         # Here is a call order:
-        #   * startup
-        #   * setup
-        #   * test_my_class1 (or test_my_class2)
-        #   * setup
-        #   * test_my_class2 (or test_my_class1)
+        # * startup
+        # * setup
+        # * test_my_class1 (or test_my_class2)
+        # * setup
+        # * test_my_class2 (or test_my_class1)
         #
         # Note that you should not assume test order. Tests
         # should be worked in any order.
@@ -173,16 +180,74 @@ module Test
         #   end
         #
         # Here is a call order:
-        #   * test_my_class1 (or test_my_class2)
-        #   * teardown
-        #   * test_my_class2 (or test_my_class1)
-        #   * teardown
-        #   * shutdown
+        # * test_my_class1 (or test_my_class2)
+        # * teardown
+        # * test_my_class2 (or test_my_class1)
+        # * teardown
+        # * shutdown
         #
         # Note that you should not assume test order. Tests
         # should be worked in any order.
         def shutdown
         end
+
+        @@test_order = AVAILABLE_ORDERS.first
+
+        # Returns the current test order. This returns
+        # +:alphabetic+ by default.
+        def test_order
+          @@test_order
+        end
+
+        # Sets the current test order.
+        #
+        # Here are the available _order_:
+        # [:alphabetic]
+        #   Default. Tests are sorted in alphabetic order.
+        # [:random]
+        #   Tests are sorted in random order.
+        # [:defined]
+        #   Tests are sorted in defined order.
+        def test_order=(order)
+          @@test_order = order
+        end
+
+        # :stopdoc:
+        private
+        def collect_test_names
+          method_names = public_instance_methods(true).collect do |name|
+            name.to_s
+          end
+          test_names = method_names.find_all do |method_name|
+            method_name =~ /^test./
+          end
+          send("sort_test_names_in_#{test_order}_order", test_names)
+        end
+
+        def sort_test_names_in_alphabetic_order(test_names)
+          test_names.sort
+        end
+
+        def sort_test_names_in_random_order(test_names)
+          test_names.sort_by {rand(test_names.size)}
+        end
+
+        def sort_test_names_in_defined_order(test_names)
+          test_names.sort do |test1, 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
+              1
+            elsif test2_defined_order
+              -1
+            else
+              test1 <=> test2
+            end
+          end
+        end
+        # :startdoc:
       end
 
       attr_reader :method_name
@@ -225,7 +290,7 @@ module Test
           result.add_run
           yield(FINISHED, name)
         ensure
-          @_result = nil
+          # @_result = nil # For test-spec's after_all :<
         end
       end
 
@@ -255,10 +320,10 @@ module Test
       #   end
       #
       # Here is a call order:
-      #   * setup
-      #   * my_setup1
-      #   * my_setup2
-      #   * test_my_class
+      # * setup
+      # * my_setup1
+      # * my_setup2
+      # * test_my_class
       def setup
       end
 
@@ -288,13 +353,13 @@ module Test
       #   end
       #
       # Here is a call order:
-      #   * test_my_class
-      #   * my_teardown2
-      #   * my_teardown1
-      #   * teardown
+      # * test_my_class
+      # * my_teardown2
+      # * my_teardown1
+      # * teardown
       def teardown
       end
-      
+
       def default_test
         flunk("No tests were specified")
       end

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

@@ -185,10 +185,13 @@ module Test
 
           def guess_color_availability
             return false unless @output.tty?
-            term = ENV["TERM"]
-            return true if term and (/term\z/ =~ term or term == "screen")
-            return true if ENV["EMACS"] == "t"
-            false
+            case ENV["TERM"]
+            when /term(?:-color)?\z/, "screen"
+              true
+            else
+              return true if ENV["EMACS"] == "t"
+              false
+            end
           end
 
           def guess_progress_row_max

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.2'
+    VERSION = '2.0.3'
   end
 end

data/test/test-color-scheme.rb

@@ -6,7 +6,8 @@ class TestUnitColorScheme < Test::Unit::TestCase
                    "pending" => color("magenta", :bold => true),
                    "omission" => color("blue", :bold => true),
                    "notification" => color("cyan", :bold => true),
-                   "error" => color("yellow", :bold => true),
+                   "error" => color("yellow", :bold => true) +
+                              color("black", :foreground => false),
                  },
                  Test::Unit::ColorScheme.default.to_hash)
   end

data/test/test-pending.rb

@@ -1,7 +1,7 @@
 require 'test/unit'
 require 'testunit-test-util'
 
-class TestUntiPending < Test::Unit::TestCase
+class TestUnitPending < Test::Unit::TestCase
   include TestUnitTestUtil
 
   class TestCase < Test::Unit::TestCase

data/test/{test_testcase.rb → test-testcase.rb}

@@ -6,7 +6,7 @@ require 'test/unit'
 
 module Test
   module Unit
-    class TC_TestCase < TestCase
+    class TestTestCase < TestCase
       def test_creation
         tc = Class.new(TestCase) do
           def test_with_arguments(arg1, arg2)
@@ -267,7 +267,7 @@ module Test
       def test_re_raise_exception
         test_case = Class.new(TestCase) do
           def test_raise_interrupt
-            raise Interrupt
+            raise Interrupt, "from test"
           end
         end
 
@@ -342,7 +342,7 @@ module Test
         test_case = Class.new(TestCase) do
           class << self
             def startup
-              raise Interrupt
+              raise Interrupt, "from startup"
             end
           end
 
@@ -383,7 +383,7 @@ module Test
         test_case = Class.new(TestCase) do
           class << self
             def shutdown
-              raise Interrupt
+              raise Interrupt, "from shutdown"
             end
           end
 
@@ -468,11 +468,40 @@ module Test
         end
       end
 
+      def test_defined_order
+        keep_test_order do
+          test_case = Class.new(Test::Unit::TestCase) do
+            def test_z
+            end
+
+            def test_1
+            end
+
+            def test_a
+            end
+          end
+
+          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
+      end
+
       private
       def check(message, passed)
         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

data/test/test_assertions.rb

@@ -1,5 +1,6 @@
 # Author:: Nathaniel Talbott.
 # Copyright:: Copyright (c) 2000-2002 Nathaniel Talbott. All rights reserved.
+#             Copyright (c) 2009 Kouhei Sutou.
 # License:: Ruby license.
 
 require 'test/unit'
@@ -245,6 +246,37 @@ EOM
         end
       end
 
+      def test_assert_equal_with_large_string
+        message = <<-EOM.chomp
+<#{("a\n" + "x" * 297).inspect}> expected but was
+<#{"x".inspect}>.
+
+diff:
++ x
+- a
+- #{"x" * 297}
+
+folded diff:
++ x
+- a
+- #{"x" * 78}
+- #{"x" * 78}
+- #{"x" * 78}
+- #{"x" * 63}
+EOM
+        check_fails(message) do
+          assert_equal("a\n" + "x" * 297, "x")
+        end
+
+        message = <<-EOM.chomp
+<#{("a\n" + "x" * 298).inspect}> expected but was
+<#{"x".inspect}>.
+EOM
+        check_fails(message) do
+          assert_equal("a\n" + "x" * 298, "x")
+        end
+      end
+
       def test_assert_raise_success
         return_value = nil
         check_nothing_fails(true) do
@@ -396,7 +428,7 @@ EOM
 
         different_error_class = Class.new(StandardError)
         message = <<-EOM
-<\#<Class:0x[a-f\\d]+>\\("Error"\\)> exception expected but was
+<\#<Class:[xa-f\\d]+>\\("Error"\\)> exception expected but was
 Class: <RuntimeError>
 Message: <"Error">
 EOM
@@ -446,8 +478,18 @@ EOM
         check_fails(%Q{failed assert_instance_of.\n<"string"> expected to be an instance of\n<Hash> but was\n<String>.}) {
           assert_instance_of(Hash, "string", "failed assert_instance_of")
         }
+
+        check_nothing_fails do
+          assert_instance_of([Fixnum, NilClass], 100)
+        end
+        check_fails(%Q{<"string"> expected to be an instance of\n[<Fixnum>, <NilClass>] but was\n<String>.}) do
+          assert_instance_of([Fixnum, NilClass], "string")
+        end
+        check_fails(%Q{<100> expected to be an instance of\n[<Numeric>, <NilClass>] but was\n<Fixnum>.}) do
+          assert_instance_of([Numeric, NilClass], 100)
+        end
       end
-      
+
       def test_assert_nil
         check_nothing_fails {
           assert_nil(nil)
@@ -486,14 +528,21 @@ EOM
         check_nothing_fails {
           assert_kind_of(Comparable, 1)
         }
-        check_fails(%Q{<"string">\nexpected to be kind_of?\n<Class> but was\n<String>.}) {
+        check_fails(%Q{<"string"> expected to be kind_of?\n<Class> but was\n<String>.}) {
           assert_kind_of(Class, "string")
         }
-        check_fails(%Q{failed assert_kind_of.\n<"string">\nexpected to be kind_of?\n<Class> but was\n<String>.}) {
+        check_fails(%Q{failed assert_kind_of.\n<"string"> expected to be kind_of?\n<Class> but was\n<String>.}) {
           assert_kind_of(Class, "string", "failed assert_kind_of")
         }
+
+        check_nothing_fails do
+          assert_kind_of([Fixnum, NilClass], 100)
+        end
+        check_fails(%Q{<"string"> expected to be kind_of?\n[<Fixnum>, <NilClass>] but was\n<String>.}) do
+          assert_kind_of([Fixnum, NilClass], "string")
+        end
       end
-      
+
       def test_assert_match
         check_nothing_fails {
           assert_match(/strin./, "string")
@@ -703,10 +752,13 @@ EOM
         check_nothing_fails {
           assert_respond_to("thing", "to_s", "message")
         }
-        check_fails("<0.15>\ngiven as the method name argument to #assert_respond_to must be a Symbol or #respond_to?(:to_str).") {
+        check_fails("<0.15>.kind_of?(Symbol) or\n" +
+                    "<0.15>.respond_to?(:to_str) expected") {
           assert_respond_to("thing", 0.15)
         }
-        check_fails("message.\n<:symbol>\nof type <Symbol>\nexpected to respond_to?<:non_existent>.") {
+        check_fails("message.\n" +
+                    "<:symbol>.respond_to?(:non_existent) expected\n" +
+                    "(Class: <Symbol>)") {
           assert_respond_to(:symbol, :non_existent, "message")
         }
       end
@@ -728,10 +780,15 @@ EOM
         check_fails("message.\n<0.5> and\n<0.4> expected to be within\n<0.05> of each other.") {
           assert_in_delta(0.5, 0.4, 0.05, "message")
         }
-        check_fails(%r{The arguments must respond to to_f; the first float did not\.\n<.+>\nof type <Object>\nexpected to respond_to\?<:to_f>.}) {
-          assert_in_delta(Object.new, 0.4, 0.1)
-        }
-        check_fails("The delta should not be negative.\n<-0.1> expected to be\n>=\n<0.0>.") {
+        object = Object.new
+        check_fails("The arguments must respond to to_f; " +
+                    "the first float did not.\n" +
+                    "<#{object.inspect}>.respond_to?(:to_f) expected\n" +
+                    "(Class: <Object>)") {
+          assert_in_delta(object, 0.4, 0.1)
+        }
+        check_fails("The delta should not be negative.\n" +
+                    "<-0.1> expected to be\n>=\n<0.0>.") {
           assert_in_delta(0.5, 0.4, -0.1, "message")
         }
       end
@@ -976,6 +1033,36 @@ EOM
         end
       end
 
+      def test_assert_predicate
+        check_nothing_fails do
+          assert_predicate([], :empty?)
+        end
+
+        check_fails("<[1]>.empty? is true value expected but was\n<false>") do
+          assert_predicate([1], :empty?)
+        end
+
+        check_fails("<[1]>.respond_to?(:nonexistent?) expected\n" +
+                    "(Class: <Array>)") do
+          assert_predicate([1], :nonexistent?)
+        end
+      end
+
+      def test_assert_not_predicate
+        check_nothing_fails do
+          assert_not_predicate([1], :empty?)
+        end
+
+        check_fails("<[]>.empty? is false value expected but was\n<true>") do
+          assert_not_predicate([], :empty?)
+        end
+
+        check_fails("<[]>.respond_to?(:nonexistent?) expected\n" +
+                    "(Class: <Array>)") do
+          assert_not_predicate([], :nonexistent?)
+        end
+      end
+
       private
       def add_failure(message, location=caller)
         unless @catch_assertions
@@ -993,4 +1080,3 @@ EOM
     end
   end
 end
-p

data/test/ui/test_testrunmediator.rb

@@ -4,7 +4,7 @@ class TestUnitUIMediator < Test::Unit::TestCase
   def test_run_suite_with_interrupt_exception
     test_case = Class.new(Test::Unit::TestCase) do
       def test_raise_interrupt
-        raise Interrupt
+        raise Interrupt, "from test"
       end
     end
     mediator = Test::Unit::UI::TestRunnerMediator.new(test_case.suite)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-21 00:00:00 +09:00
+date: 2009-07-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,9 +21,15 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 2.3.2
     version: 
-description: Test::Unit 2.x - Improved version of Test::Unit bundled in Ruby 1.8.x.  Ruby 1.9.x bundles miniunit not Test::Unit. Test::Unit bundled in Ruby 1.8.x had not been improved but unbundled Test::Unit (Test::Unit 2.x) will be improved actively.
+description: |-
+  Test::Unit 2.x - Improved version of Test::Unit bundled in
+  Ruby 1.8.x.
+  
+  Ruby 1.9.x bundles miniunit not Test::Unit. Test::Unit
+  bundled in Ruby 1.8.x had not been improved but unbundled
+  Test::Unit (Test::Unit 2.x) will be improved actively.
 email: 
 - kou@cozmixng.org
 - ryand-ruby@zenspider.com
@@ -104,10 +110,10 @@ files:
 - test/test-omission.rb
 - test/test-pending.rb
 - test/test-priority.rb
+- test/test-testcase.rb
 - test/test_assertions.rb
 - test/test_error.rb
 - test/test_failure.rb
-- test/test_testcase.rb
 - test/test_testresult.rb
 - test/test_testsuite.rb
 - test/testunit-test-util.rb
@@ -118,6 +124,8 @@ files:
 - test/util/test_procwrapper.rb
 has_rdoc: true
 homepage: http://rubyforge.org/projects/test-unit/
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -139,20 +147,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: test-unit
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Test::Unit 2.x - Improved version of Test::Unit bundled in Ruby 1.8.x
 test_files: 
-- test/test_testcase.rb
-- test/test_failure.rb
-- test/collector/test_objectspace.rb
 - test/collector/test_dir.rb
-- test/test_testsuite.rb
+- test/collector/test_objectspace.rb
+- test/ui/test_testrunmediator.rb
 - test/test_assertions.rb
-- test/util/test_observable.rb
 - test/util/test_procwrapper.rb
 - test/util/test_backtracefilter.rb
-- test/ui/test_testrunmediator.rb
+- test/util/test_observable.rb
+- test/test_failure.rb
+- test/test_testsuite.rb
 - test/test_testresult.rb
 - test/test_error.rb