soap4r 1.5.5.20061022 → 1.5.6

data/test/wsdl/document/array/test_array.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 Document
@@ -40,14 +41,17 @@ class TestArray < Test::Unit::TestCase
 
   def teardown
     teardown_server
-    File.unlink(pathname('double.rb')) unless $DEBUG
+    unless $DEBUG
+      File.unlink(pathname('double.rb'))
+      File.unlink(pathname('doubleMappingRegistry.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,16 +61,10 @@ class TestArray < Test::Unit::TestCase
     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['force'] = true
     gen.run
-    backupdir = Dir.pwd
-    begin
-      Dir.chdir(DIR)
-      require pathname('double')
-      require pathname('doubleMappingRegistry')
-    ensure
-      Dir.chdir(backupdir)
-    end
+    TestUtil.require(DIR, 'doubleMappingRegistry.rb', 'double.rb')
   end
 
   def teardown_server
@@ -75,14 +73,6 @@ class TestArray < 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/document/ping_nosoapaction.wsdl

@@ -50,7 +50,7 @@ targetNamespace="http://xmlsoap.org/Ping" name="Ping">
         <operation name="Ping">
             <soap:operation/>
             <input>
-                <soap:body use="literal"/>
+                <soap:body use="literal" encodingStyle="" />
             </input>
             <output>
                 <soap:body use="literal"/>

data/test/wsdl/document/test_nosoapaction.rb

@@ -4,6 +4,7 @@ require 'wsdl/soap/wsdl2ruby'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
 require 'soap/rpc/driver'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL; module Document
@@ -61,7 +62,7 @@ class TestNoSOAPAction < 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 teardown_server
@@ -70,14 +71,6 @@ class TestNoSOAPAction < 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 test_with_soapaction
     wsdl = File.join(DIR, 'ping_nosoapaction.wsdl')
     @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver

data/test/wsdl/document/test_number.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 Document
@@ -45,7 +46,7 @@ class TestNumber < Test::Unit::TestCase
   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)
+    @server_thread = TestUtil.start_server_thread(@server)
   end
 
   def setup_classdef
@@ -56,7 +57,7 @@ class TestNumber < Test::Unit::TestCase
     gen.opt['classdef'] = nil
     gen.opt['force'] = true
     gen.run
-    require pathname('foo')
+    TestUtil.require(DIR, 'foo.rb')
   end
 
   def teardown_server
@@ -65,14 +66,6 @@ class TestNumber < 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/document/test_rpc.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 Document
@@ -25,7 +26,14 @@ class TestRPC < Test::Unit::TestCase
         Namespace + ':return_nil',
         'return_nil',
         nil,
-        XSD::QName.new(Namespace, 'return_nil')
+        XSD::QName.new(Namespace, 'echo_response')
+      )
+      add_document_method(
+        self,
+        Namespace + ':return_empty',
+        'return_empty',
+        nil,
+        XSD::QName.new(Namespace, 'echo_response')
       )
       self.literal_mapping_registry = EchoMappingRegistry::LiteralRegistry
     end
@@ -47,7 +55,17 @@ class TestRPC < Test::Unit::TestCase
     end
 
     def return_nil
-      ::SOAP::SOAPNil.new
+      e = Echoele.new
+      e.struct1 = Echo_struct.new(nil, nil)
+      e.struct_2 = Echo_struct.new(nil, nil)
+      e
+    end
+
+    def return_empty
+      e = Echoele.new
+      e.struct1 = Echo_struct.new("", nil)
+      e.struct_2 = Echo_struct.new("", nil)
+      e
     end
   end
 
@@ -64,13 +82,15 @@ class TestRPC < Test::Unit::TestCase
   def teardown
     teardown_server
     File.unlink(pathname('echo.rb')) unless $DEBUG
+    File.unlink(pathname('echoMappingRegistry.rb')) unless $DEBUG
+    File.unlink(pathname('echoDriver.rb')) unless $DEBUG
     @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)
+    @server_thread = TestUtil.start_server_thread(@server)
   end
 
   def setup_classdef
