soap4r 1.5.7 → 1.5.8

data/test/wsdl/choice/choice.wsdl

@@ -29,6 +29,16 @@
         </xsd:sequence>
       </xsd:complexType>
 
+      <xsd:complexType name="emptyArrayAtFirst">
+        <xsd:sequence>
+          <xsd:choice>
+            <xsd:element name="A" maxOccurs="unbounded" type="xsd:string"/>
+            <xsd:element name="B1" type="xsd:string"/>
+            <xsd:element name="B2" type="xsd:string"/>
+          </xsd:choice>
+        </xsd:sequence>
+      </xsd:complexType>
+
       <xsd:element name="terminalID" minOccurs="1" maxOccurs="1">
         <xsd:complexType>
           <xsd:choice>
@@ -69,6 +79,14 @@
           </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
+
+      <xsd:element name="echoele_complex_emptyArrayAtFirst">
+        <xsd:complexType>
+          <xsd:sequence>
+            <xsd:element name="data" type="tns:emptyArrayAtFirst"/>
+          </xsd:sequence>
+        </xsd:complexType>
+      </xsd:element>
     </xsd:schema>
   </types>
 
@@ -84,6 +102,12 @@
   <message name="echo_complex_out">
     <part name="parameters" element="tns:echo_complex_response" />
   </message>
+  <message name="echo_complex_emptyArrayAtFirst_in">
+    <part name="parameters" element="tns:echoele_complex_emptyArrayAtFirst" />
+  </message>
+  <message name="echo_complex_emptyArrayAtFirst_out">
+    <part name="parameters" element="tns:echoele_complex_emptyArrayAtFirst" />
+  </message>
 
   <portType name="choice_porttype">
     <operation name="echo">
@@ -95,6 +119,11 @@
       <input message="tns:echo_complex_in" />
       <output message="tns:echo_complex_out" />
     </operation>
+
+    <operation name="echo_complex_emptyArrayAtFirst">
+      <input message="tns:echo_complex_emptyArrayAtFirst_in" />
+      <output message="tns:echo_complex_emptyArrayAtFirst_out" />
+    </operation>
   </portType>
 
   <binding name="choice_binding" type="tns:choice_porttype">
@@ -118,6 +147,16 @@
         <soap:body use="literal" />
       </output>
     </operation>
+
+    <operation name="echo_complex_emptyArrayAtFirst">
+      <soap:operation soapAction="urn:choice:echo_complex_emptyArrayAtFirst" 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

@@ -28,6 +28,13 @@ class TestChoice < Test::Unit::TestCase
         XSD::QName.new(Namespace, 'echoele_complex'),
         XSD::QName.new(Namespace, 'echo_complex_response')
       )
+      add_document_method(
+        self,
+        Namespace + ':echo_complex_emptyArrayAtFirst',
+        'echo_complex_emptyArrayAtFirst',
+        XSD::QName.new(Namespace, 'echoele_complex_emptyArrayAtFirst'),
+        XSD::QName.new(Namespace, 'echoele_complex_emptyArrayAtFirst')
+      )
       @router.literal_mapping_registry = ChoiceMappingRegistry::LiteralRegistry
     end
   
@@ -38,6 +45,10 @@ class TestChoice < Test::Unit::TestCase
     def echo_complex(arg)
       Echo_complex_response.new(arg.data)
     end
+
+    def echo_complex_emptyArrayAtFirst(arg)
+      arg
+    end
   end
 
   DIR = File.dirname(File.expand_path(__FILE__))
@@ -51,7 +62,7 @@ class TestChoice < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     unless $DEBUG
       File.unlink(pathname('choice.rb'))
       File.unlink(pathname('choiceMappingRegistry.rb'))
@@ -77,7 +88,7 @@ class TestChoice < Test::Unit::TestCase
     gen.opt['driver'] = nil
     gen.opt['force'] = true
     gen.run
-    TestUtil.require(DIR, 'choiceMappingRegistry.rb', 'choice.rb')
+    TestUtil.require(DIR, 'choiceDriver.rb', 'choiceMappingRegistry.rb', 'choice.rb')
   end
 
   def teardown_server
