From 810a605c34d97fa878cb5b615b9e95a2fee84ca8 Mon Sep 17 00:00:00 2001 From: nahi Date: Sun, 22 May 2005 13:03:38 +0000 Subject: * 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#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: http://svn.ruby-lang.org/repos/ruby/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/wsdl/datetime/DatetimeService.rb | 42 ++++---- test/wsdl/datetime/test_datetime.rb | 10 +- test/wsdl/document/document.wsdl | 74 ++++++++++++++ test/wsdl/document/echo.rb | 92 +++++++++++++++++ test/wsdl/document/number.wsdl | 54 ++++++++++ test/wsdl/document/ping_nosoapaction.wsdl | 66 +++++++++++++ test/wsdl/document/test_nosoapaction.rb | 109 ++++++++++++++++++++ test/wsdl/document/test_number.rb | 99 +++++++++++++++++++ test/wsdl/document/test_rpc.rb | 159 ++++++++++++++++++++++++++++++ test/wsdl/map/test_map.rb | 11 +-- test/wsdl/marshal/person.wsdl | 21 ++++ test/wsdl/marshal/person_org.rb | 22 +++++ test/wsdl/marshal/test_wsdlmarshal.rb | 80 +++++++++++++++ test/wsdl/raa/RAAService.rb | 3 +- test/wsdl/raa/server.rb | 103 +++++++++++++++++++ test/wsdl/raa/test_raa.rb | 9 +- test/wsdl/rpc/rpc.wsdl | 75 ++++++++++++++ test/wsdl/rpc/test_rpc.rb | 118 ++++++++++++++++++++++ test/wsdl/simpletype/simpletype.wsdl | 38 ++++++- test/wsdl/simpletype/test_simpletype.rb | 42 +++++--- test/wsdl/soap/test_soapbodyparts.rb | 27 ++--- 21 files changed, 1176 insertions(+), 78 deletions(-) create mode 100644 test/wsdl/document/document.wsdl create mode 100644 test/wsdl/document/echo.rb create mode 100644 test/wsdl/document/number.wsdl create mode 100644 test/wsdl/document/ping_nosoapaction.wsdl create mode 100644 test/wsdl/document/test_nosoapaction.rb create mode 100644 test/wsdl/document/test_number.rb create mode 100644 test/wsdl/document/test_rpc.rb create mode 100644 test/wsdl/marshal/person.wsdl create mode 100644 test/wsdl/marshal/person_org.rb create mode 100644 test/wsdl/marshal/test_wsdlmarshal.rb create mode 100644 test/wsdl/raa/server.rb create mode 100644 test/wsdl/rpc/rpc.wsdl create mode 100644 test/wsdl/rpc/test_rpc.rb (limited to 'test/wsdl') diff --git a/test/wsdl/datetime/DatetimeService.rb b/test/wsdl/datetime/DatetimeService.rb index 91c006005..800e06d66 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 0f531ff18..765231820 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/document/document.wsdl b/test/wsdl/document/document.wsdl new file mode 100644 index 000000000..fbf03fae8 --- /dev/null +++ b/test/wsdl/document/document.wsdl @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/wsdl/document/echo.rb b/test/wsdl/document/echo.rb new file mode 100644 index 000000000..05f00412f --- /dev/null +++ b/test/wsdl/document/echo.rb @@ -0,0 +1,92 @@ +require 'xsd/qname' + +# {urn:docrpc}echoele +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")]]] + + attr_accessor :struct1 + attr_accessor :struct_2 + + def xmlattr_attr_string + (@__xmlattr ||= {})[XSD::QName.new(nil, "attr_string")] + end + + def xmlattr_attr_string=(value) + (@__xmlattr ||= {})[XSD::QName.new(nil, "attr_string")] = value + end + + def xmlattr_attr_int + (@__xmlattr ||= {})[XSD::QName.new(nil, "attr-int")] + end + + def xmlattr_attr_int=(value) + (@__xmlattr ||= {})[XSD::QName.new(nil, "attr-int")] = value + end + + def initialize(struct1 = nil, struct_2 = nil) + @struct1 = struct1 + @struct_2 = struct_2 + @__xmlattr = {} + end +end + +# {urn:docrpc}echo_response +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")]]] + + attr_accessor :struct1 + attr_accessor :struct_2 + + def xmlattr_attr_string + (@__xmlattr ||= {})[XSD::QName.new(nil, "attr_string")] + end + + def xmlattr_attr_string=(value) + (@__xmlattr ||= {})[XSD::QName.new(nil, "attr_string")] = value + end + + def xmlattr_attr_int + (@__xmlattr ||= {})[XSD::QName.new(nil, "attr-int")] + end + + def xmlattr_attr_int=(value) + (@__xmlattr ||= {})[XSD::QName.new(nil, "attr-int")] = value + end + + def initialize(struct1 = nil, struct_2 = nil) + @struct1 = struct1 + @struct_2 = struct_2 + @__xmlattr = {} + end +end + +# {urn:docrpc}echo_struct +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"]] + + attr_accessor :m_string + attr_accessor :m_datetime + + def xmlattr_m_attr + (@__xmlattr ||= {})[XSD::QName.new("urn:docrpc", "m_attr")] + end + + def xmlattr_m_attr=(value) + (@__xmlattr ||= {})[XSD::QName.new("urn:docrpc", "m_attr")] = value + end + + def initialize(m_string = nil, m_datetime = nil) + @m_string = m_string + @m_datetime = m_datetime + @__xmlattr = {} + end +end diff --git a/test/wsdl/document/number.wsdl b/test/wsdl/document/number.wsdl new file mode 100644 index 000000000..cc3dd8e9f --- /dev/null +++ b/test/wsdl/document/number.wsdl @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/wsdl/document/ping_nosoapaction.wsdl b/test/wsdl/document/ping_nosoapaction.wsdl new file mode 100644 index 000000000..ab9529e45 --- /dev/null +++ b/test/wsdl/document/ping_nosoapaction.wsdl @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/wsdl/document/test_nosoapaction.rb b/test/wsdl/document/test_nosoapaction.rb new file mode 100644 index 000000000..77f642fe1 --- /dev/null +++ b/test/wsdl/document/test_nosoapaction.rb @@ -0,0 +1,109 @@ +require 'test/unit' +require 'wsdl/parser' +require 'wsdl/soap/wsdl2ruby' +require 'soap/rpc/standaloneServer' +require 'soap/wsdlDriver' +require 'soap/rpc/driver' + + +module WSDL; module Document + + +class TestNoSOAPAction < Test::Unit::TestCase + class Server < ::SOAP::RPC::StandaloneServer + Namespace = 'http://xmlsoap.org/Ping' + + def on_init + add_document_method( + self, + Namespace + '/ping', + 'ping_with_soapaction', + XSD::QName.new(Namespace, 'Ping'), + XSD::QName.new(Namespace, 'PingResponse') + ) + + add_document_method( + self, + nil, + 'ping', + XSD::QName.new(Namespace, 'Ping'), + XSD::QName.new(Namespace, 'PingResponse') + ) + + # When no SOAPAction given, latter method(ping) is called. + end + + def ping(arg) + arg.text = 'ping' + arg + end + + def ping_with_soapaction(arg) + arg.text = 'ping_with_soapaction' + arg + end + end + + DIR = File.dirname(File.expand_path(__FILE__)) + + Port = 17171 + + def setup + setup_server + @client = nil + end + + def teardown + teardown_server + @client.reset_stream if @client + end + + def setup_server + @server = Server.new('Test', Server::Namespace, '0.0.0.0', Port) + @server.level = Logger::Severity::ERROR + @server_thread = start_server_thread(@server) + end + + def teardown_server + @server.shutdown + @server_thread.kill + @server_thread.join + end + + def start_server_thread(server) + t = Thread.new { + Thread.current.abort_on_exception = true + server.start + } + t + end + + def test_with_soapaction + wsdl = File.join(DIR, 'ping_nosoapaction.wsdl') + @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver + @client.endpoint_url = "http://localhost:#{Port}/" + @client.wiredump_dev = STDOUT if $DEBUG + rv = @client.ping(:scenario => 'scenario', :origin => 'origin', + :text => 'text') + assert_equal('scenario', rv.scenario) + assert_equal('origin', rv.origin) + assert_equal('ping', rv.text) + end + + def test_without_soapaction + @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/", + Server::Namespace) + @client.add_document_method('ping', Server::Namespace + '/ping', + XSD::QName.new(Server::Namespace, 'Ping'), + XSD::QName.new(Server::Namespace, 'PingResponse')) + @client.wiredump_dev = STDOUT if $DEBUG + rv = @client.ping(:scenario => 'scenario', :origin => 'origin', + :text => 'text') + assert_equal('scenario', rv.scenario) + assert_equal('origin', rv.origin) + assert_equal('ping_with_soapaction', rv.text) + end +end + + +end; end diff --git a/test/wsdl/document/test_number.rb b/test/wsdl/document/test_number.rb new file mode 100644 index 000000000..a640ef2a2 --- /dev/null +++ b/test/wsdl/document/test_number.rb @@ -0,0 +1,99 @@ +require 'test/unit' +require 'wsdl/parser' +require 'wsdl/soap/wsdl2ruby' +require 'soap/rpc/standaloneServer' +require 'soap/wsdlDriver' + + +module WSDL; module Document + + +class TestNumber < Test::Unit::TestCase + class Server < ::SOAP::RPC::StandaloneServer + Namespace = 'urn:foo' + + def on_init + add_document_method( + self, + Namespace + ':get_foo', + 'get_foo', + XSD::QName.new(Namespace, 'get_foo'), + XSD::QName.new(Namespace, 'get_foo_response') + ) + end + + def get_foo(arg) + arg.number + end + end + + DIR = File.dirname(File.expand_path(__FILE__)) + Port = 17171 + + def setup + setup_server + setup_classdef + @client = nil + end + + def teardown + teardown_server + File.unlink(pathname('foo.rb')) + @client.reset_stream if @client + end + + def setup_server + @server = Server.new('Test', "urn:rpc", '0.0.0.0', Port) + @server.level = Logger::Severity::ERROR + @server_thread = start_server_thread(@server) + end + + def setup_classdef + gen = WSDL::SOAP::WSDL2Ruby.new + gen.location = pathname("number.wsdl") + gen.basedir = DIR + gen.logger.level = Logger::FATAL + gen.opt['classdef'] = nil + gen.opt['force'] = true + gen.run + require pathname('foo') + end + + def teardown_server + @server.shutdown + @server_thread.kill + @server_thread.join + end + + def start_server_thread(server) + t = Thread.new { + Thread.current.abort_on_exception = true + server.start + } + t + end + + def pathname(filename) + File.join(DIR, filename) + end + + def test_wsdl + wsdl = File.join(DIR, 'number.wsdl') + @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver + @client.endpoint_url = "http://localhost:#{Port}/" + @client.wiredump_dev = STDOUT if $DEBUG + + # with the Struct defined in foo.rb, which is generated from WSDL + assert_equal("12345", @client.get_foo(Get_foo.new("12345"))) + + # with Hash + assert_equal("12345", @client.get_foo({:number => "12345"})) + + # with Original struct + get_foo_struct = Struct.new(:number) + assert_equal("12345", @client.get_foo(get_foo_struct.new("12345"))) + end +end + + +end; end diff --git a/test/wsdl/document/test_rpc.rb b/test/wsdl/document/test_rpc.rb new file mode 100644 index 000000000..66b804a0f --- /dev/null +++ b/test/wsdl/document/test_rpc.rb @@ -0,0 +1,159 @@ +require 'test/unit' +require 'wsdl/parser' +require 'wsdl/soap/wsdl2ruby' +require 'soap/rpc/standaloneServer' +require 'soap/wsdlDriver' + + +module WSDL; module Document + + +class TestRPC < Test::Unit::TestCase + class Server < ::SOAP::RPC::StandaloneServer + Namespace = 'urn:docrpc' + + def on_init + add_document_method( + self, + Namespace + ':echo', + 'echo', + XSD::QName.new(Namespace, 'echo'), + XSD::QName.new(Namespace, 'echo_response') + ) + end + + def echo(arg) + if arg.is_a?(Echoele) + # swap args + tmp = arg.struct1 + arg.struct1 = arg.struct_2 + arg.struct_2 = tmp + arg + else + # swap args + tmp = arg["struct1"] + arg["struct1"] = arg["struct-2"] + arg["struct-2"] = tmp + arg + end + end + end + + DIR = File.dirname(File.expand_path(__FILE__)) + + Port = 17171 + + def setup + setup_server + setup_classdef + @client = nil + end + + def teardown + teardown_server + #File.unlink(pathname('echo.rb')) + @client.reset_stream if @client + end + + def setup_server + @server = Server.new('Test', "urn:rpc", '0.0.0.0', Port) + @server.level = Logger::Severity::ERROR + @server_thread = start_server_thread(@server) + end + + def setup_classdef + gen = WSDL::SOAP::WSDL2Ruby.new + gen.location = pathname("document.wsdl") + gen.basedir = DIR + gen.logger.level = Logger::FATAL + gen.opt['classdef'] = nil + gen.opt['force'] = true + gen.run + require pathname('echo') + end + + def teardown_server + @server.shutdown + @server_thread.kill + @server_thread.join + end + + def start_server_thread(server) + t = Thread.new { + Thread.current.abort_on_exception = true + server.start + } + t + end + + def pathname(filename) + File.join(DIR, filename) + end + + def test_wsdl + 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 + + struct1 = Echo_struct.new("mystring1", now1 = Time.now) + struct1.xmlattr_m_attr = 'myattr1' + struct2 = Echo_struct.new("mystring2", now2 = Time.now) + struct2.xmlattr_m_attr = 'myattr2' + echo = Echoele.new(struct1, struct2) + echo.xmlattr_attr_string = 'attr_string' + echo.xmlattr_attr_int = 5 + ret = @client.echo(echo) + + timeformat = "%Y-%m-%dT%H:%M:%S.%s" + assert_equal("mystring2", ret.struct1.m_string) + assert_equal(now2.strftime(timeformat), ret.struct1.m_datetime.strftime(timeformat)) + assert_equal("mystring1", ret.struct_2.m_string) + assert_equal(now1.strftime(timeformat), ret.struct_2.m_datetime.strftime(timeformat)) + assert_equal("attr_string", ret.xmlattr_attr_string) + assert_equal(5, ret.xmlattr_attr_int) + end + + include ::SOAP + def test_naive + @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/") + @client.add_document_method('echo', 'urn:docrpc:echo', + XSD::QName.new('urn:docrpc', 'echoele'), + XSD::QName.new('urn:docrpc', 'echo_response')) + @client.wiredump_dev = STDOUT if $DEBUG + + echo = SOAPElement.new('foo') + echo.extraattr['attr_string'] = 'attr_string' + echo.extraattr['attr-int'] = 5 + echo.add(struct1 = SOAPElement.new('struct1')) + struct1.add(SOAPElement.new('m_string', 'mystring1')) + struct1.add(SOAPElement.new('m_datetime', '2005-03-17T19:47:31+01:00')) + struct1.extraattr['m_attr'] = 'myattr1' + echo.add(struct2 = SOAPElement.new('struct-2')) + struct2.add(SOAPElement.new('m_string', 'mystring2')) + struct2.add(SOAPElement.new('m_datetime', '2005-03-17T19:47:32+02:00')) + struct2.extraattr['m_attr'] = 'myattr2' + ret = @client.echo(echo) + timeformat = "%Y-%m-%dT%H:%M:%S" + assert_equal('mystring2', ret.struct1.m_string) + assert_equal('2005-03-17T19:47:32', ret.struct1.m_datetime.strftime(timeformat)) + #p ret.struct1.class + #p ret.struct_2.class + assert_equal("mystring1", ret.struct_2.m_string) + assert_equal('2005-03-17T19:47:31', ret.struct_2.m_datetime.strftime(timeformat)) + assert_equal('attr_string', ret.xmlattr_attr_string) + assert_equal(5, ret.xmlattr_attr_int) + + echo = {'struct1' => {'m_string' => 'mystring1', 'm_datetime' => '2005-03-17T19:47:31+01:00'}, + 'struct-2' => {'m_string' => 'mystring2', 'm_datetime' => '2005-03-17T19:47:32+02:00'}} + ret = @client.echo(echo) + timeformat = "%Y-%m-%dT%H:%M:%S" + assert_equal('mystring2', ret.struct1.m_string) + assert_equal('2005-03-17T19:47:32', ret.struct1.m_datetime.strftime(timeformat)) + assert_equal("mystring1", ret.struct_2.m_string) + assert_equal('2005-03-17T19:47:31', ret.struct_2.m_datetime.strftime(timeformat)) + end +end + + +end; end diff --git a/test/wsdl/map/test_map.rb b/test/wsdl/map/test_map.rb index bee3a7589..68f7d76e0 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/marshal/person.wsdl b/test/wsdl/marshal/person.wsdl new file mode 100644 index 000000000..6ea8a0482 --- /dev/null +++ b/test/wsdl/marshal/person.wsdl @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + diff --git a/test/wsdl/marshal/person_org.rb b/test/wsdl/marshal/person_org.rb new file mode 100644 index 000000000..55405b658 --- /dev/null +++ b/test/wsdl/marshal/person_org.rb @@ -0,0 +1,22 @@ +require 'xsd/qname' + +# {http://www.jin.gr.jp/~nahi/xmlns/sample/Person}Person +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"]] + + attr_accessor :familyname + attr_accessor :givenname + attr_accessor :var1 + attr_accessor :var2 + attr_accessor :var3 + + def initialize(familyname = nil, givenname = nil, var1 = nil, var2 = nil, var3 = nil) + @familyname = familyname + @givenname = givenname + @var1 = var1 + @var2 = var2 + @var3 = var3 + end +end diff --git a/test/wsdl/marshal/test_wsdlmarshal.rb b/test/wsdl/marshal/test_wsdlmarshal.rb new file mode 100644 index 000000000..cd2bdb198 --- /dev/null +++ b/test/wsdl/marshal/test_wsdlmarshal.rb @@ -0,0 +1,80 @@ +require 'test/unit' +require 'wsdl/parser' +require 'soap/mapping/wsdlencodedregistry' +require 'soap/marshal' +require 'wsdl/soap/wsdl2ruby' + +class WSDLMarshaller + include SOAP + + def initialize(wsdlfile) + wsdl = WSDL::Parser.new.parse(File.open(wsdlfile) { |f| f.read }) + types = wsdl.collect_complextypes + @opt = { + :decode_typemap => types, + :generate_explicit_type => false, + :pretty => true + } + @mapping_registry = Mapping::WSDLEncodedRegistry.new(types) + end + + def dump(obj, io = nil) + type = Mapping.class2element(obj.class) + ele = Mapping.obj2soap(obj, @mapping_registry, type) + ele.elename = ele.type + Processor.marshal(SOAPEnvelope.new(nil, SOAPBody.new(ele)), @opt, io) + end + + def load(io) + header, body = Processor.unmarshal(io, @opt) + Mapping.soap2obj(body.root_node) + end +end + + +require File.join(File.dirname(__FILE__), 'person_org') + +class Person + def ==(rhs) + @familyname == rhs.familyname and @givenname == rhs.givenname and + @var1 == rhs.var1 and @var2 == rhs.var2 and @var3 == rhs.var3 + end +end + + +class TestWSDLMarshal < Test::Unit::TestCase + DIR = File.dirname(File.expand_path(__FILE__)) + + def test_marshal + marshaller = WSDLMarshaller.new(pathname('person.wsdl')) + obj = Person.new("NAKAMURA", "Hiroshi", 1, 1.0, "1") + str = marshaller.dump(obj) + obj2 = marshaller.load(str) + assert_equal(obj, obj2) + assert_equal(str, marshaller.dump(obj2)) + end + + def test_classdef + gen = WSDL::SOAP::WSDL2Ruby.new + gen.location = pathname("person.wsdl") + gen.basedir = DIR + gen.logger.level = Logger::FATAL + gen.opt['classdef'] = nil + gen.opt['force'] = true + gen.run + compare("person_org.rb", "Person.rb") + File.unlink(pathname('Person.rb')) + end + + def compare(expected, actual) + assert_equal(loadfile(expected), loadfile(actual), actual) + end + + def loadfile(file) + File.open(pathname(file)) { |f| f.read } + end + + def pathname(filename) + File.join(DIR, filename) + end +end diff --git a/test/wsdl/raa/RAAService.rb b/test/wsdl/raa/RAAService.rb index 42cdfaea4..9d0813304 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/server.rb b/test/wsdl/raa/server.rb new file mode 100644 index 000000000..87bbc6f56 --- /dev/null +++ b/test/wsdl/raa/server.rb @@ -0,0 +1,103 @@ +#!/usr/bin/env ruby +require 'soap/rpc/standaloneServer' +require 'RAA.rb' + +class RAABaseServicePortType + MappingRegistry = SOAP::Mapping::Registry.new + + MappingRegistry.set( + StringArray, + ::SOAP::SOAPArray, + ::SOAP::Mapping::Registry::TypedArrayFactory, + { :type => XSD::QName.new("http://www.w3.org/2001/XMLSchema", "string") } + ) + MappingRegistry.set( + Map, + ::SOAP::SOAPStruct, + ::SOAP::Mapping::Registry::TypedStructFactory, + { :type => XSD::QName.new("http://xml.apache.org/xml-soap", "Map") } + ) + MappingRegistry.set( + Category, + ::SOAP::SOAPStruct, + ::SOAP::Mapping::Registry::TypedStructFactory, + { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category") } + ) + MappingRegistry.set( + InfoArray, + ::SOAP::SOAPArray, + ::SOAP::Mapping::Registry::TypedArrayFactory, + { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info") } + ) + MappingRegistry.set( + Info, + ::SOAP::SOAPStruct, + ::SOAP::Mapping::Registry::TypedStructFactory, + { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info") } + ) + MappingRegistry.set( + Product, + ::SOAP::SOAPStruct, + ::SOAP::Mapping::Registry::TypedStructFactory, + { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Product") } + ) + MappingRegistry.set( + Owner, + ::SOAP::SOAPStruct, + ::SOAP::Mapping::Registry::TypedStructFactory, + { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Owner") } + ) + + Methods = [ + ["getAllListings", "getAllListings", [ + ["retval", "return", + [::SOAP::SOAPArray, "http://www.w3.org/2001/XMLSchema", "string"]]], + "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"], + ["getProductTree", "getProductTree", [ + ["retval", "return", + [::SOAP::SOAPStruct, "http://xml.apache.org/xml-soap", "Map"]]], + "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"], + ["getInfoFromCategory", "getInfoFromCategory", [ + ["in", "category", + [::SOAP::SOAPStruct, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category"]], + ["retval", "return", + [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]], + "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"], + ["getModifiedInfoSince", "getModifiedInfoSince", [ + ["in", "timeInstant", + [SOAP::SOAPDateTime]], + ["retval", "return", + [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]], + "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"], + ["getInfoFromName", "getInfoFromName", [ + ["in", "productName", + [SOAP::SOAPString]], + ["retval", "return", + [::SOAP::SOAPStruct, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]], + "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"], + ["getInfoFromOwnerId", "getInfoFromOwnerId", [ + ["in", "ownerId", + [SOAP::SOAPInt]], + ["retval", "return", + [::SOAP::SOAPArray, "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]]], + "", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/"] + ] + + def getAllListings + ["ruby", "soap4r"] + end +end + +class RAABaseServiceServer < SOAP::RPC::StandaloneServer + def initialize(*arg) + super + + servant = RAABaseServicePortType.new + RAABaseServicePortType::Methods.each do |name_as, name, params, soapaction, namespace| + qname = XSD::QName.new(namespace, name_as) + @router.add_method(servant, qname, soapaction, name, params) + end + + self.mapping_registry = RAABaseServicePortType::MappingRegistry + end +end diff --git a/test/wsdl/raa/test_raa.rb b/test/wsdl/raa/test_raa.rb index cf171b373..0b00042ff 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/rpc/rpc.wsdl b/test/wsdl/rpc/rpc.wsdl new file mode 100644 index 000000000..b0ee5c5e5 --- /dev/null +++ b/test/wsdl/rpc/rpc.wsdl @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/test/wsdl/rpc/test_rpc.rb b/test/wsdl/rpc/test_rpc.rb new file mode 100644 index 000000000..7c4c3a7ad --- /dev/null +++ b/test/wsdl/rpc/test_rpc.rb @@ -0,0 +1,118 @@ +require 'test/unit' +require 'wsdl/parser' +require 'wsdl/soap/wsdl2ruby' +require 'soap/rpc/standaloneServer' +require 'soap/wsdlDriver' + + +module WSDL; module RPC + + +class TestRPC < Test::Unit::TestCase + class Server < ::SOAP::RPC::StandaloneServer + def on_init + self.generate_explicit_type = false + add_rpc_method(self, 'echo', 'arg1', 'arg2') + add_rpc_method(self, 'echo_err', 'arg1', 'arg2') + end + + DummyPerson = Struct.new("family-name".intern, :given_name) + def echo(arg1, arg2) + case arg1.family_name + when 'normal' + arg1.family_name = arg2.family_name + arg1.given_name = arg2.given_name + arg1.age = arg2.age + arg1 + when 'dummy' + DummyPerson.new("family-name", "given_name") + else + raise + end + end + + ErrPerson = Struct.new(:given_name, :no_such_element) + def echo_err(arg1, arg2) + ErrPerson.new(58, Time.now) + end + end + + DIR = File.dirname(File.expand_path(__FILE__)) + + Port = 17171 + + def setup + setup_server + setup_classdef + @client = nil + end + + def teardown + teardown_server + File.unlink(pathname('echo.rb')) + @client.reset_stream if @client + end + + def setup_server + @server = Server.new('Test', "urn:rpc", '0.0.0.0', Port) + @server.level = Logger::Severity::ERROR + @server_thread = start_server_thread(@server) + end + + def setup_classdef + gen = WSDL::SOAP::WSDL2Ruby.new + gen.location = pathname("rpc.wsdl") + gen.basedir = DIR + gen.logger.level = Logger::FATAL + gen.opt['classdef'] = nil + gen.opt['force'] = true + gen.run + require pathname('echo') + end + + def teardown_server + @server.shutdown + @server_thread.kill + @server_thread.join + end + + def start_server_thread(server) + t = Thread.new { + Thread.current.abort_on_exception = true + server.start + } + t + end + + def pathname(filename) + File.join(DIR, filename) + end + + def test_wsdl + wsdl = File.join(DIR, 'rpc.wsdl') + @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver + @client.endpoint_url = "http://localhost:#{Port}/" + @client.wiredump_dev = STDOUT if $DEBUG + + ret = @client.echo(Person.new("normal", "", 12), Person.new("Hi", "Na", 21)) + assert_equal(Person, ret.class) + assert_equal("Hi", ret.family_name) + assert_equal("Na", ret.given_name) + assert_equal(21, ret.age) + + ret = @client.echo(Person.new("dummy", "", 12), Person.new("Hi", "Na", 21)) + assert_equal(Person, ret.class) + assert_equal("family-name", ret.family_name) + assert_equal("given_name", ret.given_name) + assert_equal(nil, ret.age) + + ret = @client.echo_err(Person.new("Na", "Hi"), Person.new("Hi", "Na")) + assert_equal(Person, ret.class) + assert_equal("58", ret.given_name) + assert_equal(nil, ret.family_name) + assert_equal(nil, ret.age) + end +end + + +end; end diff --git a/test/wsdl/simpletype/simpletype.wsdl b/test/wsdl/simpletype/simpletype.wsdl index ec3266fc1..623969c79 100644 --- a/test/wsdl/simpletype/simpletype.wsdl +++ b/test/wsdl/simpletype/simpletype.wsdl @@ -10,19 +10,28 @@ - + - + + + + + + + + + + @@ -31,11 +40,19 @@ - + + + + + + + + + - + @@ -44,6 +61,11 @@ + + + + + @@ -53,7 +75,13 @@ - + + + + + + + diff --git a/test/wsdl/simpletype/test_simpletype.rb b/test/wsdl/simpletype/test_simpletype.rb index a46bf5dd7..7e644c304 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 efead1830..291319aed 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 -- cgit