@@ -80,17 +100,11 @@ class TestRPC < Test::Unit::TestCase
     gen.logger.level = Logger::FATAL
     gen.opt['classdef'] = nil
     gen.opt['mapping_registry'] = nil
+    gen.opt['driver'] = nil
     gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
     gen.opt['force'] = true
     gen.run
-    backupdir = Dir.pwd
-    begin
-      Dir.chdir(DIR)
-      require pathname('echo')
-      require pathname('echoMappingRegistry')
-    ensure
-      Dir.chdir(backupdir)
-    end
+    TestUtil.require(DIR, 'echoDriver.rb', 'echoMappingRegistry.rb', 'echo.rb')
   end
 
   def teardown_server
@@ -99,14 +113,6 @@ class TestRPC < 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
@@ -184,7 +190,38 @@ class TestRPC < Test::Unit::TestCase
     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'}}
+          '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
+
+  def test_to_xml
+    @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.literal_mapping_registry = EchoMappingRegistry::LiteralRegistry
+    @client.wiredump_dev = STDOUT if $DEBUG
+
+    require 'rexml/document'
+    echo = REXML::Document.new(<<__XML__.chomp)
+<foo attr-int="5" attr_string="attr_string">
+  <struct1 m_attr="myattr1">
+    <m_string>mystring1</m_string>
+    <m_datetime>2005-03-17T19:47:31+01:00</m_datetime>
+  </struct1>
+  <struct-2 m_attr="myattr2">
+    <m_string>mystring2</m_string>
+    <m_datetime>2005-03-17T19:47:32+02:00</m_datetime>
+  </struct-2>
+</foo>
+__XML__
     ret = @client.echo(echo)
     timeformat = "%Y-%m-%dT%H:%M:%S"
     assert_equal('mystring2', ret.struct1.m_string)
@@ -193,6 +230,29 @@ class TestRPC < Test::Unit::TestCase
     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)
+    #
+    echoele = REXML::Document.new(<<__XML__.chomp)
+<n1:echoele xmlns:n1="urn:docrpc">
+  <struct-2>
+    <m_datetime>2005-03-17T19:47:32+02:00</m_datetime>
+    <m_string>mystring2</m_string>
+  </struct-2>
+  <struct1>
+    <m_datetime>2005-03-17T19:47:31+01:00</m_datetime>
+    <m_string>mystring1</m_string>
+  </struct1>
+</n1:echoele>
+__XML__
+    ret = @client.echo(echoele)
+    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
 
   def test_nil
@@ -203,7 +263,22 @@ class TestRPC < Test::Unit::TestCase
     @client.literal_mapping_registry = EchoMappingRegistry::LiteralRegistry
     @client.wiredump_dev = STDOUT if $DEBUG
 
-    assert_nil(@client.return_nil)
+    ret = @client.return_nil
+    assert_nil(ret.struct1.m_string)
+    assert_nil(ret.struct_2.m_string)
+  end
+
+  def test_empty
+    @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/")
+    @client.add_document_method('return_empty', 'urn:docrpc:return_empty',
+      nil,
+      XSD::QName.new('urn:docrpc', 'return_empty'))
+    @client.literal_mapping_registry = EchoMappingRegistry::LiteralRegistry
+    @client.wiredump_dev = STDOUT if $DEBUG
+
+    ret = @client.return_empty
+    assert_equal("", ret.struct1.m_string)
+    assert_equal("", ret.struct_2.m_string)
   end
 end
 