@@ -129,15 +140,119 @@ class TestChoice < Test::Unit::TestCase
     assert_nil(ret.terminalID.imei)
   end
 
-  def test_naive_complex
+  def test_wsdl_with_map_complex
+    wsdl = File.join(DIR, 'choice.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+    do_test_with_map_complex(@client)
+  end
+
+  def test_wsdl_with_stub_complex
+    wsdl = File.join(DIR, 'choice.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.literal_mapping_registry = ChoiceMappingRegistry::LiteralRegistry
+    do_test_with_stub_complex(@client)
+  end
+
+  def test_naive_with_map_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
+    do_test_with_map_complex(@client)
+  end
+
+  def test_naive_with_stub_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
+    do_test_with_stub_complex(@client)
+  end
+
+  def do_test_with_map_complex(client)
+    req = {
+      :data => {
+        :A => "A",
+        :B1 => "B1",
+        :C1 => "C1",
+        :C2 => "C2"
+      }
+    }
+    ret = client.echo_complex(req)
+    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"])
+    #
+    req = {
+      :data => {
+        :A => "A",
+        :B2a => "B2a",
+        :B2b => "B2b",
+        :C1 => "C1",
+        :C2 => "C2"
+      }
+    }
+    ret = client.echo_complex(req)
+    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"])
+    #
+    req = {
+      :data => {
+        :A => "A",
+        :B3a => "B3a",
+        :C1 => "C1",
+        :C2 => "C2"
+      }
+    }
+    ret = client.echo_complex(req)
+    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", "B1", nil, nil, nil, nil, "C1", "C2")))
+    req = {
+      :data => {
+        :A => "A",
+        :B3b => "B3b",
+        :C1 => "C1",
+        :C2 => "C2"
+      }
+    }
+    ret = client.echo_complex(req)
+    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
+
+  def do_test_with_stub_complex(client)
+    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)
@@ -147,7 +262,7 @@ class TestChoice < Test::Unit::TestCase
     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")))
+    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)
@@ -157,7 +272,7 @@ class TestChoice < Test::Unit::TestCase
     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")))
+    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)
@@ -167,7 +282,7 @@ class TestChoice < Test::Unit::TestCase
     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")))
+    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)
@@ -177,6 +292,18 @@ class TestChoice < Test::Unit::TestCase
     assert_equal("C1", ret.data.c1)
     assert_equal("C2", ret.data.c2)
   end
+
+  def test_stub_emptyArrayAtFirst
+    @client = Choice_porttype.new("http://localhost:#{Port}/")
+    @client.wiredump_dev = STDOUT if $DEBUG
+    #
+    arg = EmptyArrayAtFirst.new
+    arg.b1 = "b1"
+    ret = @client.echo_complex_emptyArrayAtFirst(Echoele_complex_emptyArrayAtFirst.new(arg))
+    assert_nil(ret.data.a)
+    assert_equal("b1", ret.data.b1)
+    assert_nil(ret.data.b2)
+  end
 end
 
 

data/test/wsdl/complexcontent/test_echo.rb

@@ -38,7 +38,7 @@ class TestEcho < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     unless $DEBUG
       File.unlink(pathname('complexContent.rb'))
       File.unlink(pathname('complexContentMappingRegistry.rb'))

data/test/wsdl/datetime/test_datetime.rb

@@ -35,8 +35,8 @@ class TestDatetime < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
-    teardown_client
+    teardown_server if @server
+    teardown_client if @client
   end
 
   def teardown_server

data/test/wsdl/document/array/double.wsdl

@@ -7,30 +7,43 @@
   xmlns:tns="http://tempuri.org/"
   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
   <wsdl:types>
