From 8bbb49ddfe12cc85232f9811c495592d8b26a206 Mon Sep 17 00:00:00 2001
From: ntalbott <ntalbott@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 1 Dec 2003 19:25:51 +0000
Subject: 	* lib/test/unit/assertions.rb: fixed #assert_no_match message.

	* test/testunit/test_assertions.rb: ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/testunit/test_assertions.rb | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/testunit/test_assertions.rb b/test/testunit/test_assertions.rb
index 0d79044dc..f62a6186e 100644
--- a/test/testunit/test_assertions.rb
+++ b/test/testunit/test_assertions.rb
@@ -336,18 +336,17 @@ module Test
       end
       
       def test_assert_no_match
-        check_nothing_fails {
-          assert_no_match(/sling/, "string")
-        }
-        check_nothing_fails {
-          assert_no_match(/sling/, "string", "message")
-        }
-        check_fails(%Q{</string/> expected to not match\n<"string">.}) {
+        check_nothing_fails{assert_no_match(/sling/, "string")}
+        check_nothing_fails{assert_no_match(/sling/, "string", "message")}
+        check_fails(%Q{The first argument to assert_no_match should be a Regexp.\n<"asdf"> expected to be an instance of\n<Regexp> but was\n<String>.}) do
+          assert_no_match("asdf", "asdf")
+        end
+        check_fails(%Q{</string/> expected to not match\n<"string">.}) do
           assert_no_match(/string/, "string")
-        }
-        check_fails(%Q{message.\n</string/> expected to not match\n<"string">.}) {
+        end
+        check_fails(%Q{message.\n</string/> expected to not match\n<"string">.}) do
           assert_no_match(/string/, "string", "message")
-        }
+        end
       end
       
       def test_assert_throws
-- 
cgit