diff options
| author | Jean Boussier <[email protected]> | 2024-10-17 19:12:58 +0200 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2024-10-18 11:30:55 +0900 |
| commit | 8feed977a06aba59d16af48a409ea0b802468c8a (patch) | |
| tree | c89772f280ca5df34bccc4615565c65bf59dea0a /test | |
| parent | 20dc1e5c255da87afb3829fa015142f23ee56b57 (diff) | |
[ruby/json] Assume Encoding is defined
https://github.com/ruby/json/commit/8713aa4812
Diffstat (limited to 'test')
| -rwxr-xr-x | test/json/json_generator_test.rb | 6 | ||||
| -rw-r--r-- | test/json/json_parser_test.rb | 6 |
2 files changed, 5 insertions, 7 deletions
diff --git a/test/json/json_generator_test.rb b/test/json/json_generator_test.rb index 2436fa0627..d14966f8d0 100755 --- a/test/json/json_generator_test.rb +++ b/test/json/json_generator_test.rb @@ -479,9 +479,7 @@ EOT 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 diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb index d76281e6bc..27cc0f5d45 100644 --- a/test/json/json_parser_test.rb +++ b/test/json/json_parser_test.rb @@ -24,13 +24,13 @@ class JSONParserTest < Test::Unit::TestCase 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 @@ class JSONParserTest < Test::Unit::TestCase } 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"') |