soap4r 1.5.5.20061022 → 1.5.6

data/test/wsdl/overload/test_overload.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 Overload
@@ -62,7 +63,7 @@ class TestOverload < 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
@@ -73,7 +74,7 @@ class TestOverload < Test::Unit::TestCase
     gen.opt['classdef'] = nil
     gen.opt['force'] = true
     gen.run
-    require pathname('default')
+    TestUtil.require(DIR, 'default.rb')
   end
 
   def teardown_server
@@ -82,14 +83,6 @@ class TestOverload < 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/qualified/test_qualified.rb

@@ -2,6 +2,8 @@ require 'test/unit'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
+
 
 if defined?(HTTPAccess2)
 
@@ -40,6 +42,7 @@ class TestQualified < Test::Unit::TestCase
     teardown_server
     unless $DEBUG
       File.unlink(pathname('default.rb'))
+      File.unlink(pathname('defaultMappingRegistry.rb'))
       File.unlink(pathname('defaultDriver.rb'))
     end
     @client.reset_stream if @client
@@ -48,7 +51,7 @@ class TestQualified < Test::Unit::TestCase
   def setup_server
     @server = Server.new('Test', "urn:lp", '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_clientdef
@@ -59,12 +62,15 @@ class TestQualified < Test::Unit::TestCase
       gen.location = pathname("np.wsdl")
       gen.basedir = DIR
       gen.logger.level = Logger::FATAL
+      gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
       gen.opt['classdef'] = nil
+      gen.opt['mapping_registry'] = nil
       gen.opt['driver'] = nil
       gen.opt['force'] = true
       gen.run
-      require pathname('default.rb')
+      require 'default.rb'
     ensure
+      $".delete('default.rb')
       Dir.chdir(backupdir)
     end
   end
@@ -75,14 +81,6 @@ class TestQualified < 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
@@ -119,13 +117,7 @@ class TestQualified < Test::Unit::TestCase
 
   include ::SOAP
   def test_naive
-    backupdir = Dir.pwd
-    begin
-      Dir.chdir(DIR)
-      require pathname('defaultDriver')
-    ensure
-      Dir.chdir(backupdir)
-    end
+    TestUtil.require(DIR, 'defaultDriver.rb', 'defaultMappingRegistry.rb', 'default.rb')
     @client = PnumSoap.new("http://localhost:#{Port}/")
 
     @client.wiredump_dev = str = ''

data/test/wsdl/qualified/test_unqualified.rb

@@ -2,6 +2,8 @@ require 'test/unit'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
+
 
 if defined?(HTTPAccess2)
 
@@ -38,15 +40,18 @@ class TestUnqualified < Test::Unit::TestCase
 
   def teardown
     teardown_server
-    File.unlink(pathname('lp.rb')) unless $DEBUG
-    File.unlink(pathname('lpDriver.rb')) unless $DEBUG
+    unless $DEBUG
+      File.unlink(pathname('lp.rb'))
+      File.unlink(pathname('lpMappingRegistry.rb'))
+      File.unlink(pathname('lpDriver.rb'))
+    end
     @client.reset_stream if @client
   end
 
   def setup_server
     @server = Server.new('Test', "urn:lp", '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_clientdef
@@ -57,12 +62,15 @@ class TestUnqualified < Test::Unit::TestCase
       gen.location = pathname("lp.wsdl")
       gen.basedir = DIR
       gen.logger.level = Logger::FATAL
+      gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
       gen.opt['classdef'] = nil
+      gen.opt['mapping_registry'] = nil
       gen.opt['driver'] = nil
       gen.opt['force'] = true
       gen.run
-      require pathname('lp')
+      require 'lp.rb'
     ensure
+      $".delete('lp.rb')
       Dir.chdir(backupdir)
     end
   end
@@ -73,14 +81,6 @@ class TestUnqualified < 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
@@ -105,8 +105,7 @@ class TestUnqualified < Test::Unit::TestCase
     xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <env:Body>
-    <n1:login xmlns:n1="urn:lp"
-        xsi:type="n1:login">
+    <n1:login xmlns:n1="urn:lp">
       <username>NaHi</username>
       <password>passwd</password>
       <timezone>JST</timezone>
@@ -134,13 +133,7 @@ class TestUnqualified < Test::Unit::TestCase
 
   include ::SOAP
   def test_naive
-    backupdir = Dir.pwd
-    begin
-      Dir.chdir(DIR)
-      require pathname('lpDriver')
-    ensure
-      Dir.chdir(backupdir)
-    end
+    TestUtil.require(DIR, 'lpDriver.rb', 'lpMappingRegistry.rb', 'lp.rb')
     @client = Lp_porttype.new("http://localhost:#{Port}/")
 
     @client.wiredump_dev = str = ''

data/test/wsdl/ref/expectedDriver.rb

@@ -0,0 +1,51 @@
+require 'product.rb'
+require 'productMappingRegistry.rb'
+
+module WSDL::Ref
+require 'soap/rpc/driver'
+
+class Ref_porttype < ::SOAP::RPC::Driver
+  DefaultEndpointUrl = "http://localhost:17171/"
+
+  Methods = [
+    [ "urn:ref:echo",
+      "echo",
+      [ ["in", "parameters", ["::SOAP::SOAPElement", "urn:ref", "Product-Bag"]],
+        ["out", "parameters", ["::SOAP::SOAPElement", "urn:ref", "Creator"]] ],
+      { :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 = ProductMappingRegistry::EncodedRegistry
+    self.literal_mapping_registry = ProductMappingRegistry::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/ref/expectedProduct.rb

@@ -1,75 +1,5 @@
 require 'xsd/qname'
 
-# {urn:ref}Rating
-class Rating < ::String
-  C_0 = Rating.new("0")
-  C_1 = Rating.new("+1")
-  C_1_2 = Rating.new("-1")
-end
-
-# {urn:ref}Product-Bag
-class ProductBag
-  attr_accessor :bag
-  attr_accessor :rating
-  attr_accessor :comment_1
-  attr_accessor :comment_2
-
-  def m___point
-    @v___point
-  end
-
-  def m___point=(value)
-    @v___point = value
-  end
-
-  def xmlattr_version
-    (@__xmlattr ||= {})[XSD::QName.new("urn:ref", "version")]
-  end
-
-  def xmlattr_version=(value)
-    (@__xmlattr ||= {})[XSD::QName.new("urn:ref", "version")] = value
-  end
-
-  def xmlattr_yesno
-    (@__xmlattr ||= {})[XSD::QName.new("urn:ref", "yesno")]
-  end
-
-  def xmlattr_yesno=(value)
-    (@__xmlattr ||= {})[XSD::QName.new("urn:ref", "yesno")] = value
-  end
-
-  def initialize(bag = [], rating = [], comment_1 = [], comment_2 = [], v___point = nil)
-    @bag = bag
-    @rating = rating
-    @comment_1 = comment_1
-    @comment_2 = comment_2
-    @v___point = v___point
-    @__xmlattr = {}
-  end
-end
-
-# {urn:ref}Creator
-class Creator < ::String
-  def xmlattr_Role
-    (@__xmlattr ||= {})[XSD::QName.new(nil, "Role")]
-  end
-
-  def xmlattr_Role=(value)
-    (@__xmlattr ||= {})[XSD::QName.new(nil, "Role")] = value
-  end
-
-  def initialize(*arg)
-    super
-    @__xmlattr = {}
-  end
-end
-
-# {urn:ref}yesno
-class Yesno < ::String
-  N = Yesno.new("N")
-  Y = Yesno.new("Y")
-end
-
 # {urn:ref}Product
 class Product
   attr_accessor :name
@@ -130,7 +60,7 @@ class Document < ::String
 end
 
 # {urn:ref}DerivedChoice_BaseSimpleContent
-class DerivedChoice_BaseSimpleContent
+class DerivedChoice_BaseSimpleContent < Document
   attr_accessor :varStringExt
   attr_accessor :varFloatExt
 
@@ -156,3 +86,73 @@ class DerivedChoice_BaseSimpleContent
     @__xmlattr = {}
   end
 end
+
+# {urn:ref}Rating
+class Rating < ::String
+  C_0 = Rating.new("0")
+  C_1 = Rating.new("+1")
+  C_1_2 = Rating.new("-1")
+end
+
+# {urn:ref}Product-Bag
+class ProductBag
+  attr_accessor :bag
+  attr_accessor :rating
+  attr_accessor :comment_1
+  attr_accessor :comment_2
+
+  def m___point
+    @v___point
+  end
+
+  def m___point=(value)
+    @v___point = value
+  end
+
+  def xmlattr_version
+    (@__xmlattr ||= {})[XSD::QName.new("urn:ref", "version")]
+  end
+
+  def xmlattr_version=(value)
+    (@__xmlattr ||= {})[XSD::QName.new("urn:ref", "version")] = value
+  end
+
+  def xmlattr_yesno
+    (@__xmlattr ||= {})[XSD::QName.new("urn:ref", "yesno")]
+  end
+
+  def xmlattr_yesno=(value)
+    (@__xmlattr ||= {})[XSD::QName.new("urn:ref", "yesno")] = value
+  end
+
+  def initialize(bag = [], rating = [], comment_1 = [], comment_2 = [], v___point = nil)
+    @bag = bag
+    @rating = rating
+    @comment_1 = comment_1
+    @comment_2 = comment_2
+    @v___point = v___point
+    @__xmlattr = {}
+  end
+end
+
+# {urn:ref}Creator
+class Creator < ::String
+  def xmlattr_Role
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "Role")]
+  end
+
+  def xmlattr_Role=(value)
+    (@__xmlattr ||= {})[XSD::QName.new(nil, "Role")] = value
+  end
+
+  def initialize(*arg)
+    super
+    @__xmlattr = {}
+  end
+end
+
+# {urn:ref}yesno
+class Yesno < ::String
+  N = Yesno.new("N")
+  Y = Yesno.new("Y")
+end

data/test/wsdl/ref/test_ref.rb

@@ -2,6 +2,7 @@ require 'test/unit'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
 require 'wsdl/soap/wsdl2ruby'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL
@@ -63,15 +64,18 @@ class TestRef < Test::Unit::TestCase
 
   def teardown
     teardown_server
-    File.unlink(pathname('product.rb')) unless $DEBUG
-    File.unlink(pathname('productDriver.rb')) unless $DEBUG
+    unless $DEBUG
+      File.unlink(pathname('product.rb'))
+      File.unlink(pathname('productMappingRegistry.rb'))
+      File.unlink(pathname('productDriver.rb'))
+    end
     @client.reset_stream if @client
   end
 
   def setup_server
     @server = Server.new('Test', 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
@@ -79,18 +83,13 @@ class TestRef < Test::Unit::TestCase
     gen.location = pathname("product.wsdl")
     gen.basedir = DIR
     gen.logger.level = Logger::FATAL
+    gen.opt['module_path'] = self.class.to_s.sub(/::[^:]+$/, '')
     gen.opt['classdef'] = nil
+    gen.opt['mapping_registry'] = nil
     gen.opt['driver'] = nil
     gen.opt['force'] = true
     gen.run
-    backupdir = Dir.pwd
-    begin
-      Dir.chdir(DIR)
-      require pathname('product')
-      require pathname('productDriver')
-    ensure
-      Dir.chdir(backupdir)
-    end
+    TestUtil.require(DIR, 'product.rb', 'productMappingRegistry.rb', 'productDriver.rb')
   end
 
   def teardown_server
@@ -99,34 +98,12 @@ class TestRef < 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
 
   def compare(expected, actual)
-    assert_equal(loadfile(expected), loadfile(actual), actual)
-  end
-
-  def loadfile(file)
-    File.open(pathname(file)) { |f| f.read }
-  end
-
-  def suppress_warning
-    back = $VERBOSE
-    $VERBOSE = nil
-    begin
-      yield
-    ensure
-      $VERBOSE = back
-    end
+    TestUtil.filecompare(pathname(expected), pathname(actual))
   end
 
   def test_classdef
@@ -136,10 +113,11 @@ class TestRef < Test::Unit::TestCase
     gen.logger.level = Logger::FATAL
     gen.opt['classdef'] = nil
     gen.opt['force'] = true
-    suppress_warning do
+    TestUtil.silent do
       gen.run
     end
     compare("expectedProduct.rb", "product.rb")
+    compare("expectedDriver.rb", "productDriver.rb")
   end
 
   def test_wsdl