soap4r 1.5.6 → 1.5.7

data/test/soap/test_custom_ns.rb

@@ -0,0 +1,63 @@
+require 'test/unit'
+require 'soap/processor'
+
+
+module SOAP
+
+
+class TestCustomNs < Test::Unit::TestCase
+  NORMAL_XML = <<__XML__.chomp
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Header>
+      <n1:headeritem xmlns:n1="my:foo"
+          env:mustUnderstand="0">hi</n1:headeritem>
+  </env:Header>
+  <env:Body>
+    <n2:test xmlns:n2="my:foo">bi</n2:test>
+  </env:Body>
+</env:Envelope>
+__XML__
+
+  CUSTOM_NS_XML = <<__XML__.chomp
+<?xml version="1.0" encoding="utf-8" ?>
+<ENV:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:ENV="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:myns="my:foo"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <ENV:Header>
+      <myns:headeritem ENV:mustUnderstand="0">hi</myns:headeritem>
+  </ENV:Header>
+  <ENV:Body>
+    <myns:test>bi</myns:test>
+  </ENV:Body>
+</ENV:Envelope>
+__XML__
+
+  def test_custom_ns
+    # create test env
+    header = SOAP::SOAPHeader.new()
+    hi = SOAP::SOAPElement.new(XSD::QName.new("my:foo", "headeritem"), 'hi')
+    header.add("test", hi)
+    body = SOAP::SOAPBody.new()
+    bi = SOAP::SOAPElement.new(XSD::QName.new("my:foo", "bodyitem"), 'bi')
+    body.add("test", bi)
+    env = SOAP::SOAPEnvelope.new(header, body)
+    # normal
+    opt = {}
+    result = SOAP::Processor.marshal(env, opt)
+    assert_equal(NORMAL_XML, result)
+    # ns customize
+    ns = XSD::NS.new
+    ns.assign(SOAP::EnvelopeNamespace, 'ENV')
+    ns.assign('my:foo', 'myns')
+    opt = { :default_ns => ns }
+    result = SOAP::Processor.marshal(env, opt)
+    assert_equal(CUSTOM_NS_XML, result)
+  end
+end
+
+
+end

data/test/soap/test_httpconfigloader.rb

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'soap/httpconfigloader'
 require 'soap/rpc/driver'
 
-if defined?(HTTPAccess2)
+if defined?(HTTPClient)
 
 module SOAP
 
@@ -14,6 +14,20 @@ class TestHTTPConfigLoader < Test::Unit::TestCase
     @client = SOAP::RPC::Driver.new(nil, nil)
   end
 
+  class Request
+    class Header
+      attr_reader :request_uri
+      def initialize(request_uri)
+        @request_uri = request_uri
+      end
+    end
+
+    attr_reader :header
+    def initialize(request_uri)
+      @header = Header.new(request_uri)
+    end
+  end
+
   def test_property
     testpropertyname = File.join(DIR, 'soapclient.properties')
     File.open(testpropertyname, "w") do |f|
@@ -37,13 +51,14 @@ __EOP__
       @client.options['protocol.http.basic_auth'] <<
         ['http://www.example.com/foo3/', 'user3', 'password3']
       h = @client.streamhandler.client
-      basic_auth = h.instance_eval { @basic_auth }
+      basic_auth = h.www_auth.basic_auth
       cred1 = ["user1:password1"].pack('m').tr("\n", '')
       cred2 = ["user2:password2"].pack('m').tr("\n", '')
       cred3 = ["user3:password3"].pack('m').tr("\n", '')
-      assert_equal(cred1, basic_auth.get(URI.parse("http://www.example.com/foo1/baz")))
-      assert_equal(cred2, basic_auth.get(URI.parse("http://www.example.com/foo2/")))
-      assert_equal(cred3, basic_auth.get(URI.parse("http://www.example.com/foo3/baz/qux")))
+      basic_auth.challenge(URI.parse("http://www.example.com/"), nil)
+      assert_equal(cred1, basic_auth.get(Request.new(URI.parse("http://www.example.com/foo1/baz"))))
+      assert_equal(cred2, basic_auth.get(Request.new(URI.parse("http://www.example.com/foo2/"))))
+      assert_equal(cred3, basic_auth.get(Request.new(URI.parse("http://www.example.com/foo3/baz/qux"))))
     ensure
       File.unlink(testpropertyname)
     end

