rubyjedi-soap4r 1.5.8.01 → 1.5.8.20100616125722

data/test/soap/marshal/test_struct.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/marshal'
 
 

data/test/soap/ssl/sslsvr.rb

@@ -1,3 +1,4 @@
+$:.unshift File.expand_path(File.dirname(__FILE__)+'/../../../lib')
 require 'webrick/https'
 require 'logger'
 require 'rbconfig'

data/test/soap/ssl/test_ssl.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 begin
   require 'httpclient'
 rescue LoadError

data/test/soap/struct/test_struct.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/httpserver'
 require 'soap/rpc/driver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP; module Struct

data/test/soap/swa/test_file.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/driver'
 require 'soap/rpc/standaloneServer'
 require 'soap/attachment'

data/test/soap/test_basetype.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/baseData'
 
 

data/test/soap/test_cookie.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/driver'
 require 'webrick'
 require 'logger'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'testutil.rb')
 
 
 module SOAP

data/test/soap/test_custom_ns.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/processor'
 
 
@@ -69,7 +69,7 @@ __XML__
     # normal
     opt = {}
     result = SOAP::Processor.marshal(env, opt)
-    assert_equal(NORMAL_XML, result)
+    assert_xml_equal(NORMAL_XML, result)
     # Envelope ns customize
     env = SOAP::SOAPEnvelope.new(header, body)
     ns = XSD::NS.new
@@ -80,7 +80,7 @@ __XML__
     tag.assign('my:bar', 'bar')
     opt = { :default_ns => ns, :default_ns_tag => tag }
     result = SOAP::Processor.marshal(env, opt)
-    assert_equal(CUSTOM_NS_XML, result)
+    assert_xml_equal(CUSTOM_NS_XML, result)
   end
 
   def test_default_namespace
@@ -97,7 +97,7 @@ __XML__
     # normal
     opt = {:use_default_namespace => true}
     result = SOAP::Processor.marshal(env, opt)
-    assert_equal(XML_WITH_DEFAULT_NS, result)
+    assert_xml_equal(XML_WITH_DEFAULT_NS, result)
   end
 end
 

data/test/soap/test_custommap.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/marshal'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'

data/test/soap/test_empty.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'
 require 'soap/header/handler'
@@ -74,22 +74,22 @@ class TestEmpty < Test::Unit::TestCase
   def test_nop
     @client.wiredump_dev = str = ''
     @client.nop
-    assert_equal(EMPTY_XML, parse_requestxml(str))
-    assert_equal(EMPTY_XML, parse_responsexml(str))
+    assert_xml_equal(EMPTY_XML, parse_requestxml(str))
+    assert_xml_equal(EMPTY_XML, parse_responsexml(str))
   end
 
   def test_nop_nil
     @client.wiredump_dev = str = ''
     @client.nop_nil
-    assert_equal(EMPTY_XML, parse_requestxml(str))
-    assert_equal(EMPTY_XML, parse_responsexml(str))
+    assert_xml_equal(EMPTY_XML, parse_requestxml(str))
+    assert_xml_equal(EMPTY_XML, parse_responsexml(str))
   end
 
   def test_empty_header
     @client.headerhandler << EmptyHeaderHandler.new(nil)
     @client.wiredump_dev = str = ''
     @client.nop
-    assert_equal(EMPTY_HEADER_XML, parse_requestxml(str))
+    assert_xml_equal(EMPTY_HEADER_XML, parse_requestxml(str))
   end
 
   def parse_requestxml(str)

data/test/soap/test_envelopenamespace.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/driver'
 require 'webrick'
 require 'logger'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'testutil.rb')
 
 
 module SOAP

data/test/soap/test_extraattr.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/processor'
 
 
@@ -37,7 +37,7 @@ class TestExtrAttr < Test::Unit::TestCase
     env.extraattr["Id"] = "extraattr"
     g = SOAP::Generator.new()
     xml = g.generate(env)
-    assert_equal(HEADER_XML, xml)
+    assert_xml_equal(HEADER_XML, xml)
     #
     parser = SOAP::Parser.new
     env = parser.parse(xml)

