From 533c24268e485c1de7d7fbe6d947681df5a48382 Mon Sep 17 00:00:00 2001 From: nahi Date: Thu, 15 Sep 2005 14:47:07 +0000 Subject: * lib/{soap,wsdl,xsd}, test/{soap,wsdl,xsd}: imported soap4r/1.5.5. #nnn is a ticket number at http://dev.ctor.org/soap4r * SOAP * allow to configure an envelope namespace of SOAP request. (#124) TemporaryNamespace = 'http://www.w3.org/2003/05/soap-envelope' @client.options["soap.envelope.requestnamespace"] = TemporaryNamespace @client.options["soap.envelope.responsenamespace"] = TemporaryNamespace @client.do_proc(...) * let SOAP request XML indent space configuable. see "soap.envelope.no_indent" option. (#130) * let external CES configuable. ex. client["soap.mapping.external_ces"] = 'SJIS'. $KCODE is used by default. (#133) external CES ::= CES used in Ruby object of client and server internal CES ::= CES used in SOAP/OM * add iso-8859-1 external CES support. (#106) * fixed illegal 'qualified' handling of elements. it caused ASP.NET inteoperability problem. (#144) * added 'soap.envelope.use_numeric_character_reference' (boolean) option to let query XML use numeric character reference in XML, not plain UTF-8 character. !GoogleSearch server seems to not allow plain UTF-8 character since 2005-08-15 update. (#147) * SOAP::Header::SimpleHeader (de)serialization throws an exception on !SimpleHeader.on_(in|out)bound when header is a String. so we could not use a simple single element headerItem. fixed. thanks to emil. (#129) * out parameter of rpc operation did not work. (#132) * follow HTTP redirect only if using http-access2. (#125) (#145) * add a workaround for importing an WSDL whose path begins with drive letter. (#115) * WSDL * SOAP Data which is defined as a simpletype was not mapped correctly to Ruby obj when using wsdl2ruby.rb generated classdef file. (#123) * rpc/literal support. (#118) * re-implemented local element qualify/unqualify control. handles elementFormDefault and form in WSDL. (#119) * Array of an element which has simpleType causes a crash. (#128) * prarmeterOrder may not contain return part so it can be shorter than parts size. Thanks to Hugh. (#139) * Samples * added !BasicAuth client sample. (#117) * added Base64 client/server sample. * added Flickr SOAP interface client sample. (#122) * added !SalesForce client sample. (#135) * updated Thawte CA certificate for !GoogleAdWords sample. * updated a client script with the newer version made by Johan. thanks! * shortened long file names. (#120) * fixed typo in authheader sample. (#129) * updated deprecated method usage. (#138) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@9171 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/soap/ssl/test_ssl.rb | 8 ++++---- test/soap/swa/test_file.rb | 5 ++++- test/soap/test_soapelement.rb | 3 ++- test/soap/test_streamhandler.rb | 2 +- test/soap/wsdlDriver/test_calc.rb | 3 +-- 5 files changed, 12 insertions(+), 9 deletions(-) (limited to 'test/soap') diff --git a/test/soap/ssl/test_ssl.rb b/test/soap/ssl/test_ssl.rb index d6df970160..38f859acdc 100644 --- a/test/soap/ssl/test_ssl.rb +++ b/test/soap/ssl/test_ssl.rb @@ -179,14 +179,14 @@ __EOP__ cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "ca.cert") cfg["protocol.http.ssl_config.ca_file"] = File.join(DIR, "subca.cert") #cfg.timeout = 123 - assert_equal("Hello World, from ssl client", @client.hello_world("ssl client")) - # cfg["protocol.http.ssl_config.ciphers"] = "!ALL" + # begin @client.hello_world("ssl client") assert(false) rescue OpenSSL::SSL::SSLError => ssle - assert_equal("no ciphers available", ssle.message) + # depends on OpenSSL version. (?:0.9.8|0.9.7) + assert_match(/\A(?:SSL_CTX_set_cipher_list:: no cipher match|no ciphers available)\z/, ssle.message) end # cfg["protocol.http.ssl_config.ciphers"] = "ALL" @@ -201,7 +201,7 @@ private def setup_server svrcmd = "#{q(RUBY)} " - svrcmd << "-d " if $DEBUG + #svrcmd << "-d " if $DEBUG svrcmd << File.join(DIR, "sslsvr.rb") svrout = IO.popen(svrcmd) @serverpid = Integer(svrout.gets.chomp) diff --git a/test/soap/swa/test_file.rb b/test/soap/swa/test_file.rb index 8389d8826c..1ec7aa92a7 100644 --- a/test/soap/swa/test_file.rb +++ b/test/soap/swa/test_file.rb @@ -47,11 +47,14 @@ class TestFile < Test::Unit::TestCase @client.reset_stream end - def test_file + def test_get_file assert_equal( File.open(THIS_FILE) { |f| f.read }, @client.get_file['file'].content ) + end + + def test_put_file assert_equal( "File 'foo' was received ok.", @client.put_file('foo', diff --git a/test/soap/test_soapelement.rb b/test/soap/test_soapelement.rb index 6cf91f93d6..66e2a836a4 100644 --- a/test/soap/test_soapelement.rb +++ b/test/soap/test_soapelement.rb @@ -1,5 +1,6 @@ require 'test/unit' require 'soap/baseData' +require 'soap/mapping' module SOAP @@ -36,7 +37,7 @@ class TestSOAPElement < Test::Unit::TestCase assert_equal(LiteralNamespace, obj.encodingstyle) assert_equal({}, obj.extraattr) assert_equal([], obj.precedents) - assert_equal(false, obj.qualified) + assert_equal(nil, obj.qualified) assert_equal(nil, obj.text) assert(obj.members.empty?) diff --git a/test/soap/test_streamhandler.rb b/test/soap/test_streamhandler.rb index a8d06d5f2a..c31254513f 100644 --- a/test/soap/test_streamhandler.rb +++ b/test/soap/test_streamhandler.rb @@ -98,7 +98,7 @@ __EOX__ end def parse_req_header(str) - if ::SOAP::StreamHandler::Client.to_s == 'SOAP::NetHttpClient' + if ::SOAP::HTTPStreamHandler::Client.to_s == 'SOAP::NetHttpClient' str = eval(str.split(/\r?\n/)[4][3..-1]) end parse_req_header_http_access2(str) diff --git a/test/soap/wsdlDriver/test_calc.rb b/test/soap/wsdlDriver/test_calc.rb index 629c5cdbfb..f1cc116a59 100644 --- a/test/soap/wsdlDriver/test_calc.rb +++ b/test/soap/wsdlDriver/test_calc.rb @@ -73,8 +73,7 @@ class TestCalc < Test::Unit::TestCase assert_equal(0.3, @client.add(0.1, 0.2)) end - # test for backward compatibility - def __NOTEST__test_old_driver + def test_old_driver @client = ::SOAP::WSDLDriverFactory.new(@wsdl).create_driver @client.wiredump_dev = STDOUT if $DEBUG @client.endpoint_url = "http://localhost:#{Port}/" -- cgit v1.2.3