summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/json/json_addition_test.rb5
-rw-r--r--test/json/json_common_interface_test.rb2
-rw-r--r--test/json/json_encoding_test.rb42
-rw-r--r--test/json/json_ext_parser_test.rb2
-rw-r--r--test/json/json_fixtures_test.rb2
-rwxr-xr-xtest/json/json_generator_test.rb6
-rw-r--r--test/json/json_generic_object_test.rb2
-rw-r--r--test/json/json_parser_test.rb6
-rw-r--r--test/json/json_string_matching_test.rb2
-rw-r--r--test/json/ractor_test.rb2
10 files changed, 35 insertions, 36 deletions
diff --git a/test/json/json_addition_test.rb b/test/json/json_addition_test.rb
index 3a7a58176a..8c3fbda56a 100644
--- a/test/json/json_addition_test.rb
+++ b/test/json/json_addition_test.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
require_relative 'test_helper'
require 'json/add/core'
require 'json/add/complex'
@@ -114,8 +114,7 @@ class JSONAdditionTest < Test::Unit::TestCase
end
def test_raw_strings
- raw = ''
- raw.respond_to?(:encode!) and raw.encode!(Encoding::ASCII_8BIT)
+ raw = ''.b
raw_array = []
for i in 0..255
raw << i
diff --git a/test/json/json_common_interface_test.rb b/test/json/json_common_interface_test.rb
index 045e72e020..e552412bfd 100644
--- a/test/json/json_common_interface_test.rb
+++ b/test/json/json_common_interface_test.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
require_relative 'test_helper'
require 'stringio'
require 'tempfile'
diff --git a/test/json/json_encoding_test.rb b/test/json/json_encoding_test.rb
index fba9ee2855..afffd8976a 100644
--- a/test/json/json_encoding_test.rb
+++ b/test/json/json_encoding_test.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
require_relative 'test_helper'
class JSONEncodingTest < Test::Unit::TestCase
@@ -26,8 +26,8 @@ class JSONEncodingTest < Test::Unit::TestCase
end
def test_generate
- assert_equal @generated, JSON.generate(@parsed, :ascii_only => true)
- assert_equal @generated, JSON.generate(@utf_16_data, :ascii_only => true)
+ assert_equal @generated, JSON.generate(@parsed, ascii_only: true)
+ assert_equal @generated, JSON.generate(@utf_16_data, ascii_only: true)
end
def test_unicode
@@ -39,35 +39,35 @@ class JSONEncodingTest < Test::Unit::TestCase
assert_equal "\"#{0x7f.chr}\"", 0x7f.chr.to_json
utf8 = [ "© ≠ €! \01" ]
json = '["© ≠ €! \u0001"]'
- assert_equal json, utf8.to_json(:ascii_only => false)
+ assert_equal json, utf8.to_json(ascii_only: false)
assert_equal utf8, parse(json)
json = '["\u00a9 \u2260 \u20ac! \u0001"]'
- assert_equal json, utf8.to_json(:ascii_only => true)
+ assert_equal json, utf8.to_json(ascii_only: true)
assert_equal utf8, parse(json)
utf8 = ["\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212"]
json = "[\"\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212\"]"
assert_equal utf8, parse(json)
- assert_equal json, utf8.to_json(:ascii_only => false)
+ assert_equal json, utf8.to_json(ascii_only: false)
utf8 = ["\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212"]
assert_equal utf8, parse(json)
json = "[\"\\u3042\\u3044\\u3046\\u3048\\u304a\"]"
- assert_equal json, utf8.to_json(:ascii_only => true)
+ assert_equal json, utf8.to_json(ascii_only: true)
assert_equal utf8, parse(json)
utf8 = ['საქართველო']
json = '["საქართველო"]'
- assert_equal json, utf8.to_json(:ascii_only => false)
+ assert_equal json, utf8.to_json(ascii_only: false)
json = "[\"\\u10e1\\u10d0\\u10e5\\u10d0\\u10e0\\u10d7\\u10d5\\u10d4\\u10da\\u10dd\"]"
- assert_equal json, utf8.to_json(:ascii_only => true)
+ assert_equal json, utf8.to_json(ascii_only: true)
assert_equal utf8, parse(json)
- assert_equal '["Ã"]', generate(["Ã"], :ascii_only => false)
- assert_equal '["\\u00c3"]', generate(["Ã"], :ascii_only => true)
+ assert_equal '["Ã"]', generate(["Ã"], ascii_only: false)
+ assert_equal '["\\u00c3"]', generate(["Ã"], ascii_only: true)
assert_equal ["€"], parse('["\u20ac"]')
utf8 = ["\xf0\xa0\x80\x81"]
json = "[\"\xf0\xa0\x80\x81\"]"
- assert_equal json, generate(utf8, :ascii_only => false)
+ assert_equal json, generate(utf8, ascii_only: false)
assert_equal utf8, parse(json)
json = '["\ud840\udc01"]'
- assert_equal json, generate(utf8, :ascii_only => true)
+ assert_equal json, generate(utf8, ascii_only: true)
assert_equal utf8, parse(json)
assert_raise(JSON::ParserError) { parse('"\u"') }
assert_raise(JSON::ParserError) { parse('"\ud800"') }
@@ -75,21 +75,21 @@ class JSONEncodingTest < Test::Unit::TestCase
def test_chars
(0..0x7f).each do |i|
- json = '["\u%04x"]' % i
+ json = '"\u%04x"' % i
i = i.chr
- assert_equal i, parse(json).first[0]
+ assert_equal i, parse(json)[0]
if i == ?\b
- generated = generate(["" << i])
- assert '["\b"]' == generated || '["\10"]' == generated
+ generated = generate(i)
+ assert '"\b"' == generated || '"\10"' == generated
elsif [?\n, ?\r, ?\t, ?\f].include?(i)
- assert_equal '[' << ('' << i).dump << ']', generate(["" << i])
+ assert_equal i.dump, generate(i)
elsif i.chr < 0x20.chr
- assert_equal json, generate(["" << i])
+ assert_equal json, generate(i)
end
end
assert_raise(JSON::GeneratorError) do
- generate(["\x80"], :ascii_only => true)
+ generate(["\x80"], ascii_only: true)
end
- assert_equal "\302\200", parse('["\u0080"]').first
+ assert_equal "\302\200", parse('"\u0080"')
end
end
diff --git a/test/json/json_ext_parser_test.rb b/test/json/json_ext_parser_test.rb
index f49f88b596..ff6598f490 100644
--- a/test/json/json_ext_parser_test.rb
+++ b/test/json/json_ext_parser_test.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
require_relative 'test_helper'
class JSONExtParserTest < Test::Unit::TestCase
diff --git a/test/json/json_fixtures_test.rb b/test/json/json_fixtures_test.rb
index acc8749965..adcdffbb5e 100644
--- a/test/json/json_fixtures_test.rb
+++ b/test/json/json_fixtures_test.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
require_relative 'test_helper'
class JSONFixturesTest < Test::Unit::TestCase
diff --git a/test/json/json_generator_test.rb b/test/json/json_generator_test.rb
index 37b28ab7b5..667baa03a9 100755
--- a/test/json/json_generator_test.rb
+++ b/test/json/json_generator_test.rb
@@ -1,5 +1,5 @@
#!/usr/bin/env ruby
-# frozen_string_literal: false
+# frozen_string_literal: true
require_relative 'test_helper'
@@ -304,12 +304,12 @@ EOT
state.configure(:indent => '1')
assert_equal '1', state.indent
state = JSON.state.new
- foo = 'foo'
+ foo = 'foo'.dup
assert_raise(TypeError) do
state.configure(foo)
end
def foo.to_h
- { :indent => '2' }
+ { indent: '2' }
end
state.configure(foo)
assert_equal '2', state.indent
diff --git a/test/json/json_generic_object_test.rb b/test/json/json_generic_object_test.rb
index d6d7e30816..c14f5713b0 100644
--- a/test/json/json_generic_object_test.rb
+++ b/test/json/json_generic_object_test.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
require_relative 'test_helper'
class JSONGenericObjectTest < Test::Unit::TestCase
diff --git a/test/json/json_parser_test.rb b/test/json/json_parser_test.rb
index e04b0c93a5..7197522def 100644
--- a/test/json/json_parser_test.rb
+++ b/test/json/json_parser_test.rb
@@ -1,5 +1,4 @@
-# encoding: utf-8
-# frozen_string_literal: false
+# frozen_string_literal: true
require_relative 'test_helper'
require 'stringio'
require 'tempfile'
@@ -36,7 +35,8 @@ class JSONParserTest < Test::Unit::TestCase
pend if RUBY_ENGINE == 'truffleruby'
bug10705 = '[ruby-core:67386] [Bug #10705]'
- json = ".\"\xE2\x88\x9A\"".force_encoding(Encoding::UTF_8)
+ json = ".\"\xE2\x88\x9A\""
+ assert_equal(Encoding::UTF_8, json.encoding)
e = assert_raise(JSON::ParserError) {
JSON::Ext::Parser.new(json).parse
}
diff --git a/test/json/json_string_matching_test.rb b/test/json/json_string_matching_test.rb
index b9cf904aaa..21cd649025 100644
--- a/test/json/json_string_matching_test.rb
+++ b/test/json/json_string_matching_test.rb
@@ -1,4 +1,4 @@
-#frozen_string_literal: false
+# frozen_string_literal: true
require_relative 'test_helper'
require 'time'
diff --git a/test/json/ractor_test.rb b/test/json/ractor_test.rb
index 36196ed23d..e0116400f8 100644
--- a/test/json/ractor_test.rb
+++ b/test/json/ractor_test.rb
@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
require_relative 'test_helper'
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-20 02:21:12 +0000