diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-28 07:56:13 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-28 07:56:13 +0000 |
commit | a2369fc2feb1f75dc72eeddbcc512ca74a70d0dd (patch) | |
tree | 0e8110d079ecbe58c564a9ccace85295a90aef93 | |
parent | a4f838c742dc758de8dec0c002e20d22c791b85a (diff) | |
download | ruby-a2369fc2feb1f75dc72eeddbcc512ca74a70d0dd.tar.gz |
encoding for inspect
* test/ruby/test_{exception,module,object}.rb: inspect result
depend on the default external encoding. [Feature #10881]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52323 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/ruby/test_exception.rb | 8 | ||||
-rw-r--r-- | test/ruby/test_module.rb | 2 | ||||
-rw-r--r-- | test/ruby/test_object.rb | 12 |
3 files changed, 14 insertions, 8 deletions
diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index a3b392ae00..f8ddd9d3fa 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -429,9 +429,11 @@ end.join bug3237 = '[ruby-core:29948]' str = "\u2600" id = :"\u2604" - msg = "undefined method `#{id}' for #{str.inspect}:String" - assert_raise_with_message(NoMethodError, msg, bug3237) do - str.__send__(id) + EnvUtil.with_default_external(Encoding::UTF_8) do + msg = "undefined method `#{id}' for #{str.inspect}:String" + assert_raise_with_message(NoMethodError, msg, bug3237) do + str.__send__(id) + end end end diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb index ed052ff711..358e47af64 100644 --- a/test/ruby/test_module.rb +++ b/test/ruby/test_module.rb @@ -686,7 +686,7 @@ class TestModule < Test::Unit::TestCase assert_raise(NameError) { c1.const_set("X\u{3042}".encode("utf-32be"), :foo) } assert_raise(NameError) { c1.const_set("X\u{3042}".encode("utf-32le"), :foo) } cx = EnvUtil.labeled_class("X\u{3042}") - EnvUtil.with_default_internal(Encoding::UTF_8) { + EnvUtil.with_default_external(Encoding::UTF_8) { assert_raise_with_message(TypeError, /X\u{3042}/) { c1.const_set(cx, :foo) } } end diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index fac5302dab..5ba44c8699 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -372,15 +372,19 @@ class TestObject < Test::Unit::TestCase m = "\u{30e1 30bd 30c3 30c9}" c = Class.new - assert_raise_with_message(NameError, /#{m}/) do - c.class_eval {remove_method m} + EnvUtil.with_default_external(Encoding::UTF_8) do + assert_raise_with_message(NameError, /#{m}/) do + c.class_eval {remove_method m} + end end c = Class.new { define_method(m) {} remove_method(m) } - assert_raise_with_message(NameError, /#{m}/) do - c.class_eval {remove_method m} + EnvUtil.with_default_external(Encoding::UTF_8) do + assert_raise_with_message(NameError, /#{m}/) do + c.class_eval {remove_method m} + end end end |