mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/json: Merge JSON 1.7.1.
e5b9a9465c
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
5f7be3150f
commit
5a00be2bf7
18 changed files with 79 additions and 43 deletions
|
@ -10,7 +10,7 @@ require 'json/add/bigdecimal'
|
|||
require 'json/add/ostruct'
|
||||
require 'date'
|
||||
|
||||
class TC_JSONAddition < Test::Unit::TestCase
|
||||
class TestJSONAddition < Test::Unit::TestCase
|
||||
include JSON
|
||||
|
||||
class A
|
||||
|
@ -64,7 +64,7 @@ class TC_JSONAddition < Test::Unit::TestCase
|
|||
|
||||
def to_json(*args)
|
||||
{
|
||||
'json_class' => 'TC_JSONAddition::Nix',
|
||||
'json_class' => 'TestJSONAddition::Nix',
|
||||
}.to_json(*args)
|
||||
end
|
||||
end
|
||||
|
@ -88,7 +88,7 @@ class TC_JSONAddition < Test::Unit::TestCase
|
|||
a_hash = JSON.parse(json, :create_additions => false)
|
||||
assert_kind_of Hash, a_hash
|
||||
assert_equal(
|
||||
{"args"=>[666], "json_class"=>"TC_JSONAddition::A"}.sort_by { |k,| k },
|
||||
{"args"=>[666], "json_class"=>"TestJSONAddition::A"}.sort_by { |k,| k },
|
||||
a_hash.sort_by { |k,| k }
|
||||
)
|
||||
end
|
||||
|
@ -97,7 +97,7 @@ class TC_JSONAddition < Test::Unit::TestCase
|
|||
b = B.new
|
||||
assert !B.json_creatable?
|
||||
json = generate(b)
|
||||
assert_equal({ "json_class"=>"TC_JSONAddition::B" }, JSON.parse(json))
|
||||
assert_equal({ "json_class"=>"TestJSONAddition::B" }, JSON.parse(json))
|
||||
end
|
||||
|
||||
def test_extended_json_fail2
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue