Update json tests for 2.16.0

Author: headius

test/mri/json/fixtures/fail4.json

@@ -12,7 +12,7 @@
         "real": -9876.543210,
         "e": 0.123456789e-12,
         "E": 1.234567890E+34,
-        "":  23456789012E666,
+        "":  23456789012E66,
         "zero": 0,
         "one": 1,
         "space": " ",

test/mri/json/fixtures/fail9.json

@@ -44,10 +44,6 @@ def to_json(*args)
   end
 
   class B
-    def self.json_creatable?
-      false
-    end
-
     def to_json(*args)
       {
         'json_class'  => self.class.name,
@@ -56,10 +52,6 @@ def to_json(*args)
   end
 
   class C
-    def self.json_creatable?
-      false
-    end
-
     def to_json(*args)
       {
         'json_class'  => 'JSONAdditionTest::Nix',
@@ -69,7 +61,6 @@ def to_json(*args)
 
   def test_extended_json
     a = A.new(666)
-    assert A.json_creatable?
     json = generate(a)
     a_again = parse(json, :create_additions => true)
     assert_kind_of a.class, a_again
@@ -78,15 +69,14 @@ def test_extended_json
 
   def test_extended_json_default
     a = A.new(666)
-    assert A.json_creatable?
+    assert A.respond_to?(:json_create)
     json = generate(a)
     a_hash = parse(json)
     assert_kind_of Hash, a_hash
   end
 
   def test_extended_json_disabled
     a = A.new(666)
-    assert A.json_creatable?
     json = generate(a)
     a_again = parse(json, :create_additions => true)
     assert_kind_of a.class, a_again
@@ -101,14 +91,12 @@ def test_extended_json_disabled
 
   def test_extended_json_fail1
     b = B.new
-    assert !B.json_creatable?
     json = generate(b)
     assert_equal({ "json_class"=>"JSONAdditionTest::B" }, parse(json))
   end
 
   def test_extended_json_fail2
     c = C.new
-    assert !C.json_creatable?
     json = generate(c)
     assert_raise(ArgumentError, NameError) { parse(json, :create_additions => true) }
   end

test/mri/json/fixtures/pass1.json

@@ -0,0 +1,144 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative 'test_helper'
+
+class JSONCoderTest < Test::Unit::TestCase
+  def test_json_coder_with_proc
+    coder = JSON::Coder.new do |object|
+      "[Object object]"
+    end
+    assert_equal %(["[Object object]"]), coder.dump([Object.new])
+  end
+
+  def test_json_coder_with_proc_with_unsupported_value
+    coder = JSON::Coder.new do |object, is_key|
+      assert_equal false, is_key
+      Object.new
+    end
+    assert_raise(JSON::GeneratorError) { coder.dump([Object.new]) }
+  end
+
+  def test_json_coder_hash_key
+    obj = Object.new
+    coder = JSON::Coder.new do |obj, is_key|
+      assert_equal true, is_key
+      obj.to_s
+    end
+    assert_equal %({#{obj.to_s.inspect}:1}), coder.dump({ obj => 1 })
+
+    coder = JSON::Coder.new { 42 }
+    error = assert_raise JSON::GeneratorError do
+      coder.dump({ obj => 1 })
+    end
+    assert_equal "Integer not allowed as object key in JSON", error.message
+  end
+
+  def test_json_coder_options
+    coder = JSON::Coder.new(array_nl: "\n") do |object|
+      42
+    end
+
+    assert_equal "[\n42\n]", coder.dump([Object.new])
+  end
+
+  def test_json_coder_load
+    coder = JSON::Coder.new
+    assert_equal [1,2,3], coder.load("[1,2,3]")
+  end
+
+  def test_json_coder_load_options
+    coder = JSON::Coder.new(symbolize_names: true)
+    assert_equal({a: 1}, coder.load('{"a":1}'))
+  end
+
+  def test_json_coder_dump_NaN_or_Infinity
+    coder = JSON::Coder.new { |o| o.inspect }
+    assert_equal "NaN", coder.load(coder.dump(Float::NAN))
+    assert_equal "Infinity", coder.load(coder.dump(Float::INFINITY))
+    assert_equal "-Infinity", coder.load(coder.dump(-Float::INFINITY))
+  end
+
+  def test_json_coder_dump_NaN_or_Infinity_loop
+    coder = JSON::Coder.new { |o| o.itself }
+    error = assert_raise JSON::GeneratorError do
+      coder.dump(Float::NAN)
+    end
+    assert_include error.message, "NaN not allowed in JSON"
+  end
+
+  def test_json_coder_string_invalid_encoding
+    calls = 0
+    coder = JSON::Coder.new do |object, is_key|
+      calls += 1
+      object
+    end
+
+    error = assert_raise JSON::GeneratorError do
+      coder.dump("\xFF")
+    end
+    assert_equal "source sequence is illegal/malformed utf-8", error.message
+    assert_equal 1, calls
+
+    error = assert_raise JSON::GeneratorError do
+      coder.dump({ "\xFF" => 1 })
+    end
+    assert_equal "source sequence is illegal/malformed utf-8", error.message
+    assert_equal 2, calls
+
+    calls = 0
+    coder = JSON::Coder.new do |object, is_key|
+      calls += 1
+      object.dup
+    end
+
+    error = assert_raise JSON::GeneratorError do
+      coder.dump("\xFF")
+    end
+    assert_equal "source sequence is illegal/malformed utf-8", error.message
+    assert_equal 1, calls
+
+    error = assert_raise JSON::GeneratorError do
+      coder.dump({ "\xFF" => 1 })
+    end
+    assert_equal "source sequence is illegal/malformed utf-8", error.message
+    assert_equal 2, calls
+
+    calls = 0
+    coder = JSON::Coder.new do |object, is_key|
+      calls += 1
+      object.bytes
+    end
+
+    assert_equal "[255]", coder.dump("\xFF")
+    assert_equal 1, calls
+
+    error = assert_raise JSON::GeneratorError do
+      coder.dump({ "\xFF" => 1 })
+    end
+    assert_equal "Array not allowed as object key in JSON", error.message
+    assert_equal 2, calls
+
+    calls = 0
+    coder = JSON::Coder.new do |object, is_key|
+      calls += 1
+      [object].pack("m")
+    end
+
+    assert_equal '"/w==\\n"', coder.dump("\xFF")
+    assert_equal 1, calls
+
+    assert_equal '{"/w==\\n":1}', coder.dump({ "\xFF" => 1 })
+    assert_equal 2, calls
+  end
+
+  def test_nesting_recovery
+    coder = JSON::Coder.new
+    ary = []
+    ary << ary
+    assert_raise JSON::NestingError do
+      coder.dump(ary)
+    end
+    assert_equal '{"a":1}', coder.dump({ a: 1 })
+  end
+end

test/mri/json/json_addition_test.rb

@@ -68,11 +68,6 @@ def test_create_id
     JSON.create_id = 'json_class'
   end
 
-  def test_deep_const_get
-    assert_raise(ArgumentError) { JSON.deep_const_get('Nix::Da') }
-    assert_equal File::SEPARATOR, JSON.deep_const_get('File::SEPARATOR')
-  end
-
   def test_parse
     assert_equal [ 1, 2, 3, ], JSON.parse('[ 1, 2, 3 ]')
   end
@@ -91,6 +86,30 @@ def test_fast_generate
 
   def test_pretty_generate
     assert_equal "[\n  1,\n  2,\n  3\n]", JSON.pretty_generate([ 1, 2, 3 ])
+    assert_equal <<~JSON.strip, JSON.pretty_generate({ a: { b: "f"}, c: "d"})
+      {
+        "a": {
+          "b": "f"
+        },
+        "c": "d"
+      }
+    JSON
+
+    # Cause the state to be spilled on the heap.
+    o = Object.new
+    def o.to_s
+      "Object"
+    end
+    actual = JSON.pretty_generate({ a: { b: o}, c: "d", e: "f"})
+    assert_equal <<~JSON.strip, actual
+      {
+        "a": {
+          "b": "Object"
+        },
+        "c": "d",
+        "e": "f"
+      }
+    JSON
   end
 
   def test_load
@@ -110,7 +129,7 @@ def test_load
 
   def test_load_with_proc
     visited = []
-    JSON.load('{"foo": [1, 2, 3], "bar": {"baz": "plop"}}', proc { |o| visited << JSON.dump(o) })
+    JSON.load('{"foo": [1, 2, 3], "bar": {"baz": "plop"}}', proc { |o| visited << JSON.dump(o); o })
 
     expected = [
       '"foo"',
@@ -138,6 +157,87 @@ def test_load_null
     assert_raise(JSON::ParserError) { JSON.load('', nil, :allow_blank => false) }
   end
 
+  def test_unsafe_load
+    string_able_klass = Class.new do
+      def initialize(str)
+        @str = str
+      end
+
+      def to_str
+        @str
+      end
+    end
+
+    io_able_klass = Class.new do
+      def initialize(str)
+        @str = str
+      end
+
+      def to_io
+        StringIO.new(@str)
+      end
+    end
+
+    assert_equal @hash, JSON.unsafe_load(@json)
+    tempfile = Tempfile.open('@json')
+    tempfile.write @json
+    tempfile.rewind
+    assert_equal @hash, JSON.unsafe_load(tempfile)
+    stringio = StringIO.new(@json)
+    stringio.rewind
+    assert_equal @hash, JSON.unsafe_load(stringio)
+    string_able = string_able_klass.new(@json)
+    assert_equal @hash, JSON.unsafe_load(string_able)
+    io_able = io_able_klass.new(@json)
+    assert_equal @hash, JSON.unsafe_load(io_able)
+    assert_equal nil, JSON.unsafe_load(nil)
+    assert_equal nil, JSON.unsafe_load('')
+  ensure
+    tempfile.close!
+  end
+
+  def test_unsafe_load_with_proc
+    visited = []
+    JSON.unsafe_load('{"foo": [1, 2, 3], "bar": {"baz": "plop"}}', proc { |o| visited << JSON.dump(o); o })
+
+    expected = [
+      '"foo"',
+      '1',
+      '2',
+      '3',
+      '[1,2,3]',
+      '"bar"',
+      '"baz"',
+      '"plop"',
+      '{"baz":"plop"}',
+      '{"foo":[1,2,3],"bar":{"baz":"plop"}}',
+    ]
+    assert_equal expected, visited
+  end
+
+  def test_unsafe_load_default_options
+    too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
+    assert JSON.unsafe_load(too_deep, nil).is_a?(Array)
+    nan_json = '{ "foo": NaN }'
+    assert JSON.unsafe_load(nan_json, nil)['foo'].nan?
+    assert_equal nil, JSON.unsafe_load(nil, nil)
+    t = Time.new(2025, 9, 3, 14, 50, 0)
+    assert_equal t.to_s, JSON.unsafe_load(JSON(t)).to_s
+  end
+
+  def test_unsafe_load_with_options
+    nan_json = '{ "foo": NaN }'
+    assert_raise(JSON::ParserError) { JSON.unsafe_load(nan_json, nil, :allow_nan => false)['foo'].nan? }
+    # make sure it still uses the defaults when something is provided
+    assert JSON.unsafe_load(nan_json, nil, :allow_blank => true)['foo'].nan?
+  end
+
+  def test_unsafe_load_null
+    assert_equal nil, JSON.unsafe_load(nil, nil, :allow_blank => true)
+    assert_raise(TypeError) { JSON.unsafe_load(nil, nil, :allow_blank => false) }
+    assert_raise(JSON::ParserError) { JSON.unsafe_load('', nil, :allow_blank => false) }
+  end
+
   def test_dump
     too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]'
     obj = eval(too_deep)
@@ -174,9 +274,9 @@ def test_dump_in_io
   end
 
   def test_dump_should_modify_defaults
-    max_nesting = JSON.dump_default_options[:max_nesting]
+    max_nesting = JSON._dump_default_options[:max_nesting]
     dump([], StringIO.new, 10)
-    assert_equal max_nesting, JSON.dump_default_options[:max_nesting]
+    assert_equal max_nesting, JSON._dump_default_options[:max_nesting]
   end
 
   def test_JSON
@@ -211,6 +311,12 @@ def test_load_file_with_bad_default_external_encoding
     end
   end
 
+  def test_deprecated_dump_default_options
+    assert_deprecated_warning(/dump_default_options/) do
+      JSON.dump_default_options
+    end
+  end
+
   private
 
   def with_external_encoding(encoding)