data/test/wsdl/fault/fault.wsdl

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="Add"
+  targetNamespace="http://fault.test/Faulttest"
+  xmlns:tns="http://fault.test/Faulttest"
+  xmlns="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+
+<types>
+  <schema targetNamespace="http://fault.test/Faulttest"
+          xmlns="http://www.w3.org/2001/XMLSchema">
+
+    <element name="Add">
+      <complexType>
+        <sequence>
+          <element name="value" type="int"/>
+        </sequence>
+      </complexType>
+    </element>
+    <element name="AddResponse">
+      <complexType>
+        <sequence>
+          <element name="sum" type="int"/>
+        </sequence>
+      </complexType>
+    </element>
+
+    <element name="AddFault">
+      <complexType>
+        <sequence>
+          <element name="Reason" type="string"/>
+          <element name="Severity" type="string"/>
+        </sequence>
+      </complexType>
+    </element>
+
+  </schema>
+</types>
+
+<message name="AddMessage">
+  <part name="request" element="tns:Add"/>
+</message>
+<message name="AddResponseMessage">
+  <part name="response" element="tns:AddResponse"/>
+</message>
+<message name="AddFaultMessage">
+  <part name="fault" element="tns:AddFault"/>
+</message>
+
+<portType name="AddPortType">
+  <operation name="Add">
+    <input  name="Add" message="tns:AddMessage"/>
+    <output name="AddResponse" message="tns:AddResponseMessage"/>
+    <fault  name="AddFault" message="tns:AddFaultMessage"/>
+  </operation>
+</portType>
+
+  <binding name="AddSOAPBinding" type="tns:AddPortType">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="Add">
+      <soap:operation soapAction="Add"/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="AddFault">
+        <soap:fault name="AddFault"/>
+      </fault>
+    </operation>
+  </binding>
+
+  <service name="AddService">
+    <port name="AddPort" binding="tns:AddSOAPBinding">
+      <soap:address location="http://localhost:8080/"/>
+    </port>
+  </service>
+
+</definitions>

data/test/wsdl/fault/multifault.wsdl

@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions name="Add"
+  targetNamespace="http://fault.test/Faulttest"
+  xmlns:tns="http://fault.test/Faulttest"
+  xmlns="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
+
+<types>
+  <schema targetNamespace="http://fault.test/Faulttest"
+          xmlns="http://www.w3.org/2001/XMLSchema">
+
+    <element name="Add">
+      <complexType>
+        <sequence>
+          <element name="value" type="int"/>
+        </sequence>
+      </complexType>
+    </element>
+    <element name="AddResponse">
+      <complexType>
+        <sequence>
+          <element name="sum" type="int"/>
+        </sequence>
+      </complexType>
+    </element>
+
+    <element name="AddFault">
+      <complexType>
+        <sequence>
+          <element name="Reason" type="string"/>
+          <element name="Severity" type="string"/>
+        </sequence>
+      </complexType>
+    </element>
+
+    <element name="NegativeValueFault">
+      <complexType>
+        <sequence>
+          <element name="Reason" type="string"/>
+          <element name="Severity" type="string"/>
+        </sequence>
+      </complexType>
+    </element>
+
+  </schema>
+</types>
+
+<message name="AddMessage">
+  <part name="request" element="tns:Add"/>
+</message>
+<message name="AddResponseMessage">
+  <part name="response" element="tns:AddResponse"/>
+</message>
+<message name="AddFaultMessage">
+  <part name="fault" element="tns:AddFault"/>
+</message>
+<message name="NegativeValueFaultMessage">
+  <part name="fault" element="tns:NegativeValueFault"/>
+</message>
+
+
+<portType name="AddPortType">
+  <operation name="Add">
+    <input  name="Add" message="tns:AddMessage"/>
+    <output name="AddResponse" message="tns:AddResponseMessage"/>
+    <fault  name="AddFault" message="tns:AddFaultMessage"/>
+    <fault  name="NegativeValueFault" message="tns:NegativeValueFaultMessage"/>
+  </operation>
+</portType>
+
+  <binding name="AddSOAPBinding" type="tns:AddPortType">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <operation name="Add">
+      <soap:operation soapAction="Add"/>
+      <input>
+        <soap:body use="literal"/>
+      </input>
+      <output>
+        <soap:body use="literal"/>
+      </output>
+      <fault name="AddFault">
+        <soap:fault name="AddFault"/>
+      </fault>
+      <fault name="NegativeValueFault">
+        <soap:fault name="NegativeValueFault"/>
+      </fault>
+    </operation>
+  </binding>
+
+  <service name="AddService">
+    <port name="AddPort" binding="tns:AddSOAPBinding">
+      <soap:address location="http://localhost:8080/"/>
+    </port>
+  </service>
+
+</definitions>