soap4r 1.5.5.20061022 → 1.5.6

data/test/interopR2/test.sh

@@ -1,14 +1,15 @@
 #!/bin/sh -
 
-#ruby clientSOAP4R.rb
+ruby clientSOAP4R.rb
 
-#ruby client4S4C.rb
-#ruby client4S4C2.rb
-#ruby clientApacheAxis.rb
-#ruby clientApacheSOAP.rb
-#ruby clientASP.NET.rb
-#ruby clientBEAWebLogic.rb
-#ruby clientDelphi.rb
+ruby client4S4C.rb
+ruby client4S4C2.rb
+ruby clientApacheAxis.rb
+ruby clientApacheSOAP.rb
+ruby clientASP.NET.rb
+ruby clientBEAWebLogic.rb
+ruby clientCapeConnect.rb
+ruby clientDelphi.rb
 ruby clientEasySoap.rb
 ruby clienteSOAP.rb
 ruby clientgSOAP.rb
@@ -46,4 +47,3 @@ ruby clientXSOAP.rb
 #ruby clientTclSOAP.rb
 #ruby clientXMLRPC-EPI.rb
 #ruby clientZSI.rb
-#ruby clientCapeConnect.rb

data/test/runner.rb

@@ -1,8 +1,6 @@
 require 'test/unit'
 
-STDOUT.sync = true
-STDERR.sync = true
-rcsid = %w$Id: runner.rb 1520 2005-04-27 14:56:40Z nahi $
+rcsid = %w$Id: runner.rb 1751 2007-05-02 08:15:55Z nahi $
 Version = rcsid[2].scan(/\d+/).collect!(&method(:Integer)).freeze
 Release = rcsid[3].freeze
 

data/test/soap/asp.net/test_aspdotnet.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP; module ASPDotNet
@@ -42,7 +43,7 @@ class TestASPDotNet < 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
@@ -51,14 +52,6 @@ class TestASPDotNet < 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_document_method
     @client = SOAP::RPC::Driver.new(Endpoint, Server::Namespace)
     @client.wiredump_dev = STDOUT if $DEBUG
@@ -68,6 +61,24 @@ class TestASPDotNet < Test::Unit::TestCase
     assert_equal("Hello Mike", @client.sayHello(:name => "Mike"))
   end
 
+  def test_xml
+    @client = SOAP::RPC::Driver.new(Endpoint, Server::Namespace)
+    @client.wiredump_dev = STDOUT if $DEBUG
+    @client.add_document_method('sayHello', Server::Namespace + 'SayHello',
+      XSD::QName.new(Server::Namespace, 'SayHello'),
+      XSD::QName.new(Server::Namespace, 'SayHelloResponse'))
+    require 'rexml/document'
+    xml = <<__XML__
+<n1:sayHello xmlns:n1="http://localhost/WebService/">
+  <n1:name>Mike</n1:name>
+</n1:sayHello>
+__XML__
+    ele = REXML::Document.new(xml)
+    assert_equal("Hello Mike", @client.sayHello(ele))
+    def xml.to_xmlpart; to_s; end
+    assert_equal("Hello Mike", @client.sayHello(xml))
+  end
+
   def test_aspdotnethandler
     @client = SOAP::RPC::Driver.new(Endpoint, Server::Namespace)
     @client.wiredump_dev = STDOUT if $DEBUG

data/test/soap/case/test_mapping.rb

