soap4r 1.5.5.20061022 → 1.5.6

data/test/wsdl/simpletype/rpc/expectedService.rb

@@ -8,18 +8,20 @@ class Echo_version_port_type
     [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
       "urn:example.com:simpletype-rpc",
       "echo_version",
-      [ ["in", "version", ["::SOAP::SOAPString"]],
+      [ ["in", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]],
         ["retval", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ],
     [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
       "urn:example.com:simpletype-rpc",
       "echo_version_r",
       [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
-        ["retval", "version", ["::SOAP::SOAPString"]] ],
+        ["retval", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ]
   ]
 end

data/test/wsdl/simpletype/rpc/rpc.wsdl

@@ -22,6 +22,24 @@
           <xsd:enumeration value="1.9"/>
         </xsd:restriction>
       </xsd:simpleType>
+
+      <xsd:simpleType name="stateType">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="stateType"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+
+      <xsd:simpleType name="zipIntType">
+        <xsd:restriction base="xsd:int">
+          <xsd:enumeration value="123"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+
+      <xsd:simpleType name="zipUnion">
+        <xsd:union memberTypes="tns:stateType tns:zipIntType"/>
+      </xsd:simpleType>
+
+      <xsd:element name="zip" type="tns:zipUnion"/>
     </xsd:schema>
   </types>
 

data/test/wsdl/simpletype/rpc/test_rpc.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'wsdl/parser'
 require 'wsdl/soap/wsdl2ruby'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', '..', 'testutil.rb')
 
 
 module WSDL; module SimpleType
@@ -18,21 +19,24 @@ class TestRPC < Test::Unit::TestCase
     gen.basedir = DIR
     gen.logger.level = Logger::FATAL
     gen.opt['classdef'] = nil
+    gen.opt['mapping_registry'] = nil
     gen.opt['driver'] = nil
     gen.opt['client_skelton'] = nil
     gen.opt['servant_skelton'] = nil
     gen.opt['standalone_server_stub'] = nil
     gen.opt['force'] = true
-    suppress_warning do
+    TestUtil.silent do
       gen.run
     end
     compare("expectedEchoVersion.rb", "echo_version.rb")
+    compare("expectedMappingRegistry.rb", "echo_versionMappingRegistry.rb")
     compare("expectedDriver.rb", "echo_versionDriver.rb")
     compare("expectedService.rb", "echo_version_service.rb")
     compare("expectedClient.rb", "echo_version_serviceClient.rb")
     compare("expectedServant.rb", "echo_versionServant.rb")
 
     File.unlink(pathname("echo_version.rb"))
+    File.unlink(pathname("echo_versionMappingRegistry.rb"))
     File.unlink(pathname("echo_versionDriver.rb"))
     File.unlink(pathname("echo_version_service.rb"))
     File.unlink(pathname("echo_version_serviceClient.rb"))
@@ -40,21 +44,7 @@ class TestRPC < Test::Unit::TestCase
   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 suppress_warning
-    back = $VERBOSE
-    $VERBOSE = nil
-    begin
-      yield
-    ensure
-      $VERBOSE = back
-    end
+    TestUtil.filecompare(pathname(expected), pathname(actual))
   end
 end
 

data/test/wsdl/simpletype/simpletype.wsdl

@@ -32,6 +32,25 @@
           <xsd:pattern value='[a-zA-Z0-9]{18}'/>
         </xsd:restriction>
       </xsd:simpleType>
+
+      <xsd:simpleType name="stateType">
+        <xsd:restriction base="xsd:string">
+          <xsd:enumeration value="stateType"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+
+      <xsd:simpleType name="zipIntType">
+        <xsd:restriction base="xsd:int">
+          <xsd:enumeration value="123"/>
+        </xsd:restriction>
+      </xsd:simpleType>
+
+      <xsd:simpleType name="zipUnion">
+        <xsd:union memberTypes="tns:stateType tns:zipIntType"/>
+      </xsd:simpleType>
+
+      <xsd:element name="zip" type="tns:zipUnion"/>
+
     </xsd:schema>
   </types>
 

data/test/wsdl/simpletype/test_simpletype.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL
@@ -41,7 +42,7 @@ class TestSimpleType < Test::Unit::TestCase
   def setup_server
     @server = Server.new('Test', "urn:example.com:simpletype", '0.0.0.0', Port)
     @server.level = Logger::Severity::ERROR
-    @server_thread = start_server_thread(@server)
+    @server_thread = TestUtil.start_server_thread(@server)
   end
 
   def setup_client
@@ -67,14 +68,6 @@ class TestSimpleType < Test::Unit::TestCase
     @client.reset_stream
   end
 
-  def start_server_thread(server)
-    t = Thread.new {
-      Thread.current.abort_on_exception = true
-      server.start
-    }
-    t
-  end
-
   def test_ping
     ret = @client.ping({:myversion => "1.9", :date => "2004-01-01T00:00:00Z"})
     assert_equal("1.9 (2004-01-01T00:00:00Z)", ret)

data/test/wsdl/soap/wsdl2ruby/expectedDriver.rb

@@ -9,18 +9,20 @@ class Echo_version_port_type < ::SOAP::RPC::Driver
     [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
       "urn:example.com:simpletype-rpc",
       "echo_version",
-      [ ["in", "version", ["::SOAP::SOAPString"]],
+      [ ["in", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]],
         ["retval", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ],
     [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
       "urn:example.com:simpletype-rpc",
       "echo_version_r",
       [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
-        ["retval", "version", ["::SOAP::SOAPString"]] ],
+        ["retval", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ]
   ]
 

data/test/wsdl/soap/wsdl2ruby/expectedMappingRegistry.rb

@@ -0,0 +1,40 @@
+require 'echo_version.rb'
+require 'soap/mapping'
+
+module Echo_versionMappingRegistry
+  EncodedRegistry = ::SOAP::Mapping::EncodedRegistry.new
+  LiteralRegistry = ::SOAP::Mapping::LiteralRegistry.new
+
+  EncodedRegistry.register(
+    :class => Version_struct,
+    :schema_ns => "urn:example.com:simpletype-rpc-type",
+    :schema_type => "version_struct",
+    :schema_element => [
+      ["version", ["SOAP::SOAPString", XSD::QName.new(nil, "version")]],
+      ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]
+    ]
+  )
+
+  EncodedRegistry.register(
+    :class => Version,
+    :schema_ns => "urn:example.com:simpletype-rpc-type",
+    :schema_type => "version"
+  )
+
+  LiteralRegistry.register(
+    :class => Version_struct,
+    :schema_ns => "urn:example.com:simpletype-rpc-type",
+    :schema_type => "version_struct",
+    :schema_qualified => false,
+    :schema_element => [
+      ["version", ["SOAP::SOAPString", XSD::QName.new(nil, "version")]],
+      ["msg", ["SOAP::SOAPString", XSD::QName.new(nil, "msg")]]
+    ]
+  )
+
+  LiteralRegistry.register(
+    :class => Version,
+    :schema_ns => "urn:example.com:simpletype-rpc-type",
+    :schema_type => "version"
+  )
+end

data/test/wsdl/soap/wsdl2ruby/expectedService.cgi

@@ -8,18 +8,20 @@ class Echo_version_port_type
     [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
       "urn:example.com:simpletype-rpc",
       "echo_version",
-      [ ["in", "version", ["::SOAP::SOAPString"]],
+      [ ["in", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]],
         ["retval", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ],
     [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
       "urn:example.com:simpletype-rpc",
       "echo_version_r",
       [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
-        ["retval", "version", ["::SOAP::SOAPString"]] ],
+        ["retval", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ]
   ]
 end

data/test/wsdl/soap/wsdl2ruby/expectedService.rb

@@ -8,18 +8,20 @@ class Echo_version_port_type
     [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version"),
       "urn:example.com:simpletype-rpc",
       "echo_version",
-      [ ["in", "version", ["::SOAP::SOAPString"]],
+      [ ["in", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]],
         ["retval", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ],
     [ XSD::QName.new("urn:example.com:simpletype-rpc", "echo_version_r"),
       "urn:example.com:simpletype-rpc",
       "echo_version_r",
       [ ["in", "version_struct", ["Version_struct", "urn:example.com:simpletype-rpc-type", "version_struct"]],
-        ["retval", "version", ["::SOAP::SOAPString"]] ],
+        ["retval", "version", [nil, "urn:example.com:simpletype-rpc-type", "version"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ]
   ]
 end

data/test/wsdl/soap/wsdl2ruby/section/test_section.rb

@@ -1,6 +1,9 @@
 require 'test/unit'
 require 'soap/marshal'
 require 'rbconfig'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', '..', '..', 'testutil.rb')
+
+
 module WSDL; module SOAP
 
 
@@ -25,7 +28,7 @@ class TestSection < Test::Unit::TestCase
     if ::Object.constants.include?("Item")
       ::Object.instance_eval { remove_const("Item") }
     end
-    require pathname('mysample.rb')
+    TestUtil.require(DIR, 'mysample.rb')
     s1 = Section.new(1, "section1", "section 1", 1001, Question.new("q1"))
     s2 = Section.new(2, "section2", "section 2", 1002, Question.new("q2"))
     org = SectionArray[s1, s2]
@@ -42,11 +45,7 @@ private
   end
 
   def compare(expected, actual)
-    assert_equal(loadfile(expected), loadfile(actual), expected)
-  end
-
-  def loadfile(file)
-    File.open(pathname(file)) { |f| f.read }
+    TestUtil.filecompare(pathname(expected), pathname(actual))
   end
 end
 

data/test/wsdl/soap/wsdl2ruby/soapenc/test_soapenc.rb

@@ -3,6 +3,7 @@ require 'wsdl/parser'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', '..', '..', 'testutil.rb')
 
 
 module WSDL; module SOAP; module T_WSDL2Ruby
@@ -40,7 +41,7 @@ class TestSOAPENC < Test::Unit::TestCase
   def setup_server
     @server = Server.new('Test', "urn:example.com:soapenc", '0.0.0.0', Port)
     @server.level = Logger::Severity::ERROR
-    @server_thread = start_server_thread(@server)
+    @server_thread = TestUtil.start_server_thread(@server)
   end
 
   def setup_classdef
@@ -54,13 +55,7 @@ class TestSOAPENC < Test::Unit::TestCase
     gen.opt['classdef'] = nil
     gen.opt['force'] = true
     gen.run
-    backupdir = Dir.pwd
-    begin
-      Dir.chdir(DIR)
-      require pathname('echo')
-    ensure
-      Dir.chdir(backupdir)
-    end
+    TestUtil.require(DIR, 'echo.rb')
   end
 
   def teardown_server
@@ -69,14 +64,6 @@ class TestSOAPENC < Test::Unit::TestCase
     @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

data/test/wsdl/soap/wsdl2ruby/test_wsdl2ruby.rb

@@ -1,6 +1,9 @@
 require 'test/unit'
 require 'wsdl/parser'
 require 'wsdl/soap/wsdl2ruby'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', '..', 'testutil.rb')
+
+
 module WSDL; module SOAP
 
 
@@ -8,9 +11,7 @@ class TestWSDL2Ruby < Test::Unit::TestCase
   DIR = File.dirname(File.expand_path(__FILE__))
 
   def setup
-    backupdir = Dir.pwd
-    begin
-      Dir.chdir(DIR)
+    Dir.chdir(DIR) do
       gen = WSDL::SOAP::WSDL2Ruby.new
       gen.location = pathname("rpc.wsdl")
       gen.basedir = DIR
@@ -20,13 +21,12 @@ class TestWSDL2Ruby < Test::Unit::TestCase
       gen.opt['servant_skelton'] = nil
       gen.opt['cgi_stub'] = nil
       gen.opt['standalone_server_stub'] = nil
+      gen.opt['mapping_registry'] = nil
       gen.opt['driver'] = nil
       gen.opt['force'] = true
-      silent do
+      TestUtil.silent do
         gen.run
       end
-    ensure
-      Dir.chdir(backupdir)
     end
   end
 
@@ -39,6 +39,7 @@ class TestWSDL2Ruby < Test::Unit::TestCase
     compare("expectedClassdef.rb", "echo_version.rb")
     compare("expectedService.rb", "echo_version_service.rb")
     compare("expectedService.cgi", "echo_version_service.cgi")
+    compare("expectedMappingRegistry.rb", "echo_versionMappingRegistry.rb")
     compare("expectedDriver.rb", "echo_versionDriver.rb")
     compare("expectedClient.rb", "echo_version_serviceClient.rb")
 
@@ -46,6 +47,7 @@ class TestWSDL2Ruby < Test::Unit::TestCase
     File.unlink(pathname("echo_version.rb"))
     File.unlink(pathname("echo_version_service.rb"))
     File.unlink(pathname("echo_version_service.cgi"))
+    File.unlink(pathname("echo_versionMappingRegistry.rb"))
     File.unlink(pathname("echo_versionDriver.rb"))
     File.unlink(pathname("echo_version_serviceClient.rb"))
   end
@@ -57,22 +59,12 @@ private
   end
 
   def compare(expected, actual)
-    assert_equal(loadfile(expected), loadfile(actual), expected)
+    TestUtil.filecompare(pathname(expected), pathname(actual))
   end
 
   def loadfile(file)
     File.open(pathname(file)) { |f| f.read }
   end
-
-  def silent
-    back = $VERBOSE
-    $VERBOSE = nil
-    begin
-      yield
-    ensure
-      $VERBOSE = back
-    end
-  end
 end
 
 

data/test/wsdl/soaptype/test_soaptype.rb

@@ -3,6 +3,7 @@ require 'wsdl/parser'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL; module RPC
@@ -40,14 +41,18 @@ class TestSOAPTYPE < Test::Unit::TestCase
 
   def teardown
     teardown_server
-    File.unlink(pathname('echo.rb')) unless $DEBUG
+    unless $DEBUG
+      File.unlink(pathname('echo.rb'))
+      File.unlink(pathname('echoMappingRegistry.rb'))
+      File.unlink(pathname('echoDriver.rb'))
+    end
     @client.reset_stream if @client
   end
 
   def setup_server
     @server = Server.new('Test', "urn:soaptype", '0.0.0.0', Port)
     @server.level = Logger::Severity::ERROR
-    @server_thread = start_server_thread(@server)
+    @server_thread = TestUtil.start_server_thread(@server)
   end
 
   def setup_classdef
@@ -56,10 +61,12 @@ class TestSOAPTYPE < Test::Unit::TestCase
     gen.basedir = DIR
     gen.logger.level = Logger::FATAL
     gen.opt['classdef'] = nil
+    gen.opt['mapping_registry'] = nil
+    gen.opt['driver'] = nil
     gen.opt['force'] = true
     gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
     gen.run
-    require pathname('echo')
+    TestUtil.require(DIR, 'echo.rb', 'echoMappingRegistry.rb', 'echoDriver.rb')
   end
 
   def teardown_server
@@ -68,14 +75,6 @@ class TestSOAPTYPE < Test::Unit::TestCase
     @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
@@ -132,11 +131,30 @@ SOAPTYPE_NATIVE_XML = %q[<?xml version="1.0" encoding="utf-8" ?>
     assert_equal(SOAPTYPE_WSDL_XML, parse_requestxml(str))
   end
 
+  def test_stub
+    @client = WSDL::RPC::Echo_port_type.new("http://localhost:#{Port}/")
+    @client.wiredump_dev = str = ''
+
+    arg = WSDL::RPC::Wrapper.new
+    arg.short = 123
+    arg.long = 456
+    arg.double = 789
+    res = @client.echo_soaptype(arg)
+
+    assert_equal(123, res.short)
+    assert_equal(456, res.long)
+    assert_equal(789.0, res.double)
+
+    assert_equal(SOAPTYPE_WSDL_XML, parse_requestxml(str))
+  end
+
   def test_native
     @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/", 'urn:soaptype')
     @client.endpoint_url = "http://localhost:#{Port}/"
     @client.add_method('echo_soaptype', 'arg')
     @client.wiredump_dev = str = ''
+    @client.mapping_registry = WSDL::RPC::EchoMappingRegistry::EncodedRegistry
+    @client.literal_mapping_registry = WSDL::RPC::EchoMappingRegistry::LiteralRegistry
 
     arg = ::Struct.new(:short, :long, :double).new
     arg.short = SOAPShort.new(123)