data/test/soap/test_generator.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/processor'
 
 
@@ -13,14 +13,16 @@ class TestGenerator < Test::Unit::TestCase
     g.generate(SOAPElement.new('foo'))
     assert_equal("&lt;", g.encode_string(str)[-4, 4])
     #
-    unless str.respond_to?(:encode!) # Ruby 1.9 and above define encode!()
+    if RUBY_VERSION.to_f >= 1.9
+      assert_equal("&lt;", g.encode_string(str)[-4, 4])
+    else
       begin
         kc_backup = $KCODE.dup
         $KCODE = 'EUC-JP'
         assert_equal("&lt;", g.encode_string(str)[-4, 4])
       ensure
         $KCODE = kc_backup
-      end 
+      end
     end
   end
 end

data/test/soap/test_httpconfigloader.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/httpconfigloader'
 require 'soap/rpc/driver'
 

data/test/soap/test_mapping.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/mapping'
 require 'soap/marshal'
 

data/test/soap/test_nestedexception.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/soap'
 
 
@@ -38,19 +38,33 @@ class TestNestedException < Test::Unit::TestCase
     end
   end
 
-  TOBE = [
-    ":15:in `foo'",
-    ":33:in `test_nestedexception'",
-    ":23:in `bar': bar (SOAP::TestNestedException::MyError) [NESTED]",
-    ":13:in `foo'",
-    ":33:in `test_nestedexception'",
-    ":28:in `baz': baz (SOAP::TestNestedException::MyError) [NESTED]",
-    ":21:in `bar'",
-    ":13:in `foo'",
-    ":33:in `test_nestedexception'",
-  ]
-
+  if (RUBY_VERSION.to_f >= 1.9)
+    TOBE = [
+      ":15:in `rescue in foo'",
+      ":12:in `foo'",
+      ":33:in `test_nestedexception'",
+      ":23:in `rescue in bar': bar (SOAP::TestNestedException::MyError) [NESTED]",
+      ":20:in `bar'",
+      ":13:in `foo'",
+      ":33:in `test_nestedexception'",
+      ":28:in `baz': baz (SOAP::TestNestedException::MyError) [NESTED]",
+      ":21:in `bar'",
+      ":13:in `foo'",
+      ":33:in `test_nestedexception'"
+    ]  
+  else
+    TOBE = [
+      ":15:in `foo'",
+      ":33:in `test_nestedexception'",
+      ":23:in `bar': bar (SOAP::TestNestedException::MyError) [NESTED]",
+      ":13:in `foo'",
+      ":33:in `test_nestedexception'",
+      ":28:in `baz': baz (SOAP::TestNestedException::MyError) [NESTED]",
+      ":21:in `bar'",
+      ":13:in `foo'",
+      ":33:in `test_nestedexception'",
+    ]
+  end
 end
 
-
 end

data/test/soap/test_nil.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'
 require 'soap/header/handler'
@@ -41,35 +41,30 @@ class TestNil < Test::Unit::TestCase
     @client.reset_stream if @client
   end
 
-  begin
-    require 'nokogiri'
-    # emulates SOAP::Lite's nil request (Nokogiri)
-    def test_soaplite_nil
-       body = SOAP::SOAPBody.new(Nokogiri::XML(<<-__XML__))
-         <nop xsi:nil="true"/>
-       __XML__
-      @client.wiredump_dev = STDOUT if $DEBUG
-      header, body = @client.invoke(nil, body)
-      assert_equal(1, body.root_node["return"].data)
-    end
-  rescue LoadError
-    puts "Nokogiri Not Installed"
-  end
+  require 'rexml/document'
+  # emulates SOAP::Lite's nil request
 