@@ -0,0 +1,57 @@
+require 'test/unit'
+require 'soap/marshal'
+
+
+module SOAP; module Case
+
+# {urn:TruckMateTypes}TTMHeader
+class TTMHeader
+  @@schema_type = "TTMHeader"
+  @@schema_ns = "urn:TruckMateTypes"
+  @@schema_element = [
+    ["dSN", ["SOAP::SOAPString", XSD::QName.new(nil, "DSN")]],
+    ["password", ["SOAP::SOAPString", XSD::QName.new(nil, "Password")]],
+    ["schema", ["SOAP::SOAPString", XSD::QName.new(nil, "Schema")]],
+    ["username", ["SOAP::SOAPString", XSD::QName.new(nil, "Username")]]
+  ]
+
+  attr_accessor :dSN
+  attr_accessor :password
+  attr_accessor :schema
+  attr_accessor :username
+
+  def initialize(dSN = nil, password = nil, schema = nil, username = nil)
+    @dSN = dSN
+    @password = password
+    @schema = schema
+    @username = username
+  end
+end
+
+
+class TestMapping < Test::Unit::TestCase
+  def test_mapping
+    dump = <<__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:Body>
+    <SOAP..Case..TTMHeader xmlns:n1="urn:TruckMateTypes"
+        xsi:type="n1:TTMHeader"
+        env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <DSN xsi:type="xsd:string">dsn</DSN>
+      <Password xsi:type="xsd:string">password</Password>
+      <Schema xsi:type="xsd:string">schema</Schema>
+      <Username xsi:type="xsd:string">username</Username>
+    </SOAP..Case..TTMHeader>
+  </env:Body>
+</env:Envelope>
+__XML__
+    o = TTMHeader.new("dsn", "password", "schema", "username")
+    assert_equal(dump, SOAP::Marshal.dump(o))
+  end
+end
+
+
+end; end

data/test/soap/filter/test_filter.rb

@@ -0,0 +1,146 @@
+require 'test/unit'
+require 'soap/rpc/driver'
+require 'soap/rpc/standaloneServer'
+require 'soap/filter'
+
+
+module SOAP
+module Filter
+
+
+class TestFilter < Test::Unit::TestCase
+  Port = 17171
+  PortName = 'http://tempuri.org/filterPort'
+
+  class FilterTestServer < SOAP::RPC::StandaloneServer
+    class Servant
+      def self.create
+	new
+      end
+
+      def echo(amt)
+        amt
+      end
+    end
+
+    class ServerFilter1 < SOAP::Filter::Handler
+      # 15 -> 30
+      def on_outbound(envelope, opt)
+        unless envelope.body.is_fault
+          node = envelope.body.root_node
+          node.retval = SOAPInt.new(node.retval.data * 2)
+          node.elename = XSD::QName.new(nil, 'return')
+        end
+        envelope
+      end
+
+      # 4 -> 5
+      def on_inbound(xml, opt)
+        xml = xml.sub(/4/, '5')
+        xml
+      end
+    end
+
+    class ServerFilter2 < SOAP::Filter::Handler
+      # 5 -> 15
+      def on_outbound(envelope, opt)
+        unless envelope.body.is_fault
+          node = envelope.body.root_node
+          node.retval = SOAPInt.new(node.retval.data + 10)
+          node.elename = XSD::QName.new(nil, 'return')
+        end
+        envelope
+      end
+
+      # 5 -> 6
+      def on_inbound(xml, opt)
+        xml = xml.sub(/5/, '6')
+        xml
+      end
+    end
+
+    def initialize(*arg)
+      super
+      add_rpc_servant(Servant.new, PortName)
+      self.filterchain << ServerFilter1.new
+      self.filterchain << ServerFilter2.new
+    end
+  end
+
+  def setup
+    @endpoint = "http://localhost:#{Port}/"
+    setup_server
+    setup_client
+  end
+
+  def setup_server
+    @server = FilterTestServer.new(self.class.name, nil, '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @t = Thread.new {
+      @server.start
+    }
+  end
+
+  def setup_client
+    @client = SOAP::RPC::Driver.new(@endpoint, PortName)
+    @client.wiredump_dev = STDERR if $DEBUG
+    @client.add_method('echo', 'amt')
+  end
+
+  def teardown
+    teardown_server
+    teardown_client
+  end
+
+  def teardown_server
+    @server.shutdown
+    @t.kill
+    @t.join
+  end
+
+  def teardown_client
+    @client.reset_stream
+  end
+
+  class ClientFilter1 < SOAP::Filter::Handler
+    # 1 -> 2
+    def on_outbound(envelope, opt)
+      param = envelope.body.root_node.inparam
+      param["amt"] = SOAPInt.new(param["amt"].data + 1)
+      param["amt"].elename = XSD::QName.new(nil, 'amt')
+      envelope
+    end
+
+    # 31 -> 32
+    def on_inbound(xml, opt)
+      xml = xml.sub(/31/, '32')
+      xml
+    end
+  end
+
+  class ClientFilter2 < SOAP::Filter::Handler
+    # 2 -> 4
+    def on_outbound(envelope, opt)
+      param = envelope.body.root_node.inparam
+      param["amt"] = SOAPInt.new(param["amt"].data * 2)
+      param["amt"].elename = XSD::QName.new(nil, 'amt')
+      envelope
+    end
+
+    # 30 -> 31
+    def on_inbound(xml, opt)
+      xml = xml.sub(/30/, '31')
+      xml
+    end
+  end
+
+  def test_call
+    @client.filterchain << ClientFilter1.new
+    @client.filterchain << ClientFilter2.new
+    assert_equal(32, @client.echo(1))
+  end
+end
+
+
+end
+end

