aboutsummaryrefslogtreecommitdiffstats
path: root/test/json/test_json_addition.rb
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-07 16:00:49 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-05-07 16:00:49 +0000
commit5a00be2bf75939fd3bb05dabbdf46244eaa6bb43 (patch)
tree7a4e8c43342493d270ea16116506295751621c85 /test/json/test_json_addition.rb
parent5f7be3150f0bffb6a958770c61270302123774c3 (diff)
downloadruby-5a00be2bf75939fd3bb05dabbdf46244eaa6bb43.tar.gz
* ext/json: Merge JSON 1.7.1.
https://github.com/flori/json/commit/e5b9a9465c1159fae533bca320d950b772bcb4ac git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/json/test_json_addition.rb')
-rwxr-xr-xtest/json/test_json_addition.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/json/test_json_addition.rb b/test/json/test_json_addition.rb
index e262e25953..cf808668b8 100755
--- a/test/json/test_json_addition.rb
+++ b/test/json/test_json_addition.rb
@@ -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