archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merges r27723 from trunk into ruby_1_9_2.

Browse source 
--
* ext/psych/parser.c (parse): Return strings encoded as
  Encoding.default_internal if set.
* test/psych/test_encoding.rb: Tests for encoding change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2010-05-16 03:07:52 +00:00
parent 675fde2e7b
commit c1dc27f7c2
3 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
test/psych/test_encoding.rb
View file

@ -29,6 +29,22 @@ module Psych
@utf8 = Encoding.find('UTF-8')
end
def test_default_internal
before = Encoding.default_internal
Encoding.default_internal = 'EUC-JP'
str = "壁に耳あり、障子に目あり"
yaml = "--- #{str}"
assert_equal @utf8, str.encoding
@parser.parse str
assert_encodings Encoding.find('EUC-JP'), @handler.strings
assert_equal str, @handler.strings.first.encode('UTF-8')
ensure
Encoding.default_internal = before
end
def test_scalar
@parser.parse("--- a")
assert_encodings @utf8, @handler.strings