From 4ab384be2d4a98868c8da9739609585efc15f920 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 9 Nov 2007 04:37:36 +0000 Subject: * test/ruby/test_basicinstructions.rb: updated for new class behavior. [ruby-dev:32192] * encoding.c (enc_name): Encoding should not rely on ENCODING in the FL_USERS flags. * encoding.c (rb_enc_from_encoding): do not call rb_enc_associate for encoding itself. * encoding.c (enc_register_at): ditto. * marshal.c (r_ivar): do not set real instance variable for encoding data associated. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_basicinstructions.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'test/ruby/test_basicinstructions.rb') diff --git a/test/ruby/test_basicinstructions.rb b/test/ruby/test_basicinstructions.rb index 2e039f5163..6ac93e037a 100644 --- a/test/ruby/test_basicinstructions.rb +++ b/test/ruby/test_basicinstructions.rb @@ -483,16 +483,16 @@ class TestBasicInstructions < Test::Unit::TestCase assert_equal 'B/singleton', CVarB.cvB assert_equal 'B/singleton', CVarB.cvB2 assert_equal 'B/singleton', CVarB.new.cvB - assert_equal 'CVarA@@cv', CVarA.cv - assert_equal 'CVarA@@cv', CVarA.cv2 - assert_equal 'CVarA@@cv', CVarA.new.cv + assert_equal 'B/singleton', CVarA.cv + assert_equal 'B/singleton', CVarA.cv2 + assert_equal 'B/singleton', CVarA.new.cv CVarB.new.cvB = 'B/instance' assert_equal 'B/instance', CVarB.cvB assert_equal 'B/instance', CVarB.cvB2 assert_equal 'B/instance', CVarB.new.cvB - assert_equal 'CVarA@@cv', CVarA.cv - assert_equal 'CVarA@@cv', CVarA.cv2 - assert_equal 'CVarA@@cv', CVarA.new.cv + assert_equal 'B/instance', CVarA.cv + assert_equal 'B/instance', CVarA.cv2 + assert_equal 'B/instance', CVarA.new.cv CVarA.cv = 'CVarA@@cv' CVarB.cvB = 'CVarB@@cv' -- cgit v1.2.3