1 files changed, 21 insertions, 9 deletions
diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb
index ef2dc39c4d..8f73a8fce1 100644
--- a/test/ruby/test_encoding.rb
+++ b/test/ruby/test_encoding.rb
@@ -1,5 +1,5 @@
+# frozen_string_literal: false
 require 'test/unit'
-require_relative 'envutil'
 
 class TestEncoding < Test::Unit::TestCase
 
@@ -22,7 +22,7 @@ class TestEncoding < Test::Unit::TestCase
     aliases.each do |a, en|
       e = Encoding.find(a)
       assert_equal(e.name, en)
-      assert(e.names.include?(a))
+      assert_include(e.names, a)
     end
   end
 
@@ -34,6 +34,9 @@ class TestEncoding < Test::Unit::TestCase
       assert_raise(TypeError) { e.dup }
       assert_raise(TypeError) { e.clone }
       assert_equal(e.object_id, Marshal.load(Marshal.dump(e)).object_id)
+      assert_not_predicate(e, :tainted?)
+      Marshal.load(Marshal.dump(e).taint)
+      assert_not_predicate(e, :tainted?, '[ruby-core:71793] [Bug #11760]')
     end
   end
 
@@ -85,8 +88,8 @@ class TestEncoding < Test::Unit::TestCase
   def test_aliases
     assert_instance_of(Hash, Encoding.aliases)
     Encoding.aliases.each do |k, v|
-      assert(Encoding.name_list.include?(k))
-      assert(Encoding.name_list.include?(v))
+      assert_include(Encoding.name_list, k)
+      assert_include(Encoding.name_list, v)
       assert_instance_of(String, k)
       assert_instance_of(String, v)
     end
@@ -100,11 +103,6 @@ class TestEncoding < Test::Unit::TestCase
     assert_equal(str, str2, '[ruby-dev:38596]')
   end
 
-  def test_unsafe
-    bug5279 = '[ruby-dev:44469]'
-    assert_ruby_status([], '$SAFE=4; "a".encode("utf-16be")', bug5279)
-  end
-
   def test_compatible_p
     ua = "abc".force_encoding(Encoding::UTF_8)
     assert_equal(Encoding::UTF_8, Encoding.compatible?(ua, :abc))
@@ -112,5 +110,19 @@ class TestEncoding < Test::Unit::TestCase
     bin = "a".force_encoding(Encoding::ASCII_8BIT)
     asc = "b".force_encoding(Encoding::US_ASCII)
     assert_equal(Encoding::ASCII_8BIT, Encoding.compatible?(bin, asc))
+    bin = "\xff".force_encoding(Encoding::ASCII_8BIT).to_sym
+    asc = "b".force_encoding(Encoding::ASCII_8BIT)
+    assert_equal(Encoding::ASCII_8BIT, Encoding.compatible?(bin, asc))
+    assert_equal(Encoding::UTF_8, Encoding.compatible?("\u{3042}".to_sym, ua.to_sym))
+  end
+
+  def test_errinfo_after_autoload
+    assert_separately(%w[--disable=gems], "#{<<~"begin;"}\n#{<<~'end;'}")
+    bug9038 = '[ruby-core:57949] [Bug #9038]'
+    begin;
+      assert_raise_with_message(SyntaxError, /unknown regexp option - Q/, bug9038) {
+        eval("/regexp/sQ")
+      }
+    end;
   end
 end