test-unit 2.4.0 → 2.4.1

data/README.textile

@@ -83,3 +83,4 @@ h2. Thanks
 * Hans de Graaff: Bug reports.
 * James Mead: A bug report.
 * Marc Seeger (Acquia): A bug report.
+* boutil: A bug report.

data/lib/test/unit/assertions.rb

@@ -62,17 +62,24 @@ module Test
       public
       def assert(boolean, message=nil)
         _wrap_assertion do
+          assertion_message = nil
           case message
           when nil, String, Proc
+          when AssertionMessage
+            assertion_message = message
           else
-            error_message = "assertion message must be String or Proc: "
+            error_message = "assertion message must be String, Proc or "
+            error_message << "#{AssertionMessage}: "
             error_message << "<#{message.inspect}>(<#{message.class}>)"
             raise ArgumentError, error_message, filter_backtrace(caller)
           end
           assert_block("assert should not be called with a block.") do
             !block_given?
           end
-          assert_block(build_message(message, "<?> is not true.", boolean)) do
+          assertion_message ||= build_message(message,
+                                              "<?> is not true.",
+                                              boolean)
+          assert_block(assertion_message) do
             boolean
           end
         end

data/lib/test/unit/diff.rb

@@ -1,7 +1,7 @@
 # port of Python's difflib.
 #
 # Copyright (c) 2001-2008 Python Software Foundation; All Rights Reserved
-# Copyright (c) 2008-2010 Kouhei Sutou; All Rights Reserved
+# Copyright (c) 2008-2011 Kouhei Sutou; All Rights Reserved
 #
 # It is free software, and is distributed under the Ruby
 # license and/or the PSF license. See the COPYING file and
@@ -166,7 +166,7 @@ module Test
               end
             end
           end
-          matches.sort_by do |(from_index, to_index, match_size)|
+          matches.sort_by do |(from_index, _, _)|
             from_index
           end
         end
@@ -601,7 +601,7 @@ module Test
           from_tags = from_tags[common..-1].rstrip
           to_tags = to_tags[common..-1].rstrip
 
-          result = tag_deleted([from_line])
+          tag_deleted([from_line])
           unless from_tags.empty?
             tag_difference(["#{"\t" * common}#{from_tags}"])
           end

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = '2.4.0'
+    VERSION = '2.4.1'
   end
 end

data/test/test-assertions.rb

@@ -330,7 +330,7 @@ EOM
         end
         ascii_8bit_string = utf8_string.dup.force_encoding("ascii-8bit")
         message = <<-EOM.chomp
-<"こんにちは">("UTF-8") expected but was
+<#{utf8_string.inspect}>("UTF-8") expected but was
 <#{ascii_8bit_string.inspect}>("ASCII-8BIT").
 EOM
         check_fails(message) do
@@ -1303,8 +1303,18 @@ EOM
         end
       end
 
-      def test_error_invalid_message
-        check_fails("assertion message must be String or Proc: " +
+      def test_fail_with_assertion_message
+        check_fails("user message.\n" +
+                    "placeholder <:in> message") do
+          assert(false, build_message("user message",
+                                      "placeholder <?> message",
+                                      :in))
+        end
+      end
+
+      def test_error_invalid_message_true
+        check_fails("assertion message must be String, Proc or " +
+                    "Test::Unit::Assertions::AssertionMessage: " +
                     "<true>(<TrueClass>)") do
           begin
             assert(true, true)

data/test/test-testcase.rb

@@ -87,7 +87,6 @@ module Test
           check("Should have a Failure", fault.instance_of?(Failure))
           check("The Failure should have the correct message", "nested" == fault.message)
           check("The Failure should have the correct test_name (was <#{fault.test_name}>)", fault.test_name == "test_nested_failure(TC_FailureError)")
-          r = 
 
           location = fault.location
           check("The location should be an array", location.kind_of?(Array))

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: test-unit
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 2
   - 4
-  - 0
-  version: 2.4.0
+  - 1
+  version: 2.4.1
 platform: ruby
 authors: 
 - Kouhei Sutou
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-18 00:00:00 Z
+date: 2011-11-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -193,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: test-unit
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: test-unit 2 - Improved version of Test::Unit bundled in Ruby 1.8.x.