summaryrefslogtreecommitdiff
path: root/test/wsdl
diff options
context:
space:
mode:
Diffstat (limited to 'test/wsdl')
-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
8 files changed, 104 insertions, 78 deletions
diff --git a/test/wsdl/datetime/DatetimeService.rb b/test/wsdl/datetime/DatetimeService.rb
index 91c006005d..800e06d66f 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 0f531ff18c..7652318205 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 bee3a75892..68f7d76e05 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 42cdfaea47..9d0813304c 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 cf171b373f..0b00042ffb 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 ec3266fc14..623969c794 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 a46bf5dd78..7e644c3042 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 efead18301..291319aedf 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 21:09:59 +0000