- Got rid of the trailing period in message for assert_equal. (tender…

…love) [git-p4: depot-paths = "//src/minitest/dev/": change = 6281]
nono · Jun 1, 2011 · f79e5cd · f79e5cd
1 parent e07ac6d
commit f79e5cd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/lib/minitest/unit.rb b/lib/minitest/unit.rb
@@ -211,7 +211,7 @@ def assert_empty obj, msg = nil
     # See also: MiniTest::Assertions.diff
 
     def assert_equal exp, act, msg = nil
-      msg = message(msg) { diff exp, act }
+      msg = message(msg, "") { diff exp, act }
       assert(exp == act, msg)
     end
 
@@ -459,10 +459,10 @@ def flunk msg = nil
     ##
     # Returns a proc that will output +msg+ along with the default message.
 
-    def message msg = nil, &default
+    def message msg = nil, ending = ".", &default
       proc {
         custom_message = "#{msg}.\n" unless msg.nil? or msg.to_s.empty?
-        "#{custom_message}#{default.call}."
+        "#{custom_message}#{default.call}#{ending}"
       }
     end
 

diff --git a/test/test_minitest_unit.rb b/test/test_minitest_unit.rb
@@ -533,7 +533,7 @@ def initialize s; @name = s; end
            @@ -1 +1 @@
            -#<#<Class:0xXXXXXX>:0xXXXXXX @name=\"a\">
            +#<#<Class:0xXXXXXX>:0xXXXXXX @name=\"b\">
-           .".gsub(/^ +/, "")
+           ".gsub(/^ +/, "")
 
     util_assert_triggered msg do
       @tc.assert_equal o1, o2
@@ -546,7 +546,7 @@ def test_assert_equal_different_hex_invisible
 
     msg = "No visible difference.
            You should look at your implementation of Object#==.
-           #<Object:0xXXXXXX>.".gsub(/^ +/, "")
+           #<Object:0xXXXXXX>".gsub(/^ +/, "")
 
     util_assert_triggered msg do
       @tc.assert_equal o1, o2
@@ -559,7 +559,7 @@ def test_assert_equal_different_long
            @@ -1 +1 @@
            -\"hahahahahahahahahahahahahahahahahahahaha\"
            +\"blahblahblahblahblahblahblahblahblahblah\"
-           .".gsub(/^ +/, "")
+           ".gsub(/^ +/, "")
 
     util_assert_triggered msg do
       o1 = "haha" * 10
@@ -572,7 +572,7 @@ def test_assert_equal_different_long
   def test_assert_equal_different_long_invisible
     msg = "No visible difference.
            You should look at your implementation of String#==.
-           \"blahblahblahblahblahblahblahblahblahblah\".".gsub(/^ +/, "")
+           \"blahblahblahblahblahblahblahblahblahblah\"".gsub(/^ +/, "")
 
     util_assert_triggered msg do
       o1 = "blah" * 10
@@ -591,7 +591,7 @@ def test_assert_equal_different_long_msg
            @@ -1 +1 @@
            -\"hahahahahahahahahahahahahahahahahahahaha\"
            +\"blahblahblahblahblahblahblahblahblahblah\"
-           .".gsub(/^ +/, "")
+           ".gsub(/^ +/, "")
 
     util_assert_triggered msg do
       o1 = "haha" * 10
@@ -613,7 +613,7 @@ def test_assert_equal_different_short_msg
   end
 
   def test_assert_equal_different_short_multiline
-    msg = "--- expected\n+++ actual\n@@ -1,2 +1,2 @@\n \"a\n-b\"\n+c\"\n."
+    msg = "--- expected\n+++ actual\n@@ -1,2 +1,2 @@\n \"a\n-b\"\n+c\"\n"
     util_assert_triggered msg do
       @tc.assert_equal "a\nb", "a\nc"
     end
@@ -1283,7 +1283,7 @@ def util_assert_triggered expected, klass = MiniTest::Assertion
   end
 
   def util_msg exp, act, msg = nil
-    s = "Expected: #{exp.inspect}\n  Actual: #{act.inspect}."
+    s = "Expected: #{exp.inspect}\n  Actual: #{act.inspect}"
     s = "#{msg}.\n#{s}" if msg
     s
   end