summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-13 13:27:08 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-07-13 13:27:08 +0000
commitbdda54c064672c1381708d8d1f1b40c2203ff171 (patch)
tree7d22b79a558c45a5deda7a0d4d0fbe38224000ab
parent158f1e5b895439adeecfa97aff14fbd6af42cc2c (diff)
* test/json/json_common_interface_test.rb: use assert_raise instead of
assert_raises. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55669 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--test/json/json_common_interface_test.rb6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a5254845f74..fb4b59d5f76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 13 22:23:03 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
+
+ * test/json/json_common_interface_test.rb: use assert_raise instead of
+ assert_raises.
+
Wed Jul 13 22:14:23 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* test/lib/test/unit.rb: added test files with `_test` suffix for json
diff --git a/test/json/json_common_interface_test.rb b/test/json/json_common_interface_test.rb
index b2051d4c501..29b4a5b5694 100644
--- a/test/json/json_common_interface_test.rb
+++ b/test/json/json_common_interface_test.rb
@@ -47,7 +47,7 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
end
def test_deep_const_get
- assert_raises(ArgumentError) { JSON.deep_const_get('Nix::Da') }
+ assert_raise(ArgumentError) { JSON.deep_const_get('Nix::Da') }
assert_equal File::SEPARATOR, JSON.deep_const_get('File::SEPARATOR')
end
@@ -93,8 +93,8 @@ class JSONCommonInterfaceTest < Test::Unit::TestCase
def test_load_null
assert_equal nil, JSON.load(nil, nil, :allow_blank => true)
- assert_raises(TypeError) { JSON.load(nil, nil, :allow_blank => false) }
- assert_raises(JSON::ParserError) { JSON.load('', nil, :allow_blank => false) }
+ assert_raise(TypeError) { JSON.load(nil, nil, :allow_blank => false) }
+ assert_raise(JSON::ParserError) { JSON.load('', nil, :allow_blank => false) }
end
def test_dump