* 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

1 files changed, 80 insertions, 0 deletions

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