summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--test/ruby/test_module.rb19
-rw-r--r--test/ruby/test_object.rb7
3 files changed, 24 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 84f6df20f0..bc0915c5b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Oct 9 22:13:58 2008 Yusuke Endoh <mame@tsg.ne.jp>
+
+ * test/ruby/test_module.rb (test_remove_class_variable): add a test
+ for Class#remove_class_variable.
+
+ * test/ruby/test_object.rb (test_remove_instance_variable): add a test
+ for Object#remove_instance_variable.
+
Thu Oct 9 22:04:38 2008 Yusuke Endoh <mame@tsg.ne.jp>
* variable.c (rb_mod_remove_cvar): fix r19711.
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 072f559c3c..e1f7299636 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -210,14 +210,6 @@ class TestModule < Test::Unit::TestCase
assert(Other.constants.include?(:CLASS_EVAL))
end
- def test_class_variable_set
- # TODO
- end
-
- def test_class_variable_get
- # TODO
- end
-
def test_const_defined?
assert(Math.const_defined?(:PI))
assert(Math.const_defined?("PI"))
@@ -445,7 +437,7 @@ class TestModule < Test::Unit::TestCase
assert_raise(NameError) { c1.const_defined?(:foo) }
end
- def test_class_variable_get2
+ def test_class_variable_get
c = Class.new
c.class_eval { @@foo = :foo }
assert_equal(:foo, c.class_variable_get(:@@foo))
@@ -453,7 +445,7 @@ class TestModule < Test::Unit::TestCase
assert_raise(NameError) { c.class_variable_get(:foo) }
end
- def test_class_variable_set2
+ def test_class_variable_set
c = Class.new
c.class_variable_set(:@@foo, :foo)
assert_equal(:foo, c.class_eval { @@foo })
@@ -468,6 +460,13 @@ class TestModule < Test::Unit::TestCase
assert_raise(NameError) { c.class_variable_defined?(:foo) }
end
+ def test_remove_class_variable
+ c = Class.new
+ c.class_eval { @@foo = :foo }
+ c.class_eval { remove_class_variable(:@@foo) }
+ assert_equal(false, c.class_variable_defined?(:@@foo))
+ end
+
def test_export_method
m = Module.new
assert_raise(NameError) do
diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb
index 5190eb69e5..2116c6a216 100644
--- a/test/ruby/test_object.rb
+++ b/test/ruby/test_object.rb
@@ -170,6 +170,13 @@ class TestObject < Test::Unit::TestCase
assert_raise(NameError) { o.instance_variable_defined?(:foo) }
end
+ def test_remove_instance_variable
+ o = Object.new
+ o.instance_eval { @foo = :foo }
+ o.instance_eval { remove_instance_variable(:@foo) }
+ assert_equal(false, o.instance_variable_defined?(:@foo))
+ end
+
def test_convert_type
o = Object.new
def o.to_s; 1; end