summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authornahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-22 13:20:28 +0000
committernahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-05-22 13:20:28 +0000
commit991d0c409cc6b1d916330a32a9624aef808176a4 (patch)
tree5e2cc150dc84ab3f6f64685ec7f54e6b2077eae7 /test
parent15b7d439885f4aa97e0f508ef485cadab4b23577 (diff)
* lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.4.
== SOAP client and server == === for both client side and server side === * improved document/literal service support. style(rpc,document)/use(encoding, literal) combination are all supported. for the detail about combination, see test/soap/test_style.rb. * let WSDLEncodedRegistry#soap2obj map SOAP/OM to Ruby according to WSDL as well as obj2soap. closes #70. * let SOAP::Mapping::Object handle XML attribute for doc/lit service. you can set/get XML attribute via accessor methods which as a name 'xmlattr_' prefixed (<foo name="bar"/> -> Foo#xmlattr_name). === client side === * WSDLDriver capitalized name operation bug fixed. from 1.5.3-ruby1.8.2, operation which has capitalized name (such as KeywordSearchRequest in AWS) is defined as a method having uncapitalized name. (converted with GenSupport.safemethodname to handle operation name 'foo-bar'). it introduced serious incompatibility; in the past, it was defined as a capitalized. define capitalized method as well under that circumstance. * added new factory interface 'WSDLDriverFactory#create_rpc_driver' to create RPC::Driver, not WSDLDriver (RPC::Driver and WSDLDriver are merged). 'WSDLDriverFactory#create_driver' still creates WSDLDriver for compatibility but it warns that the method is deprecated. please use create_rpc_driver instead of create_driver. * allow to use an URI object as an endpoint_url even with net/http, not http-access2. === server side === * added mod_ruby support to SOAP::CGIStub. rename a CGI script server.cgi to server.rb and let mod_ruby's RubyHandler handles the script. CGIStub detects if it's running under mod_ruby environment or not. * added fcgi support to SOAP::CGIStub. see the sample at sample/soap/calc/server.fcgi. (almost same as server.cgi but has fcgi handler at the bottom.) * allow to return a SOAPFault object to respond customized SOAP fault. * added the interface 'generate_explicit_type' for server side (CGIStub, HTTPServer). call 'self.generate_explicit_type = true' if you want to return simplified XML even if it's rpc/encoded service. == WSDL == === WSDL definition === * improved XML Schema support such as extension, restriction, simpleType, complexType + simpleContent, ref, length, import, include. * reduced "unknown element/attribute" warnings (warn only 1 time for each QName). * importing XSD file at schemaLocation with xsd:import. === code generation from WSDL === * generator crashed when there's '-' in defined element/attribute name. * added ApacheMap WSDL definition. * sample/{soap,wsdl}: removed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-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/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_streamhandler.rb20
-rw-r--r--test/soap/wsdlDriver/simpletype.wsdl6
-rw-r--r--test/soap/wsdlDriver/test_calc.rb3
-rw-r--r--test/soap/wsdlDriver/test_simpletype.rb15
-rw-r--r--test/wsdl/datetime/DatetimeService.rb42
-rw-r--r--test/wsdl/datetime/test_datetime.rb10
-rw-r--r--test/wsdl/map/test_map.rb11
-rw-r--r--test/wsdl/raa/RAAService.rb3
-rw-r--r--test/wsdl/raa/test_raa.rb9
-rw-r--r--test/wsdl/simpletype/simpletype.wsdl38
-rw-r--r--test/wsdl/simpletype/test_simpletype.rb42
-rw-r--r--test/wsdl/soap/test_soapbodyparts.rb27
-rw-r--r--test/xsd/test_xsd.rb6
25 files changed, 172 insertions, 169 deletions
diff --git a/test/soap/calc/test_calc.rb b/test/soap/calc/test_calc.rb
index 4210c65..8873871 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 d15cfe9..8d6180e 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 d1655b0..d288306 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/header/server.cgi b/test/soap/header/server.cgi
index f9739d0..2a18853 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 = false
+ succeeded = false
userid = my_header["userid"]
passwd = my_header["passwd"]
if login(userid, passwd)
- auth = true
+ succeeded = true
elsif sessionid = my_header["sessionid"]
if userid = auth(sessionid)
destroy_session(sessionid)
- auth = true
+ succeeded = true
end
end
- raise RuntimeError.new("authentication failed") unless auth
+ 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 2c04769..47e1e76 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 03bd1bb..d70b022 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 cd78d9f..40c35b5 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 52a8d68..4f67eb9 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 82bb890..d6df970 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 71ada31..d92f4bc 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 29bdf88..8389d88 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 afd550f..3785873 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_streamhandler.rb b/test/soap/test_streamhandler.rb
index fa0080e..a8d06d5 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/wsdlDriver/simpletype.wsdl b/test/soap/wsdlDriver/simpletype.wsdl
index 7c211a6..6781dda 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
index f1cc116..629c5cd 100644
--- a/test/soap/wsdlDriver/test_calc.rb
+++ b/test/soap/wsdlDriver/test_calc.rb
@@ -73,7 +73,8 @@ class TestCalc < Test::Unit::TestCase
assert_equal(0.3, @client.add(0.1, 0.2))
end
- def test_old_driver
+ # test for backward compatibility
+ def __NOTEST__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/soap/wsdlDriver/test_simpletype.rb b/test/soap/wsdlDriver/test_simpletype.rb
index ed62892..76b3a32 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
diff --git a/test/wsdl/datetime/DatetimeService.rb b/test/wsdl/datetime/DatetimeService.rb
index 91c0060..800e06d 100644
--- a/test/wsdl/datetime/DatetimeService.rb
+++ b/test/wsdl/datetime/DatetimeService.rb
@@ -2,37 +2,43 @@
require 'datetimeServant.rb'
require 'soap/rpc/standaloneServer'
+require 'soap/mapping/registry'
class DatetimePortType
- MappingRegistry = SOAP::Mapping::Registry.new
-
- # No mapping definition
+ MappingRegistry = ::SOAP::Mapping::Registry.new
Methods = [
- ["now", "now", [
- ["in", "now",
- [SOAP::SOAPDateTime]],
- ["retval", "now",
- [SOAP::SOAPDateTime]]], "", "urn:jp.gr.jin.rrr.example.datetime"]
+ ["now", "now",
+ [
+ ["in", "now", [::SOAP::SOAPDateTime]],
+ ["retval", "now", [::SOAP::SOAPDateTime]]
+ ],
+ "", "urn:jp.gr.jin.rrr.example.datetime", :rpc
+ ]
]
end
-class DatetimePortTypeApp < SOAP::RPC::StandaloneServer
+class DatetimePortTypeApp < ::SOAP::RPC::StandaloneServer
def initialize(*arg)
- super
-
+ super(*arg)
servant = DatetimePortType.new
- DatetimePortType::Methods.each do |name_as, name, params, soapaction, namespace|
- qname = XSD::QName.new(namespace, name_as)
- @soaplet.app_scope_router.add_method(servant, qname, soapaction,
- name, params)
+ DatetimePortType::Methods.each do |name_as, name, param_def, soapaction, namespace, style|
+ if style == :document
+ @router.add_document_operation(servant, soapaction, name, param_def)
+ else
+ qname = XSD::QName.new(namespace, name_as)
+ @router.add_rpc_operation(servant, qname, soapaction, name, param_def)
+ end
end
-
self.mapping_registry = DatetimePortType::MappingRegistry
end
end
-# Change listen port.
if $0 == __FILE__
- DatetimePortTypeApp.new('app', nil, '0.0.0.0', 10080).start
+ # Change listen port.
+ server = DatetimePortTypeApp.new('app', nil, '0.0.0.0', 10080)
+ trap(:INT) do
+ server.shutdown
+ end
+ server.start
end
diff --git a/test/wsdl/datetime/test_datetime.rb b/test/wsdl/datetime/test_datetime.rb
index 0f531ff..7652318 100644
--- a/test/wsdl/datetime/test_datetime.rb
+++ b/test/wsdl/datetime/test_datetime.rb
@@ -24,20 +24,14 @@ class TestDatetime < 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
wsdl = File.join(DIR, 'datetime.wsdl')
- @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_driver
+ @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
@client.endpoint_url = "http://localhost:#{Port}/"
@client.generate_explicit_type = true
+ @client.wiredump_dev = STDOUT if $DEBUG
end
def teardown
diff --git a/test/wsdl/map/test_map.rb b/test/wsdl/map/test_map.rb
index bee3a75..68f7d76 100644
--- a/test/wsdl/map/test_map.rb
+++ b/test/wsdl/map/test_map.rb
@@ -32,6 +32,7 @@ class TestMap < Test::Unit::TestCase
def setup_server
@server = Server.new(
+ :BindAddress => "0.0.0.0",
:Port => Port,
:AccessLog => [],
:SOAPDefaultNamespace => "urn:map"
@@ -41,20 +42,14 @@ class TestMap < 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
wsdl = File.join(DIR, 'map.wsdl')
- @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_driver
+ @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
@client.endpoint_url = "http://localhost:#{Port}/"
@client.generate_explicit_type = true
+ @client.wiredump_dev = STDOUT if $DEBUG
end
def teardown
diff --git a/test/wsdl/raa/RAAService.rb b/test/wsdl/raa/RAAService.rb
index 42cdfae..9d08133 100644
--- a/test/wsdl/raa/RAAService.rb
+++ b/test/wsdl/raa/RAAService.rb
@@ -87,8 +87,7 @@ class App < SOAP::RPC::StandaloneServer
servant = RAABaseServicePortType.new
RAABaseServicePortType::Methods.each do |name_as, name, params, soapaction, namespace|
qname = XSD::QName.new(namespace, name_as)
- @soaplet.app_scope_router.add_method(servant, qname, soapaction,
- name, params)
+ @router.add_method(servant, qname, soapaction, name, params)
end
self.mapping_registry = RAABaseServicePortType::MappingRegistry
diff --git a/test/wsdl/raa/test_raa.rb b/test/wsdl/raa/test_raa.rb
index cf171b3..0b00042 100644
--- a/test/wsdl/raa/test_raa.rb
+++ b/test/wsdl/raa/test_raa.rb
@@ -26,18 +26,11 @@ class TestRAA < 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
wsdl = File.join(DIR, 'raa.wsdl')
- @raa = ::SOAP::WSDLDriverFactory.new(wsdl).create_driver
+ @raa = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
@raa.endpoint_url = "http://localhost:#{Port}/"
end
diff --git a/test/wsdl/simpletype/simpletype.wsdl b/test/wsdl/simpletype/simpletype.wsdl
index ec3266f..623969c 100644
--- a/test/wsdl/simpletype/simpletype.wsdl
+++ b/test/wsdl/simpletype/simpletype.wsdl
@@ -10,19 +10,28 @@
<xsd:element name="ruby">
<xsd:complexType>
<xsd:sequence>
- <xsd:element minOccurs="1" maxOccurs="1" name="version" type="tns:version"/>
+ <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="version">
+ <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:element name="myid" type="tns:ID"/>
+
+ <xsd:simpleType name="ID">
+ <xsd:restriction base="xsd:string">
+ <xsd:length value="18"/>
+ <xsd:pattern value='[a-zA-Z0-9]{18}'/>
+ </xsd:restriction>
+ </xsd:simpleType>
</xsd:schema>
</types>
@@ -31,11 +40,19 @@
</message>
<message name="ping_out">
- <part name="parameters" element="xsd:string"/>
+ <part name="parameters" type="xsd:string"/>
+ </message>
+
+ <message name="ping_id_in">
+ <part name="parameters" element="tns:myid"/>
+ </message>
+
+ <message name="ping_id_out">
+ <part name="parameters" element="tns:myid"/>
</message>
<message name="versionmsg">
- <part name="version" element="tns:version"/>
+ <part name="myversion" element="tns:myversion"/>
</message>
<portType name="ping_port_type">
@@ -44,6 +61,11 @@
<output message="tns:ping_out"/>
</operation>
+ <operation name="ping_id">
+ <input message="tns:ping_id_in"/>
+ <output message="tns:ping_id_out"/>
+ </operation>
+
<operation name="echo_version">
<input message="tns:versionmsg"/>
<output message="tns:versionmsg"/>
@@ -53,7 +75,13 @@
<binding name="ping_binding" type="tns:ping_port_type">
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
<operation name="ping">
- <soap:operation soapAction="urn:example.com:simpletype" style="document"/>
+ <soap:operation soapAction="urn:example.com:simpletype:ping" style="document"/>
+ <input><soap:body use="literal"/></input>
+ <output><soap:body use="literal"/></output>
+ </operation>
+
+ <operation name="ping_id">
+ <soap:operation soapAction="urn:example.com:simpletype:ping_id" style="document"/>
<input><soap:body use="literal"/></input>
<output><soap:body use="literal"/></output>
</operation>
diff --git a/test/wsdl/simpletype/test_simpletype.rb b/test/wsdl/simpletype/test_simpletype.rb
index a46bf5d..7e644c3 100644
--- a/test/wsdl/simpletype/test_simpletype.rb
+++ b/test/wsdl/simpletype/test_simpletype.rb
@@ -10,12 +10,23 @@ module SimpleType
class TestSimpleType < Test::Unit::TestCase
class Server < ::SOAP::RPC::StandaloneServer
def on_init
- add_method(self, 'ruby', 'version', 'date')
+ add_document_method(self, 'urn:example.com:simpletype:ping', 'ping',
+ XSD::QName.new('urn:example.com:simpletype', 'ruby'),
+ XSD::QName.new('http://www.w3.org/2001/XMLSchema', 'string'))
+ add_document_method(self, 'urn:example.com:simpletype:ping_id', 'ping_id',
+ XSD::QName.new('urn:example.com:simpletype', 'myid'),
+ XSD::QName.new('urn:example.com:simpletype', 'myid'))
end
- def ruby(version, date)
+ def ping(ruby)
+ version = ruby["myversion"]
+ date = ruby["date"]
"#{version} (#{date})"
end
+
+ def ping_id(id)
+ id
+ end
end
DIR = File.dirname(File.expand_path(__FILE__))
@@ -35,9 +46,10 @@ 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.endpoint_url = "http://localhost:#{Port}/"
@client.generate_explicit_type = false
+ @client.wiredump_dev = STDOUT if $DEBUG
end
def teardown
@@ -60,19 +72,25 @@ 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
def test_ping
- header, body = @client.ping(nil, {:version => "1.9", :date => "2004-01-01T00:00:00Z"})
- assert_equal("1.9 (2004-01-01T00:00:00Z)", body)
+ ret = @client.ping({:myversion => "1.9", :date => "2004-01-01T00:00:00Z"})
+ assert_equal("1.9 (2004-01-01T00:00:00Z)", ret)
+ end
+
+ def test_ping_id
+ ret = @client.ping_id("012345678901234567")
+ assert_equal("012345678901234567", ret)
+ # length
+ assert_raise(XSD::ValueSpaceError) do
+ @client.ping_id("0123456789012345678")
+ end
+ # pattern
+ assert_raise(XSD::ValueSpaceError) do
+ @client.ping_id("01234567890123456;")
+ end
end
end
diff --git a/test/wsdl/soap/test_soapbodyparts.rb b/test/wsdl/soap/test_soapbodyparts.rb
index efead18..291319a 100644
--- a/test/wsdl/soap/test_soapbodyparts.rb
+++ b/test/wsdl/soap/test_soapbodyparts.rb
@@ -10,19 +10,19 @@ module SOAP
class TestSOAPBodyParts < Test::Unit::TestCase
class Server < ::SOAP::RPC::StandaloneServer
def on_init
- add_method(self, 'foo', 'p1', 'p2')
- add_method(self, 'bar', 'p1', 'p2')
+ add_method(self, 'foo', 'p1', 'p2', 'p3')
+ add_method(self, 'bar', 'p1', 'p2', 'p3')
add_method(self, 'baz', 'p1', 'p2', 'p3')
end
- def foo(p1, p2)
- [p1, p2]
+ def foo(p1, p2, p3)
+ [p1, p2, p3]
end
alias bar foo
def baz(p1, p2, p3)
- [p1, p2, p3]
+ [p3, p2, p1]
end
end
@@ -42,18 +42,11 @@ class TestSOAPBodyParts < 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
wsdl = File.join(DIR, 'soapbodyparts.wsdl')
- @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_driver
+ @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
@client.endpoint_url = "http://localhost:#{Port}/"
@client.wiredump_dev = STDERR if $DEBUG
end
@@ -74,10 +67,10 @@ class TestSOAPBodyParts < Test::Unit::TestCase
end
def test_soapbodyparts
- assert_equal(["2", "1"], @client.foo("1", "2"))
- assert_equal(["1", "2"], @client.foo("2", "1"))
- assert_equal(["2", "3"], @client.bar("2", "3"))
- assert_equal(["1", "2", "3"], @client.baz("1", "2", "3"))
+ assert_equal(["1", "2", "3"], @client.foo("1", "2", "3"))
+ assert_equal(["3", "2", "1"], @client.foo("3", "2", "1"))
+ assert_equal(["1", "2", "3"], @client.bar("1", "2", "3"))
+ assert_equal(["3", "2", "1"], @client.baz("1", "2", "3"))
end
end
diff --git a/test/xsd/test_xsd.rb b/test/xsd/test_xsd.rb
index 1f59457..6302f31 100644
--- a/test/xsd/test_xsd.rb
+++ b/test/xsd/test_xsd.rb
@@ -414,6 +414,9 @@ class TestXSD < Test::Unit::TestCase
]
targets.each do |data, expected|
assert_equal(expected, XSD::XSDDateTime.new(data).to_s)
+ d = DateTime.parse(data)
+ d >>= 12 if d.year < 0 # XSDDateTime.year(-1) == DateTime.year(0)
+ assert_equal(expected, XSD::XSDDateTime.new(d).to_s)
end
targets = [
@@ -513,6 +516,9 @@ class TestXSD < Test::Unit::TestCase
]
targets.each do |data, expected|
assert_equal(expected, XSD::XSDDate.new(data).to_s)
+ d = Date.parse(data)
+ d >>= 12 if d.year < 0 # XSDDate.year(-1) == Date.year(0)
+ assert_equal(expected, XSD::XSDDate.new(d).to_s)
end
end
end