-    <s:schema elementFormDefault="qualified"
-      targetNamespace="http://tempuri.org/">
+    <s:schema elementFormDefault="qualified" targetNamespace="http://tempuri.org/">
+
+      <s:element name="ArrayOfRecord">
+        <s:complexType>
+          <s:sequence>
+            <s:element maxOccurs="unbounded" name="record" type="tns:report-record"/>
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:complexType name="report-record">
+        <s:attribute name="a" type="s:string" />
+        <s:attribute name="b" type="s:string" />
+        <s:attribute name="c" type="s:string" />
+      </s:complexType>
+
       <s:complexType name="ArrayOfDouble">
         <s:sequence>
           <s:element minOccurs="0" maxOccurs="unbounded" name="double"
             type="s:double"/>
         </s:sequence>
       </s:complexType>
+
       <s:element name="echo">
         <s:complexType>
           <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="ary"
-              type="tns:ArrayOfDouble"/>
+            <s:element nillable="true" maxOccurs="1" name="ary" type="tns:ArrayOfDouble"/>
           </s:sequence>
         </s:complexType>
       </s:element>
       <s:element name="echoResponse">
         <s:complexType>
           <s:sequence>
-            <s:element minOccurs="0" maxOccurs="1" name="ary"
-              type="tns:ArrayOfDouble"/>
+            <s:element nillable="true" maxOccurs="1" name="ary" type="tns:ArrayOfDouble"/>
           </s:sequence>
         </s:complexType>
       </s:element>
+
       <s:element name="ArrayOfDouble" nillable="true" type="tns:ArrayOfDouble"/>
 
       <s:element name="echo2">
@@ -40,6 +53,7 @@
           </s:sequence>
         </s:complexType>
       </s:element>
+
       <s:element name="echo2Response">
         <s:complexType>
           <s:sequence>
@@ -47,6 +61,7 @@
           </s:sequence>
         </s:complexType>
       </s:element>
+
       <s:element name="ArrayOfComplex">
         <s:complexType>
           <s:sequence>
@@ -54,6 +69,7 @@
           </s:sequence>
         </s:complexType>
       </s:element>
+
       <s:element name="Complex">
         <s:complexType>
           <s:sequence>
@@ -77,6 +93,12 @@
   <wsdl:message name="echo2Out">
     <wsdl:part name="parameters" element="tns:echo2Response"/>
   </wsdl:message>
+  <wsdl:message name="echo3In">
+    <wsdl:part name="parameters" element="tns:ArrayOfRecord"/>
+  </wsdl:message>
+  <wsdl:message name="echo3Out">
+    <wsdl:part name="parameters" element="tns:ArrayOfRecord"/>
+  </wsdl:message>
 
   <wsdl:portType name="pricerSoap">
     <wsdl:operation name="echo">
@@ -88,11 +110,17 @@
       <wsdl:input message="tns:echo2In"/>
       <wsdl:output message="tns:echo2Out"/>
     </wsdl:operation>
+
+    <wsdl:operation name="echo3">
+      <wsdl:input message="tns:echo3In"/>
+      <wsdl:output message="tns:echo3Out"/>
+    </wsdl:operation>
   </wsdl:portType>
 
   <wsdl:binding name="pricerSoap" type="tns:pricerSoap">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http"
       style="document"/>
+
     <wsdl:operation name="echo">
       <soap:operation soapAction="http://tempuri.org/echo" style="document"/>
       <wsdl:input>
@@ -102,6 +130,7 @@
         <soap:body use="literal"/>
       </wsdl:output>
     </wsdl:operation>
+
     <wsdl:operation name="echo2">
       <soap:operation soapAction="http://tempuri.org/echo2" style="document"/>
       <wsdl:input>
@@ -111,6 +140,16 @@
         <soap:body use="literal"/>
       </wsdl:output>
     </wsdl:operation>
+
+    <wsdl:operation name="echo3">
+      <soap:operation soapAction="http://tempuri.org/echo3" style="document"/>
+      <wsdl:input>
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
   </wsdl:binding>
 
   <wsdl:service name="pricer">

data/test/wsdl/document/array/test_array.rb

@@ -28,6 +28,13 @@ class TestArray < Test::Unit::TestCase
         XSD::QName.new(Namespace, 'echo2'),
         XSD::QName.new(Namespace, 'echo2Response')
       )
