soap4r 1.5.7 → 1.5.8

data/test/wsdl/document/document.wsdl

@@ -21,6 +21,7 @@
           <xsd:sequence>
             <xsd:element minOccurs="0" maxOccurs="1" name="struct1" type="tns:echo_struct" />
             <xsd:element minOccurs="0" maxOccurs="1" name="struct-2" type="tns:echo_struct" />
+            <xsd:element minOccurs="0" maxOccurs="1" name="long" type="xsd:long" />
           </xsd:sequence>
           <xsd:attribute name="attr_string" type="xsd:string" />
           <xsd:attribute name="attr-int" type="xsd:int" />
@@ -31,6 +32,7 @@
           <xsd:sequence>
             <xsd:element minOccurs="0" maxOccurs="1" name="struct1" type="tns:echo_struct" />
             <xsd:element minOccurs="0" maxOccurs="1" name="struct-2" type="tns:echo_struct" />
+            <xsd:element minOccurs="0" maxOccurs="1" name="long" type="xsd:long" />
           </xsd:sequence>
           <xsd:attribute name="attr_string" type="xsd:string" />
           <xsd:attribute name="attr-int" type="xsd:int" />

data/test/wsdl/document/test_nosoapaction.rb

@@ -55,7 +55,7 @@ class TestNoSOAPAction < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     @client.reset_stream if @client
   end
 

data/test/wsdl/document/test_number.rb

@@ -38,7 +38,7 @@ class TestNumber < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     File.unlink(pathname('foo.rb'))
     @client.reset_stream if @client
   end

data/test/wsdl/document/test_rpc.rb

@@ -58,6 +58,7 @@ class TestRPC < Test::Unit::TestCase
       e = Echoele.new
       e.struct1 = Echo_struct.new(nil, nil)
       e.struct_2 = Echo_struct.new(nil, nil)
+      e.long = nil
       e
     end
 
@@ -65,6 +66,7 @@ class TestRPC < Test::Unit::TestCase
       e = Echoele.new
       e.struct1 = Echo_struct.new("", nil)
       e.struct_2 = Echo_struct.new("", nil)
+      e.long = 0
       e
     end
   end
@@ -80,7 +82,7 @@ class TestRPC < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     File.unlink(pathname('echo.rb')) unless $DEBUG
     File.unlink(pathname('echoMappingRegistry.rb')) unless $DEBUG
     File.unlink(pathname('echoDriver.rb')) unless $DEBUG
@@ -123,27 +125,92 @@ class TestRPC < Test::Unit::TestCase
     @client.endpoint_url = "http://localhost:#{Port}/"
     @client.wiredump_dev = STDOUT if $DEBUG
     @client.literal_mapping_registry = EchoMappingRegistry::LiteralRegistry
+    do_test_with_stub(@client)
+  end
+
+  def test_driver_stub
+    @client = ::WSDL::Document::Docrpc_porttype.new
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+    do_test_with_stub(@client)
+  end
+
+  def test_nil_attribute
+    @client = ::WSDL::Document::Docrpc_porttype.new
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+    struct1 = Echo_struct.new("mystring1", now1 = Time.now)
+    struct1.xmlattr_m_attr = nil
+    struct2 = Echo_struct.new("mystr<>ing2", now2 = Time.now)
+    struct2.xmlattr_m_attr = ''
+    echo = Echoele.new(struct1, struct2, 105759347)
+    echo.xmlattr_attr_string = ''
+    echo.xmlattr_attr_int = nil
+    ret = @client.echo(echo)
+    # struct1 and struct2 are swapped
+    assert_equal('', ret.struct1.xmlattr_m_attr)
+    assert_equal(nil, ret.struct_2.xmlattr_m_attr)
+    assert_equal('', ret.xmlattr_attr_string)
+    assert_equal(nil, ret.xmlattr_attr_int)
+    assert_equal(105759347, ret.long)
+  end
 
+  def do_test_with_stub(client)
     struct1 = Echo_struct.new("mystring1", now1 = Time.now)
     struct1.xmlattr_m_attr = 'myattr1'
-    struct2 = Echo_struct.new("mystring2", now2 = Time.now)
+    struct2 = Echo_struct.new("mystr<>ing2", now2 = Time.now)
     struct2.xmlattr_m_attr = 'myattr2'
-    echo = Echoele.new(struct1, struct2)
-    echo.xmlattr_attr_string = 'attr_string'
+    echo = Echoele.new(struct1, struct2, 105759347)
+    echo.xmlattr_attr_string = 'attr_str<>ing'
     echo.xmlattr_attr_int = 5
