rubyjedi-soap4r 1.5.8.01 → 1.5.8.20100616125722

data/test/wsdl/abstract/test_abstract.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 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 Abstract

data/test/wsdl/anonymous/test_anonymous.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 if defined?(HTTPClient)

data/test/wsdl/any/test_any.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 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 Any

data/test/wsdl/axisArray/test_axisarray.rb

@@ -1,10 +1,10 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/processor'
 require 'soap/mapping'
 require 'soap/rpc/element'
 require 'wsdl/importer'
 require 'wsdl/soap/wsdl2ruby'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL

data/test/wsdl/choice/test_choice.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 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 Choice

data/test/wsdl/complexcontent/test_echo.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 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 ComplexContent

data/test/wsdl/datetime/test_datetime.rb

@@ -1,6 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/wsdlDriver'
-require 'DatetimeService.rb'
+TestUtil.require(File.dirname(__FILE__), 'DatetimeService.rb')
 
 
 module WSDL

data/test/wsdl/document/array/test_array.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 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 Document

data/test/wsdl/document/test_nosoapaction.rb

@@ -1,10 +1,10 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'wsdl/parser'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
 require 'soap/rpc/driver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL; module Document

data/test/wsdl/document/test_number.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 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 Document

data/test/wsdl/document/test_rpc.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 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 Document

data/test/wsdl/fault/multifault.wsdl

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions name="Add"
+<definitions name="AddMulti"
   targetNamespace="http://fault.test/Faulttest"
   xmlns:tns="http://fault.test/Faulttest"
   xmlns="http://schemas.xmlsoap.org/wsdl/"
@@ -24,7 +24,7 @@
       </complexType>
     </element>
 
-    <element name="AddFault">
+    <element name="AddMultiFault">
       <complexType>
         <sequence>
           <element name="Reason" type="string"/>
@@ -51,8 +51,8 @@
 <message name="AddResponseMessage">
   <part name="response" element="tns:AddResponse"/>
 </message>
-<message name="AddFaultMessage">
-  <part name="fault" element="tns:AddFault"/>
+<message name="AddMultiFaultMessage">
+  <part name="fault" element="tns:AddMultiFault"/>
 </message>
 <message name="NegativeValueFaultMessage">
   <part name="fault" element="tns:NegativeValueFault"/>
@@ -63,7 +63,7 @@
   <operation name="Add">
     <input  name="Add" message="tns:AddMessage"/>
     <output name="AddResponse" message="tns:AddResponseMessage"/>
-    <fault  name="AddFault" message="tns:AddFaultMessage"/>
+    <fault  name="AddMultiFault" message="tns:AddMultiFaultMessage"/>
     <fault  name="NegativeValueFault" message="tns:NegativeValueFaultMessage"/>
   </operation>
 </portType>
@@ -78,8 +78,8 @@
       <output>
         <soap:body use="literal"/>
       </output>
-      <fault name="AddFault">
-        <soap:fault name="AddFault"/>
+      <fault name="AddMultiFault">
+        <soap:fault name="AddMultiFault"/>
       </fault>
       <fault name="NegativeValueFault">
         <soap:fault name="NegativeValueFault"/>
@@ -87,7 +87,7 @@
     </operation>
   </binding>
 
-  <service name="AddService">
+  <service name="AddMultiService">
     <port name="AddPort" binding="tns:AddSOAPBinding">
       <soap:address location="http://localhost:8080/"/>
     </port>

data/test/wsdl/fault/test_fault.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/wsdlDriver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL; module Fault
@@ -18,7 +18,7 @@ class TestFault < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server if @server
+    teardown_server if defined?(@server)
     unless $DEBUG
       File.unlink(pathname('Add.rb'))
       File.unlink(pathname('AddMappingRegistry.rb'))

data/test/wsdl/fault/test_multifault.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/wsdlDriver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL; module Fault
@@ -18,12 +18,12 @@ class TestMultiFault < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server if @server
+    teardown_server if defined?(@server)
     unless $DEBUG
-      File.unlink(pathname('Add.rb'))
-      File.unlink(pathname('AddMappingRegistry.rb'))
-      File.unlink(pathname('AddServant.rb'))
-      File.unlink(pathname('AddService.rb'))
+      File.unlink(pathname('AddMulti.rb'))
+      File.unlink(pathname('AddMultiMappingRegistry.rb'))
+      File.unlink(pathname('AddMultiServant.rb'))
+      File.unlink(pathname('AddMultiService.rb'))
     end
     @client.reset_stream if @client
   end
@@ -33,7 +33,7 @@ class TestMultiFault < Test::Unit::TestCase
       define_method(:add) do |request|
         @sum ||= 0
         if (request.value > 100)
-          fault = AddFault.new("Value #{request.value} is too large", "Critical")
+          fault = AddMultiFault.new("Value #{request.value} is too large", "Critical")
           raise fault
         end
 
@@ -65,7 +65,7 @@ class TestMultiFault < Test::Unit::TestCase
     TestUtil.silent do
       gen.run
     end
-    TestUtil.require(DIR, 'Add.rb', 'AddMappingRegistry.rb', 'AddServant.rb', 'AddService.rb')
+    TestUtil.require(DIR, 'AddMulti.rb', 'AddMultiMappingRegistry.rb', 'AddMultiServant.rb', 'AddMultiService.rb')
   end
 
   def teardown_server
@@ -89,7 +89,7 @@ class TestMultiFault < Test::Unit::TestCase
         [:out, "response", ["::SOAP::SOAPElement", "http://fault.test/Faulttest", "AddResponse"]] ],
       { :request_style =>  :document, :request_use =>  :literal,
         :response_style => :document, :response_use => :literal,
-        :faults => {"AddFault"=>{:namespace=>nil, :name=>"AddFault", :use=>"literal", :encodingstyle=>"document", :ns=>"http://fault.test/Faulttest"}} }
+        :faults => {"AddMultiFault"=>{:namespace=>nil, :name=>"AddMultiFault", :use=>"literal", :encodingstyle=>"document", :ns=>"http://fault.test/Faulttest"}} }
     )
     @client.wiredump_dev = STDOUT if $DEBUG
     do_test(@client)
@@ -114,9 +114,9 @@ class TestMultiFault < Test::Unit::TestCase
       assert(false)
     rescue Exception => e
       assert_equal(::SOAP::FaultError, e.class)
-      assert_equal("WSDL::Fault::AddFault", e.faultstring.data)
-      assert_equal("Value 101 is too large", e.detail.addFault.reason)
-      assert_equal("Critical", e.detail.addFault.severity)
+      assert_equal("WSDL::Fault::AddMultiFault", e.faultstring.data)
+      assert_equal("Value 101 is too large", e.detail.addMultiFault.reason)
+      assert_equal("Critical", e.detail.addMultiFault.severity)
     end
     begin
       client.add(Add.new(-50))

data/test/wsdl/group/test_rpc.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 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

data/test/wsdl/list/test_list.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 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 List

data/test/wsdl/map/test_map.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/httpserver'
 require 'soap/wsdlDriver'
 

data/test/wsdl/marshal/test_wsdlmarshal.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'wsdl/parser'
 require 'soap/mapping/wsdlencodedregistry'
 require 'soap/marshal'
 require 'wsdl/soap/wsdl2ruby'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 class WSDLMarshaller
@@ -30,8 +30,7 @@ class WSDLMarshaller
   end
 end
 
-
-require File.join(File.dirname(__FILE__), 'person_org')
+TestUtil.require(File.dirname(__FILE__), 'person_org')
 
 class Person
   def ==(rhs)

data/test/wsdl/oneway/test_oneway.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/standaloneServer'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/wsdlDriver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL

data/test/wsdl/overload/test_overload.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 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

data/test/wsdl/qualified/test_qualified.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 if defined?(HTTPClient)
@@ -111,7 +111,7 @@ class TestQualified < Test::Unit::TestCase
     @client.endpoint_url = "http://localhost:#{Port}/"
     @client.wiredump_dev = str = ''
     @client.GetPrimeNumbers(:Min => 2, :Max => 10)
-    assert_equal(LOGIN_REQUEST_QUALIFIED, parse_requestxml(str),
+    assert_xml_equal(LOGIN_REQUEST_QUALIFIED, parse_requestxml(str),
       [LOGIN_REQUEST_QUALIFIED, parse_requestxml(str)].join("\n\n"))
   end
 
@@ -122,7 +122,7 @@ class TestQualified < Test::Unit::TestCase
 
     @client.wiredump_dev = str = ''
     @client.getPrimeNumbers(GetPrimeNumbers.new(2, 10))
-    assert_equal(LOGIN_REQUEST_QUALIFIED, parse_requestxml(str),
+    assert_xml_equal(LOGIN_REQUEST_QUALIFIED, parse_requestxml(str),
       [LOGIN_REQUEST_QUALIFIED, parse_requestxml(str)].join("\n\n"))
   end
 

data/test/wsdl/qualified/test_unqualified.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'wsdl/soap/wsdl2ruby'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 if defined?(HTTPClient)
@@ -114,7 +114,7 @@ class TestUnqualified < Test::Unit::TestCase
     @client.login(:timezone => 'JST', :password => 'passwd',
       :username => 'NaHi')
     # untyped because of passing a Hash
-    assert_equal(LOGIN_REQUEST_QUALIFIED_UNTYPED, parse_requestxml(str))
+    assert_xml_equal(LOGIN_REQUEST_QUALIFIED_UNTYPED, parse_requestxml(str))
   end
 
   include ::SOAP
@@ -124,7 +124,7 @@ class TestUnqualified < Test::Unit::TestCase
 
     @client.wiredump_dev = str = ''
     @client.login(Login.new('NaHi', 'passwd', 'JST'))
-    assert_equal(LOGIN_REQUEST_QUALIFIED_UNTYPED, parse_requestxml(str))
+    assert_xml_equal(LOGIN_REQUEST_QUALIFIED_UNTYPED, parse_requestxml(str))
   end
 
   def parse_requestxml(str)

data/test/wsdl/raa/test_raa.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/wsdlDriver'
 require 'wsdl/soap/wsdl2ruby'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL
@@ -53,8 +53,8 @@ class TestRAA < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_server if @server
-    teardown_client if @client
+    teardown_server if defined?(@server)
+    teardown_client if defined?(@client)
     unless $DEBUG
       File.unlink(pathname('RAA.rb'))
       File.unlink(pathname('RAAMappingRegistry.rb'))

data/test/wsdl/ref/test_ref.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/standaloneServer'
 require 'soap/wsdlDriver'
 require 'wsdl/soap/wsdl2ruby'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module WSDL