summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-17 13:11:39 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-08-17 13:11:39 +0000
commit7ab9ef7a958f92ae490e9ceef28e9eeb232f1fb9 (patch)
tree13b980b34cd2f9523dd526495b83b0ac654e65cb
parentd8e600c60c1f97f6b5f9b301c52dade25bab5dbe (diff)
downloadruby-7ab9ef7a958f92ae490e9ceef28e9eeb232f1fb9.tar.gz
ruby-7ab9ef7a958f92ae490e9ceef28e9eeb232f1fb9.tar.xz
ruby-7ab9ef7a958f92ae490e9ceef28e9eeb232f1fb9.zip
* test/ruby/test_basicinstructions.rb: fix old tests.
class variables should be inherited. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@13080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/ruby/test_basicinstructions.rb6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 39e6c5b01..328f93f68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 17 22:10:19 2007 Koichi Sasada <ko1@atdot.net>
+
+ * test/ruby/test_basicinstructions.rb: fix old tests.
+ class variables should be inherited.
+
Fri Aug 17 21:20:44 2007 Koichi Sasada <ko1@atdot.net>
* eval.c (rb_call), eval_method.ci (rb_add_method, rb_alias),
diff --git a/test/ruby/test_basicinstructions.rb b/test/ruby/test_basicinstructions.rb
index e49eb7587..2e039f516 100644
--- a/test/ruby/test_basicinstructions.rb
+++ b/test/ruby/test_basicinstructions.rb
@@ -476,9 +476,9 @@ class TestBasicInstructions < Test::Unit::TestCase
assert_equal 'B/instance', CVarA.new.cv
CVarA.cv = 'CVarA@@cv'
- assert_raise(NameError) { CVarB.cvB }
- assert_raise(NameError) { CVarB.cvB2 }
- assert_raise(NameError) { CVarB.new.cvB }
+ assert_equal('CVarA@@cv', CVarB.cvB)
+ assert_equal('CVarA@@cv', CVarB.cvB2)
+ assert_equal('CVarA@@cv', CVarB.new.cvB)
CVarB.cvB = 'B/singleton'
assert_equal 'B/singleton', CVarB.cvB
assert_equal 'B/singleton', CVarB.cvB2