summaryrefslogtreecommitdiff
path: root/test/soap
diff options
context:
space:
mode:
Diffstat (limited to 'test/soap')
-rw-r--r--test/soap/calc/test_calc.rb7
-rw-r--r--test/soap/calc/test_calc2.rb7
-rw-r--r--test/soap/calc/test_calc_cgi.rb7
-rw-r--r--test/soap/fault/test_customfault.rb58
-rw-r--r--test/soap/header/server.cgi8
-rw-r--r--test/soap/header/test_authheader.rb9
-rw-r--r--test/soap/header/test_authheader_cgi.rb7
-rw-r--r--test/soap/helloworld/test_helloworld.rb7
-rw-r--r--test/soap/ssl/sslsvr.rb7
-rw-r--r--test/soap/ssl/test_ssl.rb29
-rw-r--r--test/soap/struct/test_struct.rb8
-rw-r--r--test/soap/swa/test_file.rb7
-rw-r--r--test/soap/test_basetype.rb6
-rw-r--r--test/soap/test_mapping.rb59
-rw-r--r--test/soap/test_streamhandler.rb20
-rw-r--r--test/soap/test_styleuse.rb333
-rw-r--r--test/soap/wsdlDriver/calc.wsdl126
-rw-r--r--test/soap/wsdlDriver/document.wsdl54
-rw-r--r--test/soap/wsdlDriver/simpletype.wsdl6
-rw-r--r--test/soap/wsdlDriver/test_calc.rb88
-rw-r--r--test/soap/wsdlDriver/test_document.rb78
-rw-r--r--test/soap/wsdlDriver/test_simpletype.rb15
22 files changed, 856 insertions, 90 deletions
diff --git a/test/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb
index 4210c65772..88738716a6 100644
--- a/test/soap/calc/test_calc.rb
+++ b/test/soap/calc/test_calc.rb
@@ -16,13 +16,6 @@ class TestCalc < Test::Unit::TestCase
@t = Thread.new {
@server.start
}
- while @server.status != :Running
- sleep 0.1
- unless @t.alive?
- @t.join
- raise
- end
- end
@endpoint = "http://localhost:#{Port}/"
@calc = SOAP::RPC::Driver.new(@endpoint, 'http://tempuri.org/calcService')
@calc.add_method('add', 'lhs', 'rhs')
diff --git a/test/soap/calc/test_calc2.rb b/test/soap/calc/test_calc2.rb
index d15cfe9600..8d6180e99e 100644
--- a/test/soap/calc/test_calc2.rb
+++ b/test/soap/calc/test_calc2.rb
@@ -17,13 +17,6 @@ class TestCalc2 < Test::Unit::TestCase
Thread.current.abort_on_exception = true
@server.start
}
- while @server.status != :Running
- sleep 0.1
- unless @t.alive?
- @t.join
- raise
- end
- end
@endpoint = "http://localhost:#{Port}/"
@var = SOAP::RPC::Driver.new(@endpoint, 'http://tempuri.org/calcService')
@var.wiredump_dev = STDERR if $DEBUG
diff --git a/test/soap/calc/test_calc_cgi.rb b/test/soap/calc/test_calc_cgi.rb
index d1655b0b01..d28830629f 100644
--- a/test/soap/calc/test_calc_cgi.rb
+++ b/test/soap/calc/test_calc_cgi.rb
@@ -35,13 +35,6 @@ class TestCalcCGI < Test::Unit::TestCase
Thread.current.abort_on_exception = true
@server.start
}
- while @server.status != :Running
- sleep 0.1
- unless @t.alive?
- @t.join
- raise
- end
- end
@endpoint = "http://localhost:#{Port}/server.cgi"
@calc = SOAP::RPC::Driver.new(@endpoint, 'http://tempuri.org/calcService')
@calc.wiredump_dev = STDERR if $DEBUG
diff --git a/test/soap/fault/test_customfault.rb b/test/soap/fault/test_customfault.rb
new file mode 100644
index 0000000000..2f7bc2be6e
--- /dev/null
+++ b/test/soap/fault/test_customfault.rb
@@ -0,0 +1,58 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'soap/rpc/standaloneServer'
+
+
+module SOAP
+module Fault
+
+
+class TestCustomFault < Test::Unit::TestCase
+ Port = 17171
+
+ class CustomFaultServer < SOAP::RPC::StandaloneServer
+ def on_init
+ add_method(self, 'fault', 'msg')
+ end
+
+ def fault(msg)
+ SOAPFault.new(SOAPString.new("mycustom"),
+ SOAPString.new("error: #{msg}"),
+ SOAPString.new(self.class.name))
+ end
+ end
+
+ def setup
+ @server = CustomFaultServer.new('customfault', 'urn:customfault', '0.0.0.0', Port)
+ @server.level = Logger::Severity::ERROR
+ @t = Thread.new {
+ Thread.current.abort_on_exception = true
+ @server.start
+ }
+ @endpoint = "http://localhost:#{Port}/"
+ @client = SOAP::RPC::Driver.new(@endpoint, 'urn:customfault')
+ @client.wiredump_dev = STDERR if $DEBUG
+ @client.add_method("fault", "msg")
+ end
+
+ def teardown
+ @server.shutdown
+ @t.kill
+ @t.join
+ @client.reset_stream
+ end
+
+ def test_custom_fault
+ begin
+ @client.fault("message")
+ assert(false, 'exception not raised')
+ rescue SOAP::FaultError => e
+ assert(true, 'exception raised')
+ assert_equal('error: message', e.message)
+ end
+ end
+end
+
+
+end
+end
diff --git a/test/soap/header/server.cgi b/test/soap/header/server.cgi
index a4326828cc..2a188538d9 100644
--- a/test/soap/header/server.cgi
+++ b/test/soap/header/server.cgi
@@ -85,18 +85,18 @@ class AuthHeaderPortServer < SOAP::RPC::CGIStub
end
def on_simple_inbound(my_header, mu)
- auth_p = false
+ succeeded = false
userid = my_header["userid"]
passwd = my_header["passwd"]
if login(userid, passwd)
- auth_p = true
+ succeeded = true
elsif sessionid = my_header["sessionid"]
if userid = auth(sessionid)
destroy_session(sessionid)
- auth_p = true
+ succeeded = true
end
end
- raise RuntimeError.new("authentication failed") unless auth_p
+ raise RuntimeError.new("authentication failed") unless succeeded
@userid = userid
@sessionid = create_session(userid)
end
diff --git a/test/soap/header/test_authheader.rb b/test/soap/header/test_authheader.rb
index 2c04769dd6..47e1e76b82 100644
--- a/test/soap/header/test_authheader.rb
+++ b/test/soap/header/test_authheader.rb
@@ -33,7 +33,7 @@ class TestAuthHeader < Test::Unit::TestCase
super
add_rpc_servant(AuthHeaderService.new, PortName)
ServerAuthHeaderHandler.init
- add_rpc_request_headerhandler(ServerAuthHeaderHandler)
+ add_request_headerhandler(ServerAuthHeaderHandler)
end
class ServerAuthHeaderHandler < SOAP::Header::SimpleHandler
@@ -162,13 +162,6 @@ class TestAuthHeader < Test::Unit::TestCase
@t = Thread.new {
@server.start
}
- while @server.status != :Running
- sleep 0.1
- unless @t.alive?
- @t.join
- raise
- end
- end
end
def setup_client
diff --git a/test/soap/header/test_authheader_cgi.rb b/test/soap/header/test_authheader_cgi.rb
index 03bd1bb965..d70b022ad8 100644
--- a/test/soap/header/test_authheader_cgi.rb
+++ b/test/soap/header/test_authheader_cgi.rb
@@ -72,13 +72,6 @@ class TestAuthHeaderCGI < Test::Unit::TestCase
Thread.current.abort_on_exception = true
@server.start
}
- while @server.status != :Running
- sleep 0.1
- unless @t.alive?
- @t.join
- raise
- end
- end
end
def setup_client
diff --git a/test/soap/helloworld/test_helloworld.rb b/test/soap/helloworld/test_helloworld.rb
index cd78d9fa0b..40c35b57fb 100644
--- a/test/soap/helloworld/test_helloworld.rb
+++ b/test/soap/helloworld/test_helloworld.rb
@@ -17,13 +17,6 @@ class TestHelloWorld < Test::Unit::TestCase
Thread.current.abort_on_exception = true
@server.start
}
- while @server.status != :Running
- sleep 0.1
- unless @t.alive?
- @t.join
- raise
- end
- end
@endpoint = "http://localhost:#{Port}/"
@client = SOAP::RPC::Driver.new(@endpoint, 'urn:hws')
@client.add_method("hello_world", "from")
diff --git a/test/soap/ssl/sslsvr.rb b/test/soap/ssl/sslsvr.rb
index 52a8d6878f..4f67eb9485 100644
--- a/test/soap/ssl/sslsvr.rb
+++ b/test/soap/ssl/sslsvr.rb
@@ -51,13 +51,6 @@ if $0 == __FILE__
Thread.current.abort_on_exception = true
$server.start
}
- while $server.status != :Running
- sleep 0.1
- unless t.alive?
- t.join
- raise
- end
- end
STDOUT.sync = true
puts $$
t.join
diff --git a/test/soap/ssl/test_ssl.rb b/test/soap/ssl/test_ssl.rb
index 82bb890d71..d6df970160 100644
--- a/test/soap/ssl/test_ssl.rb
+++ b/test/soap/ssl/test_ssl.rb
@@ -5,7 +5,7 @@ rescue LoadError
end
require 'soap/rpc/driver'
-if defined?(HTTPAccess2)
+if defined?(HTTPAccess2) and defined?(OpenSSL)
module SOAP; module SSL
@@ -130,6 +130,7 @@ __EOP__
@client.loadproperty(testpropertyname)
@client.options["protocol.http.ssl_config.verify_callback"] = method(:verify_callback).to_proc
@verify_callback_called = false
+ # NG with String
begin
@client.hello_world("ssl client")
assert(false)
@@ -137,11 +138,35 @@ __EOP__
assert_equal("certificate verify failed", ssle.message)
assert(@verify_callback_called)
end
- #
+ # NG with Integer
+ @client.options["protocol.http.ssl_config.verify_depth"] = 0
+ begin
+ @client.hello_world("ssl client")
+ assert(false)
+ rescue OpenSSL::SSL::SSLError => ssle
+ assert_equal("certificate verify failed", ssle.message)
+ assert(@verify_callback_called)
+ end
+ # OK with empty
@client.options["protocol.http.ssl_config.verify_depth"] = ""
@verify_callback_called = false
assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
assert(@verify_callback_called)
+ # OK with nil
+ @client.options["protocol.http.ssl_config.verify_depth"] = nil
+ @verify_callback_called = false
+ assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
+ assert(@verify_callback_called)
+ # OK with String
+ @client.options["protocol.http.ssl_config.verify_depth"] = "3"
+ @verify_callback_called = false
+ assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
+ assert(@verify_callback_called)
+ # OK with Integer
+ @client.options["protocol.http.ssl_config.verify_depth"] = 3
+ @verify_callback_called = false
+ assert_equal("Hello World, from ssl client", @client.hello_world("ssl client"))
+ assert(@verify_callback_called)
ensure
File.unlink(testpropertyname)
end
diff --git a/test/soap/struct/test_struct.rb b/test/soap/struct/test_struct.rb
index 71ada31676..d92f4bc18a 100644
--- a/test/soap/struct/test_struct.rb
+++ b/test/soap/struct/test_struct.rb
@@ -30,6 +30,7 @@ class TestStruct < Test::Unit::TestCase
def setup_server
@server = Server.new(
:Port => Port,
+ :BindAddress => "0.0.0.0",
:AccessLog => [],
:SOAPDefaultNamespace => Namespace
)
@@ -63,13 +64,6 @@ class TestStruct < Test::Unit::TestCase
Thread.current.abort_on_exception = true
server.start
}
- while server.status != :Running
- sleep 0.1
- unless t.alive?
- t.join
- raise
- end
- end
t
end
diff --git a/test/soap/swa/test_file.rb b/test/soap/swa/test_file.rb
index 29bdf88a3b..8389d8826c 100644
--- a/test/soap/swa/test_file.rb
+++ b/test/soap/swa/test_file.rb
@@ -33,13 +33,6 @@ class TestFile < Test::Unit::TestCase
@t = Thread.new {
@server.start
}
- while @server.status != :Running
- sleep 0.1
- unless @t.alive?
- @t.join
- raise
- end
- end
@endpoint = "http://localhost:#{Port}/"
@client = SOAP::RPC::Driver.new(@endpoint, 'http://www.acmetron.com/soap')
@client.add_method('get_file')
diff --git a/test/soap/test_basetype.rb b/test/soap/test_basetype.rb
index afd550f996..3785873560 100644
--- a/test/soap/test_basetype.rb
+++ b/test/soap/test_basetype.rb
@@ -382,6 +382,9 @@ class TestSOAP < Test::Unit::TestCase
]
targets.each do |data, expected|
assert_equal(expected, SOAP::SOAPDateTime.new(data).to_s)
+ d = DateTime.parse(data)
+ d >>= 12 if d.year < 0 # XSDDateTime.year(-1) == DateTime.year(0)
+ assert_equal(expected, SOAP::SOAPDateTime.new(d).to_s)
end
targets = [
@@ -481,6 +484,9 @@ class TestSOAP < Test::Unit::TestCase
]
targets.each do |data, expected|
assert_equal(expected, SOAP::SOAPDate.new(data).to_s)
+ d = Date.parse(data)
+ d >>= 12 if d.year < 0 # XSDDate.year(-1) == Date.year(0)
+ assert_equal(expected, SOAP::SOAPDate.new(d).to_s)
end
end
diff --git a/test/soap/test_mapping.rb b/test/soap/test_mapping.rb
new file mode 100644
index 0000000000..26222e6719
--- /dev/null
+++ b/test/soap/test_mapping.rb
@@ -0,0 +1,59 @@
+require 'test/unit'
+require 'soap/mapping'
+
+
+module SOAP
+
+
+class TestMapping < Test::Unit::TestCase
+ def test_date
+ targets = [
+ ["2002-12-31",
+ "2002-12-31Z"],
+ ["2002-12-31+00:00",
+ "2002-12-31Z"],
+ ["2002-12-31-00:00",
+ "2002-12-31Z"],
+ ["-2002-12-31",
+ "-2002-12-31Z"],
+ ["-2002-12-31+00:00",
+ "-2002-12-31Z"],
+ ["-2002-12-31-00:00",
+ "-2002-12-31Z"],
+ ]
+ targets.each do |str, expectec|
+ d = Date.parse(str)
+ assert_equal(d.class, convert(d).class)
+ assert_equal(d, convert(d))
+ end
+ end
+
+ def test_datetime
+ targets = [
+ ["2002-12-31T23:59:59.00",
+ "2002-12-31T23:59:59Z"],
+ ["2002-12-31T23:59:59+00:00",
+ "2002-12-31T23:59:59Z"],
+ ["2002-12-31T23:59:59-00:00",
+ "2002-12-31T23:59:59Z"],
+ ["-2002-12-31T23:59:59.00",
+ "-2002-12-31T23:59:59Z"],
+ ["-2002-12-31T23:59:59+00:00",
+ "-2002-12-31T23:59:59Z"],
+ ["-2002-12-31T23:59:59-00:00",
+ "-2002-12-31T23:59:59Z"],
+ ]
+ targets.each do |str, expectec|
+ d = DateTime.parse(str)
+ assert_equal(d.class, convert(d).class)
+ assert_equal(d, convert(d))
+ end
+ end
+
+ def convert(obj)
+ SOAP::Mapping.soap2obj(SOAP::Mapping.obj2soap(obj))
+ end
+end
+
+
+end
diff --git a/test/soap/test_streamhandler.rb b/test/soap/test_streamhandler.rb
index fa0080e9f1..a8d06d5f2a 100644
--- a/test/soap/test_streamhandler.rb
+++ b/test/soap/test_streamhandler.rb
@@ -80,13 +80,6 @@ class TestStreamHandler < Test::Unit::TestCase
Thread.current.abort_on_exception = true
server.start
}
- while server.status != :Running
- sleep 0.1
- unless t.alive?
- t.join
- raise
- end
- end
t
end
@@ -141,6 +134,19 @@ __EOX__
assert(/^text\/xml;/ =~ h["content-type"])
end
+ def test_uri
+ # initialize client with URI object
+ @client = SOAP::RPC::Driver.new(URI.parse(@url), '')
+ @client.add_method("do_server_proc")
+ # same as test_normal
+ str = ""
+ @client.wiredump_dev = str
+ assert_nil(@client.do_server_proc)
+ r, h = parse_req_header(str)
+ assert_match(%r"POST / HTTP/1.", r)
+ assert(/^text\/xml;/ =~ h["content-type"])
+ end
+
def test_basic_auth
unless Object.const_defined?('HTTPAccess2')
# soap4r + net/http + basic_auth is not supported.
diff --git a/test/soap/test_styleuse.rb b/test/soap/test_styleuse.rb
new file mode 100644
index 0000000000..4ea321848d
--- /dev/null
+++ b/test/soap/test_styleuse.rb
@@ -0,0 +1,333 @@
+require 'test/unit'
+require 'soap/rpc/httpserver'
+require 'soap/rpc/driver'
+
+
+module SOAP
+
+
+class TestStyleUse < Test::Unit::TestCase
+ # rpc driver: obj in(Hash allowed for literal), obj out
+ #
+ # style: not visible from user
+ # rpc: wrapped element
+ # document: unwrappted element
+ #
+ # use:
+ # encoding: a graph (SOAP Data Model)
+ # literal: not a graph (SOAPElement)
+ #
+ # rpc stub: obj in, obj out(Hash is allowed for literal)
+ #
+ # style: not visible from user
+ # rpc: wrapped element
+ # document: unwrappted element
+ #
+ # use:
+ # encoding: a graph (SOAP Data Model)
+ # literal: not a graph (SOAPElement)
+ #
+ # document driver: SOAPElement in, SOAPElement out? [not implemented]
+ #
+ # style: ditto
+ # use: ditto
+ #
+ #
+ # document stub: SOAPElement in, SOAPElement out? [not implemented]
+ #
+ # style: ditto
+ # use: ditto
+ #
+ class GenericServant
+ # method name style: requeststyle_requestuse_responsestyle_responseuse
+
+ # 2 params -> array
+ def rpc_enc_rpc_enc(obj1, obj2)
+ [obj1, [obj1, obj2]]
+ end
+
+ # 2 objs -> array
+ def rpc_lit_rpc_enc(obj1, obj2)
+ [obj2, obj1]
+ end
+
+ # 2 params -> 2 params
+ def rpc_enc_rpc_lit(obj1, obj2)
+ klass = [obj1.class.name, obj2.class.name]
+ [obj2, obj1]
+ end
+
+ # 2 objs -> 2 objs
+ def rpc_lit_rpc_lit(obj1, obj2)
+ [obj1, obj2]
+ end
+
+ # 2 params -> array
+ def doc_enc_doc_enc(obj1, obj2)
+ [obj1, [obj1, obj2]]
+ end
+
+ # 2 objs -> array
+ def doc_lit_doc_enc(obj1, obj2)
+ [obj2, obj1]
+ end
+
+ # 2 params -> 2 hashes
+ def doc_enc_doc_lit(obj1, obj2)
+ klass = [obj1.class.name, obj2.class.name]
+ return {'obj1' => {'klass' => klass}, 'misc' => 'hash does not have an order'},
+ {'obj2' => {'klass' => klass}}
+ end
+
+ # 2 objs -> 2 objs
+ def doc_lit_doc_lit(obj1, obj2)
+ return obj1, obj2
+ end
+ end
+
+ Namespace = "urn:styleuse"
+
+ module Op
+ def self.opt(request_style, request_use, response_style, response_use)
+ {
+ :request_style => request_style,
+ :request_use => request_use,
+ :response_style => response_style,
+ :response_use => response_use
+ }
+ end
+
+ Op_rpc_enc_rpc_enc = [
+ XSD::QName.new(Namespace, 'rpc_enc_rpc_enc'),
+ nil,
+ 'rpc_enc_rpc_enc', [
+ ['in', 'obj1', nil],
+ ['in', 'obj2', nil],
+ ['retval', 'return', nil]],
+ opt(:rpc, :encoded, :rpc, :encoded)
+ ]
+
+ Op_rpc_lit_rpc_enc = [
+ XSD::QName.new(Namespace, 'rpc_lit_rpc_enc'),
+ nil,
+ 'rpc_lit_rpc_enc', [
+ ['in', 'obj1', nil],
+ ['in', 'obj2', nil],
+ ['retval', 'return', nil]],
+ opt(:rpc, :literal, :rpc, :encoded)
+ ]
+
+ Op_rpc_enc_rpc_lit = [
+ XSD::QName.new(Namespace, 'rpc_enc_rpc_lit'),
+ nil,
+ 'rpc_enc_rpc_lit', [
+ ['in', 'obj1', nil],
+ ['in', 'obj2', nil],
+ ['retval', 'ret1', nil],
+ ['out', 'ret2', nil]],
+ opt(:rpc, :encoded, :rpc, :literal)
+ ]
+
+ Op_rpc_lit_rpc_lit = [
+ XSD::QName.new(Namespace, 'rpc_lit_rpc_lit'),
+ nil,
+ 'rpc_lit_rpc_lit', [
+ ['in', 'obj1', nil],
+ ['in', 'obj2', nil],
+ ['retval', 'ret1', nil],
+ ['out', 'ret2', nil]],
+ opt(:rpc, :literal, :rpc, :literal)
+ ]
+
+ Op_doc_enc_doc_enc = [
+ Namespace + 'doc_enc_doc_enc',
+ 'doc_enc_doc_enc', [
+ ['in', 'obj1', [nil, Namespace, 'obj1']],
+ ['in', 'obj2', [nil, Namespace, 'obj2']],
+ ['out', 'ret1', [nil, Namespace, 'ret1']],
+ ['out', 'ret2', [nil, Namespace, 'ret2']]],
+ opt(:document, :encoded, :document, :encoded)
+ ]
+
+ Op_doc_lit_doc_enc = [
+ Namespace + 'doc_lit_doc_enc',
+ 'doc_lit_doc_enc', [
+ ['in', 'obj1', [nil, Namespace, 'obj1']],
+ ['in', 'obj2', [nil, Namespace, 'obj2']],
+ ['out', 'ret1', [nil, Namespace, 'ret1']],
+ ['out', 'ret2', [nil, Namespace, 'ret2']]],
+ opt(:document, :literal, :document, :encoded)
+ ]
+
+ Op_doc_enc_doc_lit = [
+ Namespace + 'doc_enc_doc_lit',
+ 'doc_enc_doc_lit', [
+ ['in', 'obj1', [nil, Namespace, 'obj1']],
+ ['in', 'obj2', [nil, Namespace, 'obj2']],
+ ['out', 'ret1', [nil, Namespace, 'ret1']],
+ ['out', 'ret2', [nil, Namespace, 'ret2']]],
+ opt(:document, :encoded, :document, :literal)
+ ]
+
+ Op_doc_lit_doc_lit = [
+ Namespace + 'doc_lit_doc_lit',
+ 'doc_lit_doc_lit', [
+ ['in', 'obj1', [nil, Namespace, 'obj1']],
+ ['in', 'obj2', [nil, Namespace, 'obj2']],
+ ['out', 'ret1', [nil, Namespace, 'ret1']],
+ ['out', 'ret2', [nil, Namespace, 'ret2']]],
+ opt(:document, :literal, :document, :literal)
+ ]
+ end
+
+ include Op
+
+ class Server < ::SOAP::RPC::HTTPServer
+ include Op
+
+ def on_init
+ @servant = GenericServant.new
+ add_rpc_operation(@servant, *Op_rpc_enc_rpc_enc)
+ add_rpc_operation(@servant, *Op_rpc_lit_rpc_enc)
+ add_rpc_operation(@servant, *Op_rpc_enc_rpc_lit)
+ add_rpc_operation(@servant, *Op_rpc_lit_rpc_lit)
+ add_document_operation(@servant, *Op_doc_enc_doc_enc)
+ add_document_operation(@servant, *Op_doc_lit_doc_enc)
+ add_document_operation(@servant, *Op_doc_enc_doc_lit)
+ add_document_operation(@servant, *Op_doc_lit_doc_lit)
+ end
+ end
+
+ Port = 17171
+
+ def setup
+ setup_server
+ setup_client
+ end
+
+ def setup_server
+ @server = Server.new(
+ :BindAddress => "0.0.0.0",
+ :Port => Port,
+ :AccessLog => [],
+ :SOAPDefaultNamespace => Namespace
+ )
+ @server.level = Logger::Severity::ERROR
+ @server_thread = start_server_thread(@server)
+ end
+
+ def setup_client
+ @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/", Namespace)
+ @client.wiredump_dev = STDERR if $DEBUG
+ @client.add_rpc_operation(*Op_rpc_enc_rpc_enc)
+ @client.add_rpc_operation(*Op_rpc_lit_rpc_enc)
+ @client.add_rpc_operation(*Op_rpc_enc_rpc_lit)
+ @client.add_rpc_operation(*Op_rpc_lit_rpc_lit)
+ @client.add_document_operation(*Op_doc_enc_doc_enc)
+ @client.add_document_operation(*Op_doc_lit_doc_enc)
+ @client.add_document_operation(*Op_doc_enc_doc_lit)
+ @client.add_document_operation(*Op_doc_lit_doc_lit)
+ end
+
+ def teardown
+ teardown_server
+ teardown_client
+ end
+
+ def teardown_server
+ @server.shutdown
+ @server_thread.kill
+ @server_thread.join
+ end
+
+ def teardown_client
+ @client.reset_stream
+ end
+
+ def start_server_thread(server)
+ t = Thread.new {
+ Thread.current.abort_on_exception = true
+ server.start
+ }
+ t
+ end
+
+ def test_rpc_enc_rpc_enc
+ o = "hello"
+ obj1 = o
+ obj2 = [1]
+ ret = @client.rpc_enc_rpc_enc(obj1, obj2)
+ # server returns [obj1, [obj1, obj2]]
+ assert_equal([obj1, [obj1, obj2]], ret)
+ assert_same(ret[0], ret[1][0])
+ end
+
+ S1 = ::Struct.new(:a)
+ S2 = ::Struct.new(:c)
+ def test_rpc_lit_rpc_enc
+ ret1, ret2 = @client.rpc_lit_rpc_enc(S1.new('b'), S2.new('d'))
+ assert_equal('d', ret1.c)
+ assert_equal('b', ret2.a)
+ # Hash is allowed for literal
+ ret1, ret2 = @client.rpc_lit_rpc_enc({'a' => 'b'}, {'c' => 'd'})
+ assert_equal('d', ret1.c)
+ assert_equal('b', ret2.a)
+ # simple value
+ assert_equal(
+ ['1', 'a'],
+ @client.rpc_lit_rpc_enc('a', 1)
+ )
+ end
+
+ def test_rpc_enc_rpc_lit
+ assert_equal(
+ ['1', 'a'],
+ @client.rpc_enc_rpc_lit('a', '1')
+ )
+ end
+
+ def test_rpc_lit_rpc_lit
+ ret1, ret2 = @client.rpc_lit_rpc_lit({'a' => 'b'}, {'c' => 'd'})
+ assert_equal('b', ret1["a"])
+ assert_equal('d', ret2["c"])
+ end
+
+ def test_doc_enc_doc_enc
+ o = "hello"
+ obj1 = o
+ obj2 = [1]
+ ret = @client.rpc_enc_rpc_enc(obj1, obj2)
+ # server returns [obj1, [obj1, obj2]]
+ assert_equal([obj1, [obj1, obj2]], ret)
+ assert_same(ret[0], ret[1][0])
+ end
+
+ def test_doc_lit_doc_enc
+ ret1, ret2 = @client.doc_lit_doc_enc({'a' => 'b'}, {'c' => 'd'})
+ assert_equal('d', ret1.c)
+ assert_equal('b', ret2.a)
+ assert_equal(
+ ['a', '1'],
+ @client.doc_lit_doc_enc(1, 'a')
+ )
+ end
+
+ def test_doc_enc_doc_lit
+ ret1, ret2 = @client.doc_enc_doc_lit('a', 1)
+ # literal Array
+ assert_equal(['String', 'Fixnum'], ret1['obj1']['klass'])
+ # same value
+ assert_equal(ret1['obj1']['klass'], ret2['obj2']['klass'])
+ # not the same object (not encoded)
+ assert_not_same(ret1['obj1']['klass'], ret2['obj2']['klass'])
+ end
+
+ def test_doc_lit_doc_lit
+ ret1, ret2 = @client.doc_lit_doc_lit({'a' => 'b'}, {'c' => 'd'})
+ assert_equal('b', ret1["a"])
+ assert_equal('d', ret2["c"])
+ end
+end
+
+
+end
diff --git a/test/soap/wsdlDriver/calc.wsdl b/test/soap/wsdlDriver/calc.wsdl
new file mode 100644
index 0000000000..694a01e87e
--- /dev/null
+++ b/test/soap/wsdlDriver/calc.wsdl
@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--generated by GLUE Standard 4.0.1 on Wed Mar 09 10:20:07 GMT-08:00
+2005-->
+<wsdl:definitions name='Calculator'
+targetNamespace='http://www.themindelectric.com/wsdl/Calculator/'
+ xmlns:tns='http://www.themindelectric.com/wsdl/Calculator/'
+ xmlns:soap='http://schemas.xmlsoap.org/wsdl/soap/'
+ xmlns:http='http://schemas.xmlsoap.org/wsdl/http/'
+ xmlns:mime='http://schemas.xmlsoap.org/wsdl/mime/'
+ xmlns:xsd='http://www.w3.org/2001/XMLSchema'
+ xmlns:soapenc='http://schemas.xmlsoap.org/soap/encoding/'
+ xmlns:wsdl='http://schemas.xmlsoap.org/wsdl/'
+ xmlns:tme='http://www.themindelectric.com/'>
+ <wsdl:message name='add0In'>
+ <wsdl:part name='x' type='xsd:float'/>
+ <wsdl:part name='y' type='xsd:float'/>
+ </wsdl:message>
+ <wsdl:message name='add0Out'>
+ <wsdl:part name='Result' type='xsd:float'/>
+ </wsdl:message>
+ <wsdl:message name='divide1In'>
+ <wsdl:part name='numerator' type='xsd:float'/>
+ <wsdl:part name='denominator' type='xsd:float'/>
+ </wsdl:message>
+ <wsdl:message name='divide1Out'>
+ <wsdl:part name='Result' type='xsd:float'/>
+ </wsdl:message>
+ <wsdl:message name='multiply2In'>
+ <wsdl:part name='x' type='xsd:float'/>
+ <wsdl:part name='y' type='xsd:float'/>
+ </wsdl:message>
+ <wsdl:message name='multiply2Out'>
+ <wsdl:part name='Result' type='xsd:float'/>
+ </wsdl:message>
+ <wsdl:message name='subtract3In'>
+ <wsdl:part name='x' type='xsd:float'/>
+ <wsdl:part name='y' type='xsd:float'/>
+ </wsdl:message>
+ <wsdl:message name='subtract3Out'>
+ <wsdl:part name='Result' type='xsd:float'/>
+ </wsdl:message>
+ <wsdl:portType name='ICalculator'>
+ <wsdl:operation name='add' parameterOrder='x y'>
+ <wsdl:input name='add0In' message='tns:add0In'/>
+ <wsdl:output name='add0Out' message='tns:add0Out'/>
+ </wsdl:operation>
+ <wsdl:operation name='divide' parameterOrder='numerator
+denominator'>
+ <wsdl:input name='divide1In' message='tns:divide1In'/>
+ <wsdl:output name='divide1Out' message='tns:divide1Out'/>
+ </wsdl:operation>
+ <wsdl:operation name='multiply' parameterOrder='x y'>
+ <wsdl:input name='multiply2In' message='tns:multiply2In'/>
+ <wsdl:output name='multiply2Out'
+message='tns:multiply2Out'/>
+ </wsdl:operation>
+ <wsdl:operation name='subtract' parameterOrder='x y'>
+ <wsdl:input name='subtract3In' message='tns:subtract3In'/>
+ <wsdl:output name='subtract3Out'
+message='tns:subtract3Out'/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name='ICalculator' type='tns:ICalculator'>
+ <soap:binding style='rpc'
+transport='http://schemas.xmlsoap.org/soap/http'/>
+ <wsdl:operation name='add'>
+ <soap:operation soapAction='add' style='rpc'/>
+ <wsdl:input name='add0In'>
+ <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+ </wsdl:input>
+ <wsdl:output name='add0Out'>
+ <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name='divide'>
+ <soap:operation soapAction='divide' style='rpc'/>
+ <wsdl:input name='divide1In'>
+ <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+ </wsdl:input>
+ <wsdl:output name='divide1Out'>
+ <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name='multiply'>
+ <soap:operation soapAction='multiply' style='rpc'/>
+ <wsdl:input name='multiply2In'>
+ <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+ </wsdl:input>
+ <wsdl:output name='multiply2Out'>
+ <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+ </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name='subtract'>
+ <soap:operation soapAction='subtract' style='rpc'/>
+ <wsdl:input name='subtract3In'>
+ <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+ </wsdl:input>
+ <wsdl:output name='subtract3Out'>
+ <soap:body use='encoded'
+namespace='http://www.fred.com'
+encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'/>
+ </wsdl:output>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name='Calculator'>
+ <wsdl:documentation>calculator service</wsdl:documentation>
+ <wsdl:port name='ICalculator' binding='tns:ICalculator'>
+ <soap:address
+location='http://ukulele:8080/calcapp/services/calculator'/>
+ </wsdl:port>
+ </wsdl:service>
+</wsdl:definitions>
diff --git a/test/soap/wsdlDriver/document.wsdl b/test/soap/wsdlDriver/document.wsdl
new file mode 100644
index 0000000000..5e9e74b9df
--- /dev/null
+++ b/test/soap/wsdlDriver/document.wsdl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions name="submit_service"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="urn:example.com:document"
+ targetNamespace="urn:example.com:document"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <xsd:schema targetNamespace="urn:example.com:document">
+ <xsd:element name="ruby">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element minOccurs="1" maxOccurs="1" name="myversion" type="tns:myversion"/>
+ <xsd:element minOccurs="0" maxOccurs="1" name="date" type="xsd:dateTime"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:simpleType name="myversion">
+ <xsd:restriction base="xsd:string">
+ <xsd:enumeration value="1.6"/>
+ <xsd:enumeration value="1.8"/>
+ <xsd:enumeration value="1.9"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+ </xsd:schema>
+ </types>
+
+ <message name="submit_msg">
+ <part name="parameters" element="tns:ruby"/>
+ </message>
+
+ <portType name="submit_port_type">
+ <operation name="submit">
+ <input message="tns:submit_msg"/>
+ <output message="tns:submit_msg"/>
+ </operation>
+ </portType>
+
+ <binding name="submit_binding" type="tns:submit_port_type">
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+ <operation name="submit">
+ <soap:operation soapAction="urn:example.com:document#submit" style="document"/>
+ <input><soap:body use="literal"/></input>
+ <output><soap:body use="literal"/></output>
+ </operation>
+ </binding>
+
+ <service name="submit_service">
+ <port name="submit_port" binding="tns:submit_binding">
+ <soap:address location="http://localhost:10080"/>
+ </port>
+ </service>
+</definitions>
diff --git a/test/soap/wsdlDriver/simpletype.wsdl b/test/soap/wsdlDriver/simpletype.wsdl
index 7c211a6b2c..6781dda552 100644
--- a/test/soap/wsdlDriver/simpletype.wsdl
+++ b/test/soap/wsdlDriver/simpletype.wsdl
@@ -10,12 +10,12 @@
<xsd:schema targetNamespace="urn:example.com:simpletype-rpc-type">
<xsd:complexType name="version_struct">
<xsd:all>
- <xsd:element name="version" type="txd:versions" />
+ <xsd:element name="myversion" type="txd:myversions" />
<xsd:element name="msg" type="xsd:string" />
</xsd:all>
</xsd:complexType>
- <xsd:simpleType name="versions">
+ <xsd:simpleType name="myversions">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="1.6"/>
<xsd:enumeration value="1.8"/>
@@ -26,7 +26,7 @@
</types>
<message name="msg_version">
- <part name="version" type="txd:versions"/>
+ <part name="myversion" type="txd:myversions"/>
</message>
<message name="msg_version_struct">
diff --git a/test/soap/wsdlDriver/test_calc.rb b/test/soap/wsdlDriver/test_calc.rb
new file mode 100644
index 0000000000..f1cc116a59
--- /dev/null
+++ b/test/soap/wsdlDriver/test_calc.rb
@@ -0,0 +1,88 @@
+require 'test/unit'
+require 'soap/rpc/httpserver'
+require 'soap/wsdlDriver'
+
+
+module SOAP
+
+
+class TestCalc < Test::Unit::TestCase
+ class Server < ::SOAP::RPC::HTTPServer
+ def on_init
+ add_method(self, 'add', 'x', 'y')
+ end
+
+ def add(x, y)
+ x.to_f + y.to_f
+ end
+ end
+
+ DIR = File.dirname(File.expand_path(__FILE__))
+ Port = 17171
+
+ def setup
+ setup_server
+ setup_client
+ end
+
+ def setup_server
+ @server = Server.new(
+ :BindAddress => "0.0.0.0",
+ :Port => Port,
+ :AccessLog => [],
+ :SOAPDefaultNamespace => 'http://www.fred.com'
+ )
+ @server.level = Logger::Severity::ERROR
+ @server_thread = start_server_thread(@server)
+ end
+
+ def setup_client
+ @wsdl = File.join(DIR, 'calc.wsdl')
+ end
+
+ def teardown
+ teardown_server
+ teardown_client
+ end
+
+ def teardown_server
+ @server.shutdown
+ @server_thread.kill
+ @server_thread.join
+ end
+
+ def teardown_client
+ @client.reset_stream if @client
+ end
+
+ def start_server_thread(server)
+ t = Thread.new {
+ Thread.current.abort_on_exception = true
+ server.start
+ }
+ t
+ end
+
+ def test_rpc_driver
+ @client = ::SOAP::WSDLDriverFactory.new(@wsdl).create_rpc_driver
+ @client.wiredump_dev = STDOUT if $DEBUG
+ @client.endpoint_url = "http://localhost:#{Port}/"
+ @client.generate_explicit_type = true
+ assert_equal(0.3, @client.add(0.1, 0.2))
+ @client.generate_explicit_type = false
+ assert_equal(0.3, @client.add(0.1, 0.2))
+ end
+
+ def test_old_driver
+ @client = ::SOAP::WSDLDriverFactory.new(@wsdl).create_driver
+ @client.wiredump_dev = STDOUT if $DEBUG
+ @client.endpoint_url = "http://localhost:#{Port}/"
+ @client.generate_explicit_type = true
+ assert_equal(0.3, @client.add(0.1, 0.2))
+ @client.generate_explicit_type = false
+ assert_equal(0.3, @client.add(0.1, 0.2))
+ end
+end
+
+
+end
diff --git a/test/soap/wsdlDriver/test_document.rb b/test/soap/wsdlDriver/test_document.rb
new file mode 100644
index 0000000000..634b827aae
--- /dev/null
+++ b/test/soap/wsdlDriver/test_document.rb
@@ -0,0 +1,78 @@
+require 'test/unit'
+require 'soap/rpc/standaloneServer'
+require 'soap/wsdlDriver'
+
+
+module SOAP
+
+
+class TestDocument < Test::Unit::TestCase
+ Namespace = 'urn:example.com:document'
+
+ class Server < ::SOAP::RPC::StandaloneServer
+ def on_init
+ add_document_method(self, 'urn:example.com:document#submit', 'submit', XSD::QName.new(Namespace, 'ruby'), XSD::QName.new(Namespace, 'ruby'))
+ end
+
+ def submit(ruby)
+ ruby
+ end
+ end
+
+ DIR = File.dirname(File.expand_path(__FILE__))
+
+ Port = 17171
+
+ def setup
+ setup_server
+ setup_client
+ end
+
+ def setup_server
+ @server = Server.new('Test', Namespace, '0.0.0.0', Port)
+ @server.level = Logger::Severity::ERROR
+ @server_thread = start_server_thread(@server)
+ end
+
+ def setup_client
+ wsdl = File.join(DIR, 'document.wsdl')
+ @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+ @client.endpoint_url = "http://localhost:#{Port}/"
+ @client.wiredump_dev = STDOUT if $DEBUG
+ end
+
+ def teardown
+ teardown_server
+ teardown_client
+ end
+
+ def teardown_server
+ @server.shutdown
+ @server_thread.kill
+ @server_thread.join
+ end
+
+ def teardown_client
+ @client.reset_stream
+ end
+
+ def start_server_thread(server)
+ t = Thread.new {
+ Thread.current.abort_on_exception = true
+ server.start
+ }
+ t
+ end
+
+ def test_document
+ msg = {'myversion' => "1.9", 'date' => "2004-01-01T00:00:00Z"}
+ reply_msg = @client.submit(msg)
+ assert_equal('1.9', reply_msg.myversion)
+ assert_equal('1.9', reply_msg['myversion'])
+ assert_equal('2004-01-01T00:00:00Z', reply_msg.date)
+ assert_equal('2004-01-01T00:00:00Z', reply_msg['date'])
+ end
+end
+
+
+end
diff --git a/test/soap/wsdlDriver/test_simpletype.rb b/test/soap/wsdlDriver/test_simpletype.rb
index ed628927cd..76b3a32df7 100644
--- a/test/soap/wsdlDriver/test_simpletype.rb
+++ b/test/soap/wsdlDriver/test_simpletype.rb
@@ -30,6 +30,7 @@ class TestSimpleType < Test::Unit::TestCase
def setup_server
@server = Server.new(
+ :BindAddress => "0.0.0.0",
:Port => Port,
:AccessLog => [],
:SOAPDefaultNamespace => "urn:example.com:simpletype-rpc"
@@ -40,7 +41,8 @@ class TestSimpleType < Test::Unit::TestCase
def setup_client
wsdl = File.join(DIR, 'simpletype.wsdl')
- @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_driver
+ @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+ @client.wiredump_dev = STDOUT if $DEBUG
@client.endpoint_url = "http://localhost:#{Port}/"
@client.generate_explicit_type = false
end
@@ -65,13 +67,6 @@ class TestSimpleType < Test::Unit::TestCase
Thread.current.abort_on_exception = true
server.start
}
- while server.status != :Running
- sleep 0.1
- unless t.alive?
- t.join
- raise
- end
- end
t
end
@@ -79,10 +74,10 @@ class TestSimpleType < Test::Unit::TestCase
result = @client.echo_version("1.9")
assert_equal("1.9", result.version)
assert_equal("checked", result.msg)
- assert_raise(::XSD::ValueSpaceError) do
+ assert_raise(XSD::ValueSpaceError) do
@client.echo_version("2.0")
end
- assert_raise(::XSD::ValueSpaceError) do
+ assert_raise(XSD::ValueSpaceError) do
@client.echo_version(nil) # nil => "2.0" => out of range
end
end