-  begin
-    require 'rexml/document'
-    # emulates SOAP::Lite's nil request (REXML)
-    def test_soaplite_nil
-      body = SOAP::SOAPBody.new(REXML::Document.new(<<-__XML__))
-        <nop nil="true"/>
-      __XML__
-      @client.wiredump_dev = STDOUT if $DEBUG
-      header, body = @client.invoke(nil, body)
-      assert_equal(1, body.root_node["return"].data)
-    end
-  rescue LoadError
-    puts "REXML Not Installed"
+#  def test_soaplite_nil
+#    body = SOAP::SOAPBody.new(REXML::Document.new(<<-__XML__))
+#      <nop xsi:nil="true"/>
+#    __XML__
+#    @client.wiredump_dev = STDOUT if $DEBUG
+#    header, body = @client.invoke(nil, body)
+#    assert_equal(1, body.root_node["return"].data)
+#  end
+
+  def test_soaplite_nil
+    body = SOAP::SOAPBody.new(REXML::Document.new(<<-__XML__))
+      <nop/>
+    __XML__
+    @client.wiredump_dev = STDOUT if $DEBUG
+    header, body = @client.invoke(nil, body)
+    assert_equal(1, body.root_node["return"].data)
   end
+
+
+
 end
 
+
 end

data/test/soap/test_no_indent.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'
 
@@ -67,14 +67,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     @client.wiredump_dev = str = ''
     @client.options["soap.envelope.no_indent"] = false
     @client.nop
-    assert_equal(INDENT_XML, parse_requestxml(str))
+    assert_xml_equal(INDENT_XML, parse_requestxml(str))
   end
 
   def test_no_indent
     @client.wiredump_dev = str = ''
     @client.options["soap.envelope.no_indent"] = true
     @client.nop
-    assert_equal(NO_INDENT_XML, parse_requestxml(str))
+    assert_xml_equal(NO_INDENT_XML, parse_requestxml(str))
   end
 
   def parse_requestxml(str)

data/test/soap/test_property.rb

@@ -1,8 +1,8 @@
 # coding: utf-8
-
-require 'test/unit'
+require 'helper'
 require 'soap/property'
 
+
 module SOAP
 
 

data/test/soap/test_response_as_xml.rb

@@ -1,8 +1,8 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/httpserver'
 require 'soap/rpc/driver'
 require 'rexml/document'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'testutil.rb')
 
 
 module SOAP
@@ -75,10 +75,10 @@ class TestResponseAsXml < Test::Unit::TestCase
 __XML__
 
   def test_hello
-    assert_equal("hello world", @client.hello("world"))
+    assert_xml_equal("hello world", @client.hello("world"))
     @client.return_response_as_xml = true
     xml = @client.hello("world")
-    assert_equal(RESPONSE_AS_XML, xml, [RESPONSE_AS_XML, xml].join("\n\n"))
+    assert_xml_equal(RESPONSE_AS_XML, xml, [RESPONSE_AS_XML, xml].join("\n\n"))
     doc = REXML::Document.new(@client.hello("world"))
     assert_equal("hello world",
       REXML::XPath.match(doc, "//*[name()='return']")[0].text)

data/test/soap/test_soapelement.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'helper'
 require 'soap/baseData'
 require 'soap/mapping'
 

data/test/soap/test_streamhandler.rb

@@ -1,9 +1,9 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/driver'
 require 'webrick'
 require 'webrick/httpproxy'
 require 'logger'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'testutil.rb')
 
 
 module SOAP

data/test/soap/test_styleuse.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/httpserver'
 require 'soap/rpc/driver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'testutil.rb')
 
 
 module SOAP

data/test/soap/wsdlDriver/test_calc.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/httpserver'
 require 'soap/wsdlDriver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP

data/test/soap/wsdlDriver/test_document.rb

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

data/test/soap/wsdlDriver/test_simpletype.rb

@@ -1,7 +1,8 @@
-require 'test/unit'
+require 'helper'
+require 'testutil'
 require 'soap/rpc/httpserver'
 require 'soap/wsdlDriver'
-require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
+
 
 
 module SOAP

data/test/testutil.rb

@@ -4,11 +4,11 @@ module TestUtil
     begin
       # avoid 'already initialized constant FizzBuzz' warning
       silent do
-        Dir.chdir(dir) do
-          features.each do |feature|
-            Kernel.require feature
-          end
+        $:.unshift(dir)
+        features.each do |feature|
+          Kernel.require feature
         end
+        $:.shift
       end
     ensure
       features.each do |feature|