From e1e671d60dd5015993220b64593e0ee3f87addae Mon Sep 17 00:00:00 2001
From: tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 11 Dec 2010 01:25:25 +0000
Subject: refactor load error rescue to the openssl util file

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30176 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/openssl/test_asn1.rb   | 7 +------
 test/openssl/test_bn.rb     | 6 +-----
 test/openssl/test_cipher.rb | 6 +-----
 test/openssl/test_pair.rb   | 6 +-----
 test/openssl/utils.rb       | 7 +++++--
 5 files changed, 9 insertions(+), 23 deletions(-)

(limited to 'test/openssl')

diff --git a/test/openssl/test_asn1.rb b/test/openssl/test_asn1.rb
index 9486e09a13..f88d6d3fcb 100644
--- a/test/openssl/test_asn1.rb
+++ b/test/openssl/test_asn1.rb
@@ -1,9 +1,4 @@
-begin
-  require "openssl"
-  require_relative 'utils'
-rescue LoadError
-end
-require 'test/unit'
+require_relative 'utils'
 
 class  OpenSSL::TestASN1 < Test::Unit::TestCase
   def test_decode
diff --git a/test/openssl/test_bn.rb b/test/openssl/test_bn.rb
index d913d0c953..98348d6078 100644
--- a/test/openssl/test_bn.rb
+++ b/test/openssl/test_bn.rb
@@ -1,9 +1,5 @@
-begin
-  require "openssl"
-rescue LoadError
-end
+require_relative 'utils'
 require "digest/md5"
-require "test/unit"
 
 if defined?(OpenSSL)
 
diff --git a/test/openssl/test_cipher.rb b/test/openssl/test_cipher.rb
index cc21e818ed..5cf41879bd 100644
--- a/test/openssl/test_cipher.rb
+++ b/test/openssl/test_cipher.rb
@@ -1,8 +1,4 @@
-begin
-  require "openssl"
-rescue LoadError
-end
-require "test/unit"
+require_relative 'utils'
 
 if defined?(OpenSSL)
 
diff --git a/test/openssl/test_pair.rb b/test/openssl/test_pair.rb
index 2d761385c5..d31781f6e7 100644
--- a/test/openssl/test_pair.rb
+++ b/test/openssl/test_pair.rb
@@ -1,8 +1,4 @@
-begin
-  require "openssl"
-rescue LoadError
-end
-require 'test/unit'
+require_relative 'utils'
 
 if defined?(OpenSSL)
 
diff --git a/test/openssl/utils.rb b/test/openssl/utils.rb
index c116bf9e3e..92c6c5596e 100644
--- a/test/openssl/utils.rb
+++ b/test/openssl/utils.rb
@@ -1,4 +1,7 @@
-require "openssl"
+begin
+  require "openssl"
+rescue LoadError
+end
 require "test/unit"
 
 module OpenSSL::TestUtils
@@ -141,4 +144,4 @@ Q1VB8qkJN7rA7/2HrCR3gTsWNb1YhAsnFsoeRscC+LxXoXi9OAIUBG98h4tilg6S
       $VERBOSE = back
     end
   end
-end
+end if defined?(OpenSSL)
-- 
cgit v1.2.3