Assume Encoding is defined

Author: byroot

test/json/json_generator_test.rb

@@ -479,9 +479,7 @@ def test_string_ext_included_calls_super
     end
   end
 
-  if defined?(Encoding)
-    def test_nonutf8_encoding
-      assert_equal("\"5\u{b0}\"", "5\xb0".force_encoding("iso-8859-1").to_json)
-    end
+  def test_nonutf8_encoding
+    assert_equal("\"5\u{b0}\"", "5\xb0".force_encoding("iso-8859-1").to_json)
   end
 end

test/json/json_parser_test.rb

@@ -24,13 +24,13 @@ def test_argument_encoding
     source = "{}".encode("UTF-16")
     JSON::Parser.new(source)
     assert_equal Encoding::UTF_16, source.encoding
-  end if defined?(Encoding::UTF_16)
+  end
 
   def test_argument_encoding_for_binary
     source = "{}".encode("ASCII-8BIT")
     JSON::Parser.new(source)
     assert_equal Encoding::ASCII_8BIT, source.encoding
-  end if defined?(Encoding::ASCII_8BIT)
+  end
 
   def test_error_message_encoding
     pend if RUBY_ENGINE == 'truffleruby'
@@ -42,7 +42,7 @@ def test_error_message_encoding
     }
     assert_equal(Encoding::UTF_8, e.message.encoding, bug10705)
     assert_include(e.message, json, bug10705)
-  end if defined?(Encoding::UTF_8) and defined?(JSON::Ext::Parser)
+  end if defined?(JSON::Ext::Parser)
 
   def test_parsing
     parser = JSON::Parser.new('"test"')