From a96626e6da972d3e0d78669c075405de43c66eda Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 30 Oct 2015 03:02:14 +0000
Subject: [PATCH] test_object.rb: add more checks

* test/ruby/test_object.rb (test_remove_instance_variable): refine
  failure message and check the name.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52379 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_object.rb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index b0e561a206..515529b6a5 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -236,17 +236,19 @@ class TestObject < Test::Unit::TestCase
       'T_CLASS,T_MODULE' => Class.new(Object),
       'generic ivar' => '',
     }.each do |desc, o|
-      assert_raises(NameError, "#{desc} iv removal raises before set") do
+      e = assert_raise(NameError, "#{desc} iv removal raises before set") do
         o.remove_instance_variable(:@foo)
       end
+      assert_equal([o, :@foo], [e.receiver, e.name])
       o.instance_eval { @foo = :foo }
       assert_equal(:foo, o.remove_instance_variable(:@foo),
                    "#{desc} iv removal returns original value")
-      assert_equal(false, o.instance_variable_defined?(:@foo),
-                   "#{desc} iv removed succesfully")
-      assert_raises(NameError, "#{desc} iv removal raises after removal") do
+      assert_not_send([o, :instance_variable_defined?, :@foo],
+                      "#{desc} iv removed succesfully")
+      e = assert_raise(NameError, "#{desc} iv removal raises after removal") do
         o.remove_instance_variable(:@foo)
       end
+      assert_equal([o, :@foo], [e.receiver, e.name])
     end
   end