1 files changed, 99 insertions, 3 deletions

diff --git a/test/json/json_coder_test.rb b/test/json/json_coder_test.rb
index 9861181910..47e12ff919 100755
--- a/test/json/json_coder_test.rb
+++ b/test/json/json_coder_test.rb
@@ -12,12 +12,28 @@ class JSONCoderTest < Test::Unit::TestCase
   end
 
   def test_json_coder_with_proc_with_unsupported_value
-    coder = JSON::Coder.new do |object|
+    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
@@ -37,17 +53,97 @@ class JSONCoderTest < Test::Unit::TestCase
   end
 
   def test_json_coder_dump_NaN_or_Infinity
-    coder = JSON::Coder.new(&:inspect)
+    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(&:itself)
+    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_depth
+    coder = JSON::Coder.new(object_nl: "\n", array_nl: "\n", space: " ", indent: "  ", depth: 1)
+    assert_equal %({\n    "foo": 42\n  }), coder.dump(foo: 42)
+  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