matz	2007-12-22 02:22:34 +0900 (Sat, 22 Dec 2007)

  New Revision: 14440

  Modified files:
    trunk/test/ruby/test_eval.rb

  Log:
    test/ruby/test_eval.rb: class variable test updated.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_eval.rb?r1=14440&r2=14439

Index: test/ruby/test_eval.rb
===================================================================
--- test/ruby/test_eval.rb	(revision 14439)
+++ test/ruby/test_eval.rb	(revision 14440)
@@ -139,7 +139,7 @@
 
     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 @@
 
     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 @@
 
     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,22 +179,17 @@
 
     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 }
+    [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
-    [true, false, nil].each do |obj|
-      assert_equal env, obj.instance_eval("@@cvar")
-      assert_equal env, obj.instance_eval { @@cvar }
-    end
   end
 
   # 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml