soap4r 1.5.5.20061022 → 1.5.6

data/test/wsdl/any/expectedEcho.rb

@@ -1,5 +1,8 @@
 require 'xsd/qname'
 
+module WSDL::Any
+
+
 # {urn:example.com:echo-type}foo.bar
 class FooBar
   attr_accessor :before
@@ -16,3 +19,19 @@ class FooBar
     @after = after
   end
 end
+
+# {urn:example.com:echo-type}setOutputAndCompleteRequest
+class SetOutputAndCompleteRequest
+  attr_accessor :taskId
+  attr_accessor :data
+  attr_accessor :participantToken
+
+  def initialize(taskId = nil, data = nil, participantToken = nil)
+    @taskId = taskId
+    @data = data
+    @participantToken = participantToken
+  end
+end
+
+
+end

data/test/wsdl/any/expectedService.rb

@@ -3,6 +3,8 @@ require 'echoServant.rb'
 require 'echoMappingRegistry.rb'
 require 'soap/rpc/standaloneServer'
 
+module WSDL; module Any
+
 class Echo_port_type
   Methods = [
     [ "urn:example.com:echo",
@@ -10,16 +12,37 @@ class Echo_port_type
       [ ["in", "parameters", ["::SOAP::SOAPElement", "urn:example.com:echo-type", "foo.bar"]],
         ["out", "parameters", ["::SOAP::SOAPElement", "urn:example.com:echo-type", "foo.bar"]] ],
       { :request_style =>  :document, :request_use =>  :literal,
-        :response_style => :document, :response_use => :literal }
+        :response_style => :document, :response_use => :literal,
+        :faults => {} }
+    ],
+    [ XSD::QName.new("urn:example.com:echo", "echoAny"),
+      "urn:example.com:echoAny",
+      "echoAny",
+      [ ["retval", "echoany_return", [nil]] ],
+      { :request_style =>  :rpc, :request_use =>  :encoded,
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
+    ],
+    [ "urn:example.com:echo",
+      "setOutputAndComplete",
+      [ ["in", "parameters", ["::SOAP::SOAPElement", "urn:example.com:echo-type", "setOutputAndCompleteRequest"]],
+        ["out", "parameters", ["::SOAP::SOAPElement", "urn:example.com:echo-type", "setOutputAndCompleteRequest"]] ],
+      { :request_style =>  :document, :request_use =>  :literal,
+        :response_style => :document, :response_use => :literal,
+        :faults => {} }
     ]
   ]
 end
 
+end; end
+
+module WSDL; module Any
+
 class Echo_port_typeApp < ::SOAP::RPC::StandaloneServer
   def initialize(*arg)
     super(*arg)
-    servant = Echo_port_type.new
-    Echo_port_type::Methods.each do |definitions|
+    servant = WSDL::Any::Echo_port_type.new
+    WSDL::Any::Echo_port_type::Methods.each do |definitions|
       opt = definitions.last
       if opt[:request_style] == :document
         @router.add_document_operation(servant, *definitions)
@@ -32,9 +55,11 @@ class Echo_port_typeApp < ::SOAP::RPC::StandaloneServer
   end
 end
 
+end; end
+
 if $0 == __FILE__
   # Change listen port.
-  server = Echo_port_typeApp.new('app', nil, '0.0.0.0', 10080)
+  server = WSDL::Any::Echo_port_typeApp.new('app', nil, '0.0.0.0', 10080)
   trap(:INT) do
     server.shutdown
   end

data/test/wsdl/any/test_any.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 Any
@@ -34,6 +35,15 @@ class TestAny < Test::Unit::TestCase
         XSD::QName.new(TypeNamespace, 'foo.bar'),
         XSD::QName.new(TypeNamespace, 'foo.bar')
       )
+      add_rpc_operation(self, 
+        XSD::QName.new("urn:example.com:echo", "echoAny"),
+        "urn:example.com:echoAny",
+        "echoAny",
+        [ ["retval", "echoany_return", [XSD::QName.new("http://www.w3.org/2001/XMLSchema", "anyType")]] ],
+        { :request_style =>  :rpc, :request_use =>  :encoded,
+          :response_style => :rpc, :response_use => :encoded,
+          :faults => {} }
+      )
     end
   
     def echo(arg)
@@ -45,6 +55,11 @@ class TestAny < Test::Unit::TestCase
       res
       # TODO: arg
     end
+
+    AnyStruct = Struct.new(:a, :b)
+    def echoAny
+      AnyStruct.new(1, Time.mktime(2007, 1, 1))
+    end
   end
 
   DIR = File.dirname(File.expand_path(__FILE__))
@@ -61,7 +76,11 @@ class TestAny < Test::Unit::TestCase
     teardown_server
     unless $DEBUG
       File.unlink(pathname('echo.rb')) if File.exist?(pathname('echo.rb'))
+      File.unlink(pathname('echoMappingRegistry.rb')) if File.exist?(pathname('echoMappingRegistry.rb'))
       File.unlink(pathname('echoDriver.rb')) if File.exist?(pathname('echoDriver.rb'))
+      File.unlink(pathname('echoServant.rb')) if File.exist?(pathname('echoServant.rb'))
+      File.unlink(pathname('echo_service.rb')) if File.exist?(pathname('echo_service.rb'))
+      File.unlink(pathname('echo_serviceClient.rb')) if File.exist?(pathname('echo_serviceClient.rb'))
     end
     @client.reset_stream if @client
   end
@@ -69,7 +88,7 @@ class TestAny < Test::Unit::TestCase
   def setup_server
     @server = Server.new('Test', Namespace, '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
@@ -78,16 +97,12 @@ class TestAny < Test::Unit::TestCase
     gen.basedir = DIR
     gen.logger.level = Logger::FATAL
     gen.opt['classdef'] = nil
+    gen.opt['mapping_registry'] = nil
+    gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
     gen.opt['driver'] = nil
     gen.opt['force'] = true
     gen.run
-    begin
-      back = $:.dup
-      $:.unshift(pathname("."))
-      require pathname('echoDriver')
-    ensure
-      $:.replace(back) if back
-    end
+    TestUtil.require(DIR, 'echoDriver.rb', 'echoMappingRegistry.rb', 'echo.rb')
   end
 
   def teardown_server
@@ -96,14 +111,6 @@ class TestAny < 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
@@ -113,17 +120,19 @@ class TestAny < Test::Unit::TestCase
     gen.location = pathname("any.wsdl")
     gen.basedir = DIR
     gen.logger.level = Logger::FATAL
+    gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
     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("expectedDriver.rb", "echoDriver.rb")
     compare("expectedEcho.rb", "echo.rb")
+    compare("expectedDriver.rb", "echoDriver.rb")
     compare("expectedService.rb", "echo_service.rb")
 
     File.unlink(pathname("echo_service.rb"))
@@ -134,21 +143,17 @@ class TestAny < Test::Unit::TestCase
   end
 
   def compare(expected, actual)
-    assert_equal(loadfile(expected), loadfile(actual), actual)
+    TestUtil.filecompare(pathname(expected), pathname(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
+  def test_anyreturl_wsdl
+    wsdl = File.join(DIR, 'any.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+    res = @client.echoAny
+    assert_equal(1, res.a)
+    assert_equal(2007, res.b.year)
   end
 
   def test_wsdl

data/test/wsdl/choice/choice.wsdl

@@ -53,6 +53,22 @@
           </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
+
+      <xsd:element name="echoele_complex">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="data" type="tns:andor"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
+
+      <xsd:element name="echo_complex_response">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="data" type="tns:andor"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
     </xsd:schema>
   </types>
 
@@ -62,12 +78,23 @@
   <message name="echo_out">
     <part name="parameters" element="tns:echo_response" />
   </message>
+  <message name="echo_complex_in">
+    <part name="parameters" element="tns:echoele_complex" />
+  </message>
+  <message name="echo_complex_out">
+    <part name="parameters" element="tns:echo_complex_response" />
+  </message>
 
   <portType name="choice_porttype">
     <operation name="echo">
       <input message="tns:echo_in" />
       <output message="tns:echo_out" />
     </operation>
+
+    <operation name="echo_complex">
+      <input message="tns:echo_complex_in" />
+      <output message="tns:echo_complex_out" />
+    </operation>
   </portType>
 
   <binding name="choice_binding" type="tns:choice_porttype">
@@ -81,6 +108,16 @@
         <soap:body use="literal" />
       </output>
     </operation>
+
+    <operation name="echo_complex">
+      <soap:operation soapAction="urn:choice:echo_complex" style="document" />
+      <input>
+        <soap:body use="literal" />
+      </input>
+      <output>
+        <soap:body use="literal" />
+      </output>
+    </operation>
   </binding>
 
   <service name="choice_service">

data/test/wsdl/choice/test_choice.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 Choice
@@ -20,12 +21,23 @@ class TestChoice < Test::Unit::TestCase
         XSD::QName.new(Namespace, 'echoele'),
         XSD::QName.new(Namespace, 'echo_response')
       )
+      add_document_method(
+        self,
+        Namespace + ':echo_complex',
+        'echo_complex',
+        XSD::QName.new(Namespace, 'echoele_complex'),
+        XSD::QName.new(Namespace, 'echo_complex_response')
+      )
       @router.literal_mapping_registry = ChoiceMappingRegistry::LiteralRegistry
     end
   
     def echo(arg)
       arg
     end
+
+    def echo_complex(arg)
+      Echo_complex_response.new(arg.data)
+    end
   end
 
   DIR = File.dirname(File.expand_path(__FILE__))
@@ -42,6 +54,7 @@ class TestChoice < Test::Unit::TestCase
     teardown_server
     unless $DEBUG
       File.unlink(pathname('choice.rb'))
+      File.unlink(pathname('choiceMappingRegistry.rb'))
       File.unlink(pathname('choiceDriver.rb'))
     end
     @client.reset_stream if @client
@@ -50,7 +63,7 @@ class TestChoice < Test::Unit::TestCase
   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)
+    @server_thread = TestUtil.start_server_thread(@server)
   end
 
   def setup_classdef
@@ -59,17 +72,12 @@ class TestChoice < Test::Unit::TestCase
     gen.basedir = DIR
     gen.logger.level = Logger::FATAL
     gen.opt['classdef'] = nil
+    gen.opt['mapping_registry'] = nil
+    gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
     gen.opt['driver'] = nil
     gen.opt['force'] = true
     gen.run
-    backupdir = Dir.pwd
-    begin
-      Dir.chdir(DIR)
-      require pathname('choice')
-      require pathname('choiceMappingRegistry')
-    ensure
-      Dir.chdir(backupdir)
-    end
+    TestUtil.require(DIR, 'choiceMappingRegistry.rb', 'choice.rb')
   end
 
   def teardown_server
@@ -78,14 +86,6 @@ class TestChoice < 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
@@ -128,6 +128,55 @@ class TestChoice < Test::Unit::TestCase
     assert_equal("devId", ret.terminalID.devId)
     assert_nil(ret.terminalID.imei)
   end
+
+  def test_naive_complex
+    @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/")
+    @client.add_document_method('echo_complex', 'urn:choice:echo_complex',
+      XSD::QName.new('urn:choice', 'echoele_complex'),
+      XSD::QName.new('urn:choice', 'echo_complex_response'))
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.literal_mapping_registry = ChoiceMappingRegistry::LiteralRegistry
+    #
+    ret = @client.echo_complex(Echoele_complex.new(Andor.new("A", "B1", nil, nil, nil, nil, "C1", "C2")))
+    assert_equal("A", ret.data.a)
+    assert_equal("B1", ret.data.b1)
+    assert_equal(nil, ret.data.b2a)
+    assert_equal(nil, ret.data.b2b)
+    assert_equal(nil, ret.data.b3a)
+    assert_equal(nil, ret.data.b3b)
+    assert_equal("C1", ret.data.c1)
+    assert_equal("C2", ret.data.c2)
+    #
+    ret = @client.echo_complex(Echoele_complex.new(Andor.new("A", nil, "B2a", "B2b", nil, nil, "C1", "C2")))
+    assert_equal("A", ret.data.a)
+    assert_equal(nil, ret.data.b1)
+    assert_equal("B2a", ret.data.b2a)
+    assert_equal("B2b", ret.data.b2b)
+    assert_equal(nil, ret.data.b3a)
+    assert_equal(nil, ret.data.b3b)
+    assert_equal("C1", ret.data.c1)
+    assert_equal("C2", ret.data.c2)
+    #
+    ret = @client.echo_complex(Echoele_complex.new(Andor.new("A", nil, nil, nil, "B3a", nil, "C1", "C2")))
+    assert_equal("A", ret.data.a)
+    assert_equal(nil, ret.data.b1)
+    assert_equal(nil, ret.data.b2a)
+    assert_equal(nil, ret.data.b2b)
+    assert_equal("B3a", ret.data.b3a)
+    assert_equal(nil, ret.data.b3b)
+    assert_equal("C1", ret.data.c1)
+    assert_equal("C2", ret.data.c2)
+    #
+    ret = @client.echo_complex(Echoele_complex.new(Andor.new("A", nil, nil, nil, nil, "B3b", "C1", "C2")))
+    assert_equal("A", ret.data.a)
+    assert_equal(nil, ret.data.b1)
+    assert_equal(nil, ret.data.b2a)
+    assert_equal(nil, ret.data.b2b)
+    assert_equal(nil, ret.data.b3a)
+    assert_equal("B3b", ret.data.b3b)
+    assert_equal("C1", ret.data.c1)
+    assert_equal("C2", ret.data.c2)
+  end
 end
 
 

data/test/wsdl/complexcontent/test_echo.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 ComplexContent
@@ -38,14 +39,17 @@ class TestEcho < Test::Unit::TestCase
 
   def teardown
     teardown_server
-    File.unlink(pathname('complexContent.rb')) unless $DEBUG
+    unless $DEBUG
+      File.unlink(pathname('complexContent.rb'))
+      File.unlink(pathname('complexContentMappingRegistry.rb'))
+    end
     @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)
+    @server_thread = TestUtil.start_server_thread(@server)
   end
 
   def setup_classdef
@@ -57,14 +61,7 @@ class TestEcho < Test::Unit::TestCase
     gen.opt['mapping_registry'] = nil
     gen.opt['force'] = true
     gen.run
-    backupdir = Dir.pwd
-    begin
-      Dir.chdir(DIR)
-      require pathname('complexContent')
-      require pathname('complexContentMappingRegistry')
-    ensure
-      Dir.chdir(backupdir)
-    end
+    TestUtil.require(DIR, 'complexContentMappingRegistry.rb', 'complexContent.rb')
   end
 
   def teardown_server
@@ -73,14 +70,6 @@ class TestEcho < 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