soap4r-sgonyea 1.5.9 → 1.6.0

data/test/soap/struct/test_struct.rb

@@ -1,8 +1,7 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 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/styleuse/client.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'soap/rpc/driver'
 
 server = 'http://localhost:7000/'

data/test/soap/styleuse/server.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: ASCII-8BIT
 
 require 'soap/rpc/standaloneServer'
 

data/test/soap/swa/test_file.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/rpc/driver'
 require 'soap/rpc/standaloneServer'
 require 'soap/attachment'

data/test/soap/test_basetype.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/baseData'
 
 

data/test/soap/test_cookie.rb

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

data/test/soap/test_custommap.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/marshal'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'

data/test/soap/test_empty.rb

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

data/test/soap/test_envelopenamespace.rb

@@ -1,9 +1,8 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 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,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/processor'
 
 
@@ -38,7 +37,7 @@ class TestExtrAttr < Test::Unit::TestCase
     env.extraattr["Id"] = "extraattr"
     g = SOAP::Generator.new()
     xml = g.generate(env)
-    assert_xml_equal(HEADER_XML, xml)
+    assert_equal(HEADER_XML, xml)
     #
     parser = SOAP::Parser.new
     env = parser.parse(xml)

data/test/soap/test_generator.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/processor'
 
 
@@ -14,16 +13,12 @@ class TestGenerator < Test::Unit::TestCase
     g.generate(SOAPElement.new('foo'))
     assert_equal("&lt;", g.encode_string(str)[-4, 4])
     #
-    if RUBY_VERSION.to_f >= 1.9
+    begin
+      kc_backup = $KCODE.dup
+      $KCODE = 'EUC-JP'
       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
+    ensure
+      $KCODE = kc_backup
     end
   end
 end

data/test/soap/test_httpconfigloader.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/httpconfigloader'
 require 'soap/rpc/driver'
 

data/test/soap/test_mapping.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/mapping'
 require 'soap/marshal'
 

data/test/soap/test_nestedexception.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/soap'
 
 
@@ -39,33 +38,19 @@ class TestNestedException < Test::Unit::TestCase
     end
   end
 
-  if (RUBY_VERSION.to_f >= 1.9)
-    TOBE = [
-      ":16:in `rescue in foo'",
-      ":13:in `foo'",
-      ":34:in `test_nestedexception'",
-      ":24:in `rescue in bar': bar (SOAP::TestNestedException::MyError) [NESTED]",
-      ":21:in `bar'",
-      ":14:in `foo'",
-      ":34:in `test_nestedexception'",
-      ":29:in `baz': baz (SOAP::TestNestedException::MyError) [NESTED]",
-      ":22:in `bar'",
-      ":14:in `foo'",
-      ":34:in `test_nestedexception'"
-    ]  
-  else
-    TOBE = [
-      ":16:in `foo'",
-      ":34:in `test_nestedexception'",
-      ":24:in `bar': bar (SOAP::TestNestedException::MyError) [NESTED]",
-      ":14:in `foo'",
-      ":34:in `test_nestedexception'",
-      ":29:in `baz': baz (SOAP::TestNestedException::MyError) [NESTED]",
-      ":22:in `bar'",
-      ":14:in `foo'",
-      ":34:in `test_nestedexception'",
-    ]
-  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'",
+  ]
+
 end
 
+
 end

data/test/soap/test_nil.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'
 require 'soap/header/handler'
@@ -44,27 +43,14 @@ class TestNil < Test::Unit::TestCase
 
   require 'rexml/document'
   # emulates SOAP::Lite's nil request
-
-#  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/>
+      <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
-
-
-
 end
 
 

data/test/soap/test_no_indent.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'
 
@@ -68,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_xml_equal(INDENT_XML, parse_requestxml(str))
+    assert_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_xml_equal(NO_INDENT_XML, parse_requestxml(str))
+    assert_equal(NO_INDENT_XML, parse_requestxml(str))
   end
 
   def parse_requestxml(str)

data/test/soap/test_property.rb

@@ -1,6 +1,4 @@
-# encoding: ASCII-8BIT
-# coding: utf-8
-require 'helper'
+require 'test/unit'
 require 'soap/property'
 
 

data/test/soap/test_response_as_xml.rb

@@ -1,9 +1,8 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 require 'soap/rpc/httpserver'
 require 'soap/rpc/driver'
 require 'rexml/document'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', 'testutil.rb')
 
 
 module SOAP
@@ -76,10 +75,10 @@ class TestResponseAsXml < Test::Unit::TestCase
 __XML__
 
   def test_hello
-    assert_xml_equal("hello world", @client.hello("world"))
+    assert_equal("hello world", @client.hello("world"))
     @client.return_response_as_xml = true
     xml = @client.hello("world")
-    assert_xml_equal(RESPONSE_AS_XML, xml, [RESPONSE_AS_XML, xml].join("\n\n"))
+    assert_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,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/baseData'
 require 'soap/mapping'
 

data/test/soap/test_streamhandler.rb

@@ -1,10 +1,9 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 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,8 +1,7 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 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/echo_version.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'xsd/qname'
 
 # {urn:example.com:simpletype-rpc-type}version_struct

data/test/soap/wsdlDriver/test_calc.rb

@@ -1,8 +1,7 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 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,8 +1,7 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 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,9 +1,7 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 require 'soap/rpc/httpserver'
 require 'soap/wsdlDriver'
-
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP

data/test/testutil.rb

@@ -1,15 +1,14 @@
-# encoding: ASCII-8BIT
 module TestUtil
   # MT-unsafe
   def self.require(dir, *features)
     begin
       # avoid 'already initialized constant FizzBuzz' warning
       silent do
-        $:.unshift(dir)
-        features.each do |feature|
-          Kernel.require feature
+        Dir.chdir(dir) do
+          features.each do |feature|
+            Kernel.require feature
+          end
         end
-        $:.shift
       end
     ensure
       features.each do |feature|