summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/soap/ssl/test_ssl.rb8
-rw-r--r--test/soap/swa/test_file.rb5
-rw-r--r--test/soap/test_soapelement.rb3
-rw-r--r--test/soap/test_streamhandler.rb2
-rw-r--r--test/soap/wsdlDriver/test_calc.rb3
-rw-r--r--test/wsdl/document/echo.rb12
-rw-r--r--test/wsdl/marshal/person_org.rb2
-rw-r--r--test/wsdl/qualified/lp.rb0
8 files changed, 19 insertions, 16 deletions
diff --git a/test/soap/ssl/test_ssl.rb b/test/soap/ssl/test_ssl.rb
index d6df970160..38f859acdc 100644
--- a/test/soap/ssl/test_ssl.rb
+++ b/test/soap/ssl/test_ssl.rb
@@ -179,14 +179,14 @@ __EOP__
cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "ca.cert")
cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "subca.cert")
#cfg.timeout = 123
- assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
- #
cfg["protocol.http.ssl_config.ciphers"] = "!ALL"
+ #
begin
@client.hello_world("ssl client")
assert(false)
rescue OpenSSL::SSL::SSLError => ssle
- assert_equal("no ciphers available", ssle.message)
+ # 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"
@@ -201,7 +201,7 @@ private
def setup_server
svrcmd = "#{q(RUBY)} "
- svrcmd << "-d " if $DEBUG
+ #svrcmd << "-d " if $DEBUG
svrcmd << File.join(DIR, "sslsvr.rb")
svrout = IO.popen(svrcmd)
@serverpid = Integer(svrout.gets.chomp)
diff --git a/test/soap/swa/test_file.rb b/test/soap/swa/test_file.rb
index 8389d8826c..1ec7aa92a7 100644
--- a/test/soap/swa/test_file.rb
+++ b/test/soap/swa/test_file.rb
@@ -47,11 +47,14 @@ class TestFile < Test::Unit::TestCase
@client.reset_stream
end
- def test_file
+ def test_get_file
assert_equal(
File.open(THIS_FILE) { |f| f.read },
@client.get_file['file'].content
)
+ end
+
+ def test_put_file
assert_equal(
"File 'foo' was received ok.",
@client.put_file('foo',
diff --git a/test/soap/test_soapelement.rb b/test/soap/test_soapelement.rb
index 6cf91f93d6..66e2a836a4 100644
--- a/test/soap/test_soapelement.rb
+++ b/test/soap/test_soapelement.rb
@@ -1,5 +1,6 @@
require 'test/unit'
require 'soap/baseData'
+require 'soap/mapping'
module SOAP
@@ -36,7 +37,7 @@ class TestSOAPElement < Test::Unit::TestCase
assert_equal(LiteralNamespace, obj.encodingstyle)
assert_equal({}, obj.extraattr)
assert_equal([], obj.precedents)
- assert_equal(false, obj.qualified)
+ assert_equal(nil, obj.qualified)
assert_equal(nil, obj.text)
assert(obj.members.empty?)
diff --git a/test/soap/test_streamhandler.rb b/test/soap/test_streamhandler.rb
index a8d06d5f2a..c31254513f 100644
--- a/test/soap/test_streamhandler.rb
+++ b/test/soap/test_streamhandler.rb
@@ -98,7 +98,7 @@ __EOX__
end
def parse_req_header(str)
- if ::SOAP::StreamHandler::Client.to_s == 'SOAP::NetHttpClient'
+ if ::SOAP::HTTPStreamHandler::Client.to_s == 'SOAP::NetHttpClient'
str = eval(str.split(/\r?\n/)[4][3..-1])
end
parse_req_header_http_access2(str)
diff --git a/test/soap/wsdlDriver/test_calc.rb b/test/soap/wsdlDriver/test_calc.rb
index 629c5cdbfb..f1cc116a59 100644
--- a/test/soap/wsdlDriver/test_calc.rb
+++ b/test/soap/wsdlDriver/test_calc.rb
@@ -73,8 +73,7 @@ class TestCalc < Test::Unit::TestCase
assert_equal(0.3, @client.add(0.1, 0.2))
end
- # test for backward compatibility
- def __NOTEST__test_old_driver
+ def test_old_driver
@client = ::SOAP::WSDLDriverFactory.new(@wsdl).create_driver
@client.wiredump_dev = STDOUT if $DEBUG
@client.endpoint_url = "http://localhost:#{Port}/"
diff --git a/test/wsdl/document/echo.rb b/test/wsdl/document/echo.rb
index 05f00412f4..c6df75aca0 100644
--- a/test/wsdl/document/echo.rb
+++ b/test/wsdl/document/echo.rb
@@ -5,7 +5,7 @@ class Echoele
@@schema_type = "echoele"
@@schema_ns = "urn:docrpc"
@@schema_attribute = {XSD::QName.new(nil, "attr_string") => "SOAP::SOAPString", XSD::QName.new(nil, "attr-int") => "SOAP::SOAPInt"}
- @@schema_element = [["struct1", "Echo_struct"], ["struct_2", ["Echo_struct", XSD::QName.new(nil, "struct-2")]]]
+ @@schema_element = [["struct1", ["Echo_struct", XSD::QName.new(nil, "struct1")]], ["struct_2", ["Echo_struct", XSD::QName.new(nil, "struct-2")]]]
attr_accessor :struct1
attr_accessor :struct_2
@@ -38,7 +38,7 @@ class Echo_response
@@schema_type = "echo_response"
@@schema_ns = "urn:docrpc"
@@schema_attribute = {XSD::QName.new(nil, "attr_string") => "SOAP::SOAPString", XSD::QName.new(nil, "attr-int") => "SOAP::SOAPInt"}
- @@schema_element = [["struct1", "Echo_struct"], ["struct_2", ["Echo_struct", XSD::QName.new(nil, "struct-2")]]]
+ @@schema_element = [["struct1", ["Echo_struct", XSD::QName.new(nil, "struct1")]], ["struct_2", ["Echo_struct", XSD::QName.new(nil, "struct-2")]]]
attr_accessor :struct1
attr_accessor :struct_2
@@ -70,18 +70,18 @@ end
class Echo_struct
@@schema_type = "echo_struct"
@@schema_ns = "urn:docrpc"
- @@schema_attribute = {XSD::QName.new("urn:docrpc", "m_attr") => "SOAP::SOAPString"}
- @@schema_element = [["m_string", "SOAP::SOAPString"], ["m_datetime", "SOAP::SOAPDateTime"]]
+ @@schema_attribute = {XSD::QName.new(nil, "m_attr") => "SOAP::SOAPString"}
+ @@schema_element = [["m_string", ["SOAP::SOAPString", XSD::QName.new(nil, "m_string")]], ["m_datetime", ["SOAP::SOAPDateTime", XSD::QName.new(nil, "m_datetime")]]]
attr_accessor :m_string
attr_accessor :m_datetime
def xmlattr_m_attr
- (@__xmlattr ||= {})[XSD::QName.new("urn:docrpc", "m_attr")]
+ (@__xmlattr ||= {})[XSD::QName.new(nil, "m_attr")]
end
def xmlattr_m_attr=(value)
- (@__xmlattr ||= {})[XSD::QName.new("urn:docrpc", "m_attr")] = value
+ (@__xmlattr ||= {})[XSD::QName.new(nil, "m_attr")] = value
end
def initialize(m_string = nil, m_datetime = nil)
diff --git a/test/wsdl/marshal/person_org.rb b/test/wsdl/marshal/person_org.rb
index 55405b658d..f8c0e0db76 100644
--- a/test/wsdl/marshal/person_org.rb
+++ b/test/wsdl/marshal/person_org.rb
@@ -4,7 +4,7 @@ require 'xsd/qname'
class Person
@@schema_type = "Person"
@@schema_ns = "http://www.jin.gr.jp/~nahi/xmlns/sample/Person"
- @@schema_element = [["familyname", "SOAP::SOAPString"], ["givenname", "SOAP::SOAPString"], ["var1", "SOAP::SOAPInt"], ["var2", "SOAP::SOAPDouble"], ["var3", "SOAP::SOAPString"]]
+ @@schema_element = [["familyname", ["SOAP::SOAPString", XSD::QName.new(nil, "familyname")]], ["givenname", ["SOAP::SOAPString", XSD::QName.new(nil, "givenname")]], ["var1", ["SOAP::SOAPInt", XSD::QName.new(nil, "var1")]], ["var2", ["SOAP::SOAPDouble", XSD::QName.new(nil, "var2")]], ["var3", ["SOAP::SOAPString", XSD::QName.new(nil, "var3")]]]
attr_accessor :familyname
attr_accessor :givenname
diff --git a/test/wsdl/qualified/lp.rb b/test/wsdl/qualified/lp.rb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/test/wsdl/qualified/lp.rb
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 03:27:03 +0000