aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazuki Yamaguchi <k@rhe.jp>2016-04-13 19:16:39 +0900
committerKazuki Yamaguchi <k@rhe.jp>2016-04-21 00:46:34 +0900
commited67a78b01b626fcfe313106ebe2df3951b7c59c (patch)
treed7123c02a4f2f5c05faf32bed6ee803c6cda953b
parent6df1ef03b203bab6d25103629958340a4440f753 (diff)
downloadruby-ed67a78b01b626fcfe313106ebe2df3951b7c59c.tar.gz
test/openssl/test_engine: use assert_separately
-rw-r--r--test/openssl/test_engine.rb94
1 files changed, 57 insertions, 37 deletions
diff --git a/test/openssl/test_engine.rb b/test/openssl/test_engine.rb
index d4945b1160..1e081b7959 100644
--- a/test/openssl/test_engine.rb
+++ b/test/openssl/test_engine.rb
@@ -4,7 +4,7 @@ require_relative 'utils'
class OpenSSL::TestEngine < Test::Unit::TestCase
def test_engines_free # [ruby-dev:44173]
- assert_separately(["-ropenssl"], <<-'end;')
+ with_openssl <<-'end;'
OpenSSL::Engine.load("openssl")
OpenSSL::Engine.engines
OpenSSL::Engine.engines
@@ -12,7 +12,7 @@ class OpenSSL::TestEngine < Test::Unit::TestCase
end
def test_openssl_engine_builtin
- assert_separately(["-ropenssl"], <<-'end;')
+ with_openssl <<-'end;'
engine = OpenSSL::Engine.load("openssl")
assert_equal(true, engine)
assert_equal(1, OpenSSL::Engine.engines.size)
@@ -20,56 +20,76 @@ class OpenSSL::TestEngine < Test::Unit::TestCase
end
def test_openssl_engine_by_id_string
- engine = get_engine
- assert_not_nil(engine)
- assert_equal(1, OpenSSL::Engine.engines.size)
+ with_openssl <<-'end;'
+ engine = get_engine
+ assert_not_nil(engine)
+ assert_equal(1, OpenSSL::Engine.engines.size)
+ end;
end
def test_openssl_engine_id_name_inspect
- engine = get_engine
- assert_equal("openssl", engine.id)
- assert_not_nil(engine.name)
- assert_not_nil(engine.inspect)
+ with_openssl <<-'end;'
+ engine = get_engine
+ assert_equal("openssl", engine.id)
+ assert_not_nil(engine.name)
+ assert_not_nil(engine.inspect)
+ end;
end
def test_openssl_engine_digest_sha1
- engine = get_engine
- digest = engine.digest("SHA1")
- assert_not_nil(digest)
- data = "test"
- assert_equal(OpenSSL::Digest::SHA1.digest(data), digest.digest(data))
+ with_openssl <<-'end;'
+ engine = get_engine
+ digest = engine.digest("SHA1")
+ assert_not_nil(digest)
+ data = "test"
+ assert_equal(OpenSSL::Digest::SHA1.digest(data), digest.digest(data))
+ end;
end
def test_openssl_engine_cipher_rc4
- engine = get_engine
- algo = "RC4" #AES is not supported by openssl Engine (<=1.0.0e)
- data = "a" * 1000
- key = OpenSSL::Random.random_bytes(16)
- # suppress message from openssl Engine's RC4 cipher [ruby-core:41026]
- err_back = $stderr.dup
- $stderr.reopen(IO::NULL)
- encrypted = crypt_data(data, key, :encrypt) { engine.cipher(algo) }
- decrypted = crypt_data(encrypted, key, :decrypt) { OpenSSL::Cipher.new(algo) }
- assert_equal(data, decrypted)
- ensure
- if err_back
- $stderr.reopen(err_back)
- err_back.close
- end
+ with_openssl <<-'end;'
+ begin
+ engine = get_engine
+ algo = "RC4" #AES is not supported by openssl Engine (<=1.0.0e)
+ data = "a" * 1000
+ key = OpenSSL::Random.random_bytes(16)
+ # suppress message from openssl Engine's RC4 cipher [ruby-core:41026]
+ err_back = $stderr.dup
+ $stderr.reopen(IO::NULL)
+ encrypted = crypt_data(data, key, :encrypt) { engine.cipher(algo) }
+ decrypted = crypt_data(encrypted, key, :decrypt) { OpenSSL::Cipher.new(algo) }
+ assert_equal(data, decrypted)
+ ensure
+ if err_back
+ $stderr.reopen(err_back)
+ err_back.close
+ end
+ end
+ end;
end
private
- def get_engine
- OpenSSL::Engine.by_id("openssl")
+ # this is required because OpenSSL::Engine methods change global state
+ def with_openssl(code)
+ assert_separately(["-ropenssl"], <<~"end;")
+ require #{__FILE__.dump}
+ include OpenSSL::TestEngine::Utils
+ #{code}
+ end;
end
- def crypt_data(data, key, mode)
- cipher = yield
- cipher.send mode
- cipher.key = key
- cipher.update(data) + cipher.final
+ module Utils
+ def get_engine
+ OpenSSL::Engine.by_id("openssl")
+ end
+
+ def crypt_data(data, key, mode)
+ cipher = yield
+ cipher.send mode
+ cipher.key = key
+ cipher.update(data) + cipher.final
+ end
end
end if defined?(OpenSSL::TestUtils)
-