From 510f6dc7d0c6e78463796bdb90a90a486e4a2042 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 30 Aug 2011 02:25:32 +0000 Subject: merge revision(s) 33122: * ext/json: Merge json gem 1.5.4+ (2149f4185c598fb97db1). [Bug #5173] [ruby-core:38866] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33123 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/json/test_json.rb | 36 ++++++++++++++++++++++++++++++++++++ test/json/test_json_addition.rb | 5 +++++ test/json/test_json_generate.rb | 35 ++++++++++++++++++++++++++++++++++- 3 files changed, 75 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/json/test_json.rb b/test/json/test_json.rb index b367e906b9..eafd758bf7 100755 --- a/test/json/test_json.rb +++ b/test/json/test_json.rb @@ -104,6 +104,42 @@ class TC_JSON < Test::Unit::TestCase assert_equal({ "a" => 0.23 }, parse(' { "a" : 0.23 } ')) end + def test_parse_json_primitive_values + assert_raise(JSON::ParserError) { JSON.parse('') } + assert_raise(JSON::ParserError) { JSON.parse('', :quirks_mode => true) } + assert_raise(JSON::ParserError) { JSON.parse(' /* foo */ ') } + assert_raise(JSON::ParserError) { JSON.parse(' /* foo */ ', :quirks_mode => true) } + parser = JSON::Parser.new('null') + assert_equal false, parser.quirks_mode? + assert_raise(JSON::ParserError) { parser.parse } + assert_raise(JSON::ParserError) { JSON.parse('null') } + assert_equal nil, JSON.parse('null', :quirks_mode => true) + parser = JSON::Parser.new('null', :quirks_mode => true) + assert_equal true, parser.quirks_mode? + assert_equal nil, parser.parse + assert_raise(JSON::ParserError) { JSON.parse('false') } + assert_equal false, JSON.parse('false', :quirks_mode => true) + assert_raise(JSON::ParserError) { JSON.parse('true') } + assert_equal true, JSON.parse('true', :quirks_mode => true) + assert_raise(JSON::ParserError) { JSON.parse('23') } + assert_equal 23, JSON.parse('23', :quirks_mode => true) + assert_raise(JSON::ParserError) { JSON.parse('1') } + assert_equal 1, JSON.parse('1', :quirks_mode => true) + assert_raise(JSON::ParserError) { JSON.parse('3.141') } + assert_in_delta 3.141, JSON.parse('3.141', :quirks_mode => true), 1E-3 + assert_raise(JSON::ParserError) { JSON.parse('18446744073709551616') } + assert_equal 2 ** 64, JSON.parse('18446744073709551616', :quirks_mode => true) + assert_raise(JSON::ParserError) { JSON.parse('"foo"') } + assert_equal 'foo', JSON.parse('"foo"', :quirks_mode => true) + assert_raise(JSON::ParserError) { JSON.parse('NaN', :allow_nan => true) } + assert JSON.parse('NaN', :quirks_mode => true, :allow_nan => true).nan? + assert_raise(JSON::ParserError) { JSON.parse('Infinity', :allow_nan => true) } + assert JSON.parse('Infinity', :quirks_mode => true, :allow_nan => true).infinite? + assert_raise(JSON::ParserError) { JSON.parse('-Infinity', :allow_nan => true) } + assert JSON.parse('-Infinity', :quirks_mode => true, :allow_nan => true).infinite? + assert_raise(JSON::ParserError) { JSON.parse('[ 1, ]', :quirks_mode => true) } + end + if Array.method_defined?(:permutation) def test_parse_more_complex_arrays a = [ nil, false, true, "foßbar", [ "n€st€d", true ], { "nested" => true, "n€ßt€ð2" => {} }] diff --git a/test/json/test_json_addition.rb b/test/json/test_json_addition.rb index a8181e8d74..f28f228c22 100755 --- a/test/json/test_json_addition.rb +++ b/test/json/test_json_addition.rb @@ -164,4 +164,9 @@ class TC_JSONAddition < Test::Unit::TestCase d = DateTime.civil(2008, 6, 17, 11, 48, 32, Rational(12,24)) assert_equal d, JSON.parse(d.to_json) end + + def test_rational_complex + assert_equal Rational(2, 9), JSON(JSON(Rational(2, 9))) + assert_equal Complex(2, 9), JSON(JSON(Complex(2, 9))) + end end diff --git a/test/json/test_json_generate.rb b/test/json/test_json_generate.rb index 9b0cff4b07..da96603d61 100755 --- a/test/json/test_json_generate.rb +++ b/test/json/test_json_generate.rb @@ -50,6 +50,7 @@ EOT parsed_json = parse(json) assert_equal({"1"=>2}, parsed_json) assert_raise(GeneratorError) { generate(666) } + assert_equal '666', generate(666, :quirks_mode => true) end def test_generate_pretty @@ -67,6 +68,7 @@ EOT parsed_json = parse(json) assert_equal({"1"=>2}, parsed_json) assert_raise(GeneratorError) { pretty_generate(666) } + assert_equal '666', pretty_generate(666, :quirks_mode => true) end def test_fast_generate @@ -79,9 +81,24 @@ EOT parsed_json = parse(json) assert_equal({"1"=>2}, parsed_json) assert_raise(GeneratorError) { fast_generate(666) } + assert_equal '666', fast_generate(666, :quirks_mode => true) end - + def test_own_state + state = State.new + json = generate(@hash, state) + assert_equal(JSON.parse(@json2), JSON.parse(json)) + parsed_json = parse(json) + assert_equal(@hash, parsed_json) + json = generate({1=>2}, state) + assert_equal('{"1":2}', json) + parsed_json = parse(json) + assert_equal({"1"=>2}, parsed_json) + assert_raise(GeneratorError) { generate(666, state) } + state.quirks_mode = true + assert state.quirks_mode? + assert_equal '666', generate(666, state) + end def test_states json = generate({1=>2}, nil) @@ -107,6 +124,7 @@ EOT :allow_nan => false, :array_nl => "\n", :ascii_only => false, + :quirks_mode => false, :depth => 0, :indent => " ", :max_nesting => 19, @@ -122,6 +140,7 @@ EOT :allow_nan => false, :array_nl => "", :ascii_only => false, + :quirks_mode => false, :depth => 0, :indent => "", :max_nesting => 19, @@ -137,6 +156,7 @@ EOT :allow_nan => false, :array_nl => "", :ascii_only => false, + :quirks_mode => false, :depth => 0, :indent => "", :max_nesting => 0, @@ -177,4 +197,17 @@ EOT assert_raises(JSON::NestingError) { ary.to_json(s) } assert_equal 19, s.depth end + + def test_gc + bignum_too_long_to_embed_as_string = 1234567890123456789012345 + expect = bignum_too_long_to_embed_as_string.to_s + stress, GC.stress = GC.stress, true + + 10.times do |i| + tmp = bignum_too_long_to_embed_as_string.to_json + assert_equal expect, tmp + end + ensure + GC.stress = stress + end if GC.respond_to?(:stress=) end -- cgit v1.2.3