diff options
author | tenderlove <tenderlove@ruby-lang.org> | 2010-12-15 19:50:00 +0000 |
---|---|---|
committer | tenderlove <tenderlove@ruby-lang.org> | 2010-12-15 19:50:00 +0000 |
commit | c16f35576fd02127d5b98f209bae72df4bf94682 (patch) | |
tree | eebacc9d8424bf1c9744fd61417453dc36b999e2 | |
parent | 2f56bbffad4a2411ff4491d34099e47f8a622cc1 (diff) | |
download | ruby-openssl-history-c16f35576fd02127d5b98f209bae72df4bf94682.tar.gz |
drying up the requires in the openssl tests
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30220 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | test/test_bn.rb | 1 | ||||
-rw-r--r-- | test/test_config.rb | 5 | ||||
-rw-r--r-- | test/test_digest.rb | 7 | ||||
-rw-r--r-- | test/test_ec.rb | 7 | ||||
-rw-r--r-- | test/test_hmac.rb | 6 | ||||
-rw-r--r-- | test/test_ns_spki.rb | 11 | ||||
-rw-r--r-- | test/test_ocsp.rb | 7 | ||||
-rw-r--r-- | test/test_pkcs7.rb | 7 | ||||
-rw-r--r-- | test/test_pkey_rsa.rb | 7 | ||||
-rw-r--r-- | test/test_ssl.rb | 10 | ||||
-rw-r--r-- | test/test_x509cert.rb | 7 | ||||
-rw-r--r-- | test/test_x509crl.rb | 7 | ||||
-rw-r--r-- | test/test_x509ext.rb | 7 | ||||
-rw-r--r-- | test/test_x509name.rb | 6 | ||||
-rw-r--r-- | test/test_x509req.rb | 7 | ||||
-rw-r--r-- | test/test_x509store.rb | 7 | ||||
-rw-r--r-- | test/utils.rb | 5 |
17 files changed, 20 insertions, 94 deletions
diff --git a/test/test_bn.rb b/test/test_bn.rb index 98348d6..769b7ed 100644 --- a/test/test_bn.rb +++ b/test/test_bn.rb @@ -1,5 +1,4 @@ require_relative 'utils' -require "digest/md5" if defined?(OpenSSL) diff --git a/test/test_config.rb b/test/test_config.rb index 3c21fb1..1239e50 100644 --- a/test/test_config.rb +++ b/test/test_config.rb @@ -1,7 +1,4 @@ -require 'openssl' -require "test/unit" -require 'tempfile' -require File.join(File.dirname(__FILE__), "utils.rb") +require_relative 'utils' class OpenSSL::TestConfig < Test::Unit::TestCase def setup diff --git a/test/test_digest.rb b/test/test_digest.rb index 8941588..e9b4ad1 100644 --- a/test/test_digest.rb +++ b/test/test_digest.rb @@ -1,9 +1,4 @@ -begin - require "openssl" -rescue LoadError -end -require "digest/md5" -require "test/unit" +require_relative 'utils' if defined?(OpenSSL) diff --git a/test/test_ec.rb b/test/test_ec.rb index 39f5577..f80c3d4 100644 --- a/test/test_ec.rb +++ b/test/test_ec.rb @@ -1,9 +1,4 @@ -begin - require "openssl" - require File.join(File.dirname(__FILE__), "utils.rb") -rescue LoadError -end -require "test/unit" +require_relative 'utils' if defined?(OpenSSL::PKey::EC) diff --git a/test/test_hmac.rb b/test/test_hmac.rb index 23a3ce4..ba158d2 100644 --- a/test/test_hmac.rb +++ b/test/test_hmac.rb @@ -1,8 +1,4 @@ -begin - require "openssl" -rescue LoadError -end -require "test/unit" +require_relative 'utils' class OpenSSL::TestHMAC < Test::Unit::TestCase def setup diff --git a/test/test_ns_spki.rb b/test/test_ns_spki.rb index 14895ed..3bcf3e6 100644 --- a/test/test_ns_spki.rb +++ b/test/test_ns_spki.rb @@ -1,13 +1,7 @@ -begin - require "openssl" - require_relative 'utils' -rescue LoadError -end -require "test/unit" +require_relative 'utils' if defined?(OpenSSL) - class OpenSSL::TestNSSPI < Test::Unit::TestCase def setup # This request data is adopt from the specification of @@ -20,9 +14,6 @@ class OpenSSL::TestNSSPI < Test::Unit::TestCase @b64 << "i0//rgBvmco=" end - def teardown - end - def test_build_data key1 = OpenSSL::TestUtils::TEST_KEY_RSA1024 key2 = OpenSSL::TestUtils::TEST_KEY_RSA2048 diff --git a/test/test_ocsp.rb b/test/test_ocsp.rb index 98e1ebb..19c37e4 100644 --- a/test/test_ocsp.rb +++ b/test/test_ocsp.rb @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative "utils" -rescue LoadError -end -require "test/unit" +require_relative "utils" if defined?(OpenSSL) diff --git a/test/test_pkcs7.rb b/test/test_pkcs7.rb index fa71b9e..34c523a 100644 --- a/test/test_pkcs7.rb +++ b/test/test_pkcs7.rb @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative 'utils' -rescue LoadError -end -require "test/unit" +require_relative 'utils' if defined?(OpenSSL) diff --git a/test/test_pkey_rsa.rb b/test/test_pkey_rsa.rb index 401cb6c..c9c5f3d 100644 --- a/test/test_pkey_rsa.rb +++ b/test/test_pkey_rsa.rb @@ -1,9 +1,4 @@ -begin - require "openssl" - require File.join(File.dirname(__FILE__), "utils.rb") -rescue LoadError -end -require 'test/unit' +require_relative 'utils' if defined?(OpenSSL) diff --git a/test/test_ssl.rb b/test/test_ssl.rb index c8e42f4..d83dd42 100644 --- a/test/test_ssl.rb +++ b/test/test_ssl.rb @@ -1,12 +1,4 @@ -begin - require "openssl" - require_relative "utils.rb" -rescue LoadError -end -require "rbconfig" -require "socket" -require "test/unit" -require_relative '../ruby/envutil' +require_relative "utils" if defined?(OpenSSL) diff --git a/test/test_x509cert.rb b/test/test_x509cert.rb index 48bab17..8b88ad4 100644 --- a/test/test_x509cert.rb +++ b/test/test_x509cert.rb @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative "utils" -rescue LoadError -end -require "test/unit" +require_relative "utils" if defined?(OpenSSL) diff --git a/test/test_x509crl.rb b/test/test_x509crl.rb index 61a8de5..c0c996e 100644 --- a/test/test_x509crl.rb +++ b/test/test_x509crl.rb @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative "utils" -rescue LoadError -end -require "test/unit" +require_relative "utils" if defined?(OpenSSL) diff --git a/test/test_x509ext.rb b/test/test_x509ext.rb index d43bbd6..89b45c7 100644 --- a/test/test_x509ext.rb +++ b/test/test_x509ext.rb @@ -1,9 +1,4 @@ -begin - require "openssl" - require File.join(File.dirname(__FILE__), "utils.rb") -rescue LoadError -end -require "test/unit" +require_relative 'utils' if defined?(OpenSSL) diff --git a/test/test_x509name.rb b/test/test_x509name.rb index 951c36c..ef99252 100644 --- a/test/test_x509name.rb +++ b/test/test_x509name.rb @@ -1,8 +1,4 @@ -begin - require "openssl" -rescue LoadError -end -require "test/unit" +require_relative 'utils' if defined?(OpenSSL) diff --git a/test/test_x509req.rb b/test/test_x509req.rb index f53408f..0ea7cab 100644 --- a/test/test_x509req.rb +++ b/test/test_x509req.rb @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative "utils" -rescue LoadError -end -require "test/unit" +require_relative "utils" if defined?(OpenSSL) diff --git a/test/test_x509store.rb b/test/test_x509store.rb index 81fa0b0..0a93207 100644 --- a/test/test_x509store.rb +++ b/test/test_x509store.rb @@ -1,9 +1,4 @@ -begin - require "openssl" - require_relative "utils" -rescue LoadError -end -require "test/unit" +require_relative "utils" if defined?(OpenSSL) diff --git a/test/utils.rb b/test/utils.rb index 92c6c55..0b2115b 100644 --- a/test/utils.rb +++ b/test/utils.rb @@ -3,6 +3,11 @@ begin rescue LoadError end require "test/unit" +require "digest/md5" +require 'tempfile' +require "rbconfig" +require "socket" +require_relative '../ruby/envutil' module OpenSSL::TestUtils TEST_KEY_RSA1024 = OpenSSL::PKey::RSA.new <<-_end_of_pem_ |