Refine tests arround String#inspect.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25144 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3058eec581
commit
b3854e7162
@ -2,15 +2,6 @@ require 'test/unit'
|
|||||||
require 'stringio'
|
require 'stringio'
|
||||||
|
|
||||||
class TestM17N < Test::Unit::TestCase
|
class TestM17N < Test::Unit::TestCase
|
||||||
def inspect_encoding
|
|
||||||
Encoding.default_internal || Encoding.default_external
|
|
||||||
end
|
|
||||||
|
|
||||||
def setup
|
|
||||||
Encoding.default_internal = nil
|
|
||||||
Encoding.default_external = Encoding::UTF_8
|
|
||||||
end
|
|
||||||
|
|
||||||
def assert_encoding(encname, actual, message=nil)
|
def assert_encoding(encname, actual, message=nil)
|
||||||
assert_equal(Encoding.find(encname), actual, message)
|
assert_equal(Encoding.find(encname), actual, message)
|
||||||
end
|
end
|
||||||
@ -765,30 +756,16 @@ class TestM17N < Test::Unit::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_sprintf_p
|
def test_sprintf_p
|
||||||
assert_strenc('""', inspect_encoding, a("%p") % a(""))
|
enc = "".inspect.encoding
|
||||||
assert_strenc('""', inspect_encoding, e("%p") % e(""))
|
Encoding.list.each do |e|
|
||||||
assert_strenc('""', inspect_encoding, s("%p") % s(""))
|
format = "%p".force_encoding(e)
|
||||||
assert_strenc('""', inspect_encoding, u("%p") % u(""))
|
['', 'a', "\xC2\xA1", "\x00"].each do |s|
|
||||||
|
s.force_encoding(e)
|
||||||
assert_strenc('"a"', inspect_encoding, a("%p") % a("a"))
|
assert_strenc(s.inspect, enc, format % s)
|
||||||
assert_strenc('"a"', inspect_encoding, e("%p") % e("a"))
|
end
|
||||||
assert_strenc('"a"', inspect_encoding, s("%p") % s("a"))
|
s = "\xC2\xA1".force_encoding(e)
|
||||||
assert_strenc('"a"', inspect_encoding, u("%p") % u("a"))
|
assert_strenc('%10s' % s.inspect, enc, "%10p" % s)
|
||||||
|
end
|
||||||
assert_strenc('"\xC2\xA1"', inspect_encoding, a("%p") % a("\xc2\xa1"))
|
|
||||||
assert_strenc('"\xC2\xA1"', inspect_encoding, e("%p") % e("\xc2\xa1"))
|
|
||||||
#assert_strenc("\"\xC2\xA1\"", inspect_encoding, s("%p") % s("\xc2\xa1"))
|
|
||||||
assert_strenc("\"\xC2\xA1\"", inspect_encoding, u("%p") % u("\xc2\xa1"))
|
|
||||||
|
|
||||||
assert_strenc('"\xC2\xA1"', inspect_encoding, "%10p" % a("\xc2\xa1"))
|
|
||||||
assert_strenc('"\xC2\xA1"', inspect_encoding, "%10p" % e("\xc2\xa1"))
|
|
||||||
#assert_strenc(" \"\xC2\xA1\"", inspect_encoding, "%10p" % s("\xc2\xa1"))
|
|
||||||
assert_strenc(" \"\xC2\xA1\"", inspect_encoding, "%10p" % u("\xc2\xa1"))
|
|
||||||
|
|
||||||
assert_strenc('"\x00"', inspect_encoding, a("%p") % a("\x00"))
|
|
||||||
assert_strenc('"\x00"', inspect_encoding, e("%p") % e("\x00"))
|
|
||||||
assert_strenc('"\x00"', inspect_encoding, s("%p") % s("\x00"))
|
|
||||||
assert_strenc('"\u0000"', inspect_encoding, u("%p") % u("\x00"))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_sprintf_s
|
def test_sprintf_s
|
||||||
@ -1185,8 +1162,8 @@ class TestM17N < Test::Unit::TestCase
|
|||||||
assert_equal(Encoding::US_ASCII, [].to_s.encoding)
|
assert_equal(Encoding::US_ASCII, [].to_s.encoding)
|
||||||
assert_equal(Encoding::US_ASCII, [nil].to_s.encoding)
|
assert_equal(Encoding::US_ASCII, [nil].to_s.encoding)
|
||||||
assert_equal(Encoding::US_ASCII, [1].to_s.encoding)
|
assert_equal(Encoding::US_ASCII, [1].to_s.encoding)
|
||||||
assert_equal(inspect_encoding, [""].to_s.encoding)
|
assert_equal("".inspect.encoding, [""].to_s.encoding)
|
||||||
assert_equal(inspect_encoding, ["a"].to_s.encoding)
|
assert_equal("a".inspect.encoding, ["a"].to_s.encoding)
|
||||||
assert_equal(Encoding::US_ASCII, [nil,1,"","a","\x20",[]].to_s.encoding)
|
assert_equal(Encoding::US_ASCII, [nil,1,"","a","\x20",[]].to_s.encoding)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user