soap4r-sgonyea 1.5.9 → 1.6.0

data/test/interopR2/clienteSOAP.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: ASCII-8BIT
 
 $serverName = 'eSoap'
 

data/test/interopR2/clientgSOAP.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: ASCII-8BIT
 
 $serverName = 'gSOAP'
 

data/test/interopR2/clientkSOAP.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: ASCII-8BIT
 
 $serverName = 'kSOAP'
 

data/test/interopR2/iSimonReg.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'soap/soap'
 require 'soap/rpcUtils'
 

data/test/interopR2/interopResultBase.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'soap/mapping'
 
 

data/test/interopR2/interopService.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'interopbase'
 
 class InteropService

data/test/interopR2/rwikiInteropService.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'drb/drb'
 require 'rw-lib'
 require 'interopResultBase'

data/test/interopR2/server.cgi

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: ASCII-8BIT
 
 $:.unshift(".")
 

data/test/interopR2/server.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: ASCII-8BIT
 
 $:.unshift(".")
 

data/test/interopR2/simonReg.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: ASCII-8BIT
 
 proxy = ARGV.shift || nil
 

data/test/interopR4/client.rb

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

data/test/runner.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'test/unit'
 
 rcsid = %w$Id$

data/test/sm11/classDef.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 # http://dopg.gr.jp/sm11.xsd
 class C_struct
   attr_accessor :e_boolean	# {http://www.w3.org/2001/XMLSchema}boolean

data/test/sm11/client.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 # Done
 #   /^void/  def/
 #   /^}/  end/

data/test/sm11/driver.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'classDef'
 require 'soap/proxy'
 require 'soap/rpcUtils'

data/test/sm11/servant.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'classDef'
 
 # Done

data/test/sm11/server.rb

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: ASCII-8BIT
 
 $KCODE = "UTF8"      # Set $KCODE before loading 'soap/xmlparser'.
 

data/test/soap/asp.net/test_aspdotnet.rb

@@ -1,8 +1,7 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 require 'soap/rpc/standaloneServer'
 require 'soap/rpc/driver'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP; module ASPDotNet
@@ -109,7 +108,7 @@ __XML__
       @client.add_method_with_soapaction('sayHello', Server::Namespace + 'SayHello', 'name')
       @client.default_encodingstyle = SOAP::EncodingStyle::ASPDotNetHandler::Namespace
       assert_equal("Hello Mike", @client.sayHello("Mike"))
-      assert_xml_equal(REQUEST_ASPDOTNETHANDLER, parse_requestxml(str),
+      assert_equal(REQUEST_ASPDOTNETHANDLER, parse_requestxml(str),
         [REQUEST_ASPDOTNETHANDLER, parse_requestxml(str)].join("\n\n"))
     end
 

data/test/soap/auth/test_basic.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; module Auth

data/test/soap/auth/test_digest.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; module Auth

data/test/soap/calc/calc.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 module CalcService
   def self.add(lhs, rhs)
     lhs + rhs

data/test/soap/calc/calc2.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 class CalcService2
   def initialize(value = 0)
     @value = value

data/test/soap/calc/server.cgi

@@ -1,6 +1,3 @@
-# encoding: ASCII-8BIT
-$:.unshift File.expand_path(File.dirname(__FILE__)+'/../../../lib')
-$:.unshift '.' if RUBY_VERSION.to_f >= 1.9
 require 'soap/rpc/cgistub'
 
 class CalcServer < SOAP::RPC::CGIStub

data/test/soap/calc/server.rb

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

data/test/soap/calc/server2.rb

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

data/test/soap/calc/test_calc.rb

@@ -1,8 +1,6 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 require 'soap/rpc/driver'
-TestUtil.require(File.dirname(__FILE__), 'server.rb')
+require 'server.rb'
 
 
 module SOAP

data/test/soap/calc/test_calc2.rb

@@ -1,8 +1,6 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 require 'soap/rpc/driver'
-TestUtil.require(File.dirname(__FILE__), 'server2.rb')
+require 'server2.rb'
 
 
 module SOAP

data/test/soap/calc/test_calc_cgi.rb

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

data/test/soap/case/test_mapping.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 require 'soap/marshal'
 
 
@@ -50,7 +49,7 @@ class TestMapping < Test::Unit::TestCase
 </env:Envelope>
 __XML__
     o = TTMHeader.new("dsn", "password", "schema", "username")
-    assert_xml_equal(dump, SOAP::Marshal.dump(o))
+    assert_equal(dump, SOAP::Marshal.dump(o))
   end
 end
 

data/test/soap/fault/test_customfault.rb

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

data/test/soap/fault/test_fault.rb

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

data/test/soap/fault/test_soaparray.rb

@@ -1,8 +1,7 @@
-# encoding: ASCII-8BIT
-require 'helper'
 require 'soap/rpc/router'
 require 'soap/mapping/mapping'
 require 'soap/processor'
+require 'test/unit'
 
 
 module SOAP

data/test/soap/filter/test_filter.rb

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

data/test/soap/header/server.cgi

@@ -1,5 +1,3 @@
-# encoding: ASCII-8BIT
-$:.unshift File.expand_path(File.dirname(__FILE__)+'/../../../lib')
 require 'pstore'
 require 'soap/rpc/cgistub'
 require 'soap/header/simplehandler'

data/test/soap/header/test_authheader.rb

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

data/test/soap/header/test_authheader_cgi.rb

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

data/test/soap/header/test_simplehandler.rb

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

data/test/soap/helloworld/hw_s.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'soap/rpc/standaloneServer'
 
 class HelloWorldServer < SOAP::RPC::StandaloneServer

data/test/soap/helloworld/test_helloworld.rb

@@ -1,8 +1,6 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 require 'soap/rpc/driver'
-TestUtil.require(File.dirname(__FILE__), 'hw_s.rb')
+require 'hw_s.rb'
 
 
 module SOAP

data/test/soap/literalArrayMapping/amazonEc.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'xsd/qname'
 
 # {http://webservices.amazon.com/AWSECommerceService/2006-06-07}Bin

data/test/soap/literalArrayMapping/amazonEcDriver.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 require 'amazonEc.rb'
 
 require 'soap/rpc/driver'

data/test/soap/literalArrayMapping/test_definedarray.rb

@@ -1,9 +1,8 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 require 'soap/mapping'
 require 'soap/processor'
 require 'soap/rpc/element'
+require File.join(File.dirname(File.expand_path(__FILE__)), '..', '..', 'testutil.rb')
 
 
 module SOAP

data/test/soap/marshal/marshaltestlib.rb

@@ -1,4 +1,3 @@
-# encoding: ASCII-8BIT
 module MarshalTestLib
   # include this module to a Test::Unit::TestCase and definde encode(o) and
   # decode(s) methods.  e.g.
@@ -27,15 +26,12 @@ module MarshalTestLib
     msg = msg ? msg + "(#{ caller[0] })" : caller[0]
     o2 = marshaltest(o1)
     assert_equal(o1.class, o2.class, msg)
-    
     iv1 = o1.instance_variables.sort
     iv2 = o2.instance_variables.sort
     assert_equal(iv1, iv2)
-    
-    val1 = iv1.map {|var| o1.instance_eval( "#{var}" )}
-    val2 = iv1.map {|var| o2.instance_eval( "#{var}" )}
+    val1 = iv1.map {|var| o1.instance_eval {eval var}}
+    val2 = iv1.map {|var| o2.instance_eval {eval var}}
     assert_equal(val1, val2, msg)
-    
     if block_given?
       assert_equal(yield(o1), yield(o2), msg)
     else
@@ -373,12 +369,12 @@ module MarshalTestLib
     # once there was a bug caused by usec overflow.  try a little harder.
     10.times do
       t = Time.now
-      marshal_equal(t,t.usec.to_s) {|t| t.tv_usec }
+      marshal_equal(t, t.usec.to_s)
     end
   end
 
   def test_time_subclass
-    marshal_equal(MyTime.new(10)) {|t| t.tv_usec }
+    marshal_equal(MyTime.new(10))
   end
 
   def test_time_ivar
@@ -425,7 +421,7 @@ module MarshalTestLib
     end
     assert_raises(TypeError) { marshaltest(o) }
     assert_raises(TypeError) { marshaltest(c) }
-    assert_raises(TypeError) { marshaltest(ARGF) } unless (RUBY_VERSION.to_f >= 1.9) # Rubyjedi: ARGF is no longer a singleton in Ruby 1.9 and above
+    assert_raises(TypeError) { marshaltest(ARGF) }
     assert_raises(TypeError) { marshaltest(ENV) }
   end
 

data/test/soap/marshal/test_digraph.rb

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

data/test/soap/marshal/test_marshal.rb

@@ -1,8 +1,6 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 require 'soap/marshal'
-TestUtil.require(File.dirname(__FILE__), 'marshaltestlib')
+require File.join(File.dirname(File.expand_path(__FILE__)), 'marshaltestlib')
 
 
 if RUBY_VERSION > "1.7.0"

data/test/soap/marshal/test_struct.rb

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

data/test/soap/ssl/sslsvr.rb

@@ -1,5 +1,3 @@
-# encoding: ASCII-8BIT
-$:.unshift File.expand_path(File.dirname(__FILE__)+'/../../../lib')
 require 'webrick/https'
 require 'logger'
 require 'rbconfig'

data/test/soap/ssl/test_ssl.rb

@@ -1,5 +1,4 @@
-# encoding: ASCII-8BIT
-require 'helper'
+require 'test/unit'
 begin
   require 'httpclient'
 rescue LoadError