soap4r 1.5.7 → 1.5.8

data/test/wsdl/group/test_rpc.rb

@@ -0,0 +1,145 @@
+require 'test/unit'
+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 Group
+
+
+class TestGroup < Test::Unit::TestCase
+  class Server < ::SOAP::RPC::StandaloneServer
+    Namespace = 'urn:group'
+    TypeNamespace = 'urn:grouptype'
+
+    def on_init
+      add_document_method(
+        self,
+        Namespace + ':echo',
+        'echo',
+        XSD::QName.new(TypeNamespace, 'groupele'),
+        XSD::QName.new(TypeNamespace, 'groupele')
+      )
+      self.literal_mapping_registry = EchoMappingRegistry::LiteralRegistry
+    end
+  
+    def echo(arg)
+      # arg
+      # need to convert for 'any'
+      ret = Groupele_type.new(arg.comment, arg.element, arg.eletype, arg.var)
+      ret.xmlattr_attr_max = arg.xmlattr_attr_max
+      ret.xmlattr_attr_min = arg.xmlattr_attr_min
+      ret.set_any([::SOAP::SOAPElement.new("foo", arg.foo)])
+      ret
+    end
+  end
+
+  DIR = File.dirname(File.expand_path(__FILE__))
+
+  Port = 17171
+
+  def setup
+    setup_classdef
+    setup_server
+    @client = nil
+  end
+
+  def teardown
+    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
+    @client.reset_stream if @client
+  end
+
+  def setup_server
+    @server = Server.new('Test', "urn:group", '0.0.0.0', Port)
+    @server.level = Logger::Severity::ERROR
+    @server_thread = TestUtil.start_server_thread(@server)
+  end
+
+  def setup_classdef
+    gen = WSDL::SOAP::WSDL2Ruby.new
+    gen.location = pathname("group.wsdl")
+    gen.basedir = DIR
+    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, 'echoDriver.rb', 'echoMappingRegistry.rb', 'echo.rb')
+  end
+
+  def teardown_server
+    @server.shutdown
+    @server_thread.kill
+    @server_thread.join
+  end
+
+  def pathname(filename)
+    File.join(DIR, filename)
+  end
+
+  def compare(expected, actual)
+    TestUtil.filecompare(pathname(expected), pathname(actual))
+  end
+
+  def test_generate
+    compare("expectedClassdef.rb", "echo.rb")
+    compare("expectedMappingRegistry.rb", "echoMappingRegistry.rb")
+    compare("expectedDriver.rb", "echoDriver.rb")
+  end
+
+  def test_wsdl
+    wsdl = File.join(DIR, 'group.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 = EchoMappingRegistry::LiteralRegistry
+    #
+    do_test_arg
+  end
+
+  def test_naive
+    @client = ::SOAP::RPC::Driver.new("http://localhost:#{Port}/")
+    @client.add_document_method('echo', 'urn:group:echo',
+      XSD::QName.new('urn:grouptype', 'groupele'),
+      XSD::QName.new('urn:grouptype', 'groupele'))
+    @client.literal_mapping_registry = EchoMappingRegistry::LiteralRegistry
+    @client.wiredump_dev = STDOUT if $DEBUG
+    #
+    do_test_arg
+  end
+
+  def test_stub
+    @client = Group_porttype.new("http://localhost:#{Port}/")
+    @client.wiredump_dev = STDOUT if $DEBUG
+    #
+    do_test_arg
+  end
+
+  def do_test_arg
+    arg = Groupele_type.new
+    arg.comment = "comment"
+    arg.set_any(
+      [::SOAP::SOAPElement.new("foo", "bar")]
+    )
+    arg.eletype = "eletype"
+    arg.var = "var"
+    arg.xmlattr_attr_min = -3
+    arg.xmlattr_attr_max = 3
+    ret = @client.echo(arg)
+    assert_equal(arg.comment, ret.comment)
+    assert_equal(arg.eletype, ret.eletype)
+    assert_nil(ret.element)
+    assert_equal(arg.var, ret.var)
+    assert_equal("bar", ret.foo)
+  end
+end
+
+
+end; end

data/test/wsdl/list/test_list.rb

@@ -39,7 +39,7 @@ class TestList < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     File.unlink(pathname('list.rb')) unless $DEBUG
     File.unlink(pathname('listMappingRegistry.rb')) unless $DEBUG
     File.unlink(pathname('listDriver.rb')) unless $DEBUG

data/test/wsdl/map/test_map.rb

@@ -53,8 +53,8 @@ class TestMap < 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/marshal/person_org.rb

@@ -1,6 +1,11 @@
 require 'xsd/qname'
 
 # {http://www.jin.gr.jp/~nahi/xmlns/sample/Person}Person
+#   familyname - SOAP::SOAPString
+#   givenname - SOAP::SOAPString
+#   var1 - SOAP::SOAPInt
+#   var2 - SOAP::SOAPDouble
+#   var3 - SOAP::SOAPString
 class Person
   attr_accessor :familyname
   attr_accessor :givenname

data/test/wsdl/multiplefault.wsdl

@@ -12,6 +12,7 @@
   <types>
     <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
 	targetNamespace="urn:jp.gr.jin.rrr.example.datatypes">
+      <xsd:element name="AuthenticationError" type="tns:AuthenticationError" />
       <xsd:complexType name="AuthenticationError">
 	<all>
 	  <element name="message" type="xsd:string" />
@@ -30,18 +31,18 @@
   <message name="inputmsg"/>
   <message name="outputmsg"/>
   <message name="faultmsg1" >
-    <part name="exception" type="typens:AuthenticationError" />
+    <part name="exception" element="typens:AuthenticationError" />
   </message>
   <message name="faultmsg2" >
-    <part name="exception" type="typens:AuthorizationError" />
+    <part name="exception" element="typens:AuthorizationError" />
   </message>
 
   <portType name="MultipleFaultPortType">
     <operation name="myoperation">
       <input message="tns:inputmsg"/>
       <output message="tns:outputmsg"/>
-      <fault message="tns:faultmsg1"/>
-      <fault message="tns:faultmsg2"/>
+      <fault name="faultmsg1" message="tns:faultmsg1"/>
+      <fault name="faultmsg2" message="tns:faultmsg2"/>
     </operation>
   </portType>
 
@@ -57,6 +58,12 @@
         <soap:body use="encoded" namespace="urn:jp.gr.jin.rrr.example.ele"
    	    encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
       </output>
+      <fault name="faultmsg1">
+        <soap:fault name="faultmsg1" use="literal"/>
+      </fault>
+      <fault name="faultmsg2">
+        <soap:fault name="faultmsg2" use="literal"/>
+      </fault>
     </operation>
   </binding>
 

data/test/wsdl/oneway/test_oneway.rb

@@ -46,7 +46,7 @@ class TestOneway < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     unless $DEBUG
       File.unlink(pathname('oneway.rb'))
       File.unlink(pathname('onewayMappingRegistry.rb'))

data/test/wsdl/overload/test_overload.rb

@@ -55,7 +55,7 @@ class TestOverload < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     File.unlink(pathname('default.rb')) unless $DEBUG
     @client.reset_stream if @client
   end

data/test/wsdl/qualified/test_qualified.rb

@@ -39,7 +39,7 @@ class TestQualified < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     unless $DEBUG
       File.unlink(pathname('default.rb'))
       File.unlink(pathname('defaultMappingRegistry.rb'))

data/test/wsdl/qualified/test_unqualified.rb

@@ -39,7 +39,7 @@ class TestUnqualified < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server
+    teardown_server if @server
     unless $DEBUG
       File.unlink(pathname('lp.rb'))
       File.unlink(pathname('lpMappingRegistry.rb'))

data/test/wsdl/raa/RAAService.rb

@@ -1,104 +1,106 @@
 #!/usr/bin/env ruby
-require 'RAAServant.rb'
-
 require 'soap/rpc/standaloneServer'
-require 'soap/mapping/registry'
 
-class RAABaseServicePortType
-  MappingRegistry = ::SOAP::Mapping::Registry.new
+module WSDL; module RAA
 
-  MappingRegistry.set(
-    StringArray,
-    ::SOAP::SOAPArray,
-    ::SOAP::Mapping::Registry::TypedArrayFactory,
-    { :type => XSD::QName.new("http://www.w3.org/2001/XMLSchema", "string") }
-  )
-  MappingRegistry.set(
-    Category,
-    ::SOAP::SOAPStruct,
-    ::SOAP::Mapping::Registry::TypedStructFactory,
-    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category") }
-  )
-  MappingRegistry.set(
-    InfoArray,
-    ::SOAP::SOAPArray,
-    ::SOAP::Mapping::Registry::TypedArrayFactory,
-    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info") }
-  )
-  MappingRegistry.set(
-    Info,
-    ::SOAP::SOAPStruct,
-    ::SOAP::Mapping::Registry::TypedStructFactory,
-    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info") }
-  )
-  MappingRegistry.set(
-    Product,
-    ::SOAP::SOAPStruct,
-    ::SOAP::Mapping::Registry::TypedStructFactory,
-    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Product") }
-  )
-  MappingRegistry.set(
-    Owner,
-    ::SOAP::SOAPStruct,
-    ::SOAP::Mapping::Registry::TypedStructFactory,
-    { :type => XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Owner") }
-  )
+class RAABaseServicePortTypeServer
+  def getAllListings
+    ["ruby", "soap4r"]
+  end
+
+  def getProductTree
+    raise NotImplementedError.new
+  end
+  
+  def getInfoFromCategory(category)
+    raise NotImplementedError.new
+  end
+  
+  def getModifiedInfoSince(timeInstant)
+    raise NotImplementedError.new
+  end
+  
+  def getInfoFromName(productName)
+    Info.new(
+      Category.new("major", "minor"), 
+      Product.new(123, productName, "short description", "version", "status",
+        URI.parse("http://example.com/homepage"),
+        URI.parse("http://example.com/download"),
+        "license", "description"),
+      Owner.new(456, URI.parse("mailto:email@example.com"), "name"),
+      Time.now,
+      Time.now)
+  end
+  
+  def getInfoFromOwnerId(ownerId)
+    raise NotImplementedError.new
+  end
 
   Methods = [
     [ XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "getAllListings"),
       "",
       "getAllListings",
-      [ ["retval", "return", ["String[]", "http://www.w3.org/2001/XMLSchema", "string"]] ],
+      [ ["retval", "return", ["WSDL::RAA::C_String[]", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "StringArray"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ],
     [ XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "getProductTree"),
       "",
       "getProductTree",
       [ ["retval", "return", ["Hash", "http://xml.apache.org/xml-soap", "Map"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ],
     [ XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "getInfoFromCategory"),
       "",
       "getInfoFromCategory",
-      [ ["in", "category", ["Category", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category"]],
-        ["retval", "return", ["Info[]", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]] ],
+      [ ["in", "category", ["WSDL::RAA::Category", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Category"]],
+        ["retval", "return", ["WSDL::RAA::Info[]", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "InfoArray"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ],
     [ XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "getModifiedInfoSince"),
       "",
       "getModifiedInfoSince",
       [ ["in", "timeInstant", ["::SOAP::SOAPDateTime"]],
-        ["retval", "return", ["Info[]", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]] ],
+        ["retval", "return", ["WSDL::RAA::Info[]", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "InfoArray"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ],
     [ XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "getInfoFromName"),
       "",
       "getInfoFromName",
       [ ["in", "productName", ["::SOAP::SOAPString"]],
-        ["retval", "return", ["Info", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]] ],
+        ["retval", "return", ["WSDL::RAA::Info", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ],
     [ XSD::QName.new("http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "getInfoFromOwnerId"),
       "",
       "getInfoFromOwnerId",
       [ ["in", "ownerId", ["::SOAP::SOAPInt"]],
-        ["retval", "return", ["Info[]", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "Info"]] ],
+        ["retval", "return", ["WSDL::RAA::Info[]", "http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/", "InfoArray"]] ],
       { :request_style =>  :rpc, :request_use =>  :encoded,
-        :response_style => :rpc, :response_use => :encoded }
+        :response_style => :rpc, :response_use => :encoded,
+        :faults => {} }
     ]
   ]
 end
 
+end; end
+
+module WSDL; module RAA
+
 class RAABaseServicePortTypeApp < ::SOAP::RPC::StandaloneServer
   def initialize(*arg)
     super(*arg)
-    servant = RAABaseServicePortType.new
-    RAABaseServicePortType::Methods.each do |definitions|
+    servant = WSDL::RAA::RAABaseServicePortTypeServer.new
+    WSDL::RAA::RAABaseServicePortType::Methods.each do |definitions|
       opt = definitions.last
       if opt[:request_style] == :document
         @router.add_document_operation(servant, *definitions)
@@ -106,13 +108,16 @@ class RAABaseServicePortTypeApp < ::SOAP::RPC::StandaloneServer
         @router.add_rpc_operation(servant, *definitions)
       end
     end
-    self.mapping_registry = RAABaseServicePortType::MappingRegistry
+    self.mapping_registry = RAAMappingRegistry::EncodedRegistry
+    self.literal_mapping_registry = RAAMappingRegistry::LiteralRegistry
   end
 end
 
+end; end
+
 if $0 == __FILE__
   # Change listen port.
-  server = RAABaseServicePortTypeApp.new('app', nil, '0.0.0.0', 10080)
+  server = WSDL::RAA::RAABaseServicePortTypeApp.new('app', nil, '0.0.0.0', 10080)
   trap(:INT) do
     server.shutdown
   end

data/test/wsdl/raa/expectedClassDef.rb

@@ -0,0 +1,100 @@
+require 'xsd/qname'
+
+module WSDL; module RAA
+
+
+# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}Category
+#   major - SOAP::SOAPString
+#   minor - SOAP::SOAPString
+class Category
+  attr_accessor :major
+  attr_accessor :minor
+
+  def initialize(major = nil, minor = nil)
+    @major = major
+    @minor = minor
+  end
+end
+
+# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}Product
+#   id - SOAP::SOAPInt
+#   name - SOAP::SOAPString
+#   short_description - SOAP::SOAPString
+#   version - SOAP::SOAPString
+#   status - SOAP::SOAPString
+#   homepage - SOAP::SOAPAnyURI
+#   download - SOAP::SOAPAnyURI
+#   license - SOAP::SOAPString
+#   description - SOAP::SOAPString
+class Product
+  attr_accessor :id
+  attr_accessor :name
+  attr_accessor :short_description
+  attr_accessor :version
+  attr_accessor :status
+  attr_accessor :homepage
+  attr_accessor :download
+  attr_accessor :license
+  attr_accessor :description
+
+  def initialize(id = nil, name = nil, short_description = nil, version = nil, status = nil, homepage = nil, download = nil, license = nil, description = nil)
+    @id = id
+    @name = name
+    @short_description = short_description
+    @version = version
+    @status = status
+    @homepage = homepage
+    @download = download
+    @license = license
+    @description = description
+  end
+end
+
+# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}Owner
+#   id - SOAP::SOAPInt
+#   email - SOAP::SOAPAnyURI
+#   name - SOAP::SOAPString
+class Owner
+  attr_accessor :id
+  attr_accessor :email
+  attr_accessor :name
+
+  def initialize(id = nil, email = nil, name = nil)
+    @id = id
+    @email = email
+    @name = name
+  end
+end
+
+# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}Info
+#   category - WSDL::RAA::Category
+#   product - WSDL::RAA::Product
+#   owner - WSDL::RAA::Owner
+#   created - SOAP::SOAPDateTime
+#   updated - SOAP::SOAPDateTime
+class Info
+  attr_accessor :category
+  attr_accessor :product
+  attr_accessor :owner
+  attr_accessor :created
+  attr_accessor :updated
+
+  def initialize(category = nil, product = nil, owner = nil, created = nil, updated = nil)
+    @category = category
+    @product = product
+    @owner = owner
+    @created = created
+    @updated = updated
+  end
+end
+
+# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}InfoArray
+class InfoArray < ::Array
+end
+
+# {http://www.ruby-lang.org/xmlns/soap/interface/RAA/0.0.2/}StringArray
+class StringArray < ::Array
+end
+
+
+end; end