data/test/soap/test_mapping.rb

@@ -1,11 +1,73 @@
 require 'test/unit'
 require 'soap/mapping'
+require 'soap/marshal'
 
 
 module SOAP
 
 
 class TestMapping < Test::Unit::TestCase
+
+  class MappablePerson
+    attr_reader :name
+    attr_reader :age
+
+    def initialize(name, age)
+      @name, @age = name, age
+    end
+
+    def self.soap_marshallable
+      true
+    end
+  end
+
+  class UnmappablePerson
+    attr_reader :name
+    attr_reader :age
+
+    def initialize(name, age)
+      @name, @age = name, age
+    end
+
+    def self.soap_marshallable
+      false
+    end
+  end
+
+  def test_mappable
+    xml = <<__XML__
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <SOAP..TestMapping..MappablePerson env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <name>nahi</name>
+      <age>37</age>
+    </SOAP..TestMapping..MappablePerson>
+  </env:Body>
+</env:Envelope>
+__XML__
+    obj = SOAP::Marshal.load(xml)
+    assert_equal(SOAP::TestMapping::MappablePerson, obj.class)
+    #
+    xml = <<__XML__
+<?xml version="1.0" encoding="utf-8" ?>
+<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <SOAP..TestMapping..UnmappablePerson env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <name>nahi</name>
+      <age>37</age>
+    </SOAP..TestMapping..UnmappablePerson>
+  </env:Body>
+</env:Envelope>
+__XML__
+    obj = SOAP::Marshal.load(xml)
+    assert_equal(SOAP::Mapping::Object, obj.class)
+  end
+
   def test_date
     targets = [
       ["2002-12-31",

data/test/soap/test_nil.rb

@@ -0,0 +1,55 @@
+require 'test/unit'
+require 'soap/rpc/standaloneServer'
+require 'soap/rpc/driver'
+require 'soap/header/handler'
+
+
+module SOAP
+
+
+class TestNil < Test::Unit::TestCase
+  Port = 17171
+
+  class NilServer < SOAP::RPC::StandaloneServer
+    def initialize(*arg)
+      super
+      add_method(self, 'nop')
+    end
+
+    def nop
+      1
+    end
+  end
+
+  def setup
+    @server = NilServer.new(self.class.name, nil, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      @server.start
+    }
+    @endpoint = "http://localhost:#{Port}/"
+    @client = SOAP::RPC::Driver.new(@endpoint)
+    @client.add_rpc_method('nop')
+  end
+
+  def teardown
+    @server.shutdown
+    @t.kill
+    @t.join
+    @client.reset_stream
+  end
+
+  require 'rexml/document'
+  # emulates SOAP::Lite's nil request
+  def test_soaplite_nil
+    body = SOAP::SOAPBody.new(REXML::Document.new(<<-__XML__))
+      <nop xsi:nil="true"/>
+    __XML__
+    @client.wiredump_dev = STDOUT if $DEBUG
+    header, body = @client.invoke(nil, body)
+    assert_equal(1, body.root_node["return"].data)
+  end
+end
+
+
+end

data/test/soap/test_no_indent.rb

@@ -2,7 +2,7 @@ require 'test/unit'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'
 
-if defined?(HTTPAccess2)
+if defined?(HTTPClient)
 
 module SOAP
 

data/test/soap/test_streamhandler.rb

@@ -42,6 +42,16 @@ class TestStreamHandler < Test::Unit::TestCase
       '/',
       WEBrick::HTTPServlet::ProcHandler.new(method(:do_server_proc).to_proc)
     )
+    htpasswd = File.join(File.dirname(__FILE__), 'htpasswd')
+    htpasswd_userdb = WEBrick::HTTPAuth::Htpasswd.new(htpasswd)
+    @basic_auth = WEBrick::HTTPAuth::BasicAuth.new(
+      :Realm => 'auth',
+      :UserDB => htpasswd_userdb
+    )
+    @server.mount(
+      '/basic_auth',
+      WEBrick::HTTPServlet::ProcHandler.new(method(:do_server_proc_basic_auth).to_proc)
+    )
     @server_thread = TestUtil.start_server_thread(@server)
   end
 
@@ -58,6 +68,7 @@ class TestStreamHandler < Test::Unit::TestCase
   def setup_client
     @client = SOAP::RPC::Driver.new(@url, '')
     @client.add_method("do_server_proc")
+    @client.add_method("do_server_proc_basic_auth")
   end
 
   def teardown_server
@@ -90,10 +101,12 @@ class TestStreamHandler < Test::Unit::TestCase
 __EOX__
   end
 
+  def do_server_proc_basic_auth(req, res)
+    @basic_auth.authenticate(req, res)
+    do_server_proc(req, res)
+  end
+
   def parse_req_header(str)
-    if ::SOAP::HTTPStreamHandler::Client.to_s == 'SOAP::NetHttpClient'
-      str = eval(str.split(/\r?\n/)[4][3..-1])
-    end
     parse_req_header_http_access2(str)
   end
 
@@ -141,24 +154,23 @@ __EOX__
   end
 
   def test_basic_auth
-    unless Object.const_defined?('HTTPAccess2')
+    unless Object.const_defined?('HTTPClient')
       # soap4r + net/http + basic_auth is not supported.
-      # use http-access2 instead.
+      # use httpclient instead.
       assert(true)
       return
     end
+    @client.endpoint_url = @url + 'basic_auth'
     str = ""
     @client.wiredump_dev = str
-    @client.options["protocol.http.basic_auth"] << [@url, "foo", "bar"]
-    assert_nil(@client.do_server_proc)
-    r, h = parse_req_header(str)
-    assert_equal("Basic Zm9vOmJhcg==", h["authorization"])
+    @client.options["protocol.http.basic_auth"] << [@url, "admin", "admin"]
+    assert_nil(@client.do_server_proc_basic_auth)
   end
 
   def test_proxy
-    if Object.const_defined?('HTTPAccess2')
-      backup = HTTPAccess2::Client::NO_PROXY_HOSTS.dup
-      HTTPAccess2::Client::NO_PROXY_HOSTS.clear
+    if Object.const_defined?('HTTPClient')
+      backup = HTTPClient::NO_PROXY_HOSTS.dup
+      HTTPClient::NO_PROXY_HOSTS.clear
     else
       backup = SOAP::NetHttpClient::NO_PROXY_HOSTS.dup
       SOAP::NetHttpClient::NO_PROXY_HOSTS.clear
@@ -175,8 +187,8 @@ __EOX__
       @client.options["protocol.http.proxy"] = 'ftp://foo:8080'
     end
   ensure
-    if Object.const_defined?('HTTPAccess2')
-      HTTPAccess2::Client::NO_PROXY_HOSTS.replace(backup)
+    if Object.const_defined?('HTTPClient')
+      HTTPClient::NO_PROXY_HOSTS.replace(backup)
     else
       SOAP::NetHttpClient::NO_PROXY_HOSTS.replace(backup)
     end

data/test/wsdl/datetime/datetimeServant.rb

@@ -15,6 +15,7 @@ class DatetimePortType
   #
   def now(now)
     #raise NotImplementedError.new
+    return nil if now.nil?
     now + 1
   end
 end

data/test/wsdl/datetime/test_datetime.rb

@@ -75,6 +75,10 @@ class TestDatetime < Test::Unit::TestCase
     assert_equal(d1.sec, d2.sec)
     assert_equal(d1.sec, d2.sec)
   end
+
+  def test_nil
+    assert_nil(@client.now(nil))
+  end
 end
 
 

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

@@ -32,6 +32,36 @@
         </s:complexType>
       </s:element>
       <s:element name="ArrayOfDouble" nillable="true" type="tns:ArrayOfDouble"/>
+
+      <s:element name="echo2">
+        <s:complexType>
+          <s:sequence>
+            <s:element name="arg" type="tns:ArrayOfComplex"/>
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="echo2Response">
+        <s:complexType>
+          <s:sequence>
+            <s:element name="arg" type="tns:ArrayOfComplex"/>
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="ArrayOfComplex">
+        <s:complexType>
+          <s:sequence>
+            <s:element ref="tns:Complex" maxOccurs="3"/>
+          </s:sequence>
+        </s:complexType>
+      </s:element>
+      <s:element name="Complex">
+        <s:complexType>
+          <s:sequence>
+            <s:element name="string" type="s:string"/>
+            <s:element name="double" type="s:double"/>
+          </s:sequence>
+        </s:complexType>
+      </s:element>
     </s:schema>
   </wsdl:types>
 
@@ -41,12 +71,23 @@
   <wsdl:message name="echoOut">
     <wsdl:part name="parameters" element="tns:echoResponse"/>
   </wsdl:message>
+  <wsdl:message name="echo2In">
+    <wsdl:part name="parameters" element="tns:echo2"/>
+  </wsdl:message>
+  <wsdl:message name="echo2Out">
+    <wsdl:part name="parameters" element="tns:echo2Response"/>
+  </wsdl:message>
 
   <wsdl:portType name="pricerSoap">
     <wsdl:operation name="echo">
       <wsdl:input message="tns:echoIn"/>
       <wsdl:output message="tns:echoOut"/>
     </wsdl:operation>
+
+    <wsdl:operation name="echo2">
+      <wsdl:input message="tns:echo2In"/>
+      <wsdl:output message="tns:echo2Out"/>
+    </wsdl:operation>
   </wsdl:portType>
 
   <wsdl:binding name="pricerSoap" type="tns:pricerSoap">
@@ -61,6 +102,15 @@
         <soap:body use="literal"/>
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="echo2">
+      <soap:operation soapAction="http://tempuri.org/echo2" 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

@@ -21,12 +21,23 @@ class TestArray < Test::Unit::TestCase
         XSD::QName.new(Namespace, 'echo'),
         XSD::QName.new(Namespace, 'echoResponse')
       )