+      add_document_method(
+        self,
+        Namespace + 'echo3',
+        'echo3',
+        XSD::QName.new(Namespace, 'ArrayOfRecord'),
+        XSD::QName.new(Namespace, 'ArrayOfRecord')
+      )
       self.literal_mapping_registry = DoubleMappingRegistry::LiteralRegistry
     end
   
@@ -38,6 +45,10 @@ class TestArray < Test::Unit::TestCase
     def echo2(arg)
       arg
     end
+
+    def echo3(arg)
+      arg
+    end
   end
 
   DIR = File.dirname(File.expand_path(__FILE__))
@@ -51,7 +62,7 @@ class TestArray < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     unless $DEBUG
       File.unlink(pathname('double.rb'))
       File.unlink(pathname('doubleMappingRegistry.rb'))
@@ -128,6 +139,62 @@ class TestArray < Test::Unit::TestCase
     double = [0.1, 0.2, 0.3]
     assert_equal(double, @client.echo(:ary => double).ary)
   end
+
+  def test_stub
+    @client = ::WSDL::Document::PricerSoap.new("http://localhost:#{Port}/")
+    @client.wiredump_dev = STDOUT if $DEBUG
+    double = [0.1, 0.2, 0.3]
+    assert_equal(double, @client.echo(:ary => double).ary)
+  end
+
+  def test_stub_nil
+    @client = ::WSDL::Document::PricerSoap.new("http://localhost:#{Port}/")
+    @client.wiredump_dev = STDOUT if $DEBUG
+    assert_equal(nil, @client.echo(Echo.new).ary)
+  end
+
+  def test_attribute_array
+    @client = ::WSDL::Document::PricerSoap.new("http://localhost:#{Port}/")
+    @client.wiredump_dev = STDOUT if $DEBUG
+    #
+    r1 = ReportRecord.new
+    r1.xmlattr_a = "r1_xmlattr_a"
+    r1.xmlattr_b = "r1_xmlattr_b"
+    r1.xmlattr_c = "r1_xmlattr_c"
+    r2 = ReportRecord.new
+    r2.xmlattr_a = "r2_xmlattr_a"
+    r2.xmlattr_b = "r2_xmlattr_b"
+    r2.xmlattr_c = "r2_xmlattr_c"
+    arg = ArrayOfRecord[r1, r2]
+    ret = @client.echo3(arg)
+    assert_equal(arg.class , ret.class)
+    assert_equal(arg.size , ret.size)
+    assert_equal(2, ret.size)
+    assert_equal(arg[0].class, ret[0].class)
+    assert_equal(arg[0].xmlattr_a, ret[0].xmlattr_a)
+    assert_equal(arg[0].xmlattr_b, ret[0].xmlattr_b)
+    assert_equal(arg[0].xmlattr_c, ret[0].xmlattr_c)
+    assert_equal(arg[1].class, ret[1].class)
+    assert_equal(arg[1].xmlattr_a, ret[1].xmlattr_a)
+    assert_equal(arg[1].xmlattr_b, ret[1].xmlattr_b)
+    assert_equal(arg[1].xmlattr_c, ret[1].xmlattr_c)
+    #
+    arg = ArrayOfRecord[r1]
+    ret = @client.echo3(arg)
+    assert_equal(arg.class , ret.class)
+    assert_equal(arg.size , ret.size)
+    assert_equal(1, ret.size)
+    assert_equal(arg[0].class, ret[0].class)
+    assert_equal(arg[0].xmlattr_a, ret[0].xmlattr_a)
+    assert_equal(arg[0].xmlattr_b, ret[0].xmlattr_b)
+    assert_equal(arg[0].xmlattr_c, ret[0].xmlattr_c)
+    #
+    arg = ArrayOfRecord[]
+    ret = @client.echo3(arg)
+    assert_equal(arg.class , ret.class)
+    assert_equal(arg.size , ret.size)
+    assert_equal(0, ret.size)
+  end
 end