data/test/soap/literalArrayMapping/test_definedarray.rb

@@ -2,6 +2,7 @@ require 'test/unit'
 require 'soap/mapping'
 require 'soap/processor'
 require 'soap/rpc/element'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP
@@ -9,25 +10,22 @@ module Marshal
 
 
 class TestDefinedArray < Test::Unit::TestCase
+  DIR = File.dirname(File.expand_path(__FILE__))
+
   def pathname(filename)
-    File.join(File.dirname(__FILE__), filename)
+    File.join(DIR, filename)
   end
 
   def setup
-    back = $:.dup
-    begin
-      $:.unshift(pathname('.'))
-      require pathname('amazonEcDriver')
-    ensure
-      $:.replace(back)
-    end
+    TestUtil.require(DIR, 'amazonEcDriver.rb')
   end
 
   def test_amazonresponse
     drv = AWSECommerceServicePortType.new
+    drv.wiredump_dev = STDOUT if $DEBUG
     drv.test_loopback_response << File.read(pathname('amazonresponse.xml'))
     obj = drv.itemSearch(ItemSearch.new)
-    assert_equal(3, obj.items[0].item[0].tracks.size)
+    assert_equal(3, obj.items.item.tracks.disc.size)
   end
 end
 

data/test/soap/marshal/marshaltestlib.rb

@@ -469,7 +469,7 @@ module MarshalTestLib
   end
 
   def test_string_escape
-    marshal_equal("\0<;;>\1;;")
+    marshal_equal("<;;>&\r'\";;>")
   end
 
   MyStruct2 = Struct.new(:a, :b)

data/test/soap/ssl/test_ssl.rb

@@ -227,16 +227,6 @@ private
     p ["client", ok, cert] if $DEBUG
     ok
   end
-
-  def silent
-    back = $VERBOSE
-    $VERBOSE = nil
-    begin
-      yield
-    ensure
-      $VERBOSE = back
-    end
-  end
 end
 
 

data/test/soap/struct/test_struct.rb

@@ -1,6 +1,7 @@
 require 'test/unit'
 require 'soap/rpc/httpserver'
 require 'soap/rpc/driver'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP; module Struct
@@ -35,7 +36,7 @@ class TestStruct < Test::Unit::TestCase
       :SOAPDefaultNamespace => Namespace
     )
     @server.level = Logger::Severity::ERROR
-    @server_thread = start_server_thread(@server)
+    @server_thread = TestUtil.start_server_thread(@server)
   end
 
   def setup_client
@@ -59,14 +60,6 @@ class TestStruct < Test::Unit::TestCase
     @client.reset_stream
   end
 
-  def start_server_thread(server)
-    t = Thread.new {
-      Thread.current.abort_on_exception = true
-      server.start
-    }
-    t
-  end
-
   def test_struct
     assert_equal("string", @client.a_method.one)
     assert_equal(1, @client.a_method.two)

data/test/soap/test_basetype.rb

