2 files changed, 63 insertions, 17 deletions

diff --git a/test/wsdl/simpletype/simpletype.wsdl b/test/wsdl/simpletype/simpletype.wsdl
index ec3266fc14..623969c794 100644
--- a/test/wsdl/simpletype/simpletype.wsdl
+++ b/test/wsdl/simpletype/simpletype.wsdl
@@ -10,19 +10,28 @@
       <xsd:element name="ruby">
         <xsd:complexType>
           <xsd:sequence>
-            <xsd:element minOccurs="1" maxOccurs="1" name="version" type="tns:version"/>
+            <xsd:element minOccurs="1" maxOccurs="1" name="myversion" type="tns:myversion"/>
             <xsd:element minOccurs="0" maxOccurs="1" name="date" type="xsd:dateTime"/>
           </xsd:sequence>
         </xsd:complexType>
       </xsd:element>
 
-      <xsd:simpleType name="version">
+      <xsd:simpleType name="myversion">
         <xsd:restriction base="xsd:string">
           <xsd:enumeration value="1.6"/>
           <xsd:enumeration value="1.8"/>
           <xsd:enumeration value="1.9"/>
         </xsd:restriction>
       </xsd:simpleType>
+
+      <xsd:element name="myid" type="tns:ID"/>
+
+      <xsd:simpleType name="ID">
+        <xsd:restriction base="xsd:string">
+          <xsd:length value="18"/>
+          <xsd:pattern value='[a-zA-Z0-9]{18}'/>
+        </xsd:restriction>
+      </xsd:simpleType>
     </xsd:schema>
   </types>
 
@@ -31,11 +40,19 @@
   </message>
 
   <message name="ping_out">
-    <part name="parameters" element="xsd:string"/>
+    <part name="parameters" type="xsd:string"/>
+  </message>
+
+  <message name="ping_id_in">
+    <part name="parameters" element="tns:myid"/>
+  </message>
+
+  <message name="ping_id_out">
+    <part name="parameters" element="tns:myid"/>
   </message>
 
   <message name="versionmsg">
-    <part name="version" element="tns:version"/>
+    <part name="myversion" element="tns:myversion"/>
   </message>
 
   <portType name="ping_port_type">
@@ -44,6 +61,11 @@
       <output message="tns:ping_out"/>
     </operation>
 
+    <operation name="ping_id">
+      <input message="tns:ping_id_in"/>
+      <output message="tns:ping_id_out"/>
+    </operation>
+
     <operation name="echo_version">
       <input message="tns:versionmsg"/>
       <output message="tns:versionmsg"/>
@@ -53,7 +75,13 @@
   <binding name="ping_binding" type="tns:ping_port_type">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
     <operation name="ping">
-      <soap:operation soapAction="urn:example.com:simpletype" style="document"/>
+      <soap:operation soapAction="urn:example.com:simpletype:ping" style="document"/>
+      <input><soap:body use="literal"/></input>
+      <output><soap:body use="literal"/></output>
+    </operation>
+
+    <operation name="ping_id">
+      <soap:operation soapAction="urn:example.com:simpletype:ping_id" style="document"/>
       <input><soap:body use="literal"/></input>
       <output><soap:body use="literal"/></output>
     </operation>
diff --git a/test/wsdl/simpletype/test_simpletype.rb b/test/wsdl/simpletype/test_simpletype.rb
index a46bf5dd78..7e644c3042 100644
--- a/test/wsdl/simpletype/test_simpletype.rb
+++ b/test/wsdl/simpletype/test_simpletype.rb
@@ -10,12 +10,23 @@ module SimpleType
 class TestSimpleType < Test::Unit::TestCase
   class Server < ::SOAP::RPC::StandaloneServer
     def on_init
-      add_method(self, 'ruby', 'version', 'date')
+      add_document_method(self, 'urn:example.com:simpletype:ping', 'ping',
+        XSD::QName.new('urn:example.com:simpletype', 'ruby'),
+        XSD::QName.new('http://www.w3.org/2001/XMLSchema', 'string'))
+      add_document_method(self, 'urn:example.com:simpletype:ping_id', 'ping_id',
+        XSD::QName.new('urn:example.com:simpletype', 'myid'),
+        XSD::QName.new('urn:example.com:simpletype', 'myid'))
     end
   
-    def ruby(version, date)
+    def ping(ruby)
+      version = ruby["myversion"]
+      date = ruby["date"]
       "#{version} (#{date})"
     end
+
+    def ping_id(id)
+      id
+    end
   end
 
   DIR = File.dirname(File.expand_path(__FILE__))
@@ -35,9 +46,10 @@ class TestSimpleType < Test::Unit::TestCase
 
   def setup_client
     wsdl = File.join(DIR, 'simpletype.wsdl')
-    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_driver
+    @client = ::SOAP::WSDLDriverFactory.new(wsdl).create_rpc_driver
     @client.endpoint_url = "http://localhost:#{Port}/"
     @client.generate_explicit_type = false
+    @client.wiredump_dev = STDOUT if $DEBUG
   end
 
   def teardown
@@ -60,19 +72,25 @@ class TestSimpleType < Test::Unit::TestCase
       Thread.current.abort_on_exception = true
       server.start
     }
-    while server.status != :Running
-      sleep 0.1
-      unless t.alive?
-	t.join
-	raise
-      end
-    end
     t
   end
 
   def test_ping
-    header, body = @client.ping(nil, {:version => "1.9", :date => "2004-01-01T00:00:00Z"})
-    assert_equal("1.9 (2004-01-01T00:00:00Z)", body)
+    ret = @client.ping({:myversion => "1.9", :date => "2004-01-01T00:00:00Z"})
+    assert_equal("1.9 (2004-01-01T00:00:00Z)", ret)
+  end
+
+  def test_ping_id
+    ret = @client.ping_id("012345678901234567")
+    assert_equal("012345678901234567", ret)
+    # length
+    assert_raise(XSD::ValueSpaceError) do
+      @client.ping_id("0123456789012345678")
+    end
+    # pattern
+    assert_raise(XSD::ValueSpaceError) do
+      @client.ping_id("01234567890123456;")
+    end
   end
 end