1 files changed, 7 insertions, 41 deletions
diff --git a/test/ruby/test_encoding.rb b/test/ruby/test_encoding.rb
index 2965c0bc7b..8f73a8fce1 100644
--- a/test/ruby/test_encoding.rb
+++ b/test/ruby/test_encoding.rb
@@ -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
 
@@ -56,36 +59,11 @@ class TestEncoding < Test::Unit::TestCase
   end
 
   def test_replicate
-    assert_separately([], "#{<<~'END;'}")
-    assert_instance_of(Encoding, Encoding::UTF_8.replicate("UTF-8-ANOTHER#{Time.now.to_f}"))
-    assert_instance_of(Encoding, Encoding::ISO_2022_JP.replicate("ISO-2022-JP-ANOTHER#{Time.now.to_f}"))
+    assert_instance_of(Encoding, Encoding::UTF_8.replicate('UTF-8-ANOTHER'))
+    assert_instance_of(Encoding, Encoding::ISO_2022_JP.replicate('ISO-2022-JP-ANOTHER'))
     bug3127 = '[ruby-dev:40954]'
     assert_raise(TypeError, bug3127) {Encoding::UTF_8.replicate(0)}
-    assert_raise_with_message(ArgumentError, /\bNUL\b/, bug3127) {Encoding::UTF_8.replicate("\0")}
-    END;
-  end
-
-  def test_extra_encoding
-    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}")
-    begin;
-      200.times {|i|
-        Encoding::UTF_8.replicate("dummy#{i}")
-      }
-      e = Encoding.list.last
-      format = "%d".force_encoding(e)
-      assert_equal("0", format % 0)
-      assert_equal(e, format.dup.encoding)
-      assert_equal(e, (format*1).encoding)
-
-      assert_equal(e, (("x"*30).force_encoding(e)*1).encoding)
-      GC.start
-
-      name = "A" * 64
-      Encoding.list.each do |enc|
-        assert_raise(ArgumentError) {enc.replicate(name)}
-        name.succ!
-      end
-    end;
+    assert_raise(ArgumentError, bug3127) {Encoding::UTF_8.replicate("\0")}
   end
 
   def test_dummy_p
@@ -142,21 +120,9 @@ class TestEncoding < Test::Unit::TestCase
     assert_separately(%w[--disable=gems], "#{<<~"begin;"}\n#{<<~'end;'}")
     bug9038 = '[ruby-core:57949] [Bug #9038]'
     begin;
-      e = assert_raise_with_message(SyntaxError, /unknown regexp option - Q/, bug9038) {
+      assert_raise_with_message(SyntaxError, /unknown regexp option - Q/, bug9038) {
         eval("/regexp/sQ")
       }
-      assert_include(e.message, "/regexp/sQ\n")
-    end;
-  end
-
-  def test_nonascii_library_path
-    assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}".force_encoding("US-ASCII"))
-    begin;
-      assert_equal(Encoding::US_ASCII, __ENCODING__)
-      $:.unshift("/\x80")
-      assert_raise_with_message(LoadError, /\[Bug #16382\]/) do
-        $:.resolve_feature_path "[Bug #16382]"
-      end
     end;
   end
 end