summaryrefslogtreecommitdiffstats
path: root/test/ruby/test_eval.rb
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 17:22:34 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-21 17:22:34 +0000
commit73119d3fe43c4b8101b9692a8419875d65361116 (patch)
tree1e38d552a0390a7e6e00a369995db37094b589c4 /test/ruby/test_eval.rb
parent896c1acd5a6e980e2a4d87472c586da3ee8d0cfe (diff)
downloadruby-73119d3fe43c4b8101b9692a8419875d65361116.tar.gz
ruby-73119d3fe43c4b8101b9692a8419875d65361116.tar.xz
ruby-73119d3fe43c4b8101b9692a8419875d65361116.zip
test/ruby/test_eval.rb: class variable test updated.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/ruby/test_eval.rb')
-rw-r--r--test/ruby/test_eval.rb19
1 files changed, 7 insertions, 12 deletions
diff --git a/test/ruby/test_eval.rb b/test/ruby/test_eval.rb
index 9d0fdaa64..af59cced4 100644
--- a/test/ruby/test_eval.rb
+++ b/test/ruby/test_eval.rb
@@ -139,7 +139,7 @@ class TestEval < Test::Unit::TestCase
assert_equal 11, o.instance_eval("11")
assert_equal 12, o.instance_eval("@ivar")
- assert_equal 13, o.instance_eval("@@cvar")
+ assert_raise(NameError) {o.instance_eval("@@cvar")}
assert_equal 14, o.instance_eval("$gvar__eval")
assert_equal 15, o.instance_eval("Const")
assert_equal 16, o.instance_eval("7 + 9")
@@ -149,7 +149,7 @@ class TestEval < Test::Unit::TestCase
1.times {
assert_equal 12, o.instance_eval("@ivar")
- assert_equal 13, o.instance_eval("@@cvar")
+ assert_raise(NameError) {o.instance_eval("@@cvar")}
assert_equal 14, o.instance_eval("$gvar__eval")
assert_equal 15, o.instance_eval("Const")
}
@@ -169,7 +169,7 @@ class TestEval < Test::Unit::TestCase
assert_equal 11, o.instance_eval { 11 }
assert_equal 12, o.instance_eval { @ivar }
- assert_equal 13, o.instance_eval { @@cvar }
+ assert_raise(NameError) {o.instance_eval{ @@cvar }}
assert_equal 14, o.instance_eval { $gvar__eval }
assert_equal 15, o.instance_eval { Const }
assert_equal 16, o.instance_eval { 7 + 9 }
@@ -179,21 +179,16 @@ class TestEval < Test::Unit::TestCase
1.times {
assert_equal 12, o.instance_eval { @ivar }
- assert_equal 13, o.instance_eval { @@cvar }
+ assert_raise(NameError) {o.instance_eval{ @@cvar }}
assert_equal 14, o.instance_eval { $gvar__eval }
assert_equal 15, o.instance_eval { Const }
}
end
def test_instance_eval_cvar
- env = @@cvar
- [Object.new, [], 7, :sym].each do |obj| # TODO: check :sym
- assert_equal env, obj.instance_eval("@@cvar")
- assert_equal env, obj.instance_eval { @@cvar }
- end
- [true, false, nil].each do |obj|
- assert_equal env, obj.instance_eval("@@cvar")
- assert_equal env, obj.instance_eval { @@cvar }
+ [Object.new, [], 7, :sym, true, false, nil].each do |obj|
+ assert_raise(NameError){obj.instance_eval("@@cvar")}
+ assert_raise(NameError){obj.instance_eval{@@cvar}}
end
end