-    ret = @client.echo(echo)
+    ret = client.echo(echo)
 
     # struct#m_datetime in a response is a DateTime even though
     # struct#m_datetime in a request is a Time.
     timeformat = "%Y-%m-%dT%H:%M:%S"
-    assert_equal("mystring2", ret.struct1.m_string)
+    assert_equal("mystr<>ing2", ret.struct1.m_string)
     assert_equal(now2.strftime(timeformat),
       date2time(ret.struct1.m_datetime).strftime(timeformat))
     assert_equal("mystring1", ret.struct_2.m_string)
     assert_equal(now1.strftime(timeformat),
       date2time(ret.struct_2.m_datetime).strftime(timeformat))
-    assert_equal("attr_string", ret.xmlattr_attr_string)
+    assert_equal("attr_str<>ing", ret.xmlattr_attr_string)
     assert_equal(5, ret.xmlattr_attr_int)
+    assert_equal(105759347, ret.long)
+  end
+
+  def test_wsdl_with_map
+    wsdl = File.join(DIR, 'document.wsdl')
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+
+    struct1 = {
+      :m_string => "mystring1",
+      :m_datetime => (now1 = Time.now),
+      :xmlattr_m_attr => "myattr1"
+    }
+    struct2 = {
+      "m_string" => "mystr<>ing2",
+      "m_datetime" => now2 = (Time.now),
+      "xmlattr_m_attr" => "myattr2"
+    }
+    echo = {
+      :struct1 => struct1,
+      "struct-2" => struct2,
+      :xmlattr_attr_string => 'attr_str<>ing',
+      "xmlattr_attr-int" => 5
+    }
+    ret = @client.echo(echo)
+    #
+    now1str = XSD::XSDDateTime.new(now1).to_s
+    now2str = XSD::XSDDateTime.new(now2).to_s
+    assert_equal("mystr<>ing2", ret.struct1.m_string)
+    assert_equal(now2str, ret.struct1.m_datetime)
+    assert_equal("mystring1", ret.struct_2.m_string)
+    assert_equal(now1str, ret.struct_2.m_datetime)
+    assert_equal("attr_str<>ing", ret.xmlattr_attr_string)
+    assert_equal("5", ret.xmlattr_attr_int)
   end
 
   def date2time(date)
@@ -168,7 +235,7 @@ class TestRPC < Test::Unit::TestCase
     @client.wiredump_dev = STDOUT if $DEBUG
 
     echo = SOAPElement.new('foo')
-    echo.extraattr['attr_string'] = 'attr_string'
+    echo.extraattr['attr_string'] = 'attr_str<>ing'
     echo.extraattr['attr-int'] = 5
     echo.add(struct1 = SOAPElement.new('struct1'))
     struct1.add(SOAPElement.new('m_string', 'mystring1'))