+      add_document_method(
+        self,
+        Namespace + 'echo2',
+        'echo2',
+        XSD::QName.new(Namespace, 'echo2'),
+        XSD::QName.new(Namespace, 'echo2Response')
+      )
       self.literal_mapping_registry = DoubleMappingRegistry::LiteralRegistry
     end
   
     def echo(arg)
       arg
     end
+  
+    def echo2(arg)
+      arg
+    end
   end
 
   DIR = File.dirname(File.expand_path(__FILE__))
@@ -44,6 +55,7 @@ class TestArray < Test::Unit::TestCase
     unless $DEBUG
       File.unlink(pathname('double.rb'))
       File.unlink(pathname('doubleMappingRegistry.rb'))
+      File.unlink(pathname('doubleDriver.rb'))
     end
     @client.reset_stream if @client
   end
@@ -61,10 +73,11 @@ class TestArray < 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
-    TestUtil.require(DIR, 'doubleMappingRegistry.rb', 'double.rb')
+    TestUtil.require(DIR, 'doubleDriver.rb', 'doubleMappingRegistry.rb', 'double.rb')
   end
 
   def teardown_server
@@ -78,6 +91,25 @@ class TestArray < Test::Unit::TestCase
   end
 
   def test_stub
+    @client = PricerSoap.new
+    @client.endpoint_url = "http://localhost:#{Port}/"
+    @client.wiredump_dev = STDOUT if $DEBUG
+    arg = ArrayOfComplex[c1 = Complex.new, c2 = Complex.new, c3 = Complex.new]
+    c1.string = "str_c1"
+    c1.double = 1.1
+    c2.string = "str_c2"
+    c2.double = 2.2
+    c3.string = "str_c3"
+    c3.double = 3.3
+    ret = @client.echo2(Echo2.new(arg))
+    assert_equal(ArrayOfComplex, ret.arg.class)
+    assert_equal(Complex, ret.arg[0].class)
+    assert_equal(arg[0].string, ret.arg[0].string)
+    assert_equal(arg[1].string, ret.arg[1].string)
+    assert_equal(arg[2].string, ret.arg[2].string)
+  end
+
+  def test_wsdl_stubclassdef
     wsdl = File.join(DIR, 'double.wsdl')
     @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
     @client.endpoint_url = "http://localhost:#{Port}/"
@@ -94,12 +126,7 @@ class TestArray < Test::Unit::TestCase
     @client.literal_mapping_registry = DoubleMappingRegistry::LiteralRegistry
     @client.wiredump_dev = STDOUT if $DEBUG
     double = [0.1, 0.2, 0.3]
-    arg = {
-      :ary => {
-        XSD::QName.new("http://tempuri.org/", "double") => double
-      }
-    }
-    assert_equal(double, @client.echo(arg).ary)
+    assert_equal(double, @client.echo(:ary => double).ary)
   end
 end