summaryrefslogtreecommitdiff
path: root/test/json/json_encoding_test.rb
diff options
context:
space:
mode:
authorÉtienne Barrié <[email protected]>2024-10-21 12:01:44 +0200
committerHiroshi SHIBATA <[email protected]>2024-10-26 18:44:15 +0900
commit11348c583f228ef76ed95d8c468fbe13616826c6 (patch)
treefe36161e2ef169bbeb714ca494742d0ff771593e /test/json/json_encoding_test.rb
parenta052d961034d72fcccaa92ba356c9d43f3154502 (diff)
Use Encoding constants, String#b
Co-authored-by: Jean Boussier <[email protected]>
Diffstat (limited to 'test/json/json_encoding_test.rb')
-rw-r--r--test/json/json_encoding_test.rb21
1 files changed, 6 insertions, 15 deletions
diff --git a/test/json/json_encoding_test.rb b/test/json/json_encoding_test.rb
index be87f3c3d6..fba9ee2855 100644
--- a/test/json/json_encoding_test.rb
+++ b/test/json/json_encoding_test.rb
@@ -6,23 +6,14 @@ class JSONEncodingTest < Test::Unit::TestCase
def setup
@utf_8 = '"© ≠ €!"'
- @ascii_8bit = @utf_8.dup.force_encoding('ascii-8bit')
+ @ascii_8bit = @utf_8.b
@parsed = "© ≠ €!"
@generated = '"\u00a9 \u2260 \u20ac!"'
- if String.method_defined?(:encode)
- @utf_16_data = @parsed.encode('utf-16be', 'utf-8')
- @utf_16be = @utf_8.encode('utf-16be', 'utf-8')
- @utf_16le = @utf_8.encode('utf-16le', 'utf-8')
- @utf_32be = @utf_8.encode('utf-32be', 'utf-8')
- @utf_32le = @utf_8.encode('utf-32le', 'utf-8')
- else
- require 'iconv'
- @utf_16_data, = Iconv.iconv('utf-16be', 'utf-8', @parsed)
- @utf_16be, = Iconv.iconv('utf-16be', 'utf-8', @utf_8)
- @utf_16le, = Iconv.iconv('utf-16le', 'utf-8', @utf_8)
- @utf_32be, = Iconv.iconv('utf-32be', 'utf-8', @utf_8)
- @utf_32le, = Iconv.iconv('utf-32le', 'utf-8', @utf_8)
- end
+ @utf_16_data = @parsed.encode(Encoding::UTF_16BE, Encoding::UTF_8)
+ @utf_16be = @utf_8.encode(Encoding::UTF_16BE, Encoding::UTF_8)
+ @utf_16le = @utf_8.encode(Encoding::UTF_16LE, Encoding::UTF_8)
+ @utf_32be = @utf_8.encode(Encoding::UTF_32BE, Encoding::UTF_8)
+ @utf_32le = @utf_8.encode(Encoding::UTF_32LE, Encoding::UTF_8)
end
def test_parse