@@ -62,6 +62,120 @@ class TestSOAP < Test::Unit::TestCase
     end
   end
 
+  def test_SOAPNormalizedString
+    XSD::Charset.module_eval { @encoding_backup = @internal_encoding; @internal_encoding = "NONE" }
+    begin
+      o = SOAP::SOAPNormalizedString.new
+      assert_equal(XSD::Namespace, o.type.namespace)
+      assert_equal(XSD::NormalizedStringLiteral, o.type.name)
+      assert_equal(nil, o.data)
+      assert_equal(true, o.is_nil)
+
+      str = "abc"
+      assert_equal(str, SOAP::SOAPNormalizedString.new(str).data)
+      assert_equal(str, SOAP::SOAPNormalizedString.new(str).to_s)
+      back = SOAP::SOAPString.strict_ces_validation
+      SOAP::SOAPString.strict_ces_validation = true
+      begin
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPNormalizedString.new("\0")
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPNormalizedString.new("\xC0\xC0").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPNormalizedString.new("a\tb").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPNormalizedString.new("a\r").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPNormalizedString.new("\nb").to_s
+        end
+      ensure
+        SOAP::SOAPString.strict_ces_validation = back
+      end
+    ensure
+      XSD::Charset.module_eval { @internal_encoding = @encoding_backup }
+    end
+  end
+
+  def test_SOAPToken
+    XSD::Charset.module_eval { @encoding_backup = @internal_encoding; @internal_encoding = "NONE" }
+    begin
+      o = SOAP::SOAPToken.new
+      assert_equal(XSD::Namespace, o.type.namespace)
+      assert_equal(XSD::TokenLiteral, o.type.name)
+      assert_equal(nil, o.data)
+      assert_equal(true, o.is_nil)
+
+      str = "abc"
+      assert_equal(str, SOAP::SOAPToken.new(str).data)
+      assert_equal(str, SOAP::SOAPToken.new(str).to_s)
+      back = XSD::XSDString.strict_ces_validation
+      XSD::XSDString.strict_ces_validation = true
+      begin
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("\0")
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("\xC0\xC0").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("a\tb").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("a\r").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("\nb").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new(" a").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("b ").to_s
+        end
+        assert_raises(XSD::ValueSpaceError) do
+          SOAP::SOAPToken.new("a  b").to_s
+        end
+        assert_equal("a b", SOAP::SOAPToken.new("a b").data)
+      ensure
+        XSD::XSDString.strict_ces_validation = back
+      end
+    ensure
+      XSD::Charset.module_eval { @internal_encoding = @encoding_backup }
+    end
+  end
+
+  def test_SOAPLanguage
+    o = SOAP::SOAPLanguage.new
+    assert_equal(XSD::Namespace, o.type.namespace)
+    assert_equal(XSD::LanguageLiteral, o.type.name)
+    assert_equal(nil, o.data)
+    assert_equal(true, o.is_nil)
+
+    str = "ja"
+    assert_equal(str, SOAP::SOAPLanguage.new(str).data)
+    assert_equal(str, SOAP::SOAPLanguage.new(str).to_s)
+    str = "ja-jp"
+    assert_equal(str, SOAP::SOAPLanguage.new(str).data)
+    assert_equal(str, SOAP::SOAPLanguage.new(str).to_s)
+    assert_raises(XSD::ValueSpaceError) do
+      SOAP::SOAPLanguage.new("ja-jp-")
+    end
+    assert_raises(XSD::ValueSpaceError) do
+      SOAP::SOAPLanguage.new("-ja-")
+    end
+    assert_raises(XSD::ValueSpaceError) do
+      SOAP::SOAPLanguage.new("ja-")
+    end
+    assert_raises(XSD::ValueSpaceError) do
+      SOAP::SOAPLanguage.new("a1-01")
+    end
+    assert_equal("aA-01", SOAP::SOAPLanguage.new("aA-01").to_s)
+  end
+
   def test_SOAPBoolean
     o = SOAP::SOAPBoolean.new
     assert_equal(XSD::Namespace, o.type.namespace)