* test/ruby/test_method.rb (TestMethod#test_{instance,define}_method): assumed

  default external is UTF-8.  fixed failures introduced at r51175.

* test/-ext-/symbol/test_type.rb
  (Test_Symbol::TestType#test_check_{id,symbol}_invalid_type): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51189 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 24 insertions, 16 deletions

diff --git a/test/-ext-/symbol/test_type.rb b/test/-ext-/symbol/test_type.rb
index 3c21e61a18..ddd79561ab 100644
--- a/test/-ext-/symbol/test_type.rb
+++ b/test/-ext-/symbol/test_type.rb
@@ -122,17 +122,21 @@ module Test_Symbol
     end
 
     def test_check_id_invalid_type
-      cx = EnvUtil.labeled_class("X\u{1f431}")
-      assert_raise_with_message(TypeError, /X\u{1F431}/) {
-        Bug::Symbol.pinneddown?(cx)
-      }
+      EnvUtil.with_default_external(Encoding::UTF_8) do
+        cx = EnvUtil.labeled_class("X\u{1f431}")
+        assert_raise_with_message(TypeError, /X\u{1F431}/) {
+          Bug::Symbol.pinneddown?(cx)
+        }
+      end
     end
 
     def test_check_symbol_invalid_type
-      cx = EnvUtil.labeled_class("X\u{1f431}")
-      assert_raise_with_message(TypeError, /X\u{1F431}/) {
-        Bug::Symbol.find(cx)
-      }
+      EnvUtil.with_default_external(Encoding::UTF_8) do
+        cx = EnvUtil.labeled_class("X\u{1f431}")
+        assert_raise_with_message(TypeError, /X\u{1F431}/) {
+          Bug::Symbol.find(cx)
+        }
+      end
     end
   end
 end
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index ac92729f0a..b7b140d9a0 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -251,10 +251,12 @@ class TestMethod < Test::Unit::TestCase
     m = o.method(:bar).unbind
     assert_raise(TypeError) { m.bind(Object.new) }
 
-    cx = EnvUtil.labeled_class("X\u{1f431}")
-    assert_raise_with_message(TypeError, /X\u{1f431}/) {
-      o.method(cx)
-    }
+    EnvUtil.with_default_external(Encoding::UTF_8) do
+      cx = EnvUtil.labeled_class("X\u{1f431}")
+      assert_raise_with_message(TypeError, /X\u{1f431}/) {
+        o.method(cx)
+      }
+    end
   end
 
   def test_bind_module_instance_method
@@ -283,10 +285,12 @@ class TestMethod < Test::Unit::TestCase
     assert_raise(TypeError) do
       Class.new.class_eval { define_method(:bar, o.method(:bar)) }
     end
-    cx = EnvUtil.labeled_class("X\u{1f431}")
-    assert_raise_with_message(TypeError, /X\u{1F431}/) {
-      Class.new {define_method(cx) {}}
-    }
+    EnvUtil.with_default_external(Encoding::UTF_8) do
+      cx = EnvUtil.labeled_class("X\u{1f431}")
+      assert_raise_with_message(TypeError, /X\u{1F431}/) {
+        Class.new {define_method(cx) {}}
+      }
+    end
   end
 
   def test_define_method_no_proc