* test/ruby/test_m17n.rb: follow EncodingCompatibilityError.

* test/ruby/test_mixed_unicode_escapes.rb: ditto.

* test/ruby/enc/test_utf16.rb: ditto.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 10 insertions, 10 deletions

diff --git a/test/ruby/enc/test_utf16.rb b/test/ruby/enc/test_utf16.rb
index c10463b2b..a7c735f43 100644
--- a/test/ruby/enc/test_utf16.rb
+++ b/test/ruby/enc/test_utf16.rb
@@ -137,19 +137,19 @@ EOT
   end
 
   def test_hex
-    assert_raise(ArgumentError) {
+    assert_raise(EncodingCompatibilityError) {
       "ff".encode("utf-16le").hex
     }
-    assert_raise(ArgumentError) {
+    assert_raise(EncodingCompatibilityError) {
       "ff".encode("utf-16be").hex
     }
   end
 
   def test_oct
-    assert_raise(ArgumentError) {
+    assert_raise(EncodingCompatibilityError) {
       "77".encode("utf-16le").oct
     }
-    assert_raise(ArgumentError) {
+    assert_raise(EncodingCompatibilityError) {
       "77".encode("utf-16be").oct
     }
   end
@@ -157,7 +157,7 @@ EOT
   def test_count
     s1 = "aa".force_encoding("utf-16be")
     s2 = "aa"
-    assert_raise(ArgumentError, "#{encdump s1}.count(#{encdump s2})") {
+    assert_raise(EncodingCompatibilityError, "#{encdump s1}.count(#{encdump s2})") {
       s1.count(s2)
     }
   end
@@ -165,7 +165,7 @@ EOT
   def test_plus
     s1 = "a".force_encoding("us-ascii")
     s2 = "aa".force_encoding("utf-16be")
-    assert_raise(ArgumentError, "#{encdump s1} + #{encdump s2}") {
+    assert_raise(EncodingCompatibilityError, "#{encdump s1} + #{encdump s2}") {
       s1 + s2
     }
   end
@@ -178,7 +178,7 @@ EOT
 
   def test_interpolation
     s = "aa".force_encoding("utf-16be")
-    assert_raise(ArgumentError, "\"a\#{#{encdump s}}\"") {
+    assert_raise(EncodingCompatibilityError, "\"a\#{#{encdump s}}\"") {
       "a#{s}"
     }
   end
@@ -206,7 +206,7 @@ EOT
   def test_plus_nonempty
     s1 = "aa"
     s2 = "bb".force_encoding("utf-16be")
-    assert_raise(ArgumentError, "#{encdump s1} << #{encdump s2}") {
+    assert_raise(EncodingCompatibilityError, "#{encdump s1} << #{encdump s2}") {
       s1 + s2
     }
   end
@@ -230,7 +230,7 @@ EOT
   def test_concat_nonempty
     s1 = "aa"
     s2 = "bb".force_encoding("utf-16be")
-    assert_raise(ArgumentError, "#{encdump s1} << #{encdump s2}") {
+    assert_raise(EncodingCompatibilityError, "#{encdump s1} << #{encdump s2}") {
       s1 << s2
     }
   end
@@ -272,7 +272,7 @@ EOT
       s.gsub(Regexp.new(".".encode("utf-16be")), "xy")
     }
     s = "ab\0\ncd".force_encoding("utf-16be")
-    assert_raise(ArgumentError) {
+    assert_raise(EncodingCompatibilityError) {
       s.gsub(Regexp.new(".".encode("utf-16be")), "xy")
     }
   end