diff options
author | Erik Michaels-Ober <sferik@gmail.com> | 2012-10-05 09:11:36 -0700 |
---|---|---|
committer | Erik Michaels-Ober <sferik@gmail.com> | 2012-10-05 09:11:51 -0700 |
commit | 9f43acbaff619d813b5a96b7e303b4876dbdf9b9 (patch) | |
tree | 4bfbbf8dc3e2f14efe8fda5e41c2f44e59dd4429 /tests | |
parent | 01a5165bee5c8cf199e37b3ccc90f1f824d41783 (diff) | |
download | json-9f43acbaff619d813b5a96b7e303b4876dbdf9b9.tar.gz |
Increase default max_nesting to 100
See discussion at https://github.com/intridea/multi_json/pull/59.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/fixtures/fail18.json | 2 | ||||
-rwxr-xr-x | tests/test_json.rb | 22 | ||||
-rwxr-xr-x | tests/test_json_generate.rb | 6 |
3 files changed, 15 insertions, 15 deletions
diff --git a/tests/fixtures/fail18.json b/tests/fixtures/fail18.json index e2d130c..ebc11eb 100644 --- a/tests/fixtures/fail18.json +++ b/tests/fixtures/fail18.json @@ -1 +1 @@ -[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]] +[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]] diff --git a/tests/test_json.rb b/tests/test_json.rb index 22cd5ee..5ebe5ec 100755 --- a/tests/test_json.rb +++ b/tests/test_json.rb @@ -446,12 +446,12 @@ EOT assert_raises(JSON::NestingError) { JSON.parse '[[]]', :max_nesting => 1 } assert_raises(JSON::NestingError) { JSON.parser.new('[[]]', :max_nesting => 1).parse } assert_equal [[]], JSON.parse('[[]]', :max_nesting => 2) - too_deep = '[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]' + too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["Too deep"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]' too_deep_ary = eval too_deep assert_raises(JSON::NestingError) { JSON.parse too_deep } assert_raises(JSON::NestingError) { JSON.parser.new(too_deep).parse } - assert_raises(JSON::NestingError) { JSON.parse too_deep, :max_nesting => 19 } - ok = JSON.parse too_deep, :max_nesting => 20 + assert_raises(JSON::NestingError) { JSON.parse too_deep, :max_nesting => 100 } + ok = JSON.parse too_deep, :max_nesting => 101 assert_equal too_deep_ary, ok ok = JSON.parse too_deep, :max_nesting => nil assert_equal too_deep_ary, ok @@ -462,8 +462,8 @@ EOT assert_raises(JSON::NestingError) { JSON.generate [[]], :max_nesting => 1 } assert_equal '[[]]', JSON.generate([[]], :max_nesting => 2) assert_raises(JSON::NestingError) { JSON.generate too_deep_ary } - assert_raises(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 19 } - ok = JSON.generate too_deep_ary, :max_nesting => 20 + assert_raises(JSON::NestingError) { JSON.generate too_deep_ary, :max_nesting => 100 } + ok = JSON.generate too_deep_ary, :max_nesting => 101 assert_equal too_deep, ok ok = JSON.generate too_deep_ary, :max_nesting => nil assert_equal too_deep, ok @@ -494,18 +494,18 @@ EOT end def test_dump - too_deep = '[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]' + too_deep = '[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]' assert_equal too_deep, JSON.dump(eval(too_deep)) assert_kind_of String, Marshal.dump(eval(too_deep)) - assert_raises(ArgumentError) { JSON.dump(eval(too_deep), 19) } - assert_raises(ArgumentError) { Marshal.dump(eval(too_deep), 19) } - assert_equal too_deep, JSON.dump(eval(too_deep), 20) - assert_kind_of String, Marshal.dump(eval(too_deep), 20) + assert_raises(ArgumentError) { JSON.dump(eval(too_deep), 100) } + assert_raises(ArgumentError) { Marshal.dump(eval(too_deep), 100) } + assert_equal too_deep, JSON.dump(eval(too_deep), 101) + assert_kind_of String, Marshal.dump(eval(too_deep), 101) output = StringIO.new JSON.dump(eval(too_deep), output) assert_equal too_deep, output.string output = StringIO.new - JSON.dump(eval(too_deep), output, 20) + JSON.dump(eval(too_deep), output, 101) assert_equal too_deep, output.string end diff --git a/tests/test_json_generate.rb b/tests/test_json_generate.rb index 1c7ae34..a7975bf 100755 --- a/tests/test_json_generate.rb +++ b/tests/test_json_generate.rb @@ -130,7 +130,7 @@ EOT :quirks_mode => false, :depth => 0, :indent => " ", - :max_nesting => 19, + :max_nesting => 100, :object_nl => "\n", :space => " ", :space_before => "", @@ -147,7 +147,7 @@ EOT :quirks_mode => false, :depth => 0, :indent => "", - :max_nesting => 19, + :max_nesting => 100, :object_nl => "", :space => "", :space_before => "", @@ -200,7 +200,7 @@ EOT s = JSON.state.new assert_equal 0, s.depth assert_raises(JSON::NestingError) { ary.to_json(s) } - assert_equal 19, s.depth + assert_equal 100, s.depth end def test_buffer_initial_length |