test_wsdlmarshal.rb in soap4r-sgonyea-1.6.0

- old
+ new

@@ -1,12 +1,11 @@
-# encoding: ASCII-8BIT
-require 'helper'
-require 'testutil'
+require 'test/unit'
 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
   def initialize(wsdlfile)
     wsdl = WSDL::Parser.new.parse(File.open(wsdlfile) { |f| f.read })
@@ -29,10 +28,11 @@
     header, body = ::SOAP::Processor.unmarshal(io, @opt)
     ::SOAP::Mapping.soap2obj(body.root_node, @mapping_registry)
   end
 end
 
-TestUtil.require(File.dirname(__FILE__), 'person_org')
+
+require File.join(File.dirname(__FILE__), 'person_org')
 
 class Person
   def ==(rhs)
     @familyname == rhs.familyname and @givenname == rhs.givenname and
       @var1 == rhs.var1 and @var2 == rhs.var2 and @var3 == rhs.var3