aboutsummaryrefslogtreecommitdiffstats
path: root/test/openssl
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-02 02:18:44 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-02 02:18:44 +0000
commitbfb7e27fe2b73e054d0382990ceef7189de71d28 (patch)
tree6b64fce04b19a8e1531f60a7d3d47c8a9fc97a20 /test/openssl
parent130a077f74031a16430ec8b20955b9e57f75397c (diff)
downloadruby-bfb7e27fe2b73e054d0382990ceef7189de71d28.tar.gz
use assert_raise
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl')
-rw-r--r--test/openssl/test_asn1.rb2
-rw-r--r--test/openssl/test_buffering.rb2
-rw-r--r--test/openssl/test_digest.rb2
-rw-r--r--test/openssl/test_pkcs12.rb6
-rw-r--r--test/openssl/test_pkey_dh.rb2
5 files changed, 7 insertions, 7 deletions
diff --git a/test/openssl/test_asn1.rb b/test/openssl/test_asn1.rb
index 9fb5a551c6..8955d72716 100644
--- a/test/openssl/test_asn1.rb
+++ b/test/openssl/test_asn1.rb
@@ -552,7 +552,7 @@ rEzBQ0F9dUyqQ9gyRg8KHhDfv9HzT1d/rnUZMkoombwYBRIUChGCYV0GnJcan2Zm
end
def test_primitive_inf_length
- assert_raises(OpenSSL::ASN1::ASN1Error) do
+ assert_raise(OpenSSL::ASN1::ASN1Error) do
spec = %w{ 02 80 02 01 01 00 00 }
raw = [spec.join('')].pack('H*')
OpenSSL::ASN1.decode(raw)
diff --git a/test/openssl/test_buffering.rb b/test/openssl/test_buffering.rb
index c62dd4d1dd..0ca645998e 100644
--- a/test/openssl/test_buffering.rb
+++ b/test/openssl/test_buffering.rb
@@ -61,7 +61,7 @@ class OpenSSL::TestBuffering < Test::Unit::TestCase
raise SystemCallError, 'fail'
end
- assert_raises SystemCallError do
+ assert_raise SystemCallError do
@io.flush
end
diff --git a/test/openssl/test_digest.rb b/test/openssl/test_digest.rb
index a23b2ef0a2..5390225f36 100644
--- a/test/openssl/test_digest.rb
+++ b/test/openssl/test_digest.rb
@@ -106,7 +106,7 @@ class OpenSSL::TestDigest < Test::Unit::TestCase
def test_openssl_digest
assert_equal OpenSSL::Digest::MD5, OpenSSL::Digest("MD5")
- assert_raises NameError do
+ assert_raise NameError do
OpenSSL::Digest("no such digest")
end
end
diff --git a/test/openssl/test_pkcs12.rb b/test/openssl/test_pkcs12.rb
index 4e37904169..c44cee00ed 100644
--- a/test/openssl/test_pkcs12.rb
+++ b/test/openssl/test_pkcs12.rb
@@ -113,7 +113,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
end
def test_create_with_bad_nid
- assert_raises(ArgumentError) do
+ assert_raise(ArgumentError) do
OpenSSL::PKCS12.create(
"omg",
"hello",
@@ -137,7 +137,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
2048
)
- assert_raises(TypeError) do
+ assert_raise(TypeError) do
OpenSSL::PKCS12.create(
"omg",
"hello",
@@ -164,7 +164,7 @@ Li8JsX5yIiuVYaBg/6ha3tOg4TCa5K/3r3tVliRZ2Es=
2048
)
- assert_raises(TypeError) do
+ assert_raise(TypeError) do
OpenSSL::PKCS12.create(
"omg",
"hello",
diff --git a/test/openssl/test_pkey_dh.rb b/test/openssl/test_pkey_dh.rb
index 67dd3e7db3..8bf981661b 100644
--- a/test/openssl/test_pkey_dh.rb
+++ b/test/openssl/test_pkey_dh.rb
@@ -13,7 +13,7 @@ class OpenSSL::TestPKeyDH < Test::Unit::TestCase
def test_new_break
assert_nil(OpenSSL::PKey::DH.new(NEW_KEYLEN) { break })
- assert_raises(RuntimeError) do
+ assert_raise(RuntimeError) do
OpenSSL::PKey::DH.new(NEW_KEYLEN) { raise }
end
end