ruby-changes:9180
From: yugui <ko1@a...>
Date: Sat, 13 Dec 2008 13:06:48 +0900 (JST)
Subject: [ruby-changes:9180] Ruby:r20717 (ruby_1_9_1): merges r20714 from trunk into ruby_1_9_1.
yugui 2008-12-13 13:06:28 +0900 (Sat, 13 Dec 2008) New Revision: 20717 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20717 Log: merges r20714 from trunk into ruby_1_9_1. * test/ruby/test_m17n.rb: feature changed in r20626. follows it. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/test/ruby/test_m17n.rb Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 20716) +++ ruby_1_9_1/ChangeLog (revision 20717) @@ -1,3 +1,8 @@ +Sat Dec 13 12:48:57 2008 Yuki Sonoda (Yugui) <yugui@y...> + + * test/ruby/test_m17n.rb: feature changed in r20626. + follows it. + Sat Dec 13 12:38:16 2008 Yuki Sonoda (Yugui) <yugui@y...> * lib/minitest/test.rb (MinTest::Unit#location): Index: ruby_1_9_1/test/ruby/test_m17n.rb =================================================================== --- ruby_1_9_1/test/ruby/test_m17n.rb (revision 20716) +++ ruby_1_9_1/test/ruby/test_m17n.rb (revision 20717) @@ -48,7 +48,7 @@ if enc == r.encoding assert_nothing_raised { r =~ "\xc2\xa1".force_encoding(enc) } else - assert_raise(ArgumentError) { r =~ "\xc2\xa1".force_encoding(enc) } + assert_raise(Encoding::CompatibilityError) { r =~ "\xc2\xa1".force_encoding(enc) } end } end @@ -385,9 +385,9 @@ assert_equal(nil, r =~ s("a")) assert_equal(nil, r =~ u("a")) assert_equal(0, r =~ a("\xc2\xa1")) - assert_raise(ArgumentError) { r =~ e("\xc2\xa1") } - assert_raise(ArgumentError) { r =~ s("\xc2\xa1") } - assert_raise(ArgumentError) { r =~ u("\xc2\xa1") } + assert_raise(Encoding::CompatibilityError) { r =~ e("\xc2\xa1") } + assert_raise(Encoding::CompatibilityError) { r =~ s("\xc2\xa1") } + assert_raise(Encoding::CompatibilityError) { r =~ u("\xc2\xa1") } } end @@ -402,10 +402,10 @@ assert_equal(0, r =~ e("a")) assert_equal(0, r =~ s("a")) assert_equal(0, r =~ u("a")) - assert_raise(ArgumentError) { r =~ a("\xc2\xa1") } + assert_raise(Encoding::CompatibilityError) { r =~ a("\xc2\xa1") } assert_equal(nil, r =~ e("\xc2\xa1")) - assert_raise(ArgumentError) { r =~ s("\xc2\xa1") } - assert_raise(ArgumentError) { r =~ u("\xc2\xa1") } + assert_raise(Encoding::CompatibilityError) { r =~ s("\xc2\xa1") } + assert_raise(Encoding::CompatibilityError) { r =~ u("\xc2\xa1") } } [/\xc2\xa1/e, eval(e(%{/\xc2\xa1/})), eval(e(%q{/\xc2\xa1/}))].each {|r| @@ -413,10 +413,10 @@ assert_equal(nil, r =~ e("a")) assert_equal(nil, r =~ s("a")) assert_equal(nil, r =~ u("a")) - assert_raise(ArgumentError) { r =~ a("\xc2\xa1") } + assert_raise(Encoding::CompatibilityError) { r =~ a("\xc2\xa1") } assert_equal(0, r =~ e("\xc2\xa1")) - assert_raise(ArgumentError) { r =~ s("\xc2\xa1") } - assert_raise(ArgumentError) { r =~ u("\xc2\xa1") } + assert_raise(Encoding::CompatibilityError) { r =~ s("\xc2\xa1") } + assert_raise(Encoding::CompatibilityError) { r =~ u("\xc2\xa1") } } end @@ -430,7 +430,7 @@ def test_regexp_windows_31j begin Regexp.new("\xa1".force_encoding("windows-31j")) =~ "\xa1\xa1".force_encoding("euc-jp") - rescue ArgumentError + rescue Encoding::CompatibilityError err = $! end assert_match(/windows-31j/i, err.message) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/