summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-22 07:29:01 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-04-22 07:29:01 +0000
commitd86d283fcb35d1442a121b92030884523908a331 (patch)
tree3fe1d1269b2c0d438835ed889fd8b342bdb5ba4c /test
parent4138651b667ef434533b8a85c75edfc7d1b5b184 (diff)
merge revision(s) 58323,58324:
Merge json-2.0.4. * https://github.com/flori/json/releases/tag/v2.0.4 * https://github.com/flori/json/blob/09fabeb03e73ed88dc8ce8f19d76ac59e51dae20/CHANGES.md#2017-03-23-204 Use `assert_raise` instead of `assert_raises`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@58445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r--test/json/json_encoding_test.rb2
-rw-r--r--[-rwxr-xr-x]test/json/json_generator_test.rb0
2 files changed, 2 insertions, 0 deletions
diff --git a/test/json/json_encoding_test.rb b/test/json/json_encoding_test.rb
index 29ae02e563..cc7b71553a 100644
--- a/test/json/json_encoding_test.rb
+++ b/test/json/json_encoding_test.rb
@@ -79,6 +79,8 @@ class JSONEncodingTest < Test::Unit::TestCase
json = '["\ud840\udc01"]'
assert_equal json, generate(utf8, :ascii_only => true)
assert_equal utf8, parse(json)
+ assert_raise(JSON::ParserError) { parse('"\u"') }
+ assert_raise(JSON::ParserError) { parse('"\ud800"') }
end
def test_chars
diff --git a/test/json/json_generator_test.rb b/test/json/json_generator_test.rb
index 86be398f46..86be398f46 100755..100644
--- a/test/json/json_generator_test.rb
+++ b/test/json/json_generator_test.rb