@@ -186,7 +253,7 @@ 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('attr_str<>ing', ret.xmlattr_attr_string)
     assert_equal(5, ret.xmlattr_attr_int)
 
     echo = {'struct1' => {'m_string' => 'mystring1', 'm_datetime' => '2005-03-17T19:47:31+01:00'}, 
@@ -266,6 +333,7 @@ __XML__
     ret = @client.return_nil
     assert_nil(ret.struct1.m_string)
     assert_nil(ret.struct_2.m_string)
+    assert_nil(ret.long)
   end
 
   def test_empty
@@ -279,6 +347,7 @@ __XML__
     ret = @client.return_empty
     assert_equal("", ret.struct1.m_string)
     assert_equal("", ret.struct_2.m_string)
+    assert_equal(0, ret.long)
   end
 end
 

data/test/wsdl/fault/test_fault.rb

@@ -18,7 +18,7 @@ class TestFault < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     unless $DEBUG
       File.unlink(pathname('Add.rb'))
       File.unlink(pathname('AddMappingRegistry.rb'))

data/test/wsdl/fault/test_multifault.rb

@@ -18,7 +18,7 @@ class TestMultiFault < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     unless $DEBUG
       File.unlink(pathname('Add.rb'))
       File.unlink(pathname('AddMappingRegistry.rb'))

data/test/wsdl/group/expectedClassdef.rb

@@ -0,0 +1,58 @@
+require 'xsd/qname'
+
+module WSDL; module Group
+
+
+# {urn:grouptype}groupele_type
+#   comment - SOAP::SOAPString
+#   element - SOAP::SOAPString
+#   eletype - SOAP::SOAPString
+#   var - SOAP::SOAPString
+#   xmlattr_attr_min - SOAP::SOAPDecimal
+#   xmlattr_attr_max - SOAP::SOAPDecimal
+class Groupele_type
+  AttrAttr_max = XSD::QName.new(nil, "attr_max")
+  AttrAttr_min = XSD::QName.new(nil, "attr_min")
+
+  attr_accessor :comment
+  attr_reader :__xmlele_any
+  attr_accessor :element
+  attr_accessor :eletype
+  attr_accessor :var
+
+  def set_any(elements)
+    @__xmlele_any = elements
+  end
+
+  def __xmlattr
+    @__xmlattr ||= {}
+  end
+
+  def xmlattr_attr_min
+    __xmlattr[AttrAttr_min]
+  end
+
+  def xmlattr_attr_min=(value)
+    __xmlattr[AttrAttr_min] = value
+  end
+
+  def xmlattr_attr_max
+    __xmlattr[AttrAttr_max]
+  end
+
+  def xmlattr_attr_max=(value)
+    __xmlattr[AttrAttr_max] = value
+  end
+
+  def initialize(comment = nil, element = nil, eletype = nil, var = nil)
+    @comment = comment
+    @__xmlele_any = nil
+    @element = element
+    @eletype = eletype
+    @var = var
+    @__xmlattr = {}
+  end
+end
+
+
+end; end

data/test/wsdl/group/expectedDriver.rb

@@ -0,0 +1,51 @@
+require 'echo.rb'
+require 'echoMappingRegistry.rb'
+require 'soap/rpc/driver'
+
+module WSDL::Group
+
+class Group_porttype < ::SOAP::RPC::Driver
+  DefaultEndpointUrl = "http://localhost:17171/"
+
+  Methods = [
+    [ "urn:group:echo",
+      "echo",
+      [ ["in", "parameters", ["::SOAP::SOAPElement", "urn:grouptype", "groupele"]],
+        ["out", "parameters", ["::SOAP::SOAPElement", "urn:grouptype", "groupele"]] ],
+      { :request_style =>  :document, :request_use =>  :literal,
+        :response_style => :document, :response_use => :literal,
+        :faults => {} }
+    ]
+  ]
+
+  def initialize(endpoint_url = nil)
+    endpoint_url ||= DefaultEndpointUrl
+    super(endpoint_url, nil)
+    self.mapping_registry = EchoMappingRegistry::EncodedRegistry
+    self.literal_mapping_registry = EchoMappingRegistry::LiteralRegistry
+    init_methods
+  end
+
+private
+
+  def init_methods
+    Methods.each do |definitions|
+      opt = definitions.last
+      if opt[:request_style] == :document
+        add_document_operation(*definitions)
+      else
+        add_rpc_operation(*definitions)
+        qname = definitions[0]
+        name = definitions[2]
+        if qname.name != name and qname.name.capitalize == name.capitalize
+          ::SOAP::Mapping.define_singleton_method(self, qname.name) do |*arg|
+            __send__(name, *arg)
+          end
+        end
+      end
+    end
+  end
+end
+
+
+end

data/test/wsdl/group/expectedMappingRegistry.rb

@@ -0,0 +1,67 @@
+require 'echo.rb'
+require 'soap/mapping'
+
+module WSDL; module Group
+
+module EchoMappingRegistry
+  EncodedRegistry = ::SOAP::Mapping::EncodedRegistry.new
+  LiteralRegistry = ::SOAP::Mapping::LiteralRegistry.new
+  NsGrouptype = "urn:grouptype"
+  NsXMLSchema = "http://www.w3.org/2001/XMLSchema"
+
+  EncodedRegistry.register(
+    :class => WSDL::Group::Groupele_type,
+    :schema_type => XSD::QName.new(NsGrouptype, "groupele_type"),
+    :schema_element => [
+      ["comment", "SOAP::SOAPString", [0, 1]],
+      ["any", [nil, XSD::QName.new(NsXMLSchema, "anyType")]],
+      [ :choice,
+        ["element", ["SOAP::SOAPString", XSD::QName.new(nil, "element")]],
+        ["eletype", ["SOAP::SOAPString", XSD::QName.new(nil, "eletype")]]
+      ],
+      ["var", ["SOAP::SOAPString", XSD::QName.new(nil, "var")]]
+    ],
+    :schema_attribute => {
+      XSD::QName.new(nil, "attr_min") => "SOAP::SOAPDecimal",
+      XSD::QName.new(nil, "attr_max") => "SOAP::SOAPDecimal"
+    }
+  )
+
+  LiteralRegistry.register(
+    :class => WSDL::Group::Groupele_type,
+    :schema_type => XSD::QName.new(NsGrouptype, "groupele_type"),
+    :schema_element => [
+      ["comment", "SOAP::SOAPString", [0, 1]],
+      ["any", [nil, XSD::QName.new(NsXMLSchema, "anyType")]],
+      [ :choice,
+        ["element", ["SOAP::SOAPString", XSD::QName.new(nil, "element")]],
+        ["eletype", ["SOAP::SOAPString", XSD::QName.new(nil, "eletype")]]
+      ],
+      ["var", ["SOAP::SOAPString", XSD::QName.new(nil, "var")]]
+    ],
+    :schema_attribute => {
+      XSD::QName.new(nil, "attr_min") => "SOAP::SOAPDecimal",
+      XSD::QName.new(nil, "attr_max") => "SOAP::SOAPDecimal"
+    }
+  )
+
+  LiteralRegistry.register(
+    :class => WSDL::Group::Groupele_type,
+    :schema_name => XSD::QName.new(NsGrouptype, "groupele"),
+    :schema_element => [
+      ["comment", "SOAP::SOAPString", [0, 1]],
+      ["any", [nil, XSD::QName.new(NsXMLSchema, "anyType")]],
+      [ :choice,
+        ["element", ["SOAP::SOAPString", XSD::QName.new(nil, "element")]],
+        ["eletype", ["SOAP::SOAPString", XSD::QName.new(nil, "eletype")]]
+      ],
+      ["var", ["SOAP::SOAPString", XSD::QName.new(nil, "var")]]
+    ],
+    :schema_attribute => {
+      XSD::QName.new(nil, "attr_min") => "SOAP::SOAPDecimal",
+      XSD::QName.new(nil, "attr_max") => "SOAP::SOAPDecimal"
+    }
+  )
+end
+
+end; end

data/test/wsdl/group/group.wsdl

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<definitions
+    name="echo"
+    targetNamespace="urn:group"
+    xmlns:tns="urn:group"
+    xmlns:txd="urn:grouptype"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns="http://schemas.xmlsoap.org/wsdl/">
+    <types>
+      <xsd:schema elementFormDefault="unqualified" targetNamespace="urn:grouptype">
+
+        <xsd:element name="comment" type="xsd:string"/>
+
+        <xsd:simpleType name="attr_type">
+          <xsd:restriction base="xsd:decimal">
+            <xsd:maxInclusive value="-50"/>
+            <xsd:minInclusive value="50"/>
+          </xsd:restriction>
+        </xsd:simpleType>
+
+        <xsd:group name="common">
+          <xsd:sequence>
+            <xsd:element ref="txd:comment" minOccurs="0"/>
+            <xsd:any namespace="##any" minOccurs="0"/>
+          </xsd:sequence>
+        </xsd:group>
+
+        <xsd:attributeGroup name="common_attr">
+          <xsd:attribute name="attr_min" type="txd:attr_type" default="0"/>
+          <xsd:attribute name="attr_max" type="txd:attr_type" default="0"/>
+        </xsd:attributeGroup>
+
+        <xsd:group name="common_element">
+          <xsd:sequence>
+            <xsd:group ref="txd:common"/>
+            <xsd:choice>
+              <xsd:element name="element" type="xsd:string"/>
+              <xsd:element name="eletype" type="xsd:string"/>
+            </xsd:choice>
+          </xsd:sequence>
+        </xsd:group>
+
+        <xsd:complexType name="groupele_type">
+          <xsd:sequence>
+            <xsd:group ref="txd:common_element"/>
+            <xsd:element name="var" type="xsd:string"/>
+          </xsd:sequence>
+          <xsd:attributeGroup ref="txd:common_attr"/>
+        </xsd:complexType>
+
+        <xsd:element name="groupele" type="txd:groupele_type"/>
+      </xsd:schema>
+    </types>
+
+  <message name="echo_in">
+    <part name="parameters" element="txd:groupele" />
+  </message>
+  <message name="echo_out">
+    <part name="parameters" element="txd:groupele" />
+  </message>
+
+  <portType name="group_porttype">
+    <operation name="echo">
+      <input message="tns:echo_in" />
+      <output message="tns:echo_out" />
+    </operation>
+  </portType>
+
+  <binding name="group_binding" type="tns:group_porttype">
+    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
+    <operation name="echo">
+      <soap:operation soapAction="urn:group:echo" style="document" />
+      <input>
+        <soap:body use="literal" />
+      </input>
+      <output>
+        <soap:body use="literal" />
+      </output>
+    </operation>
+  </binding>
+
+  <service name="group_service">
+    <port name="docprc_service_port" binding="tns:group_binding">
+      <soap:address location="http://localhost:17171/" />
+    </port>
+  </service>
+</definitions>