diff options
| author | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-22 13:03:38 +0000 |
|---|---|---|
| committer | nahi <nahi@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-05-22 13:03:38 +0000 |
| commit | eb3f829be932514064a983eb98fa7f840137f985 (patch) | |
| tree | c17440206af25b52f47b1c391f818e126a994d0a /test | |
| parent | 7aea792d3bdf42c349170e710953d7de29de57ab (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/trunk@8500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
45 files changed, 2252 insertions, 168 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 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/document/document.wsdl b/test/wsdl/document/document.wsdl new file mode 100644 index 0000000000..fbf03fae8b --- /dev/null +++ b/test/wsdl/document/document.wsdl @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8"?> +<definitions + name="echo" + targetNamespace="urn:docrpc" + xmlns:tns="urn:docrpc" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <xsd:schema elementFormDefault="unqualified" targetNamespace="urn:docrpc"> + <xsd:complexType name="echo_struct"> + <xsd:sequence> + <xsd:element minOccurs="0" maxOccurs="1" name="m_string" type="xsd:string" /> + <xsd:element minOccurs="0" maxOccurs="1" name="m_datetime" type="xsd:dateTime" /> + </xsd:sequence> + <xsd:attribute name="m_attr" type="xsd:string" /> + </xsd:complexType> + + <xsd:element name="echoele"> + <xsd:complexType> + <xsd:sequence> + <xsd:element minOccurs="0" maxOccurs="1" name="struct1" type="tns:echo_struct" /> + <xsd:element minOccurs="0" maxOccurs="1" name="struct-2" type="tns:echo_struct" /> + </xsd:sequence> + <xsd:attribute name="attr_string" type="xsd:string" /> + <xsd:attribute name="attr-int" type="xsd:int" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="echo_response"> + <xsd:complexType> + <xsd:sequence> + <xsd:element minOccurs="0" maxOccurs="1" name="struct1" type="tns:echo_struct" /> + <xsd:element minOccurs="0" maxOccurs="1" name="struct-2" type="tns:echo_struct" /> + </xsd:sequence> + <xsd:attribute name="attr_string" type="xsd:string" /> + <xsd:attribute name="attr-int" type="xsd:int" /> + </xsd:complexType> + </xsd:element> + </xsd:schema> + </types> + + <message name="echo_in"> + <part name="parameters" element="tns:echoele" /> + </message> + <message name="echo_out"> + <part name="parameters" element="tns:echo_response" /> + </message> + + <portType name="docrpc_porttype"> + <operation name="echo"> + <input message="tns:echo_in" /> + <output message="tns:echo_out" /> + </operation> + </portType> + + <binding name="docrpc_binding" type="tns:docrpc_porttype"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" /> + <operation name="echo"> + <soap:operation soapAction="urn:docrpc:echo" style="document" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + </binding> + + <service name="docrpc_service"> + <port name="docprc_service_port" binding="tns:docrpc_binding"> + <soap:address location="http://localhost:17171/" /> + </port> + </service> +</definitions> diff --git a/test/wsdl/document/echo.rb b/test/wsdl/document/echo.rb new file mode 100644 index 0000000000..05f00412f4 --- /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 0000000000..cc3dd8e9f0 --- /dev/null +++ b/test/wsdl/document/number.wsdl @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="utf-8"?> +<definitions + name="foo" + targetNamespace="urn:foo" + xmlns:tns="urn:foo" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <xsd:schema elementFormDefault="unqualified" targetNamespace="urn:foo"> + <xsd:element name="get_foo"> + <xsd:complexType> + <xsd:sequence> + <xsd:element minOccurs="0" maxOccurs="1" name="number" type="xsd:string" /> + </xsd:sequence> + </xsd:complexType> + </xsd:element> + </xsd:schema> + </types> + + <message name="get_foo_in"> + <part name="parameters" element="tns:get_foo" /> + </message> + <message name="get_foo_out"> + <part name="parameters" type="xsd:string" /> + </message> + + <portType name="foo_porttype"> + <operation name="get_foo"> + <input message="tns:get_foo_in" /> + <output message="tns:get_foo_out" /> + </operation> + </portType> + + <binding name="foo_binding" type="tns:foo_porttype"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" + style="document" /> + <operation name="get_foo"> + <soap:operation soapAction="urn:foo:get_foo" style="document" /> + <input> + <soap:body use="literal" /> + </input> + <output> + <soap:body use="literal" /> + </output> + </operation> + </binding> + + <service name="foo_service"> + <port name="foo_service_port" binding="tns:foo_binding"> + <soap:address location="http://localhost:17171/" /> + </port> + </service> +</definitions> diff --git a/test/wsdl/document/ping_nosoapaction.wsdl b/test/wsdl/document/ping_nosoapaction.wsdl new file mode 100644 index 0000000000..ab9529e456 --- /dev/null +++ b/test/wsdl/document/ping_nosoapaction.wsdl @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<definitions xmlns:tns="http://xmlsoap.org/Ping" +xmlns="http://schemas.xmlsoap.org/wsdl/" +xmlns:xsd="http://www.w3.org/2001/XMLSchema" +xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" +targetNamespace="http://xmlsoap.org/Ping" name="Ping"> + <types> + <schema targetNamespace="http://xmlsoap.org/Ping" + xmlns="http://www.w3.org/2001/XMLSchema" + elementFormDefault="qualified"> + <complexType name="ping"> + <sequence> + <element name="scenario" type="xsd:string" + nillable="true"/> + <element name="origin" type="xsd:string" + nillable="true"/> + <element name="text" type="xsd:string" + nillable="true"/> + </sequence> + </complexType> + <complexType name="pingResponse"> + <sequence> + <element name="scenario" type="xsd:string" + nillable="true"/> + <element name="origin" type="xsd:string" + nillable="true"/> + <element name="text" type="xsd:string" + nillable="true"/> + </sequence> + </complexType> + <element name="Ping" type="tns:ping"/> + <element name="PingResponse" type="tns:pingResponse"/> + </schema> + </types> + <message name="PingRequest"> + <part name="ping" element="tns:Ping"/> + </message> + <message name="PingResponse"> + <part name="pingResponse" element="tns:PingResponse"/> + </message> + <portType name="PingPort"> + <operation name="Ping"> + <input message="tns:PingRequest"/> + <output message="tns:PingResponse"/> + </operation> + </portType> + <binding name="PingBinding" type="tns:PingPort"> + <soap:binding style="document" + transport="http://schemas.xmlsoap.org/soap/http"/> + <operation name="Ping"> + <soap:operation/> + <input> + <soap:body use="literal"/> + </input> + <output> + <soap:body use="literal"/> + </output> + </operation> + </binding> + <service name="PingService"> + <port name="PingPort" binding="tns:PingBinding"> + <soap:address + location="http://127.0.0.1:8080/axis/services/PingPort"/> + </port> + </service> +</definitions> diff --git a/test/wsdl/document/test_nosoapaction.rb b/test/wsdl/document/test_nosoapaction.rb new file mode 100644 index 0000000000..77f642fe1b --- /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 0000000000..a640ef2a25 --- /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 0000000000..66b804a0f9 --- /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 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/marshal/person.wsdl b/test/wsdl/marshal/person.wsdl new file mode 100644 index 0000000000..6ea8a04825 --- /dev/null +++ b/test/wsdl/marshal/person.wsdl @@ -0,0 +1,21 @@ +<?xml version="1.0"?> +<definitions name="Person" + targetNamespace="http://www.jin.gr.jp/~nahi/xmlns/sample/Person" + xmlns:tns="http://www.jin.gr.jp/~nahi/xmlns/sample/Person" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://www.jin.gr.jp/~nahi/xmlns/sample/Person"> + <complexType name="Person"> + <all> + <element name="familyname" type="xsd:string"/> + <element name="givenname" type="xsd:string"/> + <element name="var1" type="xsd:int"/> + <element name="var2" type="xsd:double"/> + <element name="var3" type="xsd:string"/> + </all> + </complexType> + </xsd:schema> + </types> +</definitions> diff --git a/test/wsdl/marshal/person_org.rb b/test/wsdl/marshal/person_org.rb new file mode 100644 index 0000000000..55405b658d --- /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 0000000000..cd2bdb198a --- /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 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/server.rb b/test/wsdl/raa/server.rb new file mode 100644 index 0000000000..87bbc6f569 --- /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 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/rpc/rpc.wsdl b/test/wsdl/rpc/rpc.wsdl new file mode 100644 index 0000000000..b0ee5c5e56 --- /dev/null +++ b/test/wsdl/rpc/rpc.wsdl @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="utf-8"?> +<definitions name="echo" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:tns="urn:rpc" + xmlns:txd="urn:rpc-type" + targetNamespace="urn:rpc" + xmlns="http://schemas.xmlsoap.org/wsdl/"> + <types> + <xsd:schema targetNamespace="urn:rpc-type"> + <xsd:complexType name="person"> + <xsd:all> + <xsd:element name="family-name" type="xsd:string" /> + <xsd:element name="given_name" type="xsd:string" /> + <xsd:element name="age" type="xsd:int" /> + <xsd:element name="link" type="txd:person" /> + </xsd:all> + </xsd:complexType> + </xsd:schema> + </types> + + <message name="echo_in"> + <part name="arg1" type="txd:person"/> + <part name="arg2" type="txd:person"/> + </message> + + <message name="echo_out"> + <part name="return" type="txd:person"/> + </message> + + <portType name="echo_port_type"> + <operation name="echo"> + <input message="tns:echo_in"/> + <output message="tns:echo_out"/> + </operation> + + <operation name="echo_err"> + <input message="tns:echo_in"/> + <output message="tns:echo_out"/> + </operation> + </portType> + + <binding name="echo_binding" type="tns:echo_port_type"> + <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> + <operation name="echo"> + <soap:operation soapAction=""/> + <input> + <soap:body use="encoded" namespace="urn:rpc" + encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> + </input> + <output> + <soap:body use="encoded" namespace="urn:rpc" + encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> + </output> + </operation> + + <operation name="echo_err"> + <soap:operation soapAction=""/> + <input> + <soap:body use="encoded" namespace="urn:rpc" + encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> + </input> + <output> + <soap:body use="encoded" namespace="urn:rpc" + encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/> + </output> + </operation> + </binding> + + <service name="echo_service"> + <port name="echo_port" binding="tns:echo_binding"> + <soap:address location="http://localhost:10080"/> + </port> + </service> +</definitions> diff --git a/test/wsdl/rpc/test_rpc.rb b/test/wsdl/rpc/test_rpc.rb new file mode 100644 index 0000000000..7c4c3a7ad6 --- /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 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 diff --git a/test/xsd/codegen/test_classdef.rb b/test/xsd/codegen/test_classdef.rb new file mode 100644 index 0000000000..64c4771918 --- /dev/null +++ b/test/xsd/codegen/test_classdef.rb @@ -0,0 +1,214 @@ +require 'test/unit' +require 'xsd/codegen/classdef' + + +module XSD; module CodeGen + + +class TestClassDefCreator < Test::Unit::TestCase + include XSD::CodeGen + include GenSupport + + def test_classdef_simple + c = ClassDef.new("Foo") + assert_equal(format(<<-EOD), c.dump) + class Foo + end + EOD + end + + def test_classdef_complex + c = ClassDef.new("Foo::Bar::Baz", String) + assert_equal(format(<<-EOD), c.dump) + module Foo; module Bar + + class Baz < String + end + + end; end + EOD + end + + def test_require + c = ClassDef.new("Foo") + c.def_require("foo/bar") + assert_equal(format(<<-EOD), c.dump) + require 'foo/bar' + + class Foo + end + EOD + end + + def test_comment + c = ClassDef.new("Foo") + c.def_require("foo/bar") + c.comment = <<-EOD + foo + EOD + assert_equal(format(<<-EOD), c.dump) + require 'foo/bar' + + # foo + class Foo + end + EOD + c.comment = <<-EOD + foo + + bar + baz + + EOD + assert_equal(format(<<-EOD), c.dump) + require 'foo/bar' + + # foo + # + # bar + # baz + # + class Foo + end + EOD + end + + def test_emptymethod + c = ClassDef.new("Foo") + c.def_method('foo') do + end + c.def_method('bar') do + '' + end + assert_equal(format(<<-EOD), c.dump) + class Foo + def foo + end + + def bar + end + end + EOD + end + + def test_full + c = ClassDef.new("Foo::Bar::HobbitName", String) + c.def_require("foo/bar") + c.comment = <<-EOD + foo + bar + baz + EOD + c.def_const("FOO", 1) + c.def_classvar("@@foo", "var".dump) + c.def_classvar("baz", "1".dump) + c.def_attr("Foo", true, "foo") + c.def_attr("bar") + c.def_attr("baz", true) + c.def_attr("Foo2", true, "foo2") + c.def_attr("foo3", false, "foo3") + c.def_method("foo") do + <<-EOD + foo.bar = 1 +\tbaz.each do |ele| +\t ele + end + EOD + end + c.def_method("baz", "qux") do + <<-EOD + [1, 2, 3].each do |i| + p i + end + EOD + end + + m = MethodDef.new("qux", "quxx", "quxxx") do + <<-EOD + p quxx + quxxx + EOD + end + m.comment = "hello world\n123" + c.add_method(m) + c.def_code <<-EOD + Foo.new + Bar.z + EOD + c.def_code <<-EOD + Foo.new + Bar.z + EOD + c.def_privatemethod("foo", "baz", "*arg", "&block") + + assert_equal(format(<<-EOD), c.dump) + require 'foo/bar' + + module Foo; module Bar + + # foo + # bar + # baz + class HobbitName < String + @@foo = "var" + @@baz = "1" + + FOO = 1 + + Foo.new + Bar.z + + Foo.new + Bar.z + + attr_accessor :bar + attr_accessor :baz + attr_reader :foo3 + + def Foo + @foo + end + + def Foo=(value) + @foo = value + end + + def Foo2 + @foo2 + end + + def Foo2=(value) + @foo2 = value + end + + def foo + foo.bar = 1 + baz.each do |ele| + ele + end + end + + def baz(qux) + [1, 2, 3].each do |i| + p i + end + end + + # hello world + # 123 + def qux(quxx, quxxx) + p quxx + quxxx + end + + private + + def foo(baz, *arg, &block) + end + end + + end; end + EOD + end +end + + +end; end diff --git a/test/xsd/test_xsd.rb b/test/xsd/test_xsd.rb index 1f594571fe..6302f3128b 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 |