1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* test/soap/ssl/test_ssl.rb (test_verification, test_property, test_ciphers):

Browse Source 
use standard assert_raise.

* test/testunit/test_assertions.rb (test_assert_send): send no longer
  calls private methods.

* test/uri/test_generic.rb (test_parse): corrected path in FTP URI.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9371 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-10-10 04:24:07 +00:00
parent a01e8895a4
commit 1f6620a6b9
3 changed files with 25 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
test/soap/ssl/test_ssl.rb
View File

@ -53,35 +53,23 @@ class TestSSL < Test::Unit::TestCase
def test_verification def test_verification
cfg = @client.options cfg = @client.options
cfg["protocol.http.ssl_config.verify_callback"] = method(:verify_callback).to_proc cfg["protocol.http.ssl_config.verify_callback"] = method(:verify_callback).to_proc
begin @verify_callback_called = false
@verify_callback_called = false ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
@client.hello_world("ssl client") assert_equal("certificate verify failed", ssle.message)
assert(false) assert(@verify_callback_called)
rescue OpenSSL::SSL::SSLError => ssle
assert_equal("certificate verify failed", ssle.message)
assert(@verify_callback_called)
end
# #
cfg["protocol.http.ssl_config.client_cert"] = File.join(DIR, "client.cert") cfg["protocol.http.ssl_config.client_cert"] = File.join(DIR, "client.cert")
cfg["protocol.http.ssl_config.client_key"] = File.join(DIR, "client.key") cfg["protocol.http.ssl_config.client_key"] = File.join(DIR, "client.key")
@verify_callback_called = false @verify_callback_called = false
begin ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
@client.hello_world("ssl client") assert_equal("certificate verify failed", ssle.message)
assert(false) assert(@verify_callback_called)
rescue OpenSSL::SSL::SSLError => ssle
assert_equal("certificate verify failed", ssle.message)
assert(@verify_callback_called)
end
# #
cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "ca.cert") cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "ca.cert")
@verify_callback_called = false @verify_callback_called = false
begin ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
@client.hello_world("ssl client") assert_equal("certificate verify failed", ssle.message)
assert(false) assert(@verify_callback_called)
rescue OpenSSL::SSL::SSLError => ssle
assert_equal("certificate verify failed", ssle.message)
assert(@verify_callback_called)
end
# #
cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "subca.cert") cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "subca.cert")
@verify_callback_called = false @verify_callback_called = false
@ -90,23 +78,15 @@ class TestSSL < Test::Unit::TestCase
# #
cfg["protocol.http.ssl_config.verify_depth"] = "1" cfg["protocol.http.ssl_config.verify_depth"] = "1"
@verify_callback_called = false @verify_callback_called = false
begin ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
@client.hello_world("ssl client") assert_equal("certificate verify failed", ssle.message)
assert(false) assert(@verify_callback_called)
rescue OpenSSL::SSL::SSLError => ssle
assert_equal("certificate verify failed", ssle.message)
assert(@verify_callback_called)
end
# #
cfg["protocol.http.ssl_config.verify_depth"] = "" cfg["protocol.http.ssl_config.verify_depth"] = ""
cfg["protocol.http.ssl_config.cert_store"] = OpenSSL::X509::Store.new cfg["protocol.http.ssl_config.cert_store"] = OpenSSL::X509::Store.new
cfg["protocol.http.ssl_config.verify_mode"] = OpenSSL::SSL::VERIFY_PEER.to_s cfg["protocol.http.ssl_config.verify_mode"] = OpenSSL::SSL::VERIFY_PEER.to_s
begin ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
@client.hello_world("ssl client") assert_equal("certificate verify failed", ssle.message)
assert(false)
rescue OpenSSL::SSL::SSLError => ssle
assert_equal("certificate verify failed", ssle.message)
end
# #
cfg["protocol.http.ssl_config.verify_mode"] = "" cfg["protocol.http.ssl_config.verify_mode"] = ""
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client")) assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
@ -131,22 +111,14 @@ __EOP__
@client.options["protocol.http.ssl_config.verify_callback"] = method(:verify_callback).to_proc @client.options["protocol.http.ssl_config.verify_callback"] = method(:verify_callback).to_proc
@verify_callback_called = false @verify_callback_called = false
# NG with String # NG with String
begin ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
@client.hello_world("ssl client") assert_equal("certificate verify failed", ssle.message)
assert(false) assert(@verify_callback_called)
rescue OpenSSL::SSL::SSLError => ssle
assert_equal("certificate verify failed", ssle.message)
assert(@verify_callback_called)
end
# NG with Integer # NG with Integer
@client.options["protocol.http.ssl_config.verify_depth"] = 0 @client.options["protocol.http.ssl_config.verify_depth"] = 0
begin ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
@client.hello_world("ssl client") assert_equal("certificate verify failed", ssle.message)
assert(false) assert(@verify_callback_called)
rescue OpenSSL::SSL::SSLError => ssle
assert_equal("certificate verify failed", ssle.message)
assert(@verify_callback_called)
end
# OK with empty # OK with empty
@client.options["protocol.http.ssl_config.verify_depth"] = "" @client.options["protocol.http.ssl_config.verify_depth"] = ""
@verify_callback_called = false @verify_callback_called = false
@ -181,13 +153,9 @@ __EOP__
#cfg.timeout = 123 #cfg.timeout = 123
cfg["protocol.http.ssl_config.ciphers"] = "!ALL" cfg["protocol.http.ssl_config.ciphers"] = "!ALL"
# #
begin ssle = assert_raise(OpenSSL::SSL::SSLError) {@client.hello_world("ssl client")}
@client.hello_world("ssl client") # depends on OpenSSL version. (?:0.9.8|0.9.7)
assert(false) assert_match(/\A(?:SSL_CTX_set_cipher_list:: no cipher match|no ciphers available)\z/, ssle.message)
rescue OpenSSL::SSL::SSLError => ssle
# depends on OpenSSL version. (?:0.9.8|0.9.7)
assert_match(/\A(?:SSL_CTX_set_cipher_list:: no cipher match|no ciphers available)\z/, ssle.message)
end
# #
cfg["protocol.http.ssl_config.ciphers"] = "ALL" cfg["protocol.http.ssl_config.ciphers"] = "ALL"
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client")) assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))

1
test/testunit/test_assertions.rb
View File

@ -483,7 +483,6 @@ Message: <"Error">
def test_assert_send def test_assert_send
object = Object.new object = Object.new
class << object class << object
private
def return_argument(argument, bogus) def return_argument(argument, bogus)
return argument return argument
end end

2
test/uri/test_generic.rb
View File

@ -38,7 +38,7 @@ class TestGeneric < Test::Unit::TestCase
exp = [ exp = [
'ftp', 'ftp',
nil, 'ftp.is.co.za', URI::FTP.default_port, nil, 'ftp.is.co.za', URI::FTP.default_port,
'/rfc/rfc1808.txt', nil, 'rfc/rfc1808.txt', nil,
] ]
ary = uri_to_ary(url) ary = uri_to_ary(url)
assert_equal(exp, ary) assert_equal(exp, ary)