diff options
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/test_json.rb | 10 | ||||
| -rwxr-xr-x | tests/test_json_generate.rb | 22 | ||||
| -rwxr-xr-x | tests/test_json_rails.rb | 2 |
3 files changed, 24 insertions, 10 deletions
diff --git a/tests/test_json.rb b/tests/test_json.rb index 5307609..5d71d61 100755 --- a/tests/test_json.rb +++ b/tests/test_json.rb @@ -222,27 +222,27 @@ EOT def test_backslash data = [ '\\.(?i:gif|jpe?g|png)$' ] json = '["\\\\.(?i:gif|jpe?g|png)$"]' - assert_equal json, JSON.unparse(data) + assert_equal json, JSON.generate(data) assert_equal data, JSON.parse(json) # data = [ '\\"' ] json = '["\\\\\""]' - assert_equal json, JSON.unparse(data) + assert_equal json, JSON.generate(data) assert_equal data, JSON.parse(json) # json = '["/"]' data = JSON.parse(json) assert_equal ['/'], data - assert_equal json, JSON.unparse(data) + assert_equal json, JSON.generate(data) # json = '["\""]' data = JSON.parse(json) assert_equal ['"'], data - assert_equal json, JSON.unparse(data) + assert_equal json, JSON.generate(data) json = '["\\\'"]' data = JSON.parse(json) assert_equal ["'"], data - assert_equal '["\'"]', JSON.unparse(data) + assert_equal '["\'"]', JSON.generate(data) end def test_wrong_inputs diff --git a/tests/test_json_generate.rb b/tests/test_json_generate.rb index ae3ce0e..e725e6f 100755 --- a/tests/test_json_generate.rb +++ b/tests/test_json_generate.rb @@ -44,8 +44,8 @@ class TC_JSONGenerate < Test::Unit::TestCase EOT end - def test_unparse - json = unparse(@hash) + def test_generate + json = generate(@hash) assert_equal(JSON.parse(@json2), JSON.parse(json)) parsed_json = parse(json) assert_equal(@hash, parsed_json) @@ -53,10 +53,11 @@ EOT assert_equal('{"1":2}', json) parsed_json = parse(json) assert_equal({"1"=>2}, parsed_json) + assert_raise(GeneratorError) { generate(666) } end - def test_unparse_pretty - json = pretty_unparse(@hash) + def test_generate_pretty + json = pretty_generate(@hash) assert_equal(JSON.parse(@json3), JSON.parse(json)) parsed_json = parse(json) assert_equal(@hash, parsed_json) @@ -68,6 +69,19 @@ EOT EOT parsed_json = parse(json) assert_equal({"1"=>2}, parsed_json) + assert_raise(GeneratorError) { pretty_generate(666) } + end + + def test_fast_generate + json = fast_generate(@hash) + assert_equal(JSON.parse(@json2), JSON.parse(json)) + parsed_json = parse(json) + assert_equal(@hash, parsed_json) + json = fast_generate({1=>2}) + assert_equal('{"1":2}', json) + parsed_json = parse(json) + assert_equal({"1"=>2}, parsed_json) + assert_raise(GeneratorError) { fast_generate(666) } end def test_states diff --git a/tests/test_json_rails.rb b/tests/test_json_rails.rb index 341d332..d33402d 100755 --- a/tests/test_json_rails.rb +++ b/tests/test_json_rails.rb @@ -141,6 +141,6 @@ EOT end def test_symbol - assert_equal '"foo"', JSON(:foo) # we don't want an object here + assert_equal '"foo"', :foo.to_json # we don't want an object here end end |