test-unit 3.2.3 → 3.2.4

data/lib/test/unit/attribute.rb

@@ -49,6 +49,70 @@ module Test
           @current_attributes = kept_attributes
         end
 
+        # Set an attribute to test methods.
+        #
+        # @overload attribute(name, value)
+        #   @example
+        #     attribute :speed, :slow
+        #     def test_my_slow_method
+        #       self[:speed] # => :slow
+        #     end
+        #
+        #   @param [Object] name the attribute name
+        #   @param [Object] value the attribute value
+        #   @return [void]
+        #
+        # @overload attribute(name, value, *method_names)
+        #   @example
+        #     def test_my_slow_method1
+        #       self[:speed] # => :slow
+        #     end
+        #
+        #     attribute :speed, :slow, :test_my_slow_method1, :test_my_slow_method2
+        #
+        #     def test_my_slow_method2
+        #       self[:speed] # => :slow
+        #     end
+        #
+        #   @param [Object] name the attribute name
+        #   @param [Object] value the attribute value
+        #   @param [Array<Symbol, String>] method_names the test method names set the attribute
+        #   @return [void]
+        #
+        # @overload attribute(name, value, options)
+        #   @example
+        #     attribute :speed, :slow, keep: true
+        #     def test_my_slow_method1
+        #       self[:speed] # => :slow
+        #     end
+        #
+        #     def test_my_slow_method2
+        #       self[:speed] # => :slow
+        #     end
+        #
+        #   @param [Object] name the attribute name
+        #   @param [Object] value the attribute value
+        #   @option options [Boolean] :keep whether or not to set attribute to following test methods
+        #   @return [void]
+        #
+        # @overload attribute(name, value, options, *method_names)
+        #   @example
+        #     def test_my_slow_method1
+        #       self[:speed] # => :slow
+        #     end
+        #
+        #     # There are no valid options for now.
+        #     attribute :speed, :slow, {}, :test_my_slow_method1
+        #
+        #     def test_my_slow_method2
+        #       self[:speed] # => nil
+        #     end
+        #
+        #   @param [Object] name the attribute name
+        #   @param [Object] value the attribute value
+        #   @param [Hash] options ignored
+        #   @param [Array<Symbol, String>] method_names the test method names set the attribute
+        #   @return [void]
         def attribute(name, value, options={}, *method_names)
           unless options.is_a?(Hash)
             method_names << options

data/lib/test/unit/autorunner.rb

@@ -246,10 +246,7 @@ module Test
             name = (%r{\A/(.*)/\Z} =~ name ? Regexp.new($1) : name)
             @filters << lambda do |test|
               return true if name === test.method_name
-              test_name_without_class_name = test.name.gsub(/\(.+?\)\z/, "")
-              if test_name_without_class_name != test.method_name
-                return true if name === test_name_without_class_name
-              end
+              return true if name === test.local_name
               false
             end
           end

data/lib/test/unit/testcase.rb

@@ -82,6 +82,25 @@ module Test
     # 1. cleanup
     # 1. teardown
     # 1. shutdown
+    #
+    # You can set an attribute to each test.
+    #
+    # Example:
+    #
+    #     class TestMyClass < Test::Unit::TestCase
+    #       attribute :speed, :fast
+    #       def test_my_fast_method
+    #         # You can get the attribute via `self[]`
+    #         self[:speed] # => :fast
+    #         ...
+    #       end
+    #
+    #       attribute :speed, :slow
+    #       def test_my_slow_method
+    #         self[:speed] # => :slow
+    #         ...
+    #       end
+    #     end
     class TestCase
       include Attribute
       include Fixture
@@ -320,7 +339,7 @@ module Test
         # the same in meaning:
         #
         # Standard:
-        #   class TestParent < Test::UnitTestCase
+        #   class TestParent < Test::Unit::TestCase
         #     class TestChild < self
         #       def test_in_child
         #       end
@@ -328,7 +347,7 @@ module Test
         #   end
         #
         # Syntax sugar:
-        #   class TestParent < Test::UnitTestCase
+        #   class TestParent < Test::Unit::TestCase
         #     sub_test_case("TestChild") do
         #       def test_in_child
         #       end
@@ -394,7 +413,8 @@ module Test
           end
           if query_method_name
             available_location = available_locations.find do |location|
-              query_method_name == location[:method_name]
+              location[:test_case] == self and
+                query_method_name == location[:method_name]
             end
             return [] if available_location.nil?
             available_locations = [available_location]
@@ -661,10 +681,19 @@ module Test
       # Returns a human-readable name for the specific test that
       # this instance of TestCase represents.
       def name
+        "#{local_name}(#{self.class.name})"
+      end
+
+      # Returns a human-readable name for the specific test that this
+      # instance of TestCase represents.
+      #
+      # `#local_name` doesn't include class name. `#name` includes
+      # class name.
+      def local_name
         if @internal_data.have_test_data?
-          "#{@method_name}[#{data_label}](#{self.class.name})"
+          "#{@method_name}[#{data_label}]"
         else
-          "#{@method_name}(#{self.class.name})"
+          @method_name.to_s
         end
       end
 
@@ -745,7 +774,7 @@ module Test
         signature = "#{self.class}\##{@method_name}"
         redefined_info = self[:redefined]
         if redefined_info
-          notify("#{signature} was redefined",
+          notify("<#{signature}> was redefined",
                  :backtrace => redefined_info[:backtrace])
         end
         if @internal_data.have_test_data?
@@ -757,7 +786,7 @@ module Test
             backtrace = locations.collect do |location|
               "#{location[:path]}:#{location[:line]}"
             end
-            notify("#{signature} misses a parameter to take test data",
+            notify("<#{signature}> misses a parameter to take test data",
                    :backtrace => backtrace)
           end
         else

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

@@ -342,7 +342,7 @@ module Test
           def test_started(test)
             return unless output?(VERBOSE)
 
-            name = test.name.sub(/\(.+?\)\z/, '')
+            name = test.local_name
             right_space = 8 * 2
             left_space = @progress_row_max - right_space
             left_space = left_space - indent.size - name.size
@@ -473,8 +473,12 @@ module Test
             fault_class.name.split(/::/).last.downcase
           end
 
+          def fault_class_color(fault_class)
+            color(fault_class_color_name(fault_class))
+          end
+
           def fault_color(fault)
-            color(fault_class_color_name(fault.class))
+            fault_class_color(fault.class)
           end
 
           def fault_marker_color(fault)

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = "3.2.3"
+    VERSION = "3.2.4"
   end
 end

data/test/test-assertions.rb

@@ -301,8 +301,8 @@ EOM
 
           def test_multi_lines_result
             message = <<-EOM.chomp
-<#{"a\nb".inspect}> expected but was
-<#{"x".inspect}>.
+<#{AssertionMessage.convert("a\nb")}> expected but was
+<#{AssertionMessage.convert("x")}>.
 
 diff:
 + x
@@ -316,8 +316,8 @@ EOM
 
           def test_large_string
             message = <<-EOM.chomp
-<#{("a\n" + "x" * 997).inspect}> expected but was
-<#{"x".inspect}>.
+<#{AssertionMessage.convert("a\n" + "x" * 997)}> expected but was
+<#{AssertionMessage.convert("x")}>.
 
 diff:
 + x
@@ -335,8 +335,8 @@ EOM
             end
 
             message = <<-EOM.chomp
-<#{("a\n" + "x" * 998).inspect}> expected but was
-<#{"x".inspect}>.
+<#{AssertionMessage.convert("a\n" + "x" * 998)}> expected but was
+<#{AssertionMessage.convert("x")}>.
 EOM
             check_fail(message) do
               assert_equal("a\n" + "x" * 998, "x")
@@ -349,8 +349,8 @@ EOM
             ENV[key] = "100"
             begin
               message = <<-EOM.chomp
-<#{("a\n" + "x" * 97).inspect}> expected but was
-<#{"x".inspect}>.
+<#{AssertionMessage.convert("a\n" + "x" * 97)}> expected but was
+<#{AssertionMessage.convert("x")}>.
 
 diff:
 + x
@@ -368,8 +368,8 @@ EOM
               end
 
               message = <<-EOM.chomp
-<#{("a\n" + "x" * 98).inspect}> expected but was
-<#{"x".inspect}>.
+<#{AssertionMessage.convert("a\n" + "x" * 98)}> expected but was
+<#{AssertionMessage.convert("x")}>.
 EOM
               check_fail(message) do
                 assert_equal("a\n" + "x" * 98, "x")
@@ -495,7 +495,7 @@ EOM
       end
 
       def test_assert_raise_fail
-        check_fail("<RuntimeError> exception expected but none was thrown.") do
+        check_fail("<RuntimeError> exception was expected but none was thrown.") do
           assert_raise(RuntimeError) do
             1 + 1
           end
@@ -556,7 +556,7 @@ EOM
         end
 
         check_fail("<[ArgumentError, TypeError, Math, Comparable]> exception " +
-                    "expected but none was thrown.") do
+                    "was expected but none was thrown.") do
           assert_raise(*rescues) do
             1 + 1
           end
@@ -663,21 +663,21 @@ EOM
         check_nothing_fails {
           assert_instance_of(String, "string", "successful assert_instance_of")
         }
-        check_fail(%Q{<"string"> expected to be instance_of?\n<Hash> but was\n<String>.}) {
+        check_fail(%Q{<"string"> was expected to be instance_of?\n<Hash> but was\n<String>.}) {
           assert_instance_of(Hash, "string")
         }
-        check_fail(%Q{failed assert_instance_of.\n<"string"> expected to be instance_of?\n<Hash> but was\n<String>.}) {
+        check_fail(%Q{failed assert_instance_of.\n<"string"> was expected to be 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)
+          assert_instance_of([Class, NilClass], Array)
         end
-        check_fail(%Q{<"string"> expected to be instance_of?\n[<Fixnum>, <NilClass>] but was\n<String>.}) do
-          assert_instance_of([Fixnum, NilClass], "string")
+        check_fail(%Q{<"string"> was expected to be instance_of?\n[<Class>, <NilClass>] but was\n<String>.}) do
+          assert_instance_of([Class, NilClass], "string")
         end
-        check_fail(%Q{<100> expected to be instance_of?\n[<Numeric>, <NilClass>] but was\n<Fixnum>.}) do
-          assert_instance_of([Numeric, NilClass], 100)
+        check_fail(%Q{<Array> was expected to be instance_of?\n[<Module>, <NilClass>] but was\n<Class>.}) do
+          assert_instance_of([Module, NilClass], Array)
         end
       end
 
@@ -688,20 +688,20 @@ EOM
         check_nothing_fails {
           assert_not_instance_of(NilClass, "string", "successful assert_instance_of")
         }
-        check_fail(%Q{<"string"> expected to not be instance_of?\n<String> but was.}) {
+        check_fail(%Q{<"string"> was expected to not be instance_of?\n<String> but was.}) {
           assert_not_instance_of(String, "string")
         }
-        check_fail(%Q{failed assert.\n<"string"> expected to not be instance_of?\n<String> but was.}) {
+        check_fail(%Q{failed assert.\n<"string"> was expected to not be instance_of?\n<String> but was.}) {
           assert_not_instance_of(String, "string", "failed assert")
         }
 
         check_nothing_fails do
-          assert_not_instance_of([Numeric, NilClass], 100)
+          assert_not_instance_of([Module, NilClass], Array)
         end
-        check_fail(%Q{<100> expected to not be instance_of?\n[<Fixnum>, <NilClass>] but was.}) do
-          assert_not_instance_of([Fixnum, NilClass], 100)
+        check_fail(%Q{<Array> was expected to not be instance_of?\n[<Class>, <NilClass>] but was.}) do
+          assert_not_instance_of([Class, NilClass], Array)
         end
-        check_fail(%Q{<"str"> expected to not be instance_of?\n[<Numeric>, <String>] but was.}) do
+        check_fail(%Q{<"str"> was expected to not be instance_of?\n[<Numeric>, <String>] but was.}) do
           assert_not_instance_of([Numeric, String], 'str')
         end
       end
@@ -716,10 +716,10 @@ EOM
         check_nothing_fails {
           assert_nil(nil, "successful assert_nil")
         }
-        check_fail(%Q{<"string"> expected to be nil.}) {
+        check_fail(%Q{<"string"> was expected to be nil.}) {
           assert_nil("string")
         }
-        check_fail(%Q{failed assert_nil.\n<"string"> expected to be nil.}) {
+        check_fail(%Q{failed assert_nil.\n<"string"> was expected to be nil.}) {
           assert_nil("string", "failed assert_nil")
         }
       end
@@ -727,8 +727,8 @@ EOM
       def test_assert_not_nil
         check_nothing_fails{assert_not_nil(false)}
         check_nothing_fails{assert_not_nil(false, "message")}
-        check_fail("<nil> expected to not be nil."){assert_not_nil(nil)}
-        check_fail("message.\n<nil> expected to not be nil.") {assert_not_nil(nil, "message")}
+        check_fail("<nil> was expected to not be nil."){assert_not_nil(nil)}
+        check_fail("message.\n<nil> was expected to not be nil.") {assert_not_nil(nil, "message")}
       end
 
       def test_assert_kind_of
@@ -744,18 +744,18 @@ EOM
         check_nothing_fails {
           assert_kind_of(Comparable, 1)
         }
-        check_fail(%Q{<"string"> expected to be kind_of?\n<Class> but was\n<String>.}) {
+        check_fail(%Q{<"string"> was expected to be kind_of?\n<Class> but was\n<String>.}) {
           assert_kind_of(Class, "string")
         }
-        check_fail(%Q{failed assert_kind_of.\n<"string"> expected to be kind_of?\n<Class> but was\n<String>.}) {
+        check_fail(%Q{failed assert_kind_of.\n<"string"> was 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)
+          assert_kind_of([Class, NilClass], Array)
         end
-        check_fail(%Q{<"string"> expected to be kind_of?\n[<Fixnum>, <NilClass>] but was\n<String>.}) do
-          assert_kind_of([Fixnum, NilClass], "string")
+        check_fail(%Q{<"string"> was expected to be kind_of?\n[<Class>, <NilClass>] but was\n<String>.}) do
+          assert_kind_of([Class, NilClass], "string")
         end
       end
 
@@ -769,18 +769,18 @@ EOM
         check_nothing_fails {
           assert_not_kind_of(Integer, 1.1)
         }
-        check_fail(%Q{<1> expected to not be kind_of?\n<Integer> but was.}) {
+        check_fail(%Q{<1> was expected to not be kind_of?\n<Integer> but was.}) {
           assert_not_kind_of(Integer, 1)
         }
-        check_fail(%Q{failed assert_not_kind_of.\n<"string"> expected to not be kind_of?\n<String> but was.}) {
+        check_fail(%Q{failed assert_not_kind_of.\n<"string"> was expected to not be kind_of?\n<String> but was.}) {
           assert_not_kind_of(String, "string", "failed assert_not_kind_of")
         }
 
         check_nothing_fails do
           assert_not_kind_of([String, NilClass], 100)
         end
-        check_fail(%Q{<100> expected to not be kind_of?\n[<Fixnum>, <NilClass>] but was.}) do
-          assert_not_kind_of([Fixnum, NilClass], 100)
+        check_fail(%Q{<Array> was expected to not be kind_of?\n[<Class>, <NilClass>] but was.}) do
+          assert_not_kind_of([Class, NilClass], Array)
         end
       end
 
@@ -797,13 +797,13 @@ EOM
         check_nothing_fails {
           assert_match(/strin./, "string", "successful assert_match")
         }
-        check_fail(%Q{</slin./> expected to be =~\n<"string">.}) {
+        check_fail(%Q{</slin./> was expected to be =~\n<"string">.}) {
           assert_match(/slin./, "string")
         }
-        check_fail(%Q{</strin\\./> expected to be =~\n<"string">.}) {
+        check_fail(%Q{</strin\\./> was expected to be =~\n<"string">.}) {
           assert_match("strin.", "string")
         }
-        check_fail(%Q{failed assert_match.\n</slin./> expected to be =~\n<"string">.}) {
+        check_fail(%Q{failed assert_match.\n</slin./> was expected to be =~\n<"string">.}) {
           assert_match(/slin./, "string", "failed assert_match")
         }
       end
@@ -820,10 +820,10 @@ EOM
           assert_same(thing, thing, "successful assert_same")
         }
         thing2 = "thing"
-        check_fail(%Q{<"thing">\nwith id <#{thing.__id__}> expected to be equal? to\n<"thing">\nwith id <#{thing2.__id__}>.}) {
+        check_fail(%Q{<"thing">\nwith id <#{thing.__id__}> was expected to be equal? to\n<"thing">\nwith id <#{thing2.__id__}>.}) {
           assert_same(thing, thing2)
         }
-        check_fail(%Q{failed assert_same.\n<"thing">\nwith id <#{thing.__id__}> expected to be equal? to\n<"thing">\nwith id <#{thing2.__id__}>.}) {
+        check_fail(%Q{failed assert_same.\n<"thing">\nwith id <#{thing.__id__}> was expected to be equal? to\n<"thing">\nwith id <#{thing2.__id__}>.}) {
           assert_same(thing, thing2, "failed assert_same")
         }
       end
@@ -913,10 +913,10 @@ EOM
         check_nothing_fails {
           assert_not_same(thing, thing2, "message")
         }
-        check_fail(%Q{<"thing">\nwith id <#{thing.__id__}> expected to not be equal? to\n<"thing">\nwith id <#{thing.__id__}>.}) {
+        check_fail(%Q{<"thing">\nwith id <#{thing.__id__}> was expected to not be equal? to\n<"thing">\nwith id <#{thing.__id__}>.}) {
           assert_not_same(thing, thing)
         }
-        check_fail(%Q{message.\n<"thing">\nwith id <#{thing.__id__}> expected to not be equal? to\n<"thing">\nwith id <#{thing.__id__}>.}) {
+        check_fail(%Q{message.\n<"thing">\nwith id <#{thing.__id__}> was expected to not be equal? to\n<"thing">\nwith id <#{thing.__id__}>.}) {
           assert_not_same(thing, thing, "message")
         }
       end
@@ -928,10 +928,10 @@ EOM
         check_nothing_fails {
           assert_not_equal("string1", "string2", "message")
         }
-        check_fail(%Q{<"string"> expected to be != to\n<"string">.}) {
+        check_fail(%Q{<"string"> was expected to be != to\n<"string">.}) {
           assert_not_equal("string", "string")
         }
-        check_fail(%Q{message.\n<"string"> expected to be != to\n<"string">.}) {
+        check_fail(%Q{message.\n<"string"> was expected to be != to\n<"string">.}) {
           assert_not_equal("string", "string", "message")
         }
       end
@@ -951,7 +951,7 @@ EOM
       def test_assert_not_match_fail_not_regexp
         check_fail("<REGEXP> in assert_not_match(<REGEXP>, ...) " +
                     "should be a Regexp.\n" +
-                    "<\"asdf\"> expected to be instance_of?\n" +
+                    "<\"asdf\"> was expected to be instance_of?\n" +
                     "<Regexp> but was\n" +
                     "<String>.") do
           assert_not_match("asdf", "asdf")
@@ -959,7 +959,7 @@ EOM
       end
 
       def test_assert_not_match_fail_match
-        check_fail("</string/> expected to not match\n" +
+        check_fail("</string/> was expected to not match\n" +
                     "<\"string\">.") do
           assert_not_match(/string/, "string")
         end
@@ -967,7 +967,7 @@ EOM
 
       def test_assert_not_match_fail_match_with_message
         check_fail("message.\n" +
-                    "</string/> expected to not match\n" +
+                    "</string/> was expected to not match\n" +
                     "<\"string\">.") do
           assert_not_match(/string/, "string", "message")
         end
@@ -976,13 +976,13 @@ EOM
       def test_assert_no_match
         check_nothing_fails{assert_no_match(/sling/, "string")}
         check_nothing_fails{assert_no_match(/sling/, "string", "message")}
-        check_fail(%Q{The first argument to assert_no_match should be a Regexp.\n<"asdf"> expected to be instance_of?\n<Regexp> but was\n<String>.}) do
+        check_fail(%Q{The first argument to assert_no_match should be a Regexp.\n<"asdf"> was expected to be instance_of?\n<Regexp> but was\n<String>.}) do
           assert_no_match("asdf", "asdf")
         end
-        check_fail(%Q{</string/> expected to not match\n<"string">.}) do
+        check_fail(%Q{</string/> was expected to not match\n<"string">.}) do
           assert_no_match(/string/, "string")
         end
-        check_fail(%Q{message.\n</string/> expected to not match\n<"string">.}) do
+        check_fail(%Q{message.\n</string/> was expected to not match\n<"string">.}) do
           assert_no_match(/string/, "string", "message")
         end
       end
@@ -996,7 +996,7 @@ EOM
 
         tag = :thing2
         check_fail("message.\n" +
-                    "<:thing> expected to be thrown but\n" +
+                    "<:thing> was expected to be thrown but\n" +
                     "<#{inspect_tag(tag)}> was thrown.") do
           assert_throw(:thing, "message") do
             throw :thing2
@@ -1034,7 +1034,7 @@ EOM
         check_fail(%Q{<0.15>\ngiven as the operator for #assert_operator must be a Symbol or #respond_to?(:to_str).}) do
           assert_operator("thing", 0.15, "thing")
         end
-        check_fail(%Q{message.\n<"thing1"> expected to be\n==\n<"thing2">.}) {
+        check_fail(%Q{message.\n<"thing1"> was expected to be\n==\n<"thing2">.}) {
           assert_operator("thing1", :==, "thing2", "message")
         }
       end
@@ -1046,7 +1046,7 @@ EOM
         check_fail(%Q{<42>\ngiven as the operator for #assert_not_operator must be a Symbol or #respond_to?(:to_str).}) do
           assert_not_operator("thing", 42, "message")
         end
-        check_fail(%Q{message.\n<0> expected to not be\n==\n<0.0>.}) {
+        check_fail(%Q{message.\n<0> was expected to not be\n==\n<0.0>.}) {
           assert_not_operator(0, :==, 0.0, "message")
         }
       end
@@ -1111,7 +1111,7 @@ EOM
         inspected_object = AssertionMessage.convert(object)
         expected_message = <<-EOM
 message.
-<#{inspected_object}> expected to respond to
+<#{inspected_object}> was expected to respond to
 <return_argument(*[false, "bogus"])> with a true value but was
 <false>.
 EOM
@@ -1210,7 +1210,7 @@ EOM
 
         expected_message = <<-EOM
 <15> < <10> should be true
-<15> expected less than
+<15> was expected to be less than
 <10>.
 EOM
         check_fail(expected_message.chomp) do
@@ -1219,7 +1219,7 @@ EOM
 
         expected_message = <<-EOM
 <15> <= <10> should be true
-<15> expected less than or equal to
+<15> was expected to be less than or equal to
 <10>.
 EOM
         check_fail(expected_message.chomp) do
@@ -1228,7 +1228,7 @@ EOM
 
         expected_message = <<-EOM
 <10> > <15> should be true
-<10> expected greater than
+<10> was expected to be greater than
 <15>.
 EOM
         check_fail(expected_message.chomp) do
@@ -1237,7 +1237,7 @@ EOM
 
         expected_message = <<-EOM
 <10> >= <15> should be true
-<10> expected greater than or equal to
+<10> was expected to be greater than or equal to
 <15>.
 EOM
         check_fail(expected_message.chomp) do
@@ -1288,7 +1288,7 @@ EOM
         end
 
         expected_message = <<-EOM
-<"Expected message"> exception message expected but none was thrown.
+<"Expected message"> exception message was expected but none was thrown.
 EOM
         check_fail(expected_message.chomp) do
           assert_raise_message("Expected message") do
@@ -1414,7 +1414,7 @@ EOM
         end
 
         nonexistent_file = __FILE__ + ".nonexistent"
-        check_fail("<#{nonexistent_file.inspect}> expected to exist") do
+        check_fail("<#{nonexistent_file.inspect}> was expected to exist") do
           assert_path_exist(nonexistent_file)
         end
       end
@@ -1425,7 +1425,7 @@ EOM
           assert_path_not_exist(nonexistent_file)
         end
 
-        check_fail("<#{__FILE__.inspect}> expected to not exist") do
+        check_fail("<#{__FILE__.inspect}> was expected to not exist") do
           assert_path_not_exist(__FILE__)
         end
       end
@@ -1521,15 +1521,18 @@ EOM
       class TestBlock < self
         def test_with_message
           if defined?(PowerAssert)
-            system_message = <<-MESSAGE
-              1 == 2
+            system_message = <<-MESSAGE.chomp
+              1.to_s == "2"
+                |    |
+                |    false
+                "1"
 MESSAGE
           else
             system_message = "<false> is not true."
           end
           check_fail("user message.\n#{system_message}") do
             assert("user message") do
-              1 == 2
+              1.to_s == "2"
             end
           end
         end
@@ -1635,7 +1638,7 @@ MESSAGE
 
       def test_fail_with_message
         check_fail("message.\n" +
-                    "<0.5> -/+ <0.05> expected to include\n" +
+                    "<0.5> -/+ <0.05> was expected to include\n" +
                     "<0.4>.\n" +
                     "\n" +
                     "Relation:\n" +
@@ -1657,13 +1660,13 @@ MESSAGE
 
       def test_fail_because_negaitve_delta
         check_fail("The delta should not be negative.\n" +
-                    "<-0.1> expected to be\n>=\n<0.0>.") do
+                    "<-0.1> was expected to be\n>=\n<0.0>.") do
           assert_in_delta(0.5, 0.4, -0.1, "message")
         end
       end
 
       def test_fail_without_delta
-        check_fail("<1.402> -/+ <0.001> expected to include\n" +
+        check_fail("<1.402> -/+ <0.001> was expected to include\n" +
                     "<1.404>.\n" +
                     "\n" +
                     "Relation:\n" +
@@ -1715,7 +1718,7 @@ MESSAGE
       end
 
       def test_fail
-        check_fail("<1.4> -/+ <0.11> expected to not include\n" +
+        check_fail("<1.4> -/+ <0.11> was expected to not include\n" +
                     "<1.5>.\n" +
                     "\n" +
                     "Relation:\n" +
@@ -1729,7 +1732,7 @@ MESSAGE
       end
 
       def test_fail_without_delta
-        check_fail("<1.402> -/+ <0.001> expected to not include\n" +
+        check_fail("<1.402> -/+ <0.001> was expected to not include\n" +
                     "<1.4021>.\n" +
                     "\n" +
                     "Relation:\n" +
@@ -1744,7 +1747,7 @@ MESSAGE
 
       def test_fail_with_message
         check_fail("message.\n" +
-                    "<0.5> -/+ <0.11> expected to not include\n" +
+                    "<0.5> -/+ <0.11> was expected to not include\n" +
                     "<0.4>.\n" +
                     "\n" +
                     "Relation:\n" +
@@ -1770,7 +1773,7 @@ MESSAGE
 
       def test_fail_because_negaitve_delta
         check_fail("The delta should not be negative.\n" +
-                    "<-0.11> expected to be\n>=\n<0.0>.") do
+                    "<-0.11> was expected to be\n>=\n<0.0>.") do
           assert_not_in_delta(0.5, 0.4, -0.11, "message")
         end
       end
@@ -1828,7 +1831,7 @@ MESSAGE
       def test_fail_with_message
         check_fail("message.\n" +
                     "<10000> -/+ (<10000> * <0.1>)[1000.0] " +
-                    "expected to include\n" +
+                    "was expected to include\n" +
                     "<8999>.\n" +
                     "\n" +
                     "Relation:\n" +
@@ -1854,14 +1857,14 @@ MESSAGE
 
       def test_fail_because_negaitve_epsilon
         check_fail("The epsilon should not be negative.\n" +
-                    "<-0.1> expected to be\n>=\n<0.0>.") do
+                    "<-0.1> was expected to be\n>=\n<0.0>.") do
           assert_in_epsilon(10000, 9000, -0.1, "message")
         end
       end
 
       def test_fail_without_epsilon
         check_fail("<10000> -/+ (<10000> * <0.001>)[10.0] " +
-                    "expected to include\n" +
+                    "was expected to include\n" +
                     "<10011>.\n" +
                     "\n" +
                     "Relation:\n" +
@@ -1914,7 +1917,7 @@ MESSAGE
 
       def test_fail
         check_fail("<10000> -/+ (<10000> * <0.1>)[1000.0] " +
-                    "expected to not include\n" +
+                    "was expected to not include\n" +
                     "<9000>.\n" +
                     "\n" +
                     "Relation:\n" +
@@ -1929,7 +1932,7 @@ MESSAGE
 
       def test_fail_without_epsilon
         check_fail("<10000> -/+ (<10000> * <0.001>)[10.0] " +
-                    "expected to not include\n" +
+                    "was expected to not include\n" +
                     "<9990>.\n" +
                     "\n" +
                     "Relation:\n" +
@@ -1945,7 +1948,7 @@ MESSAGE
       def test_fail_with_message
         check_fail("message.\n" +
                     "<10000> -/+ (<10000> * <0.1>)[1000.0] " +
-                    "expected to not include\n" +
+                    "was expected to not include\n" +
                     "<9000>.\n" +
                     "\n" +
                     "Relation:\n" +
@@ -1971,7 +1974,7 @@ MESSAGE
 
       def test_fail_because_negaitve_epsilon
         check_fail("The epsilon should not be negative.\n" +
-                    "<-0.1> expected to be\n>=\n<0.0>.") do
+                    "<-0.1> was expected to be\n>=\n<0.0>.") do
           assert_not_in_epsilon(10000, 9000, -0.1, "message")
         end
       end
@@ -1993,7 +1996,7 @@ MESSAGE
       end
 
       def test_fail
-        check_fail("<[1, 2, 3]> expected to include\n" +
+        check_fail("<[1, 2, 3]> was expected to include\n" +
                     "<4>.") do
           assert_include([1, 2, 3], 4)
         end
@@ -2001,7 +2004,7 @@ MESSAGE
 
       def test_fail_with_message
         check_fail("message.\n" +
-                    "<[1, 2, 3]> expected to include\n" +
+                    "<[1, 2, 3]> was expected to include\n" +
                     "<4>.") do
           assert_include([1, 2, 3], 4, "message")
         end
@@ -2034,7 +2037,7 @@ MESSAGE
       end
 
       def test_fail
-        check_fail("<[1, 2, 3]> expected to not include\n" +
+        check_fail("<[1, 2, 3]> was expected to not include\n" +
                     "<2>.") do
           assert_not_include([1, 2, 3], 2)
         end
@@ -2042,7 +2045,7 @@ MESSAGE
 
       def test_fail_with_message
         check_fail("message.\n" +
-                    "<[1, 2, 3]> expected to not include\n" +
+                    "<[1, 2, 3]> was expected to not include\n" +
                     "<2>.") do
           assert_not_include([1, 2, 3], 2, "message")
         end
@@ -2075,14 +2078,14 @@ MESSAGE
       end
 
       def test_fail
-        check_fail("<[1]> expected to be empty.") do
+        check_fail("<[1]> was expected to be empty.") do
           assert_empty([1])
         end
       end
 
       def test_fail_with_message
         check_fail("message.\n" +
-                    "<[1]> expected to be empty.") do
+                    "<[1]> was expected to be empty.") do
           assert_empty([1], "message")
         end
       end
@@ -2114,14 +2117,14 @@ MESSAGE
       end
 
       def test_fail
-        check_fail("<[]> expected to not be empty.") do
+        check_fail("<[]> was expected to not be empty.") do
           assert_not_empty([])
         end
       end
 
       def test_fail_with_message
         check_fail("message.\n" +
-                    "<[]> expected to not be empty.") do
+                    "<[]> was expected to not be empty.") do
           assert_not_empty([], "message")
         end
       end
@@ -2149,7 +2152,7 @@ MESSAGE
       def test_fail
         expected_message = <<-EOM
 message.
-<[1, 2]> expected to respond to
+<[1, 2]> was expected to respond to
 <member?(*[2])> with not a true value but was
 <true>.
 EOM