From 120bb4a9d55a6e2b8c44b6223e7b5a2905a4abe4 Mon Sep 17 00:00:00 2001 From: usa Date: Thu, 24 Jan 2008 11:47:37 +0000 Subject: * test/ruby/test_m17n.rb: follow to the following changes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/ruby/test_m17n.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_m17n.rb b/test/ruby/test_m17n.rb index f45dae9a47..86c69de22c 100644 --- a/test/ruby/test_m17n.rb +++ b/test/ruby/test_m17n.rb @@ -54,7 +54,7 @@ class TestM17N < Test::Unit::TestCase end def assert_regexp_generic_ascii(r) - assert_encoding("ASCII-8BIT", r.encoding) + assert_encoding("US-ASCII", r.encoding) assert_regexp_generic_encoding(r) end @@ -137,17 +137,17 @@ class TestM17N < Test::Unit::TestCase # tests start def test_string_ascii_literal - assert_encoding("ASCII-8BIT", eval(a(%{""})).encoding) - assert_encoding("ASCII-8BIT", eval(a(%{"a"})).encoding) + assert_encoding("US-ASCII", eval(a(%{""})).encoding) + assert_encoding("US-ASCII", eval(a(%{"a"})).encoding) end def test_string_eucjp_literal - assert_encoding("ASCII-8BIT", eval(e(%{""})).encoding) - assert_encoding("ASCII-8BIT", eval(e(%{"a"})).encoding) + assert_encoding("US-ASCII", eval(e(%{""})).encoding) + assert_encoding("US-ASCII", eval(e(%{"a"})).encoding) assert_encoding("EUC-JP", eval(e(%{"\xa1\xa1"})).encoding) assert_encoding("EUC-JP", eval(e(%{"\\xa1\\xa1"})).encoding) - assert_encoding("ASCII-8BIT", eval(e(%{"\\x20"})).encoding) - assert_encoding("ASCII-8BIT", eval(e(%{"\\n"})).encoding) + assert_encoding("US-ASCII", eval(e(%{"\\x20"})).encoding) + assert_encoding("US-ASCII", eval(e(%{"\\n"})).encoding) assert_encoding("EUC-JP", eval(e(%{"\\x80"})).encoding) end @@ -363,8 +363,6 @@ class TestM17N < Test::Unit::TestCase assert_regexp_fixed_ascii8bit(eval(a(%{/\xc2\xa1/n}))) assert_regexp_fixed_ascii8bit(eval(a(%q{/\xc2\xa1/}))) - assert_raise(SyntaxError) { eval("/\xa1\xa1/n".force_encoding("euc-jp")) } - [/\xc2\xa1/n, eval(a(%{/\xc2\xa1/})), eval(a(%{/\xc2\xa1/n}))].each {|r| assert_equal(nil, r =~ a("a")) assert_equal(nil, r =~ e("a")) @@ -681,7 +679,7 @@ class TestM17N < Test::Unit::TestCase #assert_strenc("\"\xC2\xA1\"", 'Windows-31J', s("%p") % s("\xc2\xa1")) assert_strenc("\"\xC2\xA1\"", 'UTF-8', u("%p") % u("\xc2\xa1")) - assert_strenc('"\xC2\xA1"', 'ASCII-8BIT', "%10p" % a("\xc2\xa1")) + assert_strenc('"\xC2\xA1"', 'US-ASCII', "%10p" % a("\xc2\xa1")) assert_strenc(" \"\xC2\xA1\"", 'EUC-JP', "%10p" % e("\xc2\xa1")) #assert_strenc(" \"\xC2\xA1\"", 'Windows-31J', "%10p" % s("\xc2\xa1")) assert_strenc(" \"\xC2\xA1\"", 'UTF-8', "%10p" % u("\xc2\xa1")) -- cgit v1.2.3