summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorntalbott <ntalbott@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-20 15:45:56 +0000
committerntalbott <ntalbott@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-11-20 15:45:56 +0000
commitb31aeea632037ce95463267cb8c0369aed5a72b1 (patch)
treec00f24da84ace31632f383dc9185b84cedc12491
parent65f4f950fb722396c823ce321245bf06a55e9492 (diff)
* lib/test/unit/assertions.rb: use #__send__ instead of #send.
* lib/test/unit/testcase.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4995 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/test/unit/assertions.rb8
-rw-r--r--lib/test/unit/testcase.rb2
3 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 19b6d881e2..ef67f2dec9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Nov 21 00:43:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
+
+ * lib/test/unit/assertions.rb: use #__send__ instead of #send.
+
+ * lib/test/unit/testcase.rb: ditto.
+
Thu Nov 20 19:19:22 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* configure.in: don't find the Cygwin's pthread library on MinGW.
diff --git a/lib/test/unit/assertions.rb b/lib/test/unit/assertions.rb
index 42f7379526..9730fe2670 100644
--- a/lib/test/unit/assertions.rb
+++ b/lib/test/unit/assertions.rb
@@ -156,8 +156,8 @@ EOT
end
# Compares the two objects based on the passed
- # operator. Passes if object1.send(operator, object2) is
- # true.
+ # operator. Passes if object1.__send__(operator, object2)
+ # is true.
public
def assert_operator(object1, operator, object2, message="")
_wrap_assertion do
@@ -168,7 +168,7 @@ EOT
?
<?>.
EOT
- assert_block(full_message) { object1.send(operator, object2) }
+ assert_block(full_message) { object1.__send__(operator, object2) }
end
end
@@ -236,7 +236,7 @@ EOT
end
UncaughtThrow = {NameError => /^uncaught throw \`(.+)\'$/,
- ThreadError => /^uncaught throw \`(.+)\' in thread /}
+ ThreadError => /^uncaught throw \`(.+)\' in thread /} #`
# Passes if block throws symbol.
public
diff --git a/lib/test/unit/testcase.rb b/lib/test/unit/testcase.rb
index f258c23ca1..8b22dd4640 100644
--- a/lib/test/unit/testcase.rb
+++ b/lib/test/unit/testcase.rb
@@ -67,7 +67,7 @@ module Test
@_result = result
begin
setup
- send(@method_name)
+ __send__(@method_name)
rescue AssertionFailedError => e
add_failure(e.message, e.backtrace)
rescue